gentoo resync : 17.05.2018

6 files changed, 43 insertions, 25 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 065fbc1e9340..bd4a682c4359 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/h2o-gtk/Manifest b/sci-physics/h2o-gtk/Manifest
index 30a7a92f0498..31d12fa7c884 100644
--- a/sci-physics/h2o-gtk/Manifest
+++ b/sci-physics/h2o-gtk/Manifest
@@ -1,4 +1,5 @@
 DIST h2o-gtk-0.1.tar.bz2 69851 BLAKE2B f097b36e1c7950bae3fa058667a3f8597cd87f59de4c6035d155cdc43e6b089c9bcc5ae1e9805447d0c295f7af49f1f41d74e8bb8c25fc467ce1763f10ea9d86 SHA512 58f376f53fc108be620d5a792227ee65e7464581c45b68e94d7bb19b90862f3b008b172d3a2f2376fee5f30fd19f6bb0f5ec74cb49f1224245f8c6ae68cc9b04
-EBUILD h2o-gtk-0.1.ebuild 558 BLAKE2B 0e92112abf6dc0f8ff2998fd5619f805ace4422ef25ccf800544da999ba0a2c3bf6162f248299c3586cad5bc1ca0feec3905f8dfcee1328f673f86e86d3a19f2 SHA512 c37b502b50ecf1e136ebcabed9ab1046892d771c664283301a5478eacf45cfd8b1a5f19a8e88a08a39d99443ee83142d179ba80951d9f419aa787c875f1f9194
-EBUILD h2o-gtk-9999.ebuild 619 BLAKE2B 84bd82477b2b4f879c6eb95fdcc679d962bee0bb4990c7e287ce010e8226efa6348b848f0a7159751ee34cc24e36d8b1b8f1744ec0a4857c82223f081e7a6d1c SHA512 bfc7e4ce0e5da1b86c5476a4ab410fa5bd0f02dddc142f6166c4141f4ed591aa41047ad4269ae78dc682e0b466d0ece5b0095ab7d69279fca9aee1d366b6bfda
-MISC metadata.xml 509 BLAKE2B 2a63838f5ed2744c94b3560107fdc52d25d5488e3d5b8b7cfafe55da6dee97c7a88766bcb83780489d675a90375ffd91787e2f1d672e807fe6ab700b3b99d423 SHA512 0787cd0836cbaca79582c6a5277c9766913a1d1c783cc8194ca1fa5e2cabb4f40f4e1c590dc48451031ef2fab4b64a1aff8cf2906ada063b0cde1a05c6b719b0
+EBUILD h2o-gtk-0.1-r1.ebuild 524 BLAKE2B 89de50c34c1772eb35b707d843c312e0523385a2c52f3b7988dac2530419f4523d52cc212bb81166ee711e759433122fb802c3b3661db7ef3c92e0ca3b4aaa5f SHA512 5f9828b8c1325292ff312fa91d2b2c8735b9df85f9f710134c92179e1a452cd377d883f864b22189b0d60ecc34f0500d7c41f03bf4f356ae4924eb62359787ee
+EBUILD h2o-gtk-0.1.ebuild 563 BLAKE2B 59d65ae1ed2949bd8e2b2cd16f5deb09b7ee83d663722cc76a1de41f3fcc4795e82cbdac3ba36aceab582ed6737019e4313efa21641b5cc8af9accc466b274df SHA512 34a749e039a9e2043763bf8890b7c57b401778322f0ce6607acb91336d7778aa1aab4ade3ebee4add4609407ecd4a2d01bedc86427287f5b0d5b88f4e5588bc0
+EBUILD h2o-gtk-9999.ebuild 491 BLAKE2B c4d0b03111e3044979fa7186ee48000aeaf08585e716990fd6e85f46f10f5faaed546dbd7e457f90a8a2c5cf4a21d528fae84512555df4c891394a1493559499 SHA512 36213873dbefae08638e66bc4a3194479261b9f404ca3d30fc7e547c83d6ced9890a206c7033a7a9c890b5957b04f0dc356c850adffe2b6c75b51c13b9c6f487
+MISC metadata.xml 503 BLAKE2B b5d08a6d52f89bf89b14942cba4e4492e5c970788116d19cd4a891f84dda109914edb1d6f8c67690bf3d837c6142b5fa790c8d8666c68219ab5dc977c90d550b SHA512 a69f2ac7caa9022d4b91ec06b5e1479bc60d96a15a5f77f86545292abe816f2be16941a2e5525a5f978fca347fe4ce284de709c607948c429a6f32c0223a0a65
diff --git a/sci-physics/h2o-gtk/h2o-gtk-0.1-r1.ebuild b/sci-physics/h2o-gtk/h2o-gtk-0.1-r1.ebuild
new file mode 100644
index 000000000000..ec3885a327dc
--- /dev/null
+++ b/sci-physics/h2o-gtk/h2o-gtk-0.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GTK+ UI for libh2o -- water & steam properties"
+HOMEPAGE="https://github.com/mgorny/h2o-gtk/"
+SRC_URI="https://github.com/mgorny/h2o-gtk/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-cpp/gtkmm:2.4=
+	sci-libs/libh2oxx:0=
+	sci-libs/plotmm:0="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local -x CXXFLAGS="${CXXFLAGS} -std=c++11"
+	default
+}
diff --git a/sci-physics/h2o-gtk/h2o-gtk-0.1.ebuild b/sci-physics/h2o-gtk/h2o-gtk-0.1.ebuild
index 58ab0a0cab1f..b3b174804c09 100644
--- a/sci-physics/h2o-gtk/h2o-gtk-0.1.ebuild
+++ b/sci-physics/h2o-gtk/h2o-gtk-0.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit autotools-utils flag-o-matic
 
 DESCRIPTION="GTK+ UI for libh2o -- water & steam properties"
-HOMEPAGE="https://bitbucket.org/mgorny/h2o-gtk/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/h2o-gtk/"
+SRC_URI="https://github.com/mgorny/h2o-gtk/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sci-physics/h2o-gtk/h2o-gtk-9999.ebuild b/sci-physics/h2o-gtk/h2o-gtk-9999.ebuild
index 6276dd849cb2..1096a19fbbc2 100644
--- a/sci-physics/h2o-gtk/h2o-gtk-9999.ebuild
+++ b/sci-physics/h2o-gtk/h2o-gtk-9999.ebuild
@@ -1,24 +1,18 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-#if LIVE
-AUTOTOOLS_AUTORECONF=yes
-EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
-
-inherit git-r3
-#endif
-
-inherit autotools-utils
+inherit autotools git-r3
 
 DESCRIPTION="GTK+ UI for libh2o -- water & steam properties"
-HOMEPAGE="https://bitbucket.org/mgorny/h2o-gtk/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/h2o-gtk/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/mgorny/h2o-gtk.git"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE=""
 
 RDEPEND="dev-cpp/gtkmm:2.4=
@@ -26,7 +20,7 @@ RDEPEND="dev-cpp/gtkmm:2.4=
 	sci-libs/plotmm:0="
 DEPEND="${RDEPEND}"
 
-#if LIVE
-KEYWORDS=
-SRC_URI=
-#endif
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sci-physics/h2o-gtk/metadata.xml b/sci-physics/h2o-gtk/metadata.xml
index 00eb8a518fdf..9cd05826817f 100644
--- a/sci-physics/h2o-gtk/metadata.xml
+++ b/sci-physics/h2o-gtk/metadata.xml
@@ -10,7 +10,7 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>https://bitbucket.org/mgorny/h2o-gtk/issues/</bugs-to>
-		<remote-id type="bitbucket">mgorny/h2o-gtk</remote-id>
+		<bugs-to>https://github.com/mgorny/h2o-gtk/issues/</bugs-to>
+		<remote-id type="github">mgorny/h2o-gtk</remote-id>
 	</upstream>
 </pkgmetadata>