gentoo resync : 07.05.2019

2 files changed, 33 insertions, 13 deletions

diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index 3f3d3fa1f167..99e9243e772e 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.4.tar.gz 80943 BLAKE2B d4c6c34d81be01bf7db2c37b0660886d99eff3c0a87024f5fbc12cc3606dc01e772b81dfbcacbf76c62213120253a9e7bda90adbc749b6d4c3e31e1ed3ae7702 SHA512 5dd13cf52a1674be776220ee1863f42261a47dc53af1ce4a31460d6d02ce87e19c5a52260f700928af98f1d9d7a96de7c11d8f384907b3187ef2effc10cbb593
-DIST libbytesize-2.0.tar.gz 84673 BLAKE2B cbe439bafc5b6a5ee1fbba6ba3e78f6a2b080394eb1da57b14945edc9180cff179a0eafb9de29a9639dfcbd6abf86158aa84121b81704d9270a93e4331d98eea SHA512 5adc7f529bebab2a568b623f876c9b65e58cd1f19dcfb2cc0c068b03a4e0cbe6a527c9cef3417e442b5eb8c00c963f325090356474c69083793a55edb54a7001
+DIST libbytesize-2.0.tar.gz 440544 BLAKE2B a371c617c965171a8746339ff8a2ec412daf3f79ae80e4e6a404546b0fc2f59f3e5882fc93726701490ef267f90cfd8c5db70bf7bd334c08806ff35eaab97377 SHA512 9d2a18930d0d900262ced4abd5cd358896570eadb06435f1b9aba5484ca530478b65dfb4982e8acf77ca4519a2d8a1dc236d42f5fa1ecbd7461949b282ef44a1
 EBUILD libbytesize-1.2-r1.ebuild 1122 BLAKE2B 6f17b8fd6560664dd8dd33861e9016269f82be242785e1f8c30e5e55bf55d81082b68e5ab329286f505b31b2b6a30145e291ecb3665554a84bc4ae5130ea69af SHA512 918fd1fdeeb6b4df3d9f1a66fabac851dff049f14b62b12aea633c6b629fa54b54eb822ec17ff80f11f8784400d59f90eb49ea3812e54c86ca68de1f819700b0
 EBUILD libbytesize-1.4.ebuild 1224 BLAKE2B e411b8c26d017f8e3776a1e7eb10439858dc32629813d70de56f511d8da62fd51e8e093fda31c3cf7c44333ba83717515cd5b3e707862c2bf55ec47cc00fc261 SHA512 de3e7f4729b3ac3e19b459153c6ecc5ca44c166eae74298995d04ddf8c0ab026b89c4c0ec24003571ce956be1ca201ae0121608076105d1b31dbaa662f4d0cd1
-EBUILD libbytesize-2.0-r1.ebuild 1209 BLAKE2B c9db5b2424cdb0335aed6d37135c55da0b2ff54e44e436b0669b9ac4acb7ace85d4bbd4a46e1d0c17329ce43b7ef91445053b892301f3964a6c7d7321794d565 SHA512 8d0c692bc51edc912ae1fc4ac1d34fbf76e5ef97c874385435580fb9ccd8bf807573eed259fadbd9d1d995d59fb1d6746dec6af5cdd787d3d8f5ee3a102bb3a4
+EBUILD libbytesize-2.0-r3.ebuild 1471 BLAKE2B cfbb90bc8d10883bbcedcfaa0ff7d023aa814a4b145bed1fdeb716444c76c01fc07fed5178cebd789b26a7e632bde7c4779e9138e50c4a3caf5ba94ac2909c70 SHA512 ae6cf6ad4ad79130ab6f83b2476228d38c41b6ef23347d7c65ac4abaa61ce6dc72e3100728fd954cae50be0f203bee76f1bb646ec0b07ec928f2a1cd51cbf848
 MISC metadata.xml 425 BLAKE2B 445bf1e0d46e04c766c4c81c90f9acb8e8f3c1c3eeb567c3101400139a7b2ab830efcf737e30332af5dd0e50d46bdf9f583cccbfb2e50186cbb6d3f5a396f0df SHA512 24b8980240c3513229ea2e181c64b7f89597be9cd121459ad62bce935fd52a7bbc0ee4871e15899b69b477fdbaf0850d55821a6fbcf3afc30d0cb81a3eb83b65
diff --git a/dev-libs/libbytesize/libbytesize-2.0-r1.ebuild b/dev-libs/libbytesize/libbytesize-2.0-r3.ebuild
index 6da71cd71480..f3c68f3c42fe 100644
--- a/dev-libs/libbytesize/libbytesize-2.0-r1.ebuild
+++ b/dev-libs/libbytesize/libbytesize-2.0-r3.ebuild
@@ -5,17 +5,20 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit autotools python-single-r1
+inherit python-r1
 
 DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
 HOMEPAGE="https://github.com/storaged-project/libbytesize"
-SRC_URI="https://github.com/storaged-project/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc python test tools"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tools? ( python )
+"
 
 RDEPEND="
 	dev-libs/gmp:0=
@@ -35,13 +38,16 @@ BDEPEND="
 	)
 "
 
-DOCS=( NEWS.rst README.md )
+DOCS=( README.md )
 
 RESTRICT="test"
 
-src_prepare() {
-	default
-	eautoreconf
+python_do() {
+	if use python; then
+		python_foreach_impl run_in_build_dir "$@"
+	else
+		"$@"
+	fi
 }
 
 src_configure() {
@@ -50,11 +56,25 @@ src_configure() {
 		$(use_with python python3)
 		$(use_with tools)
 	)
-	econf "${myeconfargs[@]}"
+	local ECONF_SOURCE="${S}"
+	python_do econf "${myeconfargs[@]}"
 }
 
-src_install() {
-	default
+src_compile() {
+	python_do emake
+}
+
+src_test() {
+	python_do emake check
+}
+
+install_helper() {
+	emake DESTDIR="${D}" install
 	use python && python_optimize
-	find "${ED}" -name "*.la*" -delete || die
+}
+
+src_install() {
+	python_do install_helper
+	einstalldocs
+	find "${ED}" -name "*.la" -type f -delete || die
 }