gentoo resync : 15.12.2017

4 files changed, 14 insertions, 112 deletions

diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index 2abeccec3176..32797c4fa7d5 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,7 +1,3 @@
-DIST libbytesize-0.11.tar.gz 68322 BLAKE2B c791ea1deb4af7942d77abc7c9ce77d25633913bfa7403c6225c2fc3acbf2dea7e182e68fd75a22abb22c97ed3c7b984bf8c12f45b69a54b015294be747be3c6 SHA512 3275116a74ead484508da494934062e77d19b50dcd124d7b309137e52a416474099685c39ddc63090d6ed124a667c7fc8c2a7a5844712b33f277703bb52d54ec
-DIST libbytesize-1.1.tar.gz 70495 BLAKE2B 852798a7d405ac65f2e6b8874f999a23a8d27d13e65eb3d168f25e8aeadb6af8037938e7059a2053baadbe8b62cd17f0c229a4e443e15a9a8db21054f2bdc6bd SHA512 3d376dd0f9a10974f2392e3417e8e99ac57313be3ec945eeb7c84f72ddd51a5f29b61c7268c8c870dbe941eebf8d9027f8f5b7e0140790510bd8fb6b2c8db35b
 DIST libbytesize-1.2.tar.gz 70598 BLAKE2B e136b1274703da7b3596e7583cea1ac773c1594af09c626f4dbb481dfcc23a3186b03ebdc54bba67d0a063c5d6587f6b7f8b610828c461cfd114eea1388dd193 SHA512 a8151e7440d0ec43d10239ddf08a9924827cdf08f20a16dff6177b444c1022fab905a0567384531e7610d854998111adb77f9a6a98e2d9648c02521f84ea2bf2
-EBUILD libbytesize-0.11.ebuild 970 BLAKE2B 3a82590b75dc0d3f3ae0ff8046ac03acbe8432d29806f4bbe93813361b7ced0e341f11a056d5f9ec05eb05723d7537a881997f32d659bf8f9c926762e98cc7f4 SHA512 341dc58d09a0111fa11e58af14e982580cf1138a2a2e70d3e74779cca58bfbdfd4769450ec435f64d1ddb9de12a08794872e969df9101102c3a16f050c4c3714
-EBUILD libbytesize-1.1.ebuild 890 BLAKE2B b4f011f3363b0f05e2f9e4981fc2b9532d517db4e2649fb75d091dd32ae6404ca644127f7f03b0e279b7d75af931bbebe8389d7473707f080a5fa9c1c11f1265 SHA512 5f542290be53c702bbf8c7f6993e0a2e25488886a56a99929c5e05401012c26e313eda540154cb29c0534182892ccc9bd4a7ea2d8ab710069b1e88112be703fb
-EBUILD libbytesize-1.2.ebuild 888 BLAKE2B 663369a2e10c33652424854ec70a1851e0f2d6db5b768487b2eee945a0899ca5b81078ed5cdbd703ff76ed1b7c292c336b5439867649e682417f6254029b4d36 SHA512 c80719780ec44bb7d76517ec1ecdb917021ab808e5521c60d9aa2354777849a824af04a58383ca574e9a5afa3971d9c5cd46ffd0133f8f525d246f5aa73e6963
+EBUILD libbytesize-1.2-r1.ebuild 1059 BLAKE2B f25ba640735c3a6843a585e71550ba89aa9e7c90f1618e41c0bd69df376db3432089f040f7bf45d7a53a4dfe326e44572ee7c519eba2e4e917fab71c438d1b28 SHA512 b37ed5aa2385fc4eba357e41e58dc3affb56ec9e0b5900627debd64e3b25e0a90343f7ca3fc664126bee687fddde15df6d81c4cdaa0bea1165c873040459032d
 MISC metadata.xml 349 BLAKE2B 3dd4c7645734d29bef7f4224c72284f6bf3583287803ddd3fa94b75f784bb41762d96cd7eb0778f363e9fdbc014b52b93ea86900983553afab993cdba2c68282 SHA512 c54a783eca349652ac007075ff736d1cb53647e702ca8aa12915ae1109e5aee536591afc0b9fe0ac427e41fcf5b86d9d3f47fa5570001c84301c5cba8bca7e9a
diff --git a/dev-libs/libbytesize/libbytesize-0.11.ebuild b/dev-libs/libbytesize/libbytesize-0.11.ebuild
deleted file mode 100644
index 9a089877335e..000000000000
--- a/dev-libs/libbytesize/libbytesize-0.11.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
-HOMEPAGE="https://github.com/rhinstaller/libbytesize"
-SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/gmp:0=
-	>=dev-libs/libpcre-8.32
-"
-
-DEPEND="
-	${CDEPEND}
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )
-	test? (
-		dev-python/pocketlint
-		dev-python/polib
-	)
-"
-
-RDEPEND="
-	${CDEPEND}
-"
-
-# https://github.com/rhinstaller/libbytesize/issues/27
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with doc gtk-doc)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/dev-libs/libbytesize/libbytesize-1.1.ebuild b/dev-libs/libbytesize/libbytesize-1.1.ebuild
deleted file mode 100644
index 61b601fbd627..000000000000
--- a/dev-libs/libbytesize/libbytesize-1.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
-HOMEPAGE="https://github.com/rhinstaller/libbytesize"
-SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/gmp:0=
-	>=dev-libs/libpcre-8.32
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )
-	test? (
-		dev-python/pocketlint
-		dev-python/polib
-	)
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with doc gtk-doc)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/dev-libs/libbytesize/libbytesize-1.2.ebuild b/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
index dbb899eae3da..2dc795777df3 100644
--- a/dev-libs/libbytesize/libbytesize-1.2.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
-inherit autotools python-single-r1
+inherit autotools python-r1
 
 DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
 HOMEPAGE="https://github.com/rhinstaller/libbytesize"
@@ -34,7 +34,7 @@ DEPEND="
 RESTRICT="test"
 
 pkg_setup() {
-	python-single-r1_pkg_setup
+	python_setup
 }
 
 src_prepare() {
@@ -44,7 +44,18 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		--without-python3
 		$(use_with doc gtk-doc)
 	)
 	econf "${myeconfargs[@]}"
 }
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	python_install() {
+		emake -C src/python install DESTDIR="${D}"
+		python_optimize
+	}
+	python_foreach_impl python_install
+}