| 1 |
commit: 05bcce6b6ddd3b7912a7428614d5bad9c361f7c2 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 30 03:13:00 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 30 03:13:00 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05bcce6b |
| 7 |
|
| 8 |
sys-devel/automake: enable Python 3.11 |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-devel/automake/automake-1.16.5.ebuild | 18 ++++++++++-------- |
| 13 |
sys-devel/automake/automake-9999.ebuild | 14 ++++++++------ |
| 14 |
2 files changed, 18 insertions(+), 14 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-devel/automake/automake-1.16.5.ebuild b/sys-devel/automake/automake-1.16.5.ebuild |
| 17 |
index df393e3b1078..6e1d35f712b0 100644 |
| 18 |
--- a/sys-devel/automake/automake-1.16.5.ebuild |
| 19 |
+++ b/sys-devel/automake/automake-1.16.5.ebuild |
| 20 |
@@ -2,20 +2,20 @@ |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
|
| 23 |
EAPI=7 |
| 24 |
-PYTHON_COMPAT=( python3_{8,9,10} ) |
| 25 |
+ |
| 26 |
+PYTHON_COMPAT=( python3_{8..11} ) |
| 27 |
|
| 28 |
inherit python-any-r1 |
| 29 |
|
| 30 |
if [[ ${PV} == 9999 ]] ; then |
| 31 |
EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" |
| 32 |
- |
| 33 |
inherit git-r3 |
| 34 |
else |
| 35 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 36 |
if [[ ${PV/_beta} == ${PV} ]]; then |
| 37 |
MY_P="${P}" |
| 38 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz |
| 39 |
https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" |
| 40 |
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 41 |
else |
| 42 |
MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" |
| 43 |
MY_P="${PN}-${MY_PV}" |
| 44 |
@@ -23,6 +23,7 @@ else |
| 45 |
# Alpha/beta releases are not distributed on the usual mirrors. |
| 46 |
SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" |
| 47 |
fi |
| 48 |
+ |
| 49 |
S="${WORKDIR}/${MY_P}" |
| 50 |
fi |
| 51 |
|
| 52 |
@@ -59,14 +60,15 @@ pkg_setup() { |
| 53 |
|
| 54 |
src_prepare() { |
| 55 |
default |
| 56 |
+ |
| 57 |
export WANT_AUTOCONF=2.5 |
| 58 |
- # Don't try wrapping the autotools this thing runs as it tends |
| 59 |
+ # Don't try wrapping the autotools - this thing runs as it tends |
| 60 |
# to be a bit esoteric, and the script does `set -e` itself. |
| 61 |
./bootstrap || die |
| 62 |
sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die |
| 63 |
|
| 64 |
- # Bug 628912 |
| 65 |
- if ! has_version sys-apps/texinfo ; then |
| 66 |
+ # bug #628912 |
| 67 |
+ if ! has_version -b sys-apps/texinfo ; then |
| 68 |
touch doc/{stamp-vti,version.texi,automake.info} || die |
| 69 |
fi |
| 70 |
} |
| 71 |
@@ -76,8 +78,8 @@ src_configure() { |
| 72 |
default |
| 73 |
} |
| 74 |
|
| 75 |
-# slot the info pages. do this w/out munging the source so we don't have |
| 76 |
-# to depend on texinfo to regen things. #464146 (among others) |
| 77 |
+# Slot the info pages. Do this w/out munging the source so we don't have |
| 78 |
+# to depend on texinfo to regen things. bug #464146 (among others) |
| 79 |
slot_info_pages() { |
| 80 |
pushd "${ED}"/usr/share/info >/dev/null || die |
| 81 |
rm -f dir |
| 82 |
|
| 83 |
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild |
| 84 |
index 0467aa671d75..a36fa3529b35 100644 |
| 85 |
--- a/sys-devel/automake/automake-9999.ebuild |
| 86 |
+++ b/sys-devel/automake/automake-9999.ebuild |
| 87 |
@@ -3,7 +3,7 @@ |
| 88 |
|
| 89 |
EAPI=7 |
| 90 |
|
| 91 |
-PYTHON_COMPAT=( python3_{8,9,10} ) |
| 92 |
+PYTHON_COMPAT=( python3_{8..11} ) |
| 93 |
|
| 94 |
inherit python-any-r1 |
| 95 |
|
| 96 |
@@ -23,6 +23,7 @@ else |
| 97 |
# Alpha/beta releases are not distributed on the usual mirrors. |
| 98 |
SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" |
| 99 |
fi |
| 100 |
+ |
| 101 |
S="${WORKDIR}/${MY_P}" |
| 102 |
fi |
| 103 |
|
| 104 |
@@ -53,14 +54,15 @@ pkg_setup() { |
| 105 |
|
| 106 |
src_prepare() { |
| 107 |
default |
| 108 |
+ |
| 109 |
export WANT_AUTOCONF=2.5 |
| 110 |
- # Don't try wrapping the autotools this thing runs as it tends |
| 111 |
+ # Don't try wrapping the autotools - this thing runs as it tends |
| 112 |
# to be a bit esoteric, and the script does `set -e` itself. |
| 113 |
./bootstrap || die |
| 114 |
sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die |
| 115 |
|
| 116 |
- # Bug 628912 |
| 117 |
- if ! has_version sys-apps/texinfo ; then |
| 118 |
+ # bug #628912 |
| 119 |
+ if ! has_version -b sys-apps/texinfo ; then |
| 120 |
touch doc/{stamp-vti,version.texi,automake.info} || die |
| 121 |
fi |
| 122 |
} |
| 123 |
@@ -70,8 +72,8 @@ src_configure() { |
| 124 |
default |
| 125 |
} |
| 126 |
|
| 127 |
-# slot the info pages. do this w/out munging the source so we don't have |
| 128 |
-# to depend on texinfo to regen things. #464146 (among others) |
| 129 |
+# Slot the info pages. Do this w/out munging the source so we don't have |
| 130 |
+# to depend on texinfo to regen things. bug #464146 (among others) |
| 131 |
slot_info_pages() { |
| 132 |
pushd "${ED}"/usr/share/info >/dev/null || die |
| 133 |
rm -f dir |
Archives