gentoo resync : 28.04.2021

16 files changed, 59 insertions, 41 deletions

diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index e2aa377c9646..11c00449186d 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -51,19 +51,19 @@ DIST automake-1.6.3.tar.bz2 476275 BLAKE2B 5d0b7f69cbf9fda3b1f1426548fae45c63137
 DIST automake-1.7.9.tar.bz2 577705 BLAKE2B 0fdd9eec855f79dba2067374d2fb902d92fa4c2ec1e3fe292376383b3f8cef62799d880610af51b7b31b4a17812b9cd25d1bbc8687fd30ee98de88d4e7625f53 SHA512 372f326cdf9c893a016473b959f0d3b92a7a82a13978e3950a887a79c93856a635549ebc63945faafba30b8be6db1c4cd68385f7dfe1cbb36386400acb2aa7a2
 DIST automake-1.8.5.tar.bz2 663182 BLAKE2B a1488fe8653517d16e69e64655829119283ae9f49d5a29c4886100197fb08d6893abf2701000125fcbaa9923c76a2466de25e056ffcf856eb2878c34284c00b6 SHA512 862f9fe8dd4f0fd51b97d80b767304b982d9c9307bf66933298187bf121f5c827f0b4880eab92f07d16e0c1d41ff5179923c7ae8d8aabd635db8574d4a3021b0
 DIST automake-1.9.6.tar.bz2 765505 BLAKE2B 078d4dff44be18d93a8b1b30367a6010fff0be890a61a23926910ac2d92ac87672e7fec8f3548815eaa72310b3c4e042ce0f5df0250423446b39924eee4d044b SHA512 6aa8824876003bcac804e88d58f014a2449c7e1d824e46b5e971d3e2d070bc6ac0a3881e8eaae12e2f7f310c6b81dfb83ad4647d58785fc7e6759aa37478784e
-EBUILD automake-1.10.3-r3.ebuild 2388 BLAKE2B 9dac25084c353bc3316360dc606c8cd4645c4fc0a68b7630a197c30b0669ac845815eb4fcdfd63549788ad2ebd797315c059ffa38c385bd5c2ec16ef4a57ef34 SHA512 b8c8b9fef56b930ad471a52b547cfe955b37bf34fd9efec2e73c6abab0c9361fe39a5801a76af8e7bc71cb274485fbf231f18abcfcbdd23f0a558de9eb87c30a
-EBUILD automake-1.11.6-r3.ebuild 2565 BLAKE2B 67a70c6bc25cc386e45d742d9552197ed1e4b1d9d2ef85f5b22d0eeceb20e018c0b482dd991a7640fbbc424d1f6e3e71c442aa32ca28b8c1fc2bc4f29b55398d SHA512 dfb8aa86a245b1fc8e28dab0b5007d9b64f78ef188ecfb469df60f8583dcf7da62fbc8c18c2a5a790fe65bef344a5e8290f4170cf6dbc34121a9bc152e836a06
-EBUILD automake-1.12.6-r2.ebuild 2420 BLAKE2B 0f8f42975c78c92fb942c3c446608854fd9058f8d811d46330054b070d3dc5585ba872060484a93713ed216b2e4984dd290e12683408bc572ed8033a38695ccb SHA512 6a197c024acc592a697efe31ce28ccef3707c6896a241f0bbcc07f985ab0ccb62a868fc844ac5cab381eaea68a30a9cd02b466cfa18382fadc979031cb22884c
-EBUILD automake-1.13.4-r2.ebuild 2642 BLAKE2B f986fc77516d8aeafc93a897769c3e0a72a6b88e6f7b871dd8aaf647393888087157d040ffe76c6b9436f824ae23a9a05e602506f4e8aa531722510d2e47d08a SHA512 2225b6dce8dda4e27ffdd386afd7c599f11aeaa345f6b44b67a8fc25f53cbeccb00564679df20b4543262475e391a8f41a88645179a7245242e928324c0cd1db
-EBUILD automake-1.14.1-r2.ebuild 3021 BLAKE2B 6a02c815643edde1d0aec03aea5e1b7005585c0a0bee7734b434c09a27efcb231ae72c885d8c38d023e8a00975cde796d95c4520e5333ffc63b43558384349b1 SHA512 3fad414923f4808aca91d51704b128ba2fffda5482b3a579dfeaa90cb2795fe238d3e1a4168732581481eb09074e01ba3e9ec7a79fae16c2ca901e3ac2bf386f
-EBUILD automake-1.15.1-r2.ebuild 3191 BLAKE2B eb8fec381047cc9de2c56d40f7c80d9bedb06649de82b5231a926ae3361c7d2537ec16e6f79fcc8194de4943c2f445a2cc23afe36c3780608ee82f249c9750ba SHA512 905cf0ec6ee9f411d4bf8ca262c8002e04b346c4b2a241005d9eecfb0b38e3050add4d5cb678ab7d332bd39e46881cfd5f695c998dc465346b2d13380b6d3566
-EBUILD automake-1.16.2-r1.ebuild 3534 BLAKE2B 832528a6d0a9e86a2077128d100659287958c74c574571477012db657c25999567eb3982643ff479c21731ed4b85315391eee871b37a3afec05d421fd86ccdb7 SHA512 013b329e82233028aeb7ca4c4c1b70a09fc854ab5016e26b5443931acc86003ac3c4d767b3022c0732cbda4a779458217b2832476f59cca969e22ab47fb4274b
-EBUILD automake-1.16.3-r1.ebuild 3464 BLAKE2B a5127b59ef8ba1a9e14e90a50e15a2e1a42fc5f2090f3b3c8750a38df92ad706941453e719d03e81c22d38efd0d79f99ad4fa935afc83c82f3c41870ea373dfd SHA512 49c9dce17bbd6f731aa4e8ec760ea190e16b531ec249e8651769b18bab022c4269f334ce6d8a0639465c7811e568ec1d3b990fa145d9c198a140f6420718c728
-EBUILD automake-1.4_p6-r2.ebuild 2469 BLAKE2B f631fc0d87edf6cef1a8a07f0417fd72df8229fdaeca66f2f85944cb00fa3f6dfba73cd20df88ab2fe6fbe268473d8dffd6ac203980d4e241988ad3084ce9271 SHA512 ff05eabeb5baf5d8415b3e8c87e462e1c3f5b3a46a4910f9c0216746e6794739947c98515251b722dfbce51cb12868f4dcc247deac924371bf504a7b35fb4c96
-EBUILD automake-1.5-r2.ebuild 2243 BLAKE2B c530c3ff67f450a3c5c10ccf224a2e87021e17821ce15b288dc979d8af78f81d578767d86fec09b15b704d32c7c46504e3ec35b126cf6792145c6056b57ba048 SHA512 7ca78eba7b26acb2ed84e8382148a895581345d359bf63c8aeee5efca99fd9637247b573c420a42f6a5f6bcfe2093057470f6ee259dea06e0a99b7ab0e1ae927
-EBUILD automake-1.6.3-r2.ebuild 2045 BLAKE2B 6c06598b71fbaa8976d5d8b1fdbe5c091698a38c881b3a5f978eebc96207b3dde2d63022b0e2f6b9ebfb9fa0e22e7ab6a67734f52cd52be083ceda959af6a4bc SHA512 b583d6abf8fb8f0f15f03d5faab000244322c309b089f40b59d0b0a3202c58427cc5de9b1aa423c1cacd20277c51387755e2c367e80a85d0bab923a5b6bd85be
-EBUILD automake-1.7.9-r3.ebuild 2179 BLAKE2B e9da60d988c7bc2a46f34271b0cb1aecd8a29f04b690d73d7cf7af821fa574ee51e899952688a055bbb6031760b1908d761465ed6ac6eeac851e76545930ab2c SHA512 6667759ace8e089d5d76553897fda8a1043926a2888578a61ed0b29892857f2c3f98df2d480249c74c7d66ab6e5d313cfc71ed7bb1d90269dbccd53b8f1f02ed
-EBUILD automake-1.8.5-r5.ebuild 2206 BLAKE2B 397fa1a1a136989e2edc100edf150ee08eacb02784aa4ed0592b9a859ed1a18ba044dd56ec71ce5ccc79771159f5a9e95070c8e4817815c37a7b10ea78a2975f SHA512 542538416e7f07413edb7f9152cf4dd5777097535b1b065d486fbbf686ca8fe2239d8c1ce7170a1b328f0986948fa483cb5b4919e75818aae4399df72ba8eb05
-EBUILD automake-1.9.6-r5.ebuild 2420 BLAKE2B 5c8f761c4a20873b880aa83d5729a892dffb4a1018570f958383b0ddfe18af3a6a2559b25118f5942a9b0690c85335205908e6bd26d234a01083a16cfe664a5d SHA512 dc8e5ad6a642196e821d2ac44a71ceaae7ae487eabc717f97f79c53683b1fa7431e5ad4b7975d3c6a963fcf1afd13040e47352b59596d4d0e2a492befe7aae5c
-EBUILD automake-9999.ebuild 3382 BLAKE2B 79a7f83ba2bc1b6e4cbbdd1669c0d7f79c3371cdd33efc18a8f3d0e7bc974d5bcc0e0834736bcadf7219ce82d7983b463d6bc2ef99d13453ffa191f064f4fb37 SHA512 4c97376fdaa0a4ec53cba77ea1875914818bb113f014fcd9c2f1df389c0d5cd54819e9d6347472d65eb5e3b96c93d0e4275a76ff1e4b80c8df7da01cd59c33e1
+EBUILD automake-1.10.3-r3.ebuild 2389 BLAKE2B fa0de8651505dad7d433f8d25fa46c5d78bf7a4d51a22092016e4e54f7a2f57fae3bb44ff03812386c922d7a5ee16f502b51354487d5fb63ad875246eef3e486 SHA512 05c6fbf4eb1293b770605d3f295f2bffbed76ed225f19a1270eb5ea6f7c87d0777009305a5f283242c9ce703a8bac358b25bdc2f5a65e0cb75801b7a0d6316e9
+EBUILD automake-1.11.6-r3.ebuild 2566 BLAKE2B c1e28e5349f89560b320f0fb61d63a18e13c3aac2a1962e6e8d31f2adf5f22136b9e949ff397c05c0781724aa40580f3217e7991fdbe8ac3c3d533f8e1262e7e SHA512 c4290cffa2dd4ce49949ba7e4db2a9ca7e07e22e6c26d814b1876583732ebd31954bbfed95e516125f12083a080209357872af2c7ccdafd4712fb30f922f9da7
+EBUILD automake-1.12.6-r2.ebuild 2421 BLAKE2B 6c605916889c8388fd8fd40d0aeb75ac58f2f4d4cfa2caef0e23709a9da611aa5a34eb851984fb2786566c29ea6c19f6518a6fa3133e96f6474f82a2a49e7809 SHA512 47ae0b3f8ffaabfbb8b2704ba97806e6cdff8e48ca0379181da3aca72263f8682b0653e311b11ffce4d3360a8c0cd295079449c341fd20c31b88328aac72e793
+EBUILD automake-1.13.4-r2.ebuild 2643 BLAKE2B cfb0517a6dbee72711d8f25f4a86c8cfd73ba821f3ed58ca86035d380d5b03102f1a56037257515a21247f1e42d74637df2cd71496a74e5bc47c798c72d9699b SHA512 41dd36863935300680001619afe6fa931521bde40e07c1b226899a09a5ed7ed67603074bfeb2dbd1f51dc0d3a3c968e83e4e64c9ab732406a0983e87c95ad79d
+EBUILD automake-1.14.1-r2.ebuild 3022 BLAKE2B e2cb5bc89a7e4626eb22704c4df87c043dab8bc3d35a0a9db040497afc9495a1803128650647bd656986e99d02ccbd239473d70c6877496c2a851287b12d3229 SHA512 1e4d32f7e40460be205d26bd9902e4e6326ed24e1896064ea6d81af1de69b8ca8e844ca96a3e38aa279a0611b8f19b2bfeaba8e06e194dd115b1fbb5abf338c2
+EBUILD automake-1.15.1-r2.ebuild 3192 BLAKE2B edd43338af2e12fdc25c419bcf452e014a64f23aac91d57d727d61a4125dcc047406a954b8d3b5d02a6232b528b25dc2b4d210e9caf76814453f9793d1a7ca7c SHA512 6de009d30ad3126f93f1c3b705ef44181a385e042488aa206cdc5a9aa7e518da79e80d5853e8f4f73fb3b3c682882afc48bec625ea7a881c63ca7d675a605c2d
+EBUILD automake-1.16.2-r1.ebuild 3590 BLAKE2B f196eff9332ada972ba70f7f614a4cb8930920d019c58abd745e355a78636623380fe9c95aaf81c6c9967b6c952462f1f422b687f80d1a8e2a0abbf208664ec5 SHA512 a9582b99723b6dc6a2ebefb4563beb16177e0e0098885174b16d2986c96a6207df9d733b7c1204f2d5d01da4f6b4d879256091294e41f42ac5a6540c07d0e231
+EBUILD automake-1.16.3-r1.ebuild 3525 BLAKE2B 87875b510256d665df069c59f1dfe6025dea79fba0bc89ee7a7579cea8bd4e930f1eb0601273ccda0d82231dd5b9a87f89681d455fcbb6b455d49affa8d49cd1 SHA512 3de3672efcf2630b3fd7357f7195524c051319879f0e1499149c9b397ce2f67ef3df7d4cc77572e2f2ad8d6aaa0d63a01bee8af89b75dc320aa027535b260995
+EBUILD automake-1.4_p6-r2.ebuild 2470 BLAKE2B aaa71b7b5c7b6a3f8102b0838a00500e8319db8e691aed3834f544586a15c174af4c69417810e138d045c35c8c7822fcab912f2d5909d450b3916d1e2adae249 SHA512 ab1d60e86d761eb80bc0bf97c930d499ba9b63e85906f8b6b2c6c909fa85fecbe21bbdf3e3a882bfad5b89f94ac31bcb7a159578b9e0a306614226d9a63e7512
+EBUILD automake-1.5-r2.ebuild 2244 BLAKE2B 0fcf4acbc952d6c4e614c047db8450626f6a3942e2231209173f22934e1f36ee76d684c0588b8aaa7144dea11d3342241c8c9add5cc60ad9234c7be6cf267d21 SHA512 043f262714a4e52851837b01066044681b7cc57e6482a9daa1877ae7134e5c917930e4490afb943392e04a57707f513f10d85465cd0f5c12ee0b9bc0a9cee382
+EBUILD automake-1.6.3-r2.ebuild 2046 BLAKE2B 96c80209c1df50b2e4b47e45783f3b55dd253b41e917a4fee75556ce1b340103648280ab2a5b9435c17322cd5e6e01fe9bbd06ba3c1314874049eaca6019a023 SHA512 932954baa0b8af349b374ee07e179976973751626e8168162168d6dd855a8264b3ea0b79a4ea48a973c0119ec9a0d1fc3dbea859557003a62a965ff8c81ebff2
+EBUILD automake-1.7.9-r3.ebuild 2180 BLAKE2B 0c17bea964b87b3b675213a072ffc75c13ac338520405d6eafe3153ee01292d7c575706f8917569d2985c9b52e5fadfc8cec836fb756498cd8663d38a63f147a SHA512 c6862dfe39091fba2fd7e4fc9920f44c8692d4c817ed11b4b103e657a59e84cd9d66dadb37b8e717495a812233af68220a188cef8cc1eb14284842fbf221cca4
+EBUILD automake-1.8.5-r5.ebuild 2207 BLAKE2B 57ed7fc04c7cf2b44b9e7fdce38efa8b32e6a3990f244c04cb2446b294bb4a605e15ee076b09c2b8eda7c438662703a0653e08cebc5fb27512f5bc74a5de3a94 SHA512 2643bd139f75b30b3f6c8c404c340e00884645c569b18fa16296913de3a4bc5d90fc2d594ef5fa820019ed35fdd10e2bd28e56ddd1feda9eeb00d1c476480640
+EBUILD automake-1.9.6-r5.ebuild 2421 BLAKE2B f72af55efb0fb127cd7f964b950eb10131d2ea01933e83e82c677b89d11838a7a931e133352cee131101fe22156004b0028064237d8450383d40a2bab3d736f3 SHA512 23b5ae30b89b97a60955d6a97adb3c197fe6b7a7fd8c0e930be7a4ca26e90a901677261cea965ad95e173d3445596536f4770758dd49f3d12e8362a4afad9726
+EBUILD automake-9999.ebuild 3437 BLAKE2B e8ce893051aaeee6717cd2fcc9f1fbfd506071d163759752285799d06c4e9349da51a2f78f2a8d0e65102b767e7a86a7be4b78fd52215ffb89df95f66cfec5cc SHA512 ad8f3b58fb219983ed2c53d333d9cae610718d2e08059c21acba6de4c6320b288a8d4351803a3af614a4b9468f769c4551af5c62315375bcae3a814d608f2e16
 MISC metadata.xml 331 BLAKE2B 71cfd842ad316730cf02f9f80b8c6ede120bfe4b007c43737d31204990c97665d916b69932d9d855cfb4a8b325e3920957c5b287b896b9d371311ebb57134b10 SHA512 2194f195d6364115d869d3417993fb58361392dc7f8c98792213a22ad3289abf35199403c6a326d6e8f3f234afde056ff6f4d67a84ddd1cb4a227dbe3e9982d6
diff --git a/sys-devel/automake/automake-1.10.3-r3.ebuild b/sys-devel/automake/automake-1.10.3-r3.ebuild
index f70d8537f23a..a85f4c5a1e3b 100644
--- a/sys-devel/automake/automake-1.10.3-r3.ebuild
+++ b/sys-devel/automake/automake-1.10.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/sys-devel/automake/automake-1.11.6-r3.ebuild b/sys-devel/automake/automake-1.11.6-r3.ebuild
index 58ccde9a40ba..8b96c4f83141 100644
--- a/sys-devel/automake/automake-1.11.6-r3.ebuild
+++ b/sys-devel/automake/automake-1.11.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/sys-devel/automake/automake-1.12.6-r2.ebuild b/sys-devel/automake/automake-1.12.6-r2.ebuild
index 3292e87d89b9..c5b185148183 100644
--- a/sys-devel/automake/automake-1.12.6-r2.ebuild
+++ b/sys-devel/automake/automake-1.12.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/sys-devel/automake/automake-1.13.4-r2.ebuild b/sys-devel/automake/automake-1.13.4-r2.ebuild
index 3eac0d586c94..286477158c2a 100644
--- a/sys-devel/automake/automake-1.13.4-r2.ebuild
+++ b/sys-devel/automake/automake-1.13.4-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
 IUSE=""
 RESTRICT="test"
 
diff --git a/sys-devel/automake/automake-1.14.1-r2.ebuild b/sys-devel/automake/automake-1.14.1-r2.ebuild
index 45228bc94880..d9af1685d569 100644
--- a/sys-devel/automake/automake-1.14.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.14.1-r2.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.gnu.org/software/automake/"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 RESTRICT="test"
 
diff --git a/sys-devel/automake/automake-1.15.1-r2.ebuild b/sys-devel/automake/automake-1.15.1-r2.ebuild
index 63846a747b26..61626303e82b 100644
--- a/sys-devel/automake/automake-1.15.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.15.1-r2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~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
diff --git a/sys-devel/automake/automake-1.16.2-r1.ebuild b/sys-devel/automake/automake-1.16.2-r1.ebuild
index 987c21303241..bd0de0291096 100644
--- a/sys-devel/automake/automake-1.16.2-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.2-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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
@@ -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 cd3307a6083d..0012a71abf81 100644
--- a/sys-devel/automake/automake-1.16.3-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit python-any-r1
 
@@ -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-1.4_p6-r2.ebuild b/sys-devel/automake/automake-1.4_p6-r2.ebuild
index 328151c0dcb6..47f6590cfc3b 100644
--- a/sys-devel/automake/automake-1.4_p6-r2.ebuild
+++ b/sys-devel/automake/automake-1.4_p6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.5-r2.ebuild b/sys-devel/automake/automake-1.5-r2.ebuild
index 5d33bc94d3d5..740ac091ff4c 100644
--- a/sys-devel/automake/automake-1.5-r2.ebuild
+++ b/sys-devel/automake/automake-1.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.6.3-r2.ebuild b/sys-devel/automake/automake-1.6.3-r2.ebuild
index 6c0cd2f16749..2f2920295686 100644
--- a/sys-devel/automake/automake-1.6.3-r2.ebuild
+++ b/sys-devel/automake/automake-1.6.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.7.9-r3.ebuild b/sys-devel/automake/automake-1.7.9-r3.ebuild
index df9f506f48e6..8ec3a1b1d3a4 100644
--- a/sys-devel/automake/automake-1.7.9-r3.ebuild
+++ b/sys-devel/automake/automake-1.7.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.8.5-r5.ebuild b/sys-devel/automake/automake-1.8.5-r5.ebuild
index f545e1e2fdee..6c6447a52c01 100644
--- a/sys-devel/automake/automake-1.8.5-r5.ebuild
+++ b/sys-devel/automake/automake-1.8.5-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.9.6-r5.ebuild b/sys-devel/automake/automake-1.9.6-r5.ebuild
index bfb4a120b038..ef506d0fa073 100644
--- a/sys-devel/automake/automake-1.9.6-r5.ebuild
+++ b/sys-devel/automake/automake-1.9.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 RESTRICT="test"
 
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() {