[gentoo-commits] repo/gentoo:master commit in: dev-libs/libbytesize/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     5625fcd35454c1af54fbb4a12bc8785894edc2ef
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 16:44:37 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon May  6 07:34:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5625fcd3

dev-libs/libbytesize: use python-r1

Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 ...ize-2.0-r1.ebuild => libbytesize-2.0-r2.ebuild} | 32 ++++++++++++++++++----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/dev-libs/libbytesize/libbytesize-2.0-r1.ebuild b/dev-libs/libbytesize/libbytesize-2.0-r2.ebuild
similarity index 72%
rename from dev-libs/libbytesize/libbytesize-2.0-r1.ebuild
rename to dev-libs/libbytesize/libbytesize-2.0-r2.ebuild
index 6da71cd7148..bfb8a984b13 100644
--- a/dev-libs/libbytesize/libbytesize-2.0-r1.ebuild
+++ b/dev-libs/libbytesize/libbytesize-2.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-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/storaged-project/libbytesize"
@@ -44,17 +44,39 @@ src_prepare() {
 	eautoreconf
 }
 
+python_do() {
+	if use python; then
+		python_foreach_impl run_in_build_dir "$@"
+	else
+		"$@"
+	fi
+}
+
 src_configure() {
 	local myeconfargs=(
 		$(use_with doc gtk-doc)
 		$(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
 }