From d8f87d7389569af3520b9ca2dfc68e7a82059ccf Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Thu, 1 Mar 2018 02:31:30 +0100 Subject: [PATCH] sys-devel/automake: Provide pkg_setup to call python_setup only when FEATURES=test is set Previous attempt cfaa5ec192519a74951fd57f05c483984e408e4b was reverted in commit cd0e6915f3f7a02915bc7029026bfe2f53dc7f68 to avoid unnecessary mass rebuild for "--changed-deps=y" users which was possible because dependencies were fine. Package was only failing at build time in pkg_setup when Python 2.7 wasn't available because eclass exports pkg_setup. Bug: https://bugs.gentoo.org/648940 Package-Manager: Portage-2.3.24, Repoman-2.3.6 --- sys-devel/automake/automake-1.10.3-r3.ebuild | 10 ++++------ sys-devel/automake/automake-1.11.6-r3.ebuild | 6 ++++-- sys-devel/automake/automake-1.12.6-r2.ebuild | 10 ++++------ sys-devel/automake/automake-1.13.4-r2.ebuild | 10 ++++------ sys-devel/automake/automake-1.14.1-r2.ebuild | 10 ++++------ sys-devel/automake/automake-1.15.1-r2.ebuild | 10 ++++------ sys-devel/automake/automake-1.16-r1.ebuild | 10 ++++------ sys-devel/automake/automake-1.9.6-r5.ebuild | 10 ++++------ sys-devel/automake/automake-9999.ebuild | 10 ++++------ 9 files changed, 36 insertions(+), 50 deletions(-) diff --git a/sys-devel/automake/automake-1.10.3-r3.ebuild b/sys-devel/automake/automake-1.10.3-r3.ebuild index 7ce1045c91039..0978a2b81768d 100644 --- a/sys-devel/automake/automake-1.10.3-r3.ebuild +++ b/sys-devel/automake/automake-1.10.3-r3.ebuild @@ -30,6 +30,10 @@ 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 @@ -69,12 +73,6 @@ 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-r3.ebuild b/sys-devel/automake/automake-1.11.6-r3.ebuild index b8ddb4f137162..d5b3804a55e6c 100644 --- a/sys-devel/automake/automake-1.11.6-r3.ebuild +++ b/sys-devel/automake/automake-1.11.6-r3.ebuild @@ -30,6 +30,10 @@ 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 @@ -84,8 +88,6 @@ slot_info_pages() { src_test() { unset HELP2MAN # 583108 - python_setup - default } diff --git a/sys-devel/automake/automake-1.12.6-r2.ebuild b/sys-devel/automake/automake-1.12.6-r2.ebuild index b926404ca18e2..b2256bd2d7753 100644 --- a/sys-devel/automake/automake-1.12.6-r2.ebuild +++ b/sys-devel/automake/automake-1.12.6-r2.ebuild @@ -29,6 +29,10 @@ 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 @@ -68,12 +72,6 @@ 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-r2.ebuild b/sys-devel/automake/automake-1.13.4-r2.ebuild index e805dccdb6e64..6f00929967daf 100644 --- a/sys-devel/automake/automake-1.13.4-r2.ebuild +++ b/sys-devel/automake/automake-1.13.4-r2.ebuild @@ -30,6 +30,10 @@ 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 @@ -40,12 +44,6 @@ 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-r2.ebuild b/sys-devel/automake/automake-1.14.1-r2.ebuild index 1747213bd308c..5e47c05140a9e 100644 --- a/sys-devel/automake/automake-1.14.1-r2.ebuild +++ b/sys-devel/automake/automake-1.14.1-r2.ebuild @@ -43,6 +43,10 @@ PATCHES=( S="${WORKDIR}/${MY_P}" +pkg_setup() { + use test && python-any-r1_pkg_setup +} + src_prepare() { default export WANT_AUTOCONF=2.5 @@ -58,12 +62,6 @@ 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-r2.ebuild b/sys-devel/automake/automake-1.15.1-r2.ebuild index 3add6f0127e5a..fe0a51c196a7a 100644 --- a/sys-devel/automake/automake-1.15.1-r2.ebuild +++ b/sys-devel/automake/automake-1.15.1-r2.ebuild @@ -44,6 +44,10 @@ 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 @@ -87,12 +91,6 @@ slot_info_pages() { popd >/dev/null || die } -src_test() { - python_setup - - default -} - src_install() { default diff --git a/sys-devel/automake/automake-1.16-r1.ebuild b/sys-devel/automake/automake-1.16-r1.ebuild index 65ef083500f50..616c4ff8646ff 100644 --- a/sys-devel/automake/automake-1.16-r1.ebuild +++ b/sys-devel/automake/automake-1.16-r1.ebuild @@ -47,6 +47,10 @@ 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 @@ -90,12 +94,6 @@ 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-r5.ebuild b/sys-devel/automake/automake-1.9.6-r5.ebuild index 830139964d5d4..533931fcf3633 100644 --- a/sys-devel/automake/automake-1.9.6-r5.ebuild +++ b/sys-devel/automake/automake-1.9.6-r5.ebuild @@ -36,6 +36,10 @@ 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 @@ -70,12 +74,6 @@ 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 3add6f0127e5a..fe0a51c196a7a 100644 --- a/sys-devel/automake/automake-9999.ebuild +++ b/sys-devel/automake/automake-9999.ebuild @@ -44,6 +44,10 @@ 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 @@ -87,12 +91,6 @@ slot_info_pages() { popd >/dev/null || die } -src_test() { - python_setup - - default -} - src_install() { default