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

This reverts commit cfaa5ec192519a74951fd57f05c483984e408e4b.

No rev bump required. Reverting to avoid mass rebuild.

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 0978a2b81768d0555d7ad7e6b07aa127337b7c0d..7ce1045c910392be45f7ea6e2d84d83e72e6cc23 100644 (file)
--- 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 d5b3804a55e6c0c31ac1aba65e96e3640782bd80..b8ddb4f1371625f9e8088b47558f3057fbebf34c 100644 (file)
--- 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 b2256bd2d7753f9ac743f6badaab1bca8999b620..b926404ca18e25e7729904d0a75010cdd513cedd 100644 (file)
--- 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 6f00929967daf711dd85b00f3c01e75262c2e9c7..e805dccdb6e64ba392d806c4d961dd50f62302e4 100644 (file)
--- 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 5e47c05140a9e6778162630ddbd7c79539043466..1747213bd308ca8e9a1be516b3716b8d667c1378 100644 (file)
--- 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 fe0a51c196a7a6f2b0d0138cb73816a5c2bb2481..3add6f0127e5afc9a019b0747dec4720dbbb8c0e 100644 (file)
--- 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 616c4ff8646fffad1532c8cab1bfd189385fe367..65ef083500f508f9dc8edee000375a7894f9682d 100644 (file)
--- 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 533931fcf36337dcabf096a14e40f027de42cf7f..830139964d5d482e683f76c35cccecd3c82f2995 100644 (file)
--- 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 fe0a51c196a7a6f2b0d0138cb73816a5c2bb2481..3add6f0127e5afc9a019b0747dec4720dbbb8c0e 100644 (file)
--- 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