commit: 1577baf352f108388d4241a03c46e0a613189644
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 17 14:17:55 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Apr 17 14:17:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1577baf3
sys-devel/automake: defer python_setup to src_configure
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-devel/automake/automake-1.16.2-r1.ebuild | 8 +++++++-
sys-devel/automake/automake-1.16.3-r1.ebuild | 8 +++++++-
sys-devel/automake/automake-9999.ebuild | 8 +++++++-
3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/sys-devel/automake/automake-1.16.2-r1.ebuild
b/sys-devel/automake/automake-1.16.2-r1.ebuild
index 1cab2f8a07e..bd0de029109 100644
--- a/sys-devel/automake/automake-1.16.2-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.2-r1.ebuild
@@ -55,7 +55,8 @@ PATCHES=(
)
pkg_setup() {
- use test && python-any-r1_pkg_setup
+ # Avoid python-any-r1_pkg_setup
+ :
}
src_prepare() {
@@ -72,6 +73,11 @@ src_prepare() {
fi
}
+src_configure() {
+ use 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.16.3-r1.ebuild
b/sys-devel/automake/automake-1.16.3-r1.ebuild
index 113f78c20f8..0012a71abf8 100644
--- a/sys-devel/automake/automake-1.16.3-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.3-r1.ebuild
@@ -53,7 +53,8 @@ PATCHES=(
)
pkg_setup() {
- use test && python-any-r1_pkg_setup
+ # Avoid python-any-r1_pkg_setup
+ :
}
src_prepare() {
@@ -70,6 +71,11 @@ src_prepare() {
fi
}
+src_configure() {
+ use 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-9999.ebuild
b/sys-devel/automake/automake-9999.ebuild
index 2b52d2f7a57..d7b666cfe55 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -52,7 +52,8 @@ PATCHES=(
# All patches have been submitted upstream.
pkg_setup() {
- use test && python-any-r1_pkg_setup
+ # Avoid python-any-r1_pkg_setup
+ :
}
src_prepare() {
@@ -69,6 +70,11 @@ src_prepare() {
fi
}
+src_configure() {
+ use 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() {
