10 files changed, 10 insertions, 110 deletions
diff --git a/dev-python/twisted/twisted-24.7.0.ebuild b/dev-python/twisted/twisted-24.7.0.ebuild
index 23de55ced5f0..8f833d5ced10 100644
--- a/dev-python/twisted/twisted-24.7.0.ebuild
+++ b/dev-python/twisted/twisted-24.7.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI+="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="conch http2 serial ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ruby/activesupport/activesupport-7.0.8.4.ebuild b/dev-ruby/activesupport/activesupport-7.0.8.4.ebuild
index 67ce92a72474..699fc17f47d3 100644
--- a/dev-ruby/activesupport/activesupport-7.0.8.4.ebuild
+++ b/dev-ruby/activesupport/activesupport-7.0.8.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="test"
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-util/gcovr/gcovr-7.2-r1.ebuild b/dev-util/gcovr/gcovr-7.2-r1.ebuild
index 1d820d592f3c..4d658c1454d4 100644
--- a/dev-util/gcovr/gcovr-7.2-r1.ebuild
+++ b/dev-util/gcovr/gcovr-7.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/gcovr/gcovr/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
+KEYWORDS="amd64 ~loong ~x86"
 
 RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/profiles/prefix/package.mask b/profiles/prefix/package.mask
index 32d9ead502f3..4cc8f353b920 100644
--- a/profiles/prefix/package.mask
+++ b/profiles/prefix/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
 # When you add an entry to the top of this file, add your name, the date, and
@@ -8,10 +8,6 @@
 # NOTE: Please add your entry at the top!
 #
 
-# Fabian Groffen <grobian@gentoo.org> <2024-08-07)
-# installs files out of prefix, breaks bootstrap #937463
->sys-apps/gentoo-functions-1.7
-
 # Fabian Groffen <grobian@gentoo.org> (2020-08-02)
 # Python 2 is no longer supported
 # Recent Portage releases no longer supports Python 2, and the version
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index 9affe6719bdd..4feb7b8ff903 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,5 +1,3 @@
 DIST gentoo-functions-0.19.tar.bz2 12079 BLAKE2B be0a3a54d4dee1755866047b670a69cd6fec368239123c3f0c08180b79a33c20147bca0e35e568faef6877513551e731bdf0c181aeb0460f6574d2d708219373 SHA512 2674d3fe5724cc6d685ae58bf0ee33f4a1bdba2c5e5809cfb193fd0a710d4678c2d9392c2c62d2321cf455f524950266dc1629ab684fe46632d179e539d5a39e
-DIST gentoo-functions-1.5.tar.bz2 15808 BLAKE2B 99c330eb4c7f1d7af67b6f93dba565f9ea37c15e82d0b97157067279671dc3918668bf8120f7c410f018d67761cee41320efaec4df43639765d023b23a3a9a7f SHA512 f7add7770f40e110864f16978e968bfd937c1a5099e336cc04f6861483bae36ff7932f502994df1ddfa347beef8736bd39bd276bafbe04190c9915446457ce15
 DIST gentoo-functions-1.6.tar.bz2 16795 BLAKE2B c901cdb8f2fcb507b5397e9ce674a12641f2129b9be05776bb272e09b9db3a6d205e6a00ef51f71b3203eac4e333b297cfe5ae5d61f9dd43074073a749ca171e SHA512 922b801c79f12d15bcabdb6cd52246cc60a4b512dfcc10bb3933f07d2ec03e01fe5be72502ae34c87374c8a7e880ce268e7dc8d1afcbd28b65efb51b9e467306
-DIST gentoo-functions-1.7.1.tar.bz2 26081 BLAKE2B d62259bdbce08043ce266f6ef78eeda2d103feb541526eb3c8fd692d46eec83368c8d4173b72a1dd8a3acd48f13681ef5e44544b7c185f76b325b6bb05c36e9c SHA512 67b7df5d17ac74aeec8cb6733e6270a184bb11f25c86871758835d860d3466e636f5b7660ef7ab189f3ba90ab3b14f7fb65f1c1e95cf7629220aee8e1d93c72a
-DIST gentoo-functions-1.7.tar.bz2 25934 BLAKE2B f105d8dfab99d56256828ea833c1035445667d80261576a7c7ba3bc74cce64a58567a75d2dad37dff02836989bac2bd9d32f0fd87f93ca337f90eeb04889b991 SHA512 a7e8498dea93bf6f7796d25eb55fd440f9c675ef32d7c2e059bc8206adba7334b7f07b7510174e181dd88dbc9753494e3ff0fbd3c129a6f8524ee07a85edb8cf
+DIST gentoo-functions-1.7.2.tar.bz2 29059 BLAKE2B 2b3d13e6f5b553fd0fa7a0880677bd61c82c8815d3801a2d80e7632a97c36f81b41075109856f6248ad0eb2453b511066e63a110c97984e6427135ad19cdc234 SHA512 3839b04784576cc5c5824b24f967862ea421be051983d1ac587de7e21b0fbc4f403e0d4f707ee5cbcf466ec4a12d188da9413a81ca71993c957328ff225cb9af
diff --git a/sys-apps/gentoo-functions/gentoo-functions-1.5.ebuild b/sys-apps/gentoo-functions/gentoo-functions-1.5.ebuild
deleted file mode 100644
index 8df3a1e88bad..000000000000
--- a/sys-apps/gentoo-functions/gentoo-functions-1.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2014-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-inherit meson
-
-DESCRIPTION="Base functions required by all Gentoo systems"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Specifically needs GNU find, as well.
-RDEPEND=">=sys-apps/findutils-4.9"
-
-src_configure() {
-	local emesonargs=(
-		# Deliberately avoid /usr as consumers assume we're at /lib/gentoo.
-		--prefix="${EPREFIX:-/}"
-		--mandir="${EPREFIX}/usr/share/man"
-		$(meson_use test tests)
-	)
-
-	meson_src_configure
-}
diff --git a/sys-apps/gentoo-functions/gentoo-functions-1.6-r1.ebuild b/sys-apps/gentoo-functions/gentoo-functions-1.6-r2.ebuild
index 191370d892fa..d4867ab362ac 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-1.6-r1.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-1.6-r2.ebuild
@@ -16,7 +16,7 @@ inherit meson
 DESCRIPTION="Base functions required by all Gentoo systems"
 HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
 
-LICENSE="GPL-2 public-domain"
+LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/gentoo-functions/gentoo-functions-1.7.1.ebuild b/sys-apps/gentoo-functions/gentoo-functions-1.7.1.ebuild
deleted file mode 100644
index 864663a97757..000000000000
--- a/sys-apps/gentoo-functions/gentoo-functions-1.7.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2014-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Base functions required by all Gentoo systems"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Specifically needs GNU find, as well.
-RDEPEND=">=sys-apps/findutils-4.9"
-
-src_configure() {
-	local emesonargs=(
-		# Deliberately avoid /usr as consumers assume we're at /lib/gentoo.
-		--prefix="${EPREFIX:-/}"
-		--mandir="${EPREFIX}/usr/share/man"
-		$(meson_use test tests)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if [[ ${EPREFIX} ]]; then
-		while read -r; do
-			if [[ ${REPLY} == $'\t'genfun_prefix= ]]; then
-				printf 'genfun_prefix=%q\n' "${EPREFIX}"
-			else
-				printf '%s\n' "${REPLY}"
-			fi || ! break
-		done < "${ED}/lib/gentoo/functions.sh" > "${T}/functions.sh" \
-		&& mv -- "${T}/functions.sh" "${ED}/lib/gentoo/functions.sh" \
-		|| die
-	fi
-}
diff --git a/sys-apps/gentoo-functions/gentoo-functions-1.7-r1.ebuild b/sys-apps/gentoo-functions/gentoo-functions-1.7.2.ebuild
index 864663a97757..512195ceb8c2 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-1.7-r1.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-1.7.2.ebuild
@@ -16,14 +16,11 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
-LICENSE="GPL-2 public-domain"
+LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-# Specifically needs GNU find, as well.
-RDEPEND=">=sys-apps/findutils-4.9"
-
 src_configure() {
 	local emesonargs=(
 		# Deliberately avoid /usr as consumers assume we're at /lib/gentoo.
@@ -41,7 +38,7 @@ src_install() {
 	if [[ ${EPREFIX} ]]; then
 		while read -r; do
 			if [[ ${REPLY} == $'\t'genfun_prefix= ]]; then
-				printf 'genfun_prefix=%q\n' "${EPREFIX}"
+				printf '\tgenfun_prefix=%q\n' "${EPREFIX}"
 			else
 				printf '%s\n' "${REPLY}"
 			fi || ! break
diff --git a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
index 864663a97757..512195ceb8c2 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
@@ -16,14 +16,11 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
-LICENSE="GPL-2 public-domain"
+LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-# Specifically needs GNU find, as well.
-RDEPEND=">=sys-apps/findutils-4.9"
-
 src_configure() {
 	local emesonargs=(
 		# Deliberately avoid /usr as consumers assume we're at /lib/gentoo.
@@ -41,7 +38,7 @@ src_install() {
 	if [[ ${EPREFIX} ]]; then
 		while read -r; do
 			if [[ ${REPLY} == $'\t'genfun_prefix= ]]; then
-				printf 'genfun_prefix=%q\n' "${EPREFIX}"
+				printf '\tgenfun_prefix=%q\n' "${EPREFIX}"
 			else
 				printf '%s\n' "${REPLY}"
 			fi || ! break