| 1 |
commit: 1577baf352f108388d4241a03c46e0a613189644 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 17 14:17:55 2021 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 17 14:17:55 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1577baf3 |
| 7 |
|
| 8 |
sys-devel/automake: defer python_setup to src_configure |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-devel/automake/automake-1.16.2-r1.ebuild | 8 +++++++- |
| 13 |
sys-devel/automake/automake-1.16.3-r1.ebuild | 8 +++++++- |
| 14 |
sys-devel/automake/automake-9999.ebuild | 8 +++++++- |
| 15 |
3 files changed, 21 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-devel/automake/automake-1.16.2-r1.ebuild b/sys-devel/automake/automake-1.16.2-r1.ebuild |
| 18 |
index 1cab2f8a07e..bd0de029109 100644 |
| 19 |
--- a/sys-devel/automake/automake-1.16.2-r1.ebuild |
| 20 |
+++ b/sys-devel/automake/automake-1.16.2-r1.ebuild |
| 21 |
@@ -55,7 +55,8 @@ PATCHES=( |
| 22 |
) |
| 23 |
|
| 24 |
pkg_setup() { |
| 25 |
- use test && python-any-r1_pkg_setup |
| 26 |
+ # Avoid python-any-r1_pkg_setup |
| 27 |
+ : |
| 28 |
} |
| 29 |
|
| 30 |
src_prepare() { |
| 31 |
@@ -72,6 +73,11 @@ src_prepare() { |
| 32 |
fi |
| 33 |
} |
| 34 |
|
| 35 |
+src_configure() { |
| 36 |
+ use test && python_setup |
| 37 |
+ default |
| 38 |
+} |
| 39 |
+ |
| 40 |
# slot the info pages. do this w/out munging the source so we don't have |
| 41 |
# to depend on texinfo to regen things. #464146 (among others) |
| 42 |
slot_info_pages() { |
| 43 |
|
| 44 |
diff --git a/sys-devel/automake/automake-1.16.3-r1.ebuild b/sys-devel/automake/automake-1.16.3-r1.ebuild |
| 45 |
index 113f78c20f8..0012a71abf8 100644 |
| 46 |
--- a/sys-devel/automake/automake-1.16.3-r1.ebuild |
| 47 |
+++ b/sys-devel/automake/automake-1.16.3-r1.ebuild |
| 48 |
@@ -53,7 +53,8 @@ PATCHES=( |
| 49 |
) |
| 50 |
|
| 51 |
pkg_setup() { |
| 52 |
- use test && python-any-r1_pkg_setup |
| 53 |
+ # Avoid python-any-r1_pkg_setup |
| 54 |
+ : |
| 55 |
} |
| 56 |
|
| 57 |
src_prepare() { |
| 58 |
@@ -70,6 +71,11 @@ src_prepare() { |
| 59 |
fi |
| 60 |
} |
| 61 |
|
| 62 |
+src_configure() { |
| 63 |
+ use test && python_setup |
| 64 |
+ default |
| 65 |
+} |
| 66 |
+ |
| 67 |
# slot the info pages. do this w/out munging the source so we don't have |
| 68 |
# to depend on texinfo to regen things. #464146 (among others) |
| 69 |
slot_info_pages() { |
| 70 |
|
| 71 |
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild |
| 72 |
index 2b52d2f7a57..d7b666cfe55 100644 |
| 73 |
--- a/sys-devel/automake/automake-9999.ebuild |
| 74 |
+++ b/sys-devel/automake/automake-9999.ebuild |
| 75 |
@@ -52,7 +52,8 @@ PATCHES=( |
| 76 |
# All patches have been submitted upstream. |
| 77 |
|
| 78 |
pkg_setup() { |
| 79 |
- use test && python-any-r1_pkg_setup |
| 80 |
+ # Avoid python-any-r1_pkg_setup |
| 81 |
+ : |
| 82 |
} |
| 83 |
|
| 84 |
src_prepare() { |
| 85 |
@@ -69,6 +70,11 @@ src_prepare() { |
| 86 |
fi |
| 87 |
} |
| 88 |
|
| 89 |
+src_configure() { |
| 90 |
+ use test && python_setup |
| 91 |
+ default |
| 92 |
+} |
| 93 |
+ |
| 94 |
# slot the info pages. do this w/out munging the source so we don't have |
| 95 |
# to depend on texinfo to regen things. #464146 (among others) |
| 96 |
slot_info_pages() { |
Archives