From cd0e6915f3f7a02915bc7029026bfe2f53dc7f68 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Thu, 1 Mar 2018 02:19:31 +0100 Subject: [PATCH] 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. --- ...make-1.10.3-r4.ebuild => automake-1.10.3-r3.ebuild} | 10 ++++++---- ...make-1.11.6-r4.ebuild => automake-1.11.6-r3.ebuild} | 6 ++---- ...make-1.12.6-r3.ebuild => automake-1.12.6-r2.ebuild} | 10 ++++++---- ...make-1.13.4-r3.ebuild => automake-1.13.4-r2.ebuild} | 10 ++++++---- ...make-1.14.1-r3.ebuild => automake-1.14.1-r2.ebuild} | 10 ++++++---- ...make-1.15.1-r3.ebuild => automake-1.15.1-r2.ebuild} | 10 ++++++---- ...automake-1.16-r2.ebuild => automake-1.16-r1.ebuild} | 10 ++++++---- ...tomake-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(-) rename sys-devel/automake/{automake-1.10.3-r4.ebuild => automake-1.10.3-r3.ebuild} (97%) rename sys-devel/automake/{automake-1.11.6-r4.ebuild => automake-1.11.6-r3.ebuild} (98%) rename sys-devel/automake/{automake-1.12.6-r3.ebuild => automake-1.12.6-r2.ebuild} (97%) rename sys-devel/automake/{automake-1.13.4-r3.ebuild => automake-1.13.4-r2.ebuild} (98%) rename sys-devel/automake/{automake-1.14.1-r3.ebuild => automake-1.14.1-r2.ebuild} (98%) rename sys-devel/automake/{automake-1.15.1-r3.ebuild => automake-1.15.1-r2.ebuild} (98%) rename sys-devel/automake/{automake-1.16-r2.ebuild => automake-1.16-r1.ebuild} (98%) rename sys-devel/automake/{automake-1.9.6-r6.ebuild => automake-1.9.6-r5.ebuild} (98%) 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 0978a2b81768..7ce1045c9103 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 d5b3804a55e6..b8ddb4f13716 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 b2256bd2d775..b926404ca18e 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 6f00929967da..e805dccdb6e6 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 5e47c05140a9..1747213bd308 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 fe0a51c196a7..3add6f0127e5 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 616c4ff8646f..65ef083500f5 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 533931fcf363..830139964d5d 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 fe0a51c196a7..3add6f0127e5 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 -- 2.26.2