gentoo auto-resync : 05:12:2022 - 21:07:33

7 files changed, 55 insertions, 79 deletions

diff --git a/app-alternatives/Manifest.gz b/app-alternatives/Manifest.gz
index ac4091a19fd3..ed0cde5ccc6f 100644
--- a/app-alternatives/Manifest.gz
+++ b/app-alternatives/Manifest.gz
diff --git a/app-alternatives/awk/Manifest b/app-alternatives/awk/Manifest
index b31038130df7..5ecba01dea54 100644
--- a/app-alternatives/awk/Manifest
+++ b/app-alternatives/awk/Manifest
@@ -1,3 +1,3 @@
 EBUILD awk-1.ebuild 554 BLAKE2B 29fc3ad3018b3ce17a24c250e22789105c8a564fdda0c2185401fe999ccb2d33eae2afacef01042e3b58e968b906452e9fb623f0a804c0a0954042297146abf9 SHA512 53db324987a3b7dc3c49f4d5d2060b8d065aa5798be2084d75c5eea89344205118ca301ca21ecc438d45e28ea1eb60357d44c2fe0b52ae1602636bf85535d1d0
-EBUILD awk-2.ebuild 1757 BLAKE2B 968c3e236089382449abe64e62ded3cba39646746fbbf0762f7006f2ef76c8de27741e66a262474b8a694b40c37e1114157a665d32edda04d667ae2626e24339 SHA512 e0ffed625431f2e2afd18ff39b3dc21bf6d6be7e7aa20573b0cf740f42b93e3f76057022b16fabb1179dca00bea63647108996e24baa48c41947ac20dee8764e
+EBUILD awk-2.ebuild 1373 BLAKE2B a65daeca559e47330535a17923c6b21e083d671292d99391365895c74e408aeb6d03e2135f3e5d9b6bf50dda171ee5535597b6724dd8699b126d58e79ce2e669 SHA512 1cc668225cb6bfee490ab8564d777a668899937726a892e86b484b38d46a10e2614cb1501128973640c41f04118ba48d09651efd43a9c66b11809abcc631621e
 MISC metadata.xml 829 BLAKE2B bf4375b33e702c61a3f8553e1b63110acab32b68d4ac2d905b6dd12a2204484bc5c2f3a34b2ec127a6c60aac8c105949dbc6eb5ade3a1c8c959afdabdd3658a1 SHA512 32252970d3b12c7a5b9fc7c7ffae821908b9bd4101372e699c70e64572fd7563121427ed5971462417d8c2e6155e47f567ac3bb057d457d58648c5b4d2458974
diff --git a/app-alternatives/awk/awk-2.ebuild b/app-alternatives/awk/awk-2.ebuild
index c76362361bef..c20aa0953478 100644
--- a/app-alternatives/awk/awk-2.ebuild
+++ b/app-alternatives/awk/awk-2.ebuild
@@ -3,47 +3,41 @@
 
 EAPI=8
 
-DESCRIPTION="/bin/awk and /usr/bin/awk symlinks"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Base/Alternatives"
-SRC_URI=""
-S=${WORKDIR}
+ALTERNATIVES=(
+	gawk:sys-apps/gawk
+	busybox:sys-apps/busybox
+	mawk:sys-apps/mawk
+	nawk:sys-apps/nawk
+)
+
+inherit app-alternatives
 
-LICENSE="CC0-1.0"
-SLOT="0"
+DESCRIPTION="/bin/awk and /usr/bin/awk symlinks"
 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"
-IUSE="busybox +gawk mawk nawk split-usr"
-REQUIRED_USE="^^ ( busybox gawk mawk nawk )"
+IUSE="split-usr"
 
 RDEPEND="
-	busybox? ( sys-apps/busybox )
-	gawk? ( sys-apps/gawk )
-	mawk? ( sys-apps/mawk )
-	nawk? ( sys-apps/nawk )
 	!app-eselect/eselect-awk
 "
 
 src_install() {
+	local alt=$(get_alternative)
 	local root_prefix=
 	use split-usr && root_prefix=../../bin/
 
 	# We could consider setting AWK=... like we do for yacc & lex,
 	# but it would need some testing with a fair amount of packages first,
 	# as autoconf prefers gawk.
-	if use busybox; then
-		dosym "${root_prefix}busybox" /usr/bin/awk
-		newman - awk.1 <<<".so busybox.1"
-	elif use gawk; then
-		dosym gawk /usr/bin/awk
-		newman - awk.1 <<<".so gawk.1"
-	elif use mawk; then
-		dosym mawk /usr/bin/awk
-		newman - awk.1 <<<".so mawk.1"
-	elif use nawk; then
-		dosym nawk /usr/bin/awk
-		newman - awk.1 <<<".so nawk.1"
-	else
-		die "Invalid USE flag combination (broken REQUIRED_USE?)"
-	fi
+	case ${alt} in
+		busybox)
+			dosym "${root_prefix}busybox" /usr/bin/awk
+			;;
+		*)
+			dosym "${alt}" /usr/bin/awk
+			;;
+	esac
+
+	newman - awk.1 <<<".so ${alt}.1"
 
 	if use split-usr; then
 		dosym ../usr/bin/awk /bin/awk
diff --git a/app-alternatives/bzip2/Manifest b/app-alternatives/bzip2/Manifest
index 0da99e63177c..c1380cf60046 100644
--- a/app-alternatives/bzip2/Manifest
+++ b/app-alternatives/bzip2/Manifest
@@ -1,2 +1,2 @@
-EBUILD bzip2-1.ebuild 1254 BLAKE2B 38c087d2a7d15dcd39094036ce94c0494f6d600ba473d447f8bcc51fc775101a144b2d362c11236894c2981836f13900074f536a71d50b0c2ab2a034f8256907 SHA512 86d7b9df293bb0256e798b78db171a5d82462a682be1999ab70035c19157a217d401c5112d3b756df160bca94a147808ee95f6397ade67d6db0faedb5e3bcf19
+EBUILD bzip2-1.ebuild 942 BLAKE2B 1b4f3e831ab7170f26c718465d8ce26444c02990c459be837216a17bbab00906acdb4eaf7e6614fdef50f56d3ac42bfadb57dc7342b32ca8cd8083e4676f0167 SHA512 a3d272ff41cadcb5564e72cd75aab2465012f7125cff6b544212c114cc15b6781051ca34f7d46e8549d9ef4810bd8ef8fb56b5c726040fe105ce6e45023c3a8f
 MISC metadata.xml 608 BLAKE2B a8bd6f79e552943ee891edc7e90399c77dca3347ce407767902446d0e25720eacc137a6ed31fb851553caf8a938cf6be63c7a1451b2b8aa4a3c367995204216b SHA512 a3863d41f2b3475e64903389efa2b0f8258bf5f21df4e83ff0e28fa44519b012ab92d4a773d05089d7fcf210e4c29da63d25be8e9e098d15284e13dc75bfcf6d
diff --git a/app-alternatives/bzip2/bzip2-1.ebuild b/app-alternatives/bzip2/bzip2-1.ebuild
index 6e61b5e2135d..6b0b5ef620d1 100644
--- a/app-alternatives/bzip2/bzip2-1.ebuild
+++ b/app-alternatives/bzip2/bzip2-1.ebuild
@@ -3,46 +3,43 @@
 
 EAPI=8
 
-DESCRIPTION="bzip2 symlink"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Base/Alternatives"
-SRC_URI=""
-S=${WORKDIR}
+ALTERNATIVES=(
+	"reference:>=app-arch/bzip2-1.0.8-r4"
+	"lbzip2:app-arch/lbzip2[-symlink(-)]"
+	"pbzip2:app-arch/pbzip2[-symlink(-)]"
+)
+
+inherit app-alternatives
 
-LICENSE="CC0-1.0"
-SLOT="0"
+DESCRIPTION="bzip2 symlink"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="lbzip2 pbzip2 +reference split-usr"
-REQUIRED_USE="^^ ( lbzip2 pbzip2 reference )"
+IUSE="split-usr"
 
 RDEPEND="
-	lbzip2? ( app-arch/lbzip2[-symlink(-)] )
-	pbzip2? ( app-arch/pbzip2[-symlink(-)] )
-	reference? ( >=app-arch/bzip2-1.0.8-r4 )
 	!<app-arch/bzip2-1.0.8-r4
 	!app-arch/lbzip2[symlink(-)]
 	!app-arch/pbzip2[symlink(-)]
 "
 
 src_install() {
+	local alt=$(get_alternative)
 	local usr_prefix=
 	use split-usr && usr_prefix=../usr/bin/
 
-	if use lbzip2; then
-		dosym "${usr_prefix}lbzip2" /bin/bzip2
-		newman - bzip2.1 <<<".so lbzip2.1"
-	elif use pbzip2; then
-		dosym "${usr_prefix}pbzip2" /bin/bzip2
-		newman - bzip2.1 <<<".so pbzip2.1"
-	elif use reference; then
-		dosym bzip2-reference /bin/bzip2
-		newman - bzip2.1 <<<".so bzip2-reference.1"
-	else
-		die "Invalid USE flag combination (broken REQUIRED_USE?)"
-	fi
+	case ${alt} in
+		reference)
+			dosym bzip2-reference /bin/bzip2
+			alt=bzip2-reference
+			;;
+		*)
+			dosym "${usr_prefix}${alt}" /bin/bzip2
+			;;
+	esac
 
 	dosym bzip2 /bin/bunzip2
 	dosym bzip2 /bin/bzcat
 
+	newman - bzip2.1 <<<".so ${alt}.1"
 	newman - bunzip2.1 <<<".so bzip2.1"
 	newman - bzcat.1 <<<".so bzip2.1"
 }
diff --git a/app-alternatives/sh/Manifest b/app-alternatives/sh/Manifest
index b9138b0e2340..de424a18a40d 100644
--- a/app-alternatives/sh/Manifest
+++ b/app-alternatives/sh/Manifest
@@ -1,2 +1,2 @@
-EBUILD sh-0.ebuild 1243 BLAKE2B d8969c5ee83fe3a88656d09448607a4ad482457408dcaf809a43453c0eaeb36bee7c1299e058417a5e0939032e1e46107c56cdba96eab63be748831e69a62ac8 SHA512 a8f3296f6053ea628b9278a36a0caa122e744e4f1ccbe7709569bafd205e8e29229f9fe269841914dc17f54a7864a87051686487615b4730cf7a5a319c065db8
+EBUILD sh-0.ebuild 835 BLAKE2B c677add726e1907141f794c461282a869474a2aefe294df1aebc169d03c2b66d65a8d7d80473747201fef707ce75a614667727fee37417a39588155b18280457 SHA512 34f98126bf1cb2aad3d9bd15c1a912fdd1417267ae59b74da9bffad7b95070764bb2d810f86f19c96838eabc367b1153c2e6401a792e9e3487bbabf705c24eb0
 MISC metadata.xml 759 BLAKE2B 4f691499f0da47c72c61999275d72604093856ff5440a7f72fdf9a6fe09ac86ce8d07e453d8a88ee9747142cf506cb4824223f9372ba2c8f0414086a3390a239 SHA512 2d2c06a26faf1cb72fea2f201a3bdabed020d8e2f1fb6bd86fdb985274a76db14080410982c74d3d5e5ccf483f1c280f2ea77d3d083d87985f36b54c190b2ec9
diff --git a/app-alternatives/sh/sh-0.ebuild b/app-alternatives/sh/sh-0.ebuild
index 5da158c80cab..882b960924a4 100644
--- a/app-alternatives/sh/sh-0.ebuild
+++ b/app-alternatives/sh/sh-0.ebuild
@@ -3,40 +3,25 @@
 
 EAPI=8
 
-DESCRIPTION="/bin/sh (POSIX shell) symlink"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Base/Alternatives"
-SRC_URI=""
-S=${WORKDIR}
+ALTERNATIVES=(
+	bash:app-shells/bash
+	dash:app-shells/dash
+	ksh:app-shells/ksh
+	"lksh:app-shells/mksh[lksh]"
+	mksh:app-shells/mksh
+)
+
+inherit app-alternatives
 
-LICENSE="CC0-1.0"
-SLOT="0"
+DESCRIPTION="/bin/sh (POSIX shell) symlink"
 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"
-IUSE="+bash dash ksh lksh mksh"
-REQUIRED_USE="^^ ( bash dash ksh lksh mksh )"
 
 RDEPEND="
-	bash? ( app-shells/bash )
-	dash? ( app-shells/dash )
-	ksh? ( app-shells/ksh )
-	lksh? ( app-shells/mksh[lksh] )
-	mksh? ( app-shells/mksh )
 	!!app-eselect/eselect-sh
 "
 
 src_install() {
-	if use bash; then
-		dosym bash /bin/sh
-	elif use dash; then
-		dosym dash /bin/sh
-	elif use ksh; then
-		dosym ksh /bin/sh
-	elif use lksh; then
-		dosym lksh /bin/sh
-	elif use mksh; then
-		dosym mksh /bin/sh
-	else
-		die "Invalid USE flag combination (broken REQUIRED_USE?)"
-	fi
+	dosym "$(get_alternative)" /bin/sh || die
 }
 
 pkg_postrm() {