gentoo resync : 17.05.2018

5 files changed, 58 insertions, 27 deletions

diff --git a/sci-libs/libh2oxx/Manifest b/sci-libs/libh2oxx/Manifest
index 0a72bb707874..27ffaa60b64c 100644
--- a/sci-libs/libh2oxx/Manifest
+++ b/sci-libs/libh2oxx/Manifest
@@ -1,4 +1,5 @@
 DIST libh2oxx-0.2.tar.bz2 266320 BLAKE2B b63363dfa5ec1a63a3fa35b0dcf8bf79b84d33a8fdd1452c4ae2b7e2c3ed14d5e24bc732ff5cf240557ab7e92558f2aa41f005b1bfe2f7efa294dde21bd1c0b9 SHA512 37b5eb713eed9a41f001add0ed3415fb4e1d6a19917de7fe36017f9a8b102394ac86b47fa845b18d7c4c63ad94e270f28e0883c9e9503c1952fdefbfdb6cc3a3
-EBUILD libh2oxx-0.2.ebuild 525 BLAKE2B 9a781bb7a2e8f584512fefe0ae6135282b17894794cf6a66b47e916495e90a45b98367b23716ed8eeddd2f5c33f8f7501e191ac4b3886a96996b5ea5ca2ab745 SHA512 30dd08bb7ac538a86c653b6150f0c4f5e8e2510016fec6d39dac77cb2b2046972e4436d25f3ddda30865b1eb69b7595e640291b124a5cececcb60040bf7a3e93
-EBUILD libh2oxx-9999.ebuild 677 BLAKE2B 62ccefd55d9a126abc7dd795f1a6986ec2fe6d74fe773820ce01c9eb7902770463196989a7259e22399ac53effc5441dd4e0764f40410cf8750e7e46ca2f86b5 SHA512 50c39a3ca128b6ecfe7e138721f44de46ced4151655e68f7d0275e83780ce58b25002c4fb7cf5954ccf2c6bae99ef201ac20c6b8944593a6e333da725b84fd0e
-MISC metadata.xml 511 BLAKE2B 24b3acb499f8d08e02240b60477873d2a212761de6e0dcf512fdba920c98796eba5d5f1f28c733a3c044c14ba292e38759e695ad69ee25b5b535534a4b9d8b86 SHA512 3a49f70371effa3cc1935b84e5b4528a4ac106054f713516516c135270323d4fc83cda1b9d50d9c97a3c163d7cedfe7f7cc6711cf7bd8ecc0b5597fb0c32c2df
+EBUILD libh2oxx-0.2-r1.ebuild 599 BLAKE2B 32339fb44bd05cba08923727741d8599dfa6c6cbd3f78f9ece8256ddfe48c8669f77d15e60cfd3a6ae0c6c32ca3ed078f2bfda8cfc7b9bc999deeb7eb2d7e507 SHA512 cf78484e2ba2ad412d06282a5a2b6e383eb4d6d93cb81690bc53c7b0188caa6e6d10046915edb08853d91857d6cbde0ed477e6e9167a8905a10039d16d00554e
+EBUILD libh2oxx-0.2.ebuild 531 BLAKE2B 67884c0fbab74c0a7350c67d42521d1f7834215c7aba01511b7693ca9c05704fa4cd342f48102cb7d25928feeb077958a1f5af84b14852ebfb630b94975042b4 SHA512 693d14b374a5f2eda401248b67eb02e76c9ec67618cdaaee169c8e6d0e2bc5e3702de8f0fd92dd2302973e60212208f0ef39282736a2fafe0394de4215c23df2
+EBUILD libh2oxx-9999.ebuild 640 BLAKE2B 437011e0add2d627aeb00ce2463eed6142c895f573363cc3261b602a90f3c8432f164eb0cbcc4f285ab7cf64bb91247596b332aa26e7edc053eeb5a7ddacf10a SHA512 5d95dc5282690e55e5fa99304771e6bf67d26801d71fc8cf0a2c30e8f9a04412a1c282265113a0f337a49f35a786cb41bd6f5564fbf530b02738e68a5fd50761
+MISC metadata.xml 505 BLAKE2B 5e8794a8c28c717046b54793fe07bf87208716702a00aa40ce702e63607f7ea778ac6ae74dfa69831e2795e0d0fd24ef1cd8793280d4997946953df130584f4b SHA512 bc7138f060c6c2dfe3ec7d0fd2150e895bded77ccdb143f866f20aa7d2c683fb94a88163928a70cf9cb7974695b0358303b4bc4ca4709bae0dfab7578c0b880a
diff --git a/sci-libs/libh2oxx/libh2oxx-0.2-r1.ebuild b/sci-libs/libh2oxx/libh2oxx-0.2-r1.ebuild
new file mode 100644
index 000000000000..7dcb50db90ff
--- /dev/null
+++ b/sci-libs/libh2oxx/libh2oxx-0.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C++ bindings for libh2o"
+HOMEPAGE="https://github.com/mgorny/libh2oxx/"
+SRC_URI="https://github.com/mgorny/libh2oxx/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug static-libs"
+
+RDEPEND=">=sci-libs/libh2o-0.2:0="
+DEPEND="${RDEPEND}"
+
+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/libh2oxx/libh2oxx-0.2.ebuild b/sci-libs/libh2oxx/libh2oxx-0.2.ebuild
index 5b2383ae7c42..9d629d2d6a24 100644
--- a/sci-libs/libh2oxx/libh2oxx-0.2.ebuild
+++ b/sci-libs/libh2oxx/libh2oxx-0.2.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="C++ bindings for libh2o"
-HOMEPAGE="https://bitbucket.org/mgorny/libh2oxx/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/libh2oxx/"
+SRC_URI="https://github.com/mgorny/libh2oxx/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sci-libs/libh2oxx/libh2oxx-9999.ebuild b/sci-libs/libh2oxx/libh2oxx-9999.ebuild
index d1de9347c06a..a9e3eef7129e 100644
--- a/sci-libs/libh2oxx/libh2oxx-9999.ebuild
+++ b/sci-libs/libh2oxx/libh2oxx-9999.ebuild
@@ -1,38 +1,38 @@
-# 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="C++ bindings for libh2o"
-HOMEPAGE="https://bitbucket.org/mgorny/libh2oxx/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/libh2oxx/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/mgorny/libh2oxx.git"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="debug static-libs"
 
 RDEPEND=">=sci-libs/libh2o-0.2:0="
 DEPEND="${RDEPEND}"
 
-#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/libh2oxx/metadata.xml b/sci-libs/libh2oxx/metadata.xml
index 34c84fc28149..ab8b9c0d2e6c 100644
--- a/sci-libs/libh2oxx/metadata.xml
+++ b/sci-libs/libh2oxx/metadata.xml
@@ -10,7 +10,7 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>https://bitbucket.org/mgorny/libh2oxx/issues/</bugs-to>
-		<remote-id type="bitbucket">mgorny/libh2oxx</remote-id>
+		<bugs-to>https://github.com/mgorny/libh2oxx/issues/</bugs-to>
+		<remote-id type="github">mgorny/libh2oxx</remote-id>
 	</upstream>
 </pkgmetadata>