From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ABB7E158094 for ; Sat, 30 Jul 2022 03:14:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70DC6E0FF9; Sat, 30 Jul 2022 03:14:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 50C26E0FF9 for ; Sat, 30 Jul 2022 03:14:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 14436340EA9 for ; Sat, 30 Jul 2022 03:14:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 76CD3553 for ; Sat, 30 Jul 2022 03:14:27 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1659150780.05bcce6b6ddd3b7912a7428614d5bad9c361f7c2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/automake/automake-1.16.5.ebuild sys-devel/automake/automake-9999.ebuild X-VCS-Directories: sys-devel/automake/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 05bcce6b6ddd3b7912a7428614d5bad9c361f7c2 X-VCS-Branch: master Date: Sat, 30 Jul 2022 03:14:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 187f2b8a-5dcf-444f-93c6-15d08678279e X-Archives-Hash: 1f60cbbe957c7a146fc1c18f1a54d656 commit: 05bcce6b6ddd3b7912a7428614d5bad9c361f7c2 Author: Sam James gentoo org> AuthorDate: Sat Jul 30 03:13:00 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jul 30 03:13:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05bcce6b sys-devel/automake: enable Python 3.11 Signed-off-by: Sam James gentoo.org> sys-devel/automake/automake-1.16.5.ebuild | 18 ++++++++++-------- sys-devel/automake/automake-9999.ebuild | 14 ++++++++------ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/sys-devel/automake/automake-1.16.5.ebuild b/sys-devel/automake/automake-1.16.5.ebuild index df393e3b1078..6e1d35f712b0 100644 --- a/sys-devel/automake/automake-1.16.5.ebuild +++ b/sys-devel/automake/automake-1.16.5.ebuild @@ -2,20 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8,9,10} ) + +PYTHON_COMPAT=( python3_{8..11} ) inherit python-any-r1 if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" - inherit git-r3 else - 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" if [[ ${PV/_beta} == ${PV} ]]; then MY_P="${P}" SRC_URI="mirror://gnu/${PN}/${P}.tar.xz https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" + 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" else MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" MY_P="${PN}-${MY_PV}" @@ -23,6 +23,7 @@ else # Alpha/beta releases are not distributed on the usual mirrors. SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" fi + S="${WORKDIR}/${MY_P}" fi @@ -59,14 +60,15 @@ pkg_setup() { src_prepare() { default + export WANT_AUTOCONF=2.5 - # Don't try wrapping the autotools this thing runs as it tends + # Don't try wrapping the autotools - this thing runs as it tends # to be a bit esoteric, and the script does `set -e` itself. ./bootstrap || die sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die - # Bug 628912 - if ! has_version sys-apps/texinfo ; then + # bug #628912 + if ! has_version -b sys-apps/texinfo ; then touch doc/{stamp-vti,version.texi,automake.info} || die fi } @@ -76,8 +78,8 @@ src_configure() { 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 the info pages. Do this w/out munging the source so we don't have +# to depend on texinfo to regen things. bug #464146 (among others) slot_info_pages() { pushd "${ED}"/usr/share/info >/dev/null || die rm -f dir diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild index 0467aa671d75..a36fa3529b35 100644 --- a/sys-devel/automake/automake-9999.ebuild +++ b/sys-devel/automake/automake-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit python-any-r1 @@ -23,6 +23,7 @@ else # Alpha/beta releases are not distributed on the usual mirrors. SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" fi + S="${WORKDIR}/${MY_P}" fi @@ -53,14 +54,15 @@ pkg_setup() { src_prepare() { default + export WANT_AUTOCONF=2.5 - # Don't try wrapping the autotools this thing runs as it tends + # Don't try wrapping the autotools - this thing runs as it tends # to be a bit esoteric, and the script does `set -e` itself. ./bootstrap || die sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die - # Bug 628912 - if ! has_version sys-apps/texinfo ; then + # bug #628912 + if ! has_version -b sys-apps/texinfo ; then touch doc/{stamp-vti,version.texi,automake.info} || die fi } @@ -70,8 +72,8 @@ src_configure() { 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 the info pages. Do this w/out munging the source so we don't have +# to depend on texinfo to regen things. bug #464146 (among others) slot_info_pages() { pushd "${ED}"/usr/share/info >/dev/null || die rm -f dir