[gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/

[Thomas Deutschmann]

commit:     cd0e6915f3f7a02915bc7029026bfe2f53dc7f68
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  1 01:19:31 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar  1 01:20:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd0e6915

Revert "sys-devel/automake: Rev bump to remove Python 2.7 dependency for FEATURES=-test"

This reverts commit cfaa5ec192519a74951fd57f05c483984e408e4b.

No rev bump required. Reverting to avoid mass rebuild.

 .../{automake-1.10.3-r4.ebuild => automake-1.10.3-r3.ebuild}   | 10 ++++++----
 .../{automake-1.11.6-r4.ebuild => automake-1.11.6-r3.ebuild}   |  6 ++----
 .../{automake-1.12.6-r3.ebuild => automake-1.12.6-r2.ebuild}   | 10 ++++++----
 .../{automake-1.13.4-r3.ebuild => automake-1.13.4-r2.ebuild}   | 10 ++++++----
 .../{automake-1.14.1-r3.ebuild => automake-1.14.1-r2.ebuild}   | 10 ++++++----
 .../{automake-1.15.1-r3.ebuild => automake-1.15.1-r2.ebuild}   | 10 ++++++----
 .../{automake-1.16-r2.ebuild => automake-1.16-r1.ebuild}       | 10 ++++++----
 .../{automake-1.9.6-r6.ebuild => automake-1.9.6-r5.ebuild}     | 10 ++++++----
 sys-devel/automake/automake-9999.ebuild                        | 10 ++++++----
 9 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/sys-devel/automake/automake-1.10.3-r4.ebuild b/sys-devel/automake/automake-1.10.3-r3.ebuild
similarity index 97%
rename from sys-devel/automake/automake-1.10.3-r4.ebuild
rename to sys-devel/automake/automake-1.10.3-r3.ebuild
index 0978a2b8176..7ce1045c910 100644
--- a/sys-devel/automake/automake-1.10.3-r4.ebuild
+++ b/sys-devel/automake/automake-1.10.3-r3.ebuild
@@ -30,10 +30,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch
 )
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 	export WANT_AUTOCONF=2.5
@@ -73,6 +69,12 @@ slot_info_pages() {
 	popd >/dev/null || die
 }
 
+src_test() {
+	python_setup
+
+	default
+}
+
 src_install() {
 	default
 	slot_info_pages

diff --git a/sys-devel/automake/automake-1.11.6-r4.ebuild b/sys-devel/automake/automake-1.11.6-r3.ebuild
similarity index 98%
rename from sys-devel/automake/automake-1.11.6-r4.ebuild
rename to sys-devel/automake/automake-1.11.6-r3.ebuild
index d5b3804a55e..b8ddb4f1371 100644
--- a/sys-devel/automake/automake-1.11.6-r4.ebuild
+++ b/sys-devel/automake/automake-1.11.6-r3.ebuild
@@ -30,10 +30,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch
 )
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 	export WANT_AUTOCONF=2.5
@@ -88,6 +84,8 @@ slot_info_pages() {
 src_test() {
 	unset HELP2MAN # 583108
 
+	python_setup
+
 	default
 }
 

diff --git a/sys-devel/automake/automake-1.12.6-r3.ebuild b/sys-devel/automake/automake-1.12.6-r2.ebuild
similarity index 97%
rename from sys-devel/automake/automake-1.12.6-r3.ebuild
rename to sys-devel/automake/automake-1.12.6-r2.ebuild
index b2256bd2d77..b926404ca18 100644
--- a/sys-devel/automake/automake-1.12.6-r3.ebuild
+++ b/sys-devel/automake/automake-1.12.6-r2.ebuild
@@ -29,10 +29,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.14-install-sh-avoid-low-risk-race-in-tmp.patch
 )
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 	export WANT_AUTOCONF=2.5
@@ -72,6 +68,12 @@ slot_info_pages() {
 	popd >/dev/null || die
 }
 
+src_test() {
+	python_setup
+
+	default
+}
+
 src_install() {
 	default
 

diff --git a/sys-devel/automake/automake-1.13.4-r3.ebuild b/sys-devel/automake/automake-1.13.4-r2.ebuild
similarity index 98%
rename from sys-devel/automake/automake-1.13.4-r3.ebuild
rename to sys-devel/automake/automake-1.13.4-r2.ebuild
index 6f00929967d..e805dccdb6e 100644
--- a/sys-devel/automake/automake-1.13.4-r3.ebuild
+++ b/sys-devel/automake/automake-1.13.4-r2.ebuild
@@ -30,10 +30,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.14-install-sh-avoid-low-risk-race-in-tmp.patch
 )
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 	export WANT_AUTOCONF=2.5
@@ -44,6 +40,12 @@ src_configure() {
 	econf --docdir="\$(datarootdir)/doc/${PF}"
 }
 
+src_test() {
+	python_setup
+
+	default
+}
+
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {

diff --git a/sys-devel/automake/automake-1.14.1-r3.ebuild b/sys-devel/automake/automake-1.14.1-r2.ebuild
similarity index 98%
rename from sys-devel/automake/automake-1.14.1-r3.ebuild
rename to sys-devel/automake/automake-1.14.1-r2.ebuild
index 5e47c05140a..1747213bd30 100644
--- a/sys-devel/automake/automake-1.14.1-r3.ebuild
+++ b/sys-devel/automake/automake-1.14.1-r2.ebuild
@@ -43,10 +43,6 @@ PATCHES=(
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 	export WANT_AUTOCONF=2.5
@@ -62,6 +58,12 @@ src_configure() {
 	econf --docdir="\$(datarootdir)/doc/${PF}"
 }
 
+src_test() {
+	python_setup
+
+	default
+}
+
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {

diff --git a/sys-devel/automake/automake-1.15.1-r3.ebuild b/sys-devel/automake/automake-1.15.1-r2.ebuild
similarity index 98%
rename from sys-devel/automake/automake-1.15.1-r3.ebuild
rename to sys-devel/automake/automake-1.15.1-r2.ebuild
index fe0a51c196a..3add6f0127e 100644
--- a/sys-devel/automake/automake-1.15.1-r3.ebuild
+++ b/sys-devel/automake/automake-1.15.1-r2.ebuild
@@ -44,10 +44,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=( "${FILESDIR}"/${PN}-1.15-install-sh-avoid-low-risk-race-in-tmp.patch )
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 	export WANT_AUTOCONF=2.5
@@ -91,6 +87,12 @@ slot_info_pages() {
 	popd >/dev/null || die
 }
 
+src_test() {
+	python_setup
+
+	default
+}
+
 src_install() {
 	default
 

diff --git a/sys-devel/automake/automake-1.16-r2.ebuild b/sys-devel/automake/automake-1.16-r1.ebuild
similarity index 98%
rename from sys-devel/automake/automake-1.16-r2.ebuild
rename to sys-devel/automake/automake-1.16-r1.ebuild
index 616c4ff8646..65ef083500f 100644
--- a/sys-devel/automake/automake-1.16-r2.ebuild
+++ b/sys-devel/automake/automake-1.16-r1.ebuild
@@ -47,10 +47,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.16-fix-AM_PATH_PYTHON.patch
 )
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 	export WANT_AUTOCONF=2.5
@@ -94,6 +90,12 @@ slot_info_pages() {
 	popd >/dev/null || die
 }
 
+src_test() {
+	python_setup
+
+	default
+}
+
 src_install() {
 	default
 

diff --git a/sys-devel/automake/automake-1.9.6-r6.ebuild b/sys-devel/automake/automake-1.9.6-r5.ebuild
similarity index 98%
rename from sys-devel/automake/automake-1.9.6-r6.ebuild
rename to sys-devel/automake/automake-1.9.6-r5.ebuild
index 533931fcf36..830139964d5 100644
--- a/sys-devel/automake/automake-1.9.6-r6.ebuild
+++ b/sys-devel/automake/automake-1.9.6-r5.ebuild
@@ -36,10 +36,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.8-perl-5.11.patch
 )
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 	export WANT_AUTOCONF=2.5
@@ -74,6 +70,12 @@ slot_info_pages() {
 	popd >/dev/null || die
 }
 
+src_test() {
+	python_setup
+
+	default
+}
+
 src_install() {
 	default
 	slot_info_pages

diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index fe0a51c196a..3add6f0127e 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -44,10 +44,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=( "${FILESDIR}"/${PN}-1.15-install-sh-avoid-low-risk-race-in-tmp.patch )
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 	export WANT_AUTOCONF=2.5
@@ -91,6 +87,12 @@ slot_info_pages() {
 	popd >/dev/null || die
 }
 
+src_test() {
+	python_setup
+
+	default
+}
+
 src_install() {
 	default