gentoo auto-resync : 13:08:2024 - 11:06:03

6 files changed, 9 insertions, 107 deletions

diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index c9268c55eb68..beafa09e28df 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,14 +1,10 @@
 AUX gentoo-functions-1.6-add-warn-function.patch 827 BLAKE2B b14277a0799fa3eab52cbec08a6277dc2e585fe5f8e757a7b25dc81490c5975e8aac9b245ed8000dc4d9f6b2f17922a685c44182acb7a2e452c57e599c5de701 SHA512 8d0dc12d9ef32bda3797882408de7e9796a891d55c5158aa9ab2d7e6bb1f1c0f6c952b64429ec0c4fdc74d37c165f3dd9b020199ee9061fb75c305586b7ae93d
 AUX gentoo-functions-1.6-relax-parameter-validation.patch 5644 BLAKE2B db68c8f83ce6cb010fc1c25d2f643f0a26cea5a6bc29045c85177db722a5cfdb461c594aaf9c840173a3d173088cfe984c7187b6c62468f70d50eda985b824f9 SHA512 c790ebbd308e257470b30b96a787e4085939847938ab9c8ffa3b4e2758ff7eedc23fb2df0907d2676d5deb2718ce526e43cd4d77fe82982949de74fb42eb7ee4
 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
 EBUILD gentoo-functions-0.19.ebuild 877 BLAKE2B 457e5c405c05e9e928c4f8e9e764fe07b7ace335750bebb01d7226e9b7b1f7ceac0fcb49148087439c8a6b42c034aa1f7590b4203e9d42f06031f2b3acee58d4 SHA512 c846b3451c764b64ec601e9d579542a47d68775e94eac97b8680a08891076226279f0611a19a72ba1b75b0cb35941b22ff3c734831e6c8665c2ca5b65cd1f5b4
-EBUILD gentoo-functions-1.5.ebuild 1025 BLAKE2B ec059aed56465fcfd1ee9e057b77c1d1f9c4c251a863c742806a191459b2432a1bc5c7d339d4028fd80f4a77de2c8a21bd7d3724e2dd7c17fa628e7110d658c6 SHA512 0e0b913559b3bd975a53a69bdebb1b04350f59c6c3f5e761ad3ac6472db70a8cbe4c3273158569ce35597d4e81a0e4e15c5805e2585e6ff3025967b02e0b503d
-EBUILD gentoo-functions-1.6-r1.ebuild 1135 BLAKE2B 1e5a1a5a25fd10f662c8edf97ddeec7b327c70da9ca31cdf154d16fbf801932c9eeed2bc38873c0d8a675f2991ac957470cf260b4c5a37e06dfd37c01788aaf7 SHA512 003dda154594ad45ceccb1fbed0b54923d08e61b4fb6dde54a0cd420ae6c97ed5ec82681974c54132f0c22be1f3443bf5c01eefe9b091b3d96c10aa2981f59e6
-EBUILD gentoo-functions-1.7-r1.ebuild 1403 BLAKE2B 1f76b45647e4cbcfdff6bb17fd551f09bc311af7e82c8c3e8b9b5b7931c310367ff04e0b827d0551b6c71218e23fcae167de27096a7f99b13202a99ab3a02722 SHA512 201cd97be2e61fccdcb6efd38a0759a0297af7ad0f3c76f8570ec9de7ab35afc523bb8f2d03e42ac771a5ebda2423bed785ac6cf83ff623231fbbded2f968bba
-EBUILD gentoo-functions-1.7.1.ebuild 1403 BLAKE2B 1f76b45647e4cbcfdff6bb17fd551f09bc311af7e82c8c3e8b9b5b7931c310367ff04e0b827d0551b6c71218e23fcae167de27096a7f99b13202a99ab3a02722 SHA512 201cd97be2e61fccdcb6efd38a0759a0297af7ad0f3c76f8570ec9de7ab35afc523bb8f2d03e42ac771a5ebda2423bed785ac6cf83ff623231fbbded2f968bba
-EBUILD gentoo-functions-9999.ebuild 1403 BLAKE2B 1f76b45647e4cbcfdff6bb17fd551f09bc311af7e82c8c3e8b9b5b7931c310367ff04e0b827d0551b6c71218e23fcae167de27096a7f99b13202a99ab3a02722 SHA512 201cd97be2e61fccdcb6efd38a0759a0297af7ad0f3c76f8570ec9de7ab35afc523bb8f2d03e42ac771a5ebda2423bed785ac6cf83ff623231fbbded2f968bba
+EBUILD gentoo-functions-1.6-r2.ebuild 1121 BLAKE2B 494e0b19f9f29450d432596e5953a82ca218b60f9ad22266bf31219299db65208d503184854664173838062abba5546f497bbad7cfd918df98a22d9af8757096 SHA512 56ed20f73298f27e0d5bffaf383074580238ba53ac0a8cbcf16b6e59d3c308df1794e614518fabe678bb5a585693ec7d7239331b2cbe3cacd5679d616ea77c70
+EBUILD gentoo-functions-1.7.2.ebuild 1315 BLAKE2B 526adf9f8a50403be14a47f55ea6cb648bdd398cd69cbee22ed58c2b0579c1cc1606193e88ef1f6eb1e9dc6038033d6218e682decade3d5458730d3d7d2ca91a SHA512 9537b3fdd900b5e7093f4f9646b1678f9ec31106e1fe7920f11735438796d56fe34be9a2b312f41c1a68a750cae4bbf9b00754995f7157cdb59d184104f2710a
+EBUILD gentoo-functions-9999.ebuild 1315 BLAKE2B 526adf9f8a50403be14a47f55ea6cb648bdd398cd69cbee22ed58c2b0579c1cc1606193e88ef1f6eb1e9dc6038033d6218e682decade3d5458730d3d7d2ca91a SHA512 9537b3fdd900b5e7093f4f9646b1678f9ec31106e1fe7920f11735438796d56fe34be9a2b312f41c1a68a750cae4bbf9b00754995f7157cdb59d184104f2710a
 MISC metadata.xml 487 BLAKE2B c34b1b196d84a44ca3f2729101b826a6460f6b560f942e95e444d23b821256e9c4f330e5b7a2530dabd34b0f1e0a3844ed4b52ea5944500b0b4c72bd955f988a SHA512 3c3008734be30e74ccf3a1f34e4112eef2df0f4e8b0b5d1dd1e90037d130428b21b05ad3686a74c18e5a035a15b32e89cd04de4274e311aa1e30a42ad8cf97f0
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