gentoo auto-resync : 30:07:2022 - 09:09:33

3 files changed, 20 insertions, 16 deletions

diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index e3444c54ca30..22e76f3808e7 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -15,6 +15,6 @@ DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d15
 EBUILD automake-1.11.6-r3.ebuild 2566 BLAKE2B c1e28e5349f89560b320f0fb61d63a18e13c3aac2a1962e6e8d31f2adf5f22136b9e949ff397c05c0781724aa40580f3217e7991fdbe8ac3c3d533f8e1262e7e SHA512 c4290cffa2dd4ce49949ba7e4db2a9ca7e07e22e6c26d814b1876583732ebd31954bbfed95e516125f12083a080209357872af2c7ccdafd4712fb30f922f9da7
 EBUILD automake-1.13.4-r2.ebuild 2643 BLAKE2B cfb0517a6dbee72711d8f25f4a86c8cfd73ba821f3ed58ca86035d380d5b03102f1a56037257515a21247f1e42d74637df2cd71496a74e5bc47c798c72d9699b SHA512 41dd36863935300680001619afe6fa931521bde40e07c1b226899a09a5ed7ed67603074bfeb2dbd1f51dc0d3a3c968e83e4e64c9ab732406a0983e87c95ad79d
 EBUILD automake-1.15.1-r2.ebuild 3192 BLAKE2B edd43338af2e12fdc25c419bcf452e014a64f23aac91d57d727d61a4125dcc047406a954b8d3b5d02a6232b528b25dc2b4d210e9caf76814453f9793d1a7ca7c SHA512 6de009d30ad3126f93f1c3b705ef44181a385e042488aa206cdc5a9aa7e518da79e80d5853e8f4f73fb3b3c682882afc48bec625ea7a881c63ca7d675a605c2d
-EBUILD automake-1.16.5.ebuild 3525 BLAKE2B 3a44b5c1bef29af0fb91a116e87fad69e124b1dcfebbd6c9046c2754bf54ee401995884fb703248f749b30bb9b2f35388b3559d0a62e33fc81368b5b1e25d322 SHA512 e5cd64e9de5e8ccd9652aeb6420e8596b0e06aace2fc9ce157afd1da2a0a5c14cd49b93115dd1ebc7d3d2ab6a14cc9c52b9a418874e1b7b3009a1e7731d12a50
-EBUILD automake-9999.ebuild 3332 BLAKE2B 6abbaa1f0a3c9b461fa37b51e8e57134d07325eaba082ef4ba057d8e5636af9c0d5b4cf31a269765409bb868a93b5c4aa47843019e0b700a62af605becfe74b2 SHA512 4b96583e29f9598197a9aebbe6a385befe3a0eabb55bfbbb9924a6eb80ea0afbeb6763a52356b0e4175baf0e33d365594896593b09ed5eb1c3ff2ee5b1b6c659
+EBUILD automake-1.16.5.ebuild 3535 BLAKE2B a722a4c6628636d7e13f7b70ffd050d58c9485e5aef6b005e3eabae151dc1f223b2ac53bf74a6e57d50937b94e3c2600803ea6423b33b5ff7f4f26d88f997f54 SHA512 72fb8fe84da386aa75e5e1b905629f0fe87fd8233db336e4803feb159524aab6692b70aef5279c27a460efe7e191b2433bdd2f985112c87df62739f484231375
+EBUILD automake-9999.ebuild 3341 BLAKE2B 042f3a63a8f6121e15bcf6dceef94078b44288b510081fe6f9030dfa9d6511e4e52038d04e9d678a160a890cd094b4f5c897095bcc2421fe336ab865c98c0762 SHA512 f46119a3089930c38680fd0bf556b8508657905a5a6b7c285940188456c1456cdf5faad32a47f2d23b69e43e4ea533bef381eee72b0d31728da08762f44772ac
 MISC metadata.xml 332 BLAKE2B d33ce6b379d5d8d44ae9104f3e5c5a0b5b25682072f7222bdd6dd92b97123b3cc011ed078178a8d2cb9e3e3d1da03dde67b3a844374819fdb67b879341a8a5fa SHA512 ad4477b610e680468526c77df5550b44f8d0558237aac887312a463d4da29216a63db372710398d0eb478550550507e81421d1deee272038b3658c38b84e5b06
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