gentoo resync : 17.05.2018

5 files changed, 57 insertions, 27 deletions

diff --git a/sci-libs/libh2o/Manifest b/sci-libs/libh2o/Manifest
index 0b741a50374e..d443f161a540 100644
--- a/sci-libs/libh2o/Manifest
+++ b/sci-libs/libh2o/Manifest
@@ -1,4 +1,5 @@
 DIST libh2o-0.2.1.tar.bz2 290418 BLAKE2B a1de444e13d8ceb65af73eb7fc8f0b35ff59377fa72417b1cf2ee4d919a44d31f356ed14dc0bf9c04ca6f3e5cce71bed7552e98a30f5b134f7a5d322845bf105 SHA512 e2fb14171aa401e85edcef6be36bfd2af31a7da2db03bc77c41fd58962a8e2616bbbd43adb268c262b848d044c9d33016c504ce770f5cfe0d585d05dacc63e2a
-EBUILD libh2o-0.2.1.ebuild 528 BLAKE2B 2975ed4c411f420bcacf2430408f38dd6becc9354e8878e254486ec1c43d916ea937049ed821bed75272ad71ff220050364fd4183524500fd03b287d16450b8a SHA512 9f87dbd6f34e2a0a9e2a22ca9f720b0e001584cdc9b388f53a8cda45cdae488993b03fc426bc999bdf01e7c25f95fd46ef68537fd2234df8f18c0965c85277ae
-EBUILD libh2o-9999.ebuild 677 BLAKE2B 29ee190b194f1bd70a0978a01e9e96ec5dd9085d742814c3938c7b957a4e6cf081c4e40f2a5c651cce416d653fb9293c629e51211942d8e968f7943fa1b92dbf SHA512 82685a513e2a3c7e2799bbf3858942997d09bccbc347971227e957e11e8f106d706e3bb224925c5dc8839d3e6267ba548235e2031b2032bd4b6b8310446c3a48
-MISC metadata.xml 507 BLAKE2B f41f91246ef9864646511982acfda42dad1ba2d1d338f0c6101aeee91fcf4775877542cc7465382982bf5174fc1312d26a4bf966717329e6cc593d464edbd6da SHA512 7f7f002eaf1d743555dce80e0c29cc3fb598e784ed76fc3a6e2d807edc1a3858489002cebe07613070d6fd0f4a3293b7e42711cd8c6efe3d5c51a2fb4b0ab427
+EBUILD libh2o-0.2.1-r1.ebuild 597 BLAKE2B 2374db74af4e9cd5c40c9bf8dc438db95b62bd469ecdef2f575aac298c5e730338ed267952ccde02537565d2b11ca330859c4373dab77c36f4008f8d9c99b82a SHA512 2b648c1a16d8059c02fdcf1c3c57d26cb926ea66831473e0497bbe9b4419c53e5fc42eaf4d194d4731bc3c5441210a329fd316aa6bd524b8f1f1945d784bbb30
+EBUILD libh2o-0.2.1.ebuild 532 BLAKE2B 1f784f0688ffc788d931c771d42842e457bbeae5d7b7db2197136efbc28c4a50e8f47da552092eb3effb73ba7e84d5e864d689dbf2e33f4513156fcbe67e9f9e SHA512 e77231e598f59483f88c7a547e60c6ede36700045fce70641b4f0ce3a16b81e95446848a6e1e143d6659a8167f4b1fbadfe88ddd7a8eade26907d2df8fe2f640
+EBUILD libh2o-9999.ebuild 638 BLAKE2B 8cc669e90631baa193f0af2600d1fa409f84ac4ac5f0c955e6782b421dcccbe9dc1d99e5eec40112b67ff25d801a6c51f1e5f206cbe4991ea2a71a95d66e6050 SHA512 1dd674261ab0423d1d66f61e48731ae3209e11d30d56d836ad29b589d17e82ad9803d831035b46dc6ff316a22bc101ff4628be85c42aa7f9a56d856805250fac
+MISC metadata.xml 501 BLAKE2B 6eb77e4e388dd5c0cabe3d85563c8bd58b8053ed68f33b4b36d78836ff3507a9168ec568aa7aa179acfe9bda97ac755db13c5fa615b89356c5d293191cf2c736 SHA512 87be30fa6955758d194d0f50b1102d337157cfad6ba35ef346afa7e960c9885f2bbdefd5432fb783aa99339702986d7e287db8a3cec1398e8d5fbb57e78806f9
diff --git a/sci-libs/libh2o/libh2o-0.2.1-r1.ebuild b/sci-libs/libh2o/libh2o-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..2b52c92af381
--- /dev/null
+++ b/sci-libs/libh2o/libh2o-0.2.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library of routines for IF97 water & steam properties"
+HOMEPAGE="https://github.com/mgorny/libh2o/"
+SRC_URI="https://github.com/mgorny/libh2o/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug static-libs"
+
+DEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/libh2o/libh2o-0.2.1.ebuild b/sci-libs/libh2o/libh2o-0.2.1.ebuild
index 03e9cb7d25c1..1cc49ecad8b6 100644
--- a/sci-libs/libh2o/libh2o-0.2.1.ebuild
+++ b/sci-libs/libh2o/libh2o-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,8 +6,8 @@ EAPI=4
 inherit autotools-utils
 
 DESCRIPTION="Library of routines for IF97 water & steam properties"
-HOMEPAGE="https://bitbucket.org/mgorny/libh2o/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/libh2o/"
+SRC_URI="https://github.com/mgorny/libh2o/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sci-libs/libh2o/libh2o-9999.ebuild b/sci-libs/libh2o/libh2o-9999.ebuild
index 2413fb4aaf6a..731e477a3910 100644
--- a/sci-libs/libh2o/libh2o-9999.ebuild
+++ b/sci-libs/libh2o/libh2o-9999.ebuild
@@ -1,37 +1,37 @@
-# 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="Library of routines for IF97 water & steam properties"
-HOMEPAGE="https://bitbucket.org/mgorny/libh2o/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/libh2o/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/mgorny/libh2o.git"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="debug static-libs"
 
 DEPEND="virtual/pkgconfig"
 
-#if LIVE
-KEYWORDS=
-SRC_URI=
-#endif
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
-	local myeconfargs=(
+	local myconf=(
 		$(use_enable debug)
+		$(use_enable static-libs static)
 	)
 
-	autotools-utils_src_configure
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/libh2o/metadata.xml b/sci-libs/libh2o/metadata.xml
index 3b33b5ad848d..d7baf471a705 100644
--- a/sci-libs/libh2o/metadata.xml
+++ b/sci-libs/libh2o/metadata.xml
@@ -10,7 +10,7 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>https://bitbucket.org/mgorny/libh2o/issues/</bugs-to>
-		<remote-id type="bitbucket">mgorny/libh2o</remote-id>
+		<bugs-to>https://github.com/mgorny/libh2o/issues/</bugs-to>
+		<remote-id type="github">mgorny/libh2o</remote-id>
 	</upstream>
 </pkgmetadata>