summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2021-04-17 10:17:55 -0400
committerMike Gilbert <floppym@gentoo.org>2021-04-17 10:17:55 -0400
commit1577baf352f108388d4241a03c46e0a613189644 (patch)
tree7b716df847d4b17456103eefc38f754a8b34cede /sys-devel
parentsys-devel/automake: add python3.{8,9} to 1.16.3 (diff)
downloadgentoo-1577baf352f108388d4241a03c46e0a613189644.tar.gz
gentoo-1577baf352f108388d4241a03c46e0a613189644.tar.bz2
gentoo-1577baf352f108388d4241a03c46e0a613189644.zip
sys-devel/automake: defer python_setup to src_configure
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/automake/automake-1.16.2-r1.ebuild8
-rw-r--r--sys-devel/automake/automake-1.16.3-r1.ebuild8
-rw-r--r--sys-devel/automake/automake-9999.ebuild8
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 1cab2f8a07e2..bd0de0291096 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 113f78c20f80..0012a71abf81 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 2b52d2f7a57d..d7b666cfe551 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() {