sys-devel/automake: Provide pkg_setup to call python_setup only when FEATURES=test is set

Previous attempt cfaa5ec192 was reverted in commit
cd0e6915f3 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
This commit is contained in:
Thomas Deutschmann
2018-03-01 02:31:30 +01:00
parent cd0e6915f3
commit d8f87d7389
9 changed files with 36 additions and 50 deletions

View File

@@ -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

View File

@@ -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
}

View File

@@ -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

View File

@@ -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() {

View File

@@ -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() {

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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