gentoo resync : 04.05.2019

4 files changed, 29 insertions, 30 deletions

diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index 64a49f1fda58..3f3d3fa1f167 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,7 +1,7 @@
 DIST libbytesize-1.2.tar.gz 70598 BLAKE2B e136b1274703da7b3596e7583cea1ac773c1594af09c626f4dbb481dfcc23a3186b03ebdc54bba67d0a063c5d6587f6b7f8b610828c461cfd114eea1388dd193 SHA512 a8151e7440d0ec43d10239ddf08a9924827cdf08f20a16dff6177b444c1022fab905a0567384531e7610d854998111adb77f9a6a98e2d9648c02521f84ea2bf2
-DIST libbytesize-1.3.tar.gz 71648 BLAKE2B 40794a38af8ee1fcc03ef8000b20123c0e02e208f329a75e7da3a18b224e4a8456ce5982d72e4eefa2ff9d9dcd90b98142037dd37be6bc31f25e2ff347010829 SHA512 a50f5d4ea07a295909e09168518f8fc25da8dcd52859beca9c9c3b8c8c180b025c774c730d449ffbd4c7fd5aba07b5d071b6d9ad36f9d9ebc96bb06699aa08f3
 DIST libbytesize-1.4.tar.gz 80943 BLAKE2B d4c6c34d81be01bf7db2c37b0660886d99eff3c0a87024f5fbc12cc3606dc01e772b81dfbcacbf76c62213120253a9e7bda90adbc749b6d4c3e31e1ed3ae7702 SHA512 5dd13cf52a1674be776220ee1863f42261a47dc53af1ce4a31460d6d02ce87e19c5a52260f700928af98f1d9d7a96de7c11d8f384907b3187ef2effc10cbb593
+DIST libbytesize-2.0.tar.gz 84673 BLAKE2B cbe439bafc5b6a5ee1fbba6ba3e78f6a2b080394eb1da57b14945edc9180cff179a0eafb9de29a9639dfcbd6abf86158aa84121b81704d9270a93e4331d98eea SHA512 5adc7f529bebab2a568b623f876c9b65e58cd1f19dcfb2cc0c068b03a4e0cbe6a527c9cef3417e442b5eb8c00c963f325090356474c69083793a55edb54a7001
 EBUILD libbytesize-1.2-r1.ebuild 1122 BLAKE2B 6f17b8fd6560664dd8dd33861e9016269f82be242785e1f8c30e5e55bf55d81082b68e5ab329286f505b31b2b6a30145e291ecb3665554a84bc4ae5130ea69af SHA512 918fd1fdeeb6b4df3d9f1a66fabac851dff049f14b62b12aea633c6b629fa54b54eb822ec17ff80f11f8784400d59f90eb49ea3812e54c86ca68de1f819700b0
-EBUILD libbytesize-1.3-r1.ebuild 1175 BLAKE2B ecf198112f90310f0a540a29d6dadecf716461c30ccf9d706553ac43424a0a66d06fd725b5eefd26dc2587d54bb463d635b0313582056d2ea5b7ddb1d2925357 SHA512 2f489188c42a90ede2e41d99e3267681d1abc8ccbabf4580797beff0210a595a179c0d38496338bee5b862dcac5d703227f08a9678e698c7a716254351467761
-EBUILD libbytesize-1.4.ebuild 1226 BLAKE2B 07fedb183ab087300409fc486a717a9c4c403d6efbd20d34a785cfe34cac804e215e72840bae8451a2b5f12b757c11025835abc9b02fcf3bacc4ade813255b2b SHA512 806d4df6f59c942c4259cadd6239838a8f57f78f6e11dc8781cf20142d308e2cec282d101aee59bc28c96aa87113bafc01aa38aa8d40a43bfa4d61b3e17dd6f1
-MISC metadata.xml 349 BLAKE2B 3dd4c7645734d29bef7f4224c72284f6bf3583287803ddd3fa94b75f784bb41762d96cd7eb0778f363e9fdbc014b52b93ea86900983553afab993cdba2c68282 SHA512 c54a783eca349652ac007075ff736d1cb53647e702ca8aa12915ae1109e5aee536591afc0b9fe0ac427e41fcf5b86d9d3f47fa5570001c84301c5cba8bca7e9a
+EBUILD libbytesize-1.4.ebuild 1224 BLAKE2B e411b8c26d017f8e3776a1e7eb10439858dc32629813d70de56f511d8da62fd51e8e093fda31c3cf7c44333ba83717515cd5b3e707862c2bf55ec47cc00fc261 SHA512 de3e7f4729b3ac3e19b459153c6ecc5ca44c166eae74298995d04ddf8c0ab026b89c4c0ec24003571ce956be1ca201ae0121608076105d1b31dbaa662f4d0cd1
+EBUILD libbytesize-2.0-r1.ebuild 1209 BLAKE2B c9db5b2424cdb0335aed6d37135c55da0b2ff54e44e436b0669b9ac4acb7ace85d4bbd4a46e1d0c17329ce43b7ef91445053b892301f3964a6c7d7321794d565 SHA512 8d0c692bc51edc912ae1fc4ac1d34fbf76e5ef97c874385435580fb9ccd8bf807573eed259fadbd9d1d995d59fb1d6746dec6af5cdd787d3d8f5ee3a102bb3a4
+MISC metadata.xml 425 BLAKE2B 445bf1e0d46e04c766c4c81c90f9acb8e8f3c1c3eeb567c3101400139a7b2ab830efcf737e30332af5dd0e50d46bdf9f583cccbfb2e50186cbb6d3f5a396f0df SHA512 24b8980240c3513229ea2e181c64b7f89597be9cd121459ad62bce935fd52a7bbc0ee4871e15899b69b477fdbaf0850d55821a6fbcf3afc30d0cb81a3eb83b65
diff --git a/dev-libs/libbytesize/libbytesize-1.4.ebuild b/dev-libs/libbytesize/libbytesize-1.4.ebuild
index a350712ffa22..3e5b0175c924 100644
--- a/dev-libs/libbytesize/libbytesize-1.4.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/storaged-project/libbytesize"
 SRC_URI="https://github.com/storaged-project/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="doc test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/libbytesize/libbytesize-1.3-r1.ebuild b/dev-libs/libbytesize/libbytesize-2.0-r1.ebuild
index 46301df5958b..6da71cd71480 100644
--- a/dev-libs/libbytesize/libbytesize-1.3-r1.ebuild
+++ b/dev-libs/libbytesize/libbytesize-2.0-r1.ebuild
@@ -1,42 +1,43 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit autotools python-r1
+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"
+HOMEPAGE="https://github.com/storaged-project/libbytesize"
+SRC_URI="https://github.com/storaged-project/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc test"
+IUSE="doc python test tools"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
-	${PYTHON_DEPS}
 	dev-libs/gmp:0=
 	dev-libs/mpfr:=
-	>=dev-libs/libpcre-8.32
+	dev-libs/libpcre2
+	python? ( ${PYTHON_DEPS} )
 "
 
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+
+BDEPEND="
 	sys-devel/gettext
 	doc? ( dev-util/gtk-doc )
 	test? (
-		dev-python/pocketlint
-		dev-python/polib
+		dev-python/pocketlint[${PYTHON_USEDEP}]
+		dev-python/polib[${PYTHON_USEDEP}]
 	)
 "
 
-RESTRICT="test"
+DOCS=( NEWS.rst README.md )
 
-pkg_setup() {
-	python_setup
-}
+RESTRICT="test"
 
 src_prepare() {
 	default
@@ -45,20 +46,15 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--without-python3 #634840
 		$(use_with doc gtk-doc)
+		$(use_with python python3)
+		$(use_with tools)
 	)
 	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	emake install DESTDIR="${D}"
-
-	python_install() {
-		emake -C src/python install DESTDIR="${D}"
-		python_optimize
-	}
-	python_foreach_impl python_install
-
+	default
+	use python && python_optimize
 	find "${ED}" -name "*.la*" -delete || die
 }
diff --git a/dev-libs/libbytesize/metadata.xml b/dev-libs/libbytesize/metadata.xml
index 19b3c25b5bd6..97f2d51ca8b0 100644
--- a/dev-libs/libbytesize/metadata.xml
+++ b/dev-libs/libbytesize/metadata.xml
@@ -5,6 +5,9 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
+  <use>
+    <flag name="tools">Build bscalc python CLI tool</flag>
+  </use>
   <upstream>
     <remote-id type="github">rhinstaller/libbytesize</remote-id>
   </upstream>