gentoo auto-resync : 09:06:2024 - 00:08:13

12 files changed, 7 insertions, 415 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 0cee912c6cac..e3b0320abfdd 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 008c86a6d400..dc8cdb5d35c6 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,11 +1,7 @@
 AUX bash-completion-2.14.0-optimize-kernel-modules.patch 493 BLAKE2B cdc4ddab98922d1282380953ee5fb3b8d81415cd6e799e28f24d3298e86ebc3958a4afebf3ae4c603547bb1b0f06baa8d51ecd64dbbcf5f909630ff94b4c50c5 SHA512 a8a95045b1046538f242515d50c5c625b809b69da6e8e600a33e671408f452b42d69d64e7831c29a2f743c88826f51c29054ba9712b7b13cdeb18c960fa0c397
-DIST bash-completion-2.11.tar.xz 311004 BLAKE2B 98e3ab6669bd70b49b238a597f1bc1309dc7ddd51c5b17c5e054f9161115d75d26e85d547471bc087e070d10554448b790a6dfb557abc413b70079ecc94acce3 SHA512 41585f730b5114d397831ba36d10d05643c6a6179e746ddc49aa1cbef61ea5525fd2f09b2e474adee14e647f99df8d5983ee48e29a59d8a30e1daf7fb1837e06
-DIST bash-completion-2.13.0.tar.xz 424956 BLAKE2B 5055118378f99ea679cc9e6e2c12a2c82b3428bae3f87b2b73df448ce31c68567fc18423332fccd6f3c0c7ceb3ae8d0f0a84eec7ddbd8c2b7868061a03c4a8a5 SHA512 7c65fea599a25c2c9d6ef300a9cc2d5fbabd0bcc9e09fe32bb706d3398936f40501171f03280f042465bc0d9aca4b1b53c2c13a99bbdfb6fe916767a267158af
 DIST bash-completion-2.14.0.tar.xz 428980 BLAKE2B c28ec0cd348a3954461f7a865823a358e47c4b479c7812baa6d54aef856c958510967806550e62784955f9daf233a0b01edade19884e534df857472a3196e63e SHA512 2e12d2e57c932b931a6cfe59234f9d33d715538d6ea4eb72ed4ed3d8d2cf2cedaf08fcb6abaf3117e06115d892283e38a07b3abe5c91c026d2c06a0f64e347bd
 DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
-EBUILD bash-completion-2.11.ebuild 4048 BLAKE2B 177e6746e781a1743b28d4d523c934d6779c2dfab654d2d2ee280bd446004df315a775e8685f17c9db701f97619e4ba789cf2c84c245a05996d7decc90142d4c SHA512 f1a58ee868d4b44a29924650dcaeca20aebd05afce9f80da79bc562770b37a67f3d58c8f6d4488ba37c40e48f127173d7b194f39d33bdf40105f7040297679a8
-EBUILD bash-completion-2.13.0-r1.ebuild 4882 BLAKE2B d6ab14e7f431b971d3220a2ff3c1152983df424d0c5a5468f803030b3af2d012dc711c98c863b5c6e58e04a464fbb91fa612890b848b35f8fc6ef5105c1e2cec SHA512 dd62efb394f9958d660a3f8277806c204cab3e762640318128798521a2341735f3dd84942452ed2f561541c5730a80a57464c1d3724da5f34472cfaec1b6f2ea
 EBUILD bash-completion-2.14.0-r1.ebuild 5117 BLAKE2B 05c9000145f2c71e659fa1f4d52a94b173d0dd517d3357e2abe4a38e6731c913b249a475c4ba9139814d156a44fe076d0d648b5fc375b0e188e119bdd3cacde3 SHA512 6df17c92462cd95af10df22f93ac06c1c18210b560ee7ea4acdca1d8710ab15d44b8f68146ba24bec9ae6eb1fe23a66fc86e4439a3b106842601b2ccc5f75313
-EBUILD bash-completion-2.14.0.ebuild 4814 BLAKE2B 3d4736024841a73c7e15f16ce4d0cee37d6008d728e847d18a4f4d4e7557ec0d80d61337697e582d6f5690fa3e78097a11587610ffc3626acec48a03f044451b SHA512 92a26d809674a2754119cfa07a1914af42bb644624e30a2aaf1e9bec311bc725556b7c38533d91680989b658b314f49403e844c0a23ec53a669d6f63c6fd5496
+EBUILD bash-completion-2.14.0.ebuild 4813 BLAKE2B c3716ef16431ebc228f108de257d34b387b3ce76a5988e28300c082426ba89d0c6b733e516d84fc1f8b88ce1935f0315fab6e20162c3f7f43c3121993b500435 SHA512 e2dc86ccbc427e770223be2561d093a8d02b5d6d6d5d3f9911950f08b191cdfaca2ab4cb990429072e17303220348b98d98b68cd2f94205df9bcbf5bb0d23c70
 EBUILD bash-completion-9999.ebuild 5071 BLAKE2B be0e74b1eac5bf91867e3d34a4d8371b987a3ce72d126c59b31feddd1566b1b582d75584e1ebfe0df468803cb2d2c78f28a074ee17db2fd1bc453639d5020c44 SHA512 db93c9f68a95feb334b321963d505547320d248a6aec7c920544bc6db3f1c5919b007542818094fb3c404cbed6ebe54ca217d6722412b1aa6c0d9389e85fddfb
 MISC metadata.xml 1436 BLAKE2B a01cee2abf1c4bc38ed6fe464f3daf43f8cf441a2a70f74b20bad79e37183a311326a863680d6939f18f8adebb9976861de897df272ab3cc7448cafbcb87f4b3 SHA512 f1b1af3f696ed159b8e1f728b51d651ac66ff849ee3bb37d949bc09e3be47698ea052ed48826edf4341d87835b3b54482153ca4fa3c299a5602eaec5f0cd780b
diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild b/app-shells/bash-completion/bash-completion-2.11.ebuild
deleted file mode 100644
index 60411504c5c1..000000000000
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-BASHCOMP_P=bashcomp-2.0.3
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit python-any-r1
-
-DESCRIPTION="Programmable Completion for bash"
-HOMEPAGE="https://github.com/scop/bash-completion"
-SRC_URI="
-	https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
-	eselect? (
-		https://github.com/projg2/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz
-	)
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="+eselect test"
-RESTRICT="!test? ( test )"
-
-# completion collision with net-fs/mc
-RDEPEND="
-	>=app-shells/bash-4.3_p30-r1:0
-	sys-apps/miscfiles
-	!!net-fs/mc
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		$(python_gen_any_dep '
-			dev-python/pexpect[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-PDEPEND="
-	>=app-shells/gentoo-bashcomp-20140911
-"
-
-strip_completions() {
-	# Remove unwanted completions.
-	local strip_completions=(
-		# Slackware package stuff, quite generic names cause collisions
-		# (e.g. with sys-apps/pacman)
-		explodepkg installpkg makepkg pkgtool removepkg upgradepkg
-
-		# Debian/Red Hat network stuff
-		ifdown ifup ifquery ifstatus
-
-		# Installed in app-editors/vim-core
-		xxd
-
-		# Now-dead symlinks to deprecated completions
-		hd ncal
-
-		# FreeBSD
-		freebsd-update kldload kldunload portinstall portsnap
-		pkg_deinstall pkg_delete pkg_info
-	)
-
-	local file
-	for file in "${strip_completions[@]}"; do
-		rm "${ED}"/usr/share/bash-completion/completions/${file} ||
-			die "stripping ${file} failed"
-	done
-
-	# remove deprecated completions (moved to other packages)
-	rm "${ED}"/usr/share/bash-completion/completions/_* || die
-}
-
-python_check_deps() {
-	python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use eselect; then
-		eapply "${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch"
-	fi
-
-	eapply_user
-}
-
-src_test() {
-	local EPYTEST_DESELECT=(
-		# redhat-specific, we strip these completions
-		test/t/test_if{down,up}.py
-		# not available for icedtea
-		test/t/test_javaws.py
-		# TODO
-		test/t/test_xmlwf.py::TestXmlwf::test_2
-	)
-
-	# portage's HOME override breaks tests
-	local -x HOME=$(unset HOME; echo ~)
-	addpredict "${HOME}"
-	# used in pytest tests
-	local -x NETWORK=none
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	emake -C completions check
-	epytest
-}
-
-src_install() {
-	# work-around race conditions, bug #526996
-	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
-
-	emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
-
-	strip_completions
-
-	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
-
-	# install the eselect module
-	if use eselect; then
-		insinto /usr/share/eselect/modules
-		doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
-		doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
-	fi
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 2.1-r90; then
-			ewarn "For bash-completion autoloader to work, all completions need to"
-			ewarn "be installed in /usr/share/bash-completion/completions. You may"
-			ewarn "need to rebuild packages that installed completions in the old"
-			ewarn "location. You can do this using:"
-			ewarn
-			ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
-			ewarn
-			ewarn "After the rebuild, you should remove the old setup symlinks:"
-			ewarn
-			ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
-		fi
-	done
-
-	if has_version 'app-shells/zsh'; then
-		elog
-		elog "If you are interested in using the provided bash completion functions with"
-		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
-		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
-		elog
-	fi
-}
diff --git a/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild b/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild
deleted file mode 100644
index c3b7f3ec814f..000000000000
--- a/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-BASHCOMP_P=bashcomp-2.0.3
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit python-any-r1
-
-DESCRIPTION="Programmable Completion for bash"
-HOMEPAGE="https://github.com/scop/bash-completion"
-SRC_URI="
-	https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
-	eselect? (
-		https://github.com/projg2/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz
-	)
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="+eselect test"
-RESTRICT="!test? ( test )"
-
-# completion collision with net-fs/mc
-RDEPEND="
-	>=app-shells/bash-4.3_p30-r1:0
-	sys-apps/miscfiles
-	!<app-text/tree-2.1.1-r1
-	!!net-fs/mc
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		$(python_gen_any_dep '
-			dev-python/pexpect[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-forked[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		')
-	)
-"
-PDEPEND="
-	>=app-shells/gentoo-bashcomp-20140911
-"
-
-strip_completions() {
-	# Remove unwanted completions.
-	local strip_completions=(
-		# Slackware package stuff, quite generic names cause collisions
-		# (e.g. with sys-apps/pacman)
-		explodepkg installpkg makepkg pkgtool removepkg upgradepkg
-
-		# Debian/Red Hat network stuff
-		ifdown ifup ifquery ifstatus
-
-		# Installed in app-editors/vim-core
-		xxd
-
-		# Now-dead symlinks to deprecated completions
-		hd ncal
-
-		# FreeBSD
-		freebsd-update kldload kldunload portinstall portsnap
-		pkg_deinstall pkg_delete pkg_info
-	)
-
-	local file
-	for file in "${strip_completions[@]}"; do
-		rm "${ED}"/usr/share/bash-completion/completions/${file} ||
-			die "stripping ${file} failed"
-	done
-
-	# remove deprecated completions (moved to other packages)
-	rm "${ED}"/usr/share/bash-completion/completions/_* || die
-}
-
-python_check_deps() {
-	python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pytest-forked[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use eselect; then
-		eapply "${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch"
-	fi
-
-	eapply_user
-}
-
-src_test() {
-	local EPYTEST_DESELECT=(
-		# redhat-specific, we strip these completions
-		test/t/test_if{down,up}.py
-		# not available for icedtea
-		test/t/test_javaws.py
-		# TODO
-		test/t/test_vi.py::TestVi::test_2
-		test/t/test_xmlwf.py::TestXmlwf::test_2 #bug 886159
-		test/t/test_xrandr.py::TestXrandr::test_output_filter
-	)
-	local EPYTEST_IGNORE=(
-		# stupid test that async tests work
-		test/fixtures/pytest/test_async.py
-	)
-	local EPYTEST_XDIST=1
-
-	# portage's HOME override breaks tests
-	local -x HOME=$(unset HOME; echo ~)
-	addpredict "${HOME}"
-	# used in pytest tests
-	local -x NETWORK=none
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked
-	emake -C completions check
-	epytest
-}
-
-src_install() {
-	# work-around race conditions, bug #526996
-	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
-
-	emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
-
-	strip_completions
-
-	dodoc AUTHORS CHANGELOG.md CONTRIBUTING.md README.md
-
-	# install the python completions for all targets, bug #622892
-	local TARGET
-	for TARGET in "${PYTHON_COMPAT[@]}"; do
-		if [[ ! -e "${ED}"/usr/share/bash-completion/completions/${TARGET/_/.} ]]; then
-			dosym python "${ED}"/usr/share/bash-completion/completions/${TARGET/_/.}
-		fi
-	done
-
-	# install the eselect module
-	if use eselect; then
-		insinto /usr/share/eselect/modules
-		doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
-		doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
-	fi
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 2.1-r90; then
-			ewarn "For bash-completion autoloader to work, all completions need to"
-			ewarn "be installed in /usr/share/bash-completion/completions. You may"
-			ewarn "need to rebuild packages that installed completions in the old"
-			ewarn "location. You can do this using:"
-			ewarn
-			ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
-			ewarn
-			ewarn "After the rebuild, you should remove the old setup symlinks:"
-			ewarn
-			ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
-		fi
-	done
-
-	if has_version 'app-shells/zsh'; then
-		elog
-		elog "If you are interested in using the provided bash completion functions with"
-		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
-		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
-		elog
-	fi
-}
diff --git a/app-shells/bash-completion/bash-completion-2.14.0.ebuild b/app-shells/bash-completion/bash-completion-2.14.0.ebuild
index c2afa2872829..915982e5261f 100644
--- a/app-shells/bash-completion/bash-completion-2.14.0.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.14.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="+eselect test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-shells/dsh/Manifest b/app-shells/dsh/Manifest
index e660fb3d8056..fe2f1cbe88b5 100644
--- a/app-shells/dsh/Manifest
+++ b/app-shells/dsh/Manifest
@@ -1,4 +1,3 @@
 DIST dsh-0.25.10.tar.gz 394506 BLAKE2B 1110787e454d5c77e4d4090faa2317720b034ecdc4eaac3c58502a4d87b1a7213abc57a77c564d0f893cce5d7d5252f646676a959c1392c63d208a97745104f4 SHA512 a53fba14e65644ce5858b1e9827601016db6d61cb50b0229ea53eeaee676f5870d2dbfd6ebde237008bfc7144316484529c646104e72d99868d44d814a41a009
-EBUILD dsh-0.25.10-r1.ebuild 568 BLAKE2B d4afc9cf9b22dce94082ca2319403d59e7a33315ff31dd2b78e84947f76e93ee2a7be27b1c91503062c9a1e508c589776018e603746384749c9daacf0948ac86 SHA512 bb4edc5df8666380efeff628fec2216744a29dc34828fe4f686da830b3f4ae9bcf9e6b79d4d4e2aee878afbcfbc343970a7a5ac0edc0d300e5643e889e514fc6
-EBUILD dsh-0.25.10-r2.ebuild 615 BLAKE2B a10aeb69d10968bad7125e1cc290a6c75dec857af864336c1ff9f8a414e242578e81525de5d62e05ac972d2eac8d47fb66061e0a72d126f94b5e49b0728fbc43 SHA512 250234ca82178dbe5a3d67e20f7d950bbea5a76d93b045197c08088c3f7808b34229e9fac5647238158be2cb99219699f9a8b21d8e7984026400c3bc7cbf0d9b
+EBUILD dsh-0.25.10-r2.ebuild 614 BLAKE2B e2cd2897206487cfb182cb4a9cbc922a2a1c0e72142e489d07092c7c021d30f2f4e0a7a770f6ded72b943b8b9fd70460c64c315672bedf08765e370bed57cbc2 SHA512 4109df16cb8ede0065631c11d3adb2fdb2cdb7cfb3c4eb344d0faf24cafabdc2cbd40bfb0df27cb843bb1601969fe7c7207cac711777646acb96442ee10b3586
 MISC metadata.xml 254 BLAKE2B d6008c0af75d2c59696336153c1fbf23e23bb091b3786644f333d4c0bb9e43c13041ef756532814f203054bead254e98ee24c4e04b053a84e51c18e8714ec84c SHA512 49ac9b7f3e1a9e805c65e2288af69d49c40246ccd58241740afb44593e73c26fa89772185d6b6693db2778e14f5b493169f8b2def93e2d6bdde44cf3b5d66244
diff --git a/app-shells/dsh/dsh-0.25.10-r1.ebuild b/app-shells/dsh/dsh-0.25.10-r1.ebuild
deleted file mode 100644
index 74aff87b8378..000000000000
--- a/app-shells/dsh/dsh-0.25.10-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Distributed Shell"
-HOMEPAGE="http://www.netfort.gr.jp/~dancer/software/dsh.html.en"
-SRC_URI="http://www.netfort.gr.jp/~dancer/software/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="nls"
-
-DEPEND="dev-libs/libdshconfig"
-
-RDEPEND="
-	${DEPEND}
-	virtual/ssh"
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/etc/dsh $(use_enable nls)
-}
-
-src_install() {
-	default
-	dodir /etc/dsh/group
-}
diff --git a/app-shells/dsh/dsh-0.25.10-r2.ebuild b/app-shells/dsh/dsh-0.25.10-r2.ebuild
index 5749ccc6d05d..e928ad2dbbf3 100644
--- a/app-shells/dsh/dsh-0.25.10-r2.ebuild
+++ b/app-shells/dsh/dsh-0.25.10-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.netfort.gr.jp/~dancer/software/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 DEPEND="dev-libs/libdshconfig"
diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index e91959865a89..cf9180b16f63 100644
--- a/app-shells/gentoo-bashcomp/Manifest
+++ b/app-shells/gentoo-bashcomp/Manifest
@@ -1,9 +1,5 @@
-DIST gentoo-bashcomp-20190211.tar.bz2 21508 BLAKE2B 410994819f62b0bd105ca398c335d76993fd694b8e7f56c761b94fc1e2f6e90f2010f2f2a88febd71ac0c5643fc0e923c60151fbf9411e8a553b5917d6bcd8db SHA512 4b0a5e79f90ee8122fa8d0a7224fee6472b1762a0dda680ea1c0e8d4069760be9b6472e052b1b166a389c0e779816b98715386dbc62a3574e7ad851b2567a070
-DIST gentoo-bashcomp-20230313.tar.bz2 21536 BLAKE2B 5dc47aecf68fc19c177026582d98b441d09a15bf0f9e618533c62a37b7986ab6d619f2873b58697f484830bbe88e7697755bb7ee14fb8c55be12e7296e1acfec SHA512 482bf1444e76da544bfbab727f9016abcc82ed4283e31e7ad1e1d302cfe67edfc55cdc37871ae53c09e4e3ce5a5e20dd5f8994ec60e1698076bc81659a2fa3b0
 DIST gentoo-bashcomp-20240511.tar.bz2 21695 BLAKE2B 886a80eafbb923b5ccb5c9e6e0749b66878003d99e0ddf8fc3d07c072fd23cb3277eb254c4687695459fe8401d427dee2779bc29f2a48ab1c6f2b4bfe7d4ef0d SHA512 3e5add581268e7911eb18d1958e4db3b549b2afc496231dcf537abe5409fdd4fa045c6f61538be6c2686888e20ad0d0b714ecf82639a9ae0ec6eecedc378b78d
 DIST gentoo-bashcomp-20240525.tar.bz2 23392 BLAKE2B 03da7f6a077382efaac9c9ddad2ef6bcf21704574378a400aeeb0ec2b88934c3aac10009912ad6f0d06ae410c42d6013acaf4629f3c6f46abb19b0d1e000c1d9 SHA512 5017f2e106e2b3f1335f1edbce7ede1fd918bd701a1082ec8cd71f1cedad9480109d82381d56587cb6da4dd04c210f9f51dbaaf8b2aa419abbc6fab73825226a
-EBUILD gentoo-bashcomp-20190211-r1.ebuild 713 BLAKE2B 29596473516965efb6f0de2110ec0b1ae54db7fb81878b5626d251a965e2c994819d98d94e0d79e740d5136cddc633e81cd5dbcd94914549a8cc6ad2a8263511 SHA512 6ac12134730a531c7ad0388dbf4ffadeb1ef75a0463bedc2affd054a495979c0671e54e95eb819e7a488520220e0b0763502cc4d8275087e1dfb5d3a56af825e
-EBUILD gentoo-bashcomp-20230313.ebuild 713 BLAKE2B 4f47666a2d2f8aa5937661be660037835c66417365c4591cfbdbd6a2a68cf65ff4b4b56b150ef6ad05de12ac043a5d516b142bf222eb5eeccea36fccce01e166 SHA512 204e4541c867ec187bdbcbb245b778ed24f607284639b28d9833f0afdc0e70d6c49d9edc1a04f7cc5dbfbafbb89a9e81db3756fce645b3ba877394a89c7c2185
 EBUILD gentoo-bashcomp-20240511.ebuild 713 BLAKE2B f6e440d53af7db052fe8e87f866c015dc72273247fe35e6dffc472bf5c2feda33a368b18cd49448376d14a21e1f704cc21005204954933fc159256bd7d9fe028 SHA512 fffc55725e6a49f4d0732969083006e11a0059a83598771a1807fb96f29d1ac8f0e51bd75a33be4f734ce7e21fb57fed3d2fbde5678447458f5c063f8aac9b67
 EBUILD gentoo-bashcomp-20240525.ebuild 721 BLAKE2B c820a59c93fc9734dc3483a5afaa3a16c8132ee14298444286f63cf8c6c94f515e602abcbe115ae00a08def6a5aadf1ae6957376838bca0acf4535f0e8e7e772 SHA512 f87fd78b7ebd1b0ec9efda71e79a27fca5e8ca46865bd1349ab28fb9e5e45af17612f685f0b52a1a7e54f5663f1eb694df64ae2f06bca47885c0a57817b61094
-MISC metadata.xml 462 BLAKE2B 3cda2b7d1bf7c72e89ed24b3b3d8a7b2ed32bdde2e207c137d5cd166a43abe42260f9e0865feeaae9e7f19c522d2782a4d9fa6403174d78e5f1bf4be6473a16b SHA512 81850261bd2036db40887fd5ac7c5cb1f60f158497f92ac633a699b4245a95cdce7ccdad869e1f7527a6c3de4832b04699117b6c76fb84f9d9e2bd3660280552
+MISC metadata.xml 548 BLAKE2B 545dcbc7897cc95b930bb9c595772b6e64f88f56989050c3662ef96c57e220ac548c3d242959ef437279e3cc727f526cb3dc4852a608b8fe6136d67f1c718be8 SHA512 585ac798f1f16d9201896517d917b88aedd485b7192f101fa051afabf9a63c3bbfe205cd97058aa6bb7630f9b78839cd8945b42b9303e7688b873954ff1e8777
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211-r1.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211-r1.ebuild
deleted file mode 100644
index ea57924b9740..000000000000
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-DESCRIPTION="Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		completionsdir="$(get_bashcompdir)" \
-		helpersdir="$(get_bashhelpersdir)" \
-		compatdir="${EPREFIX}/etc/bash_completion.d"
-}
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20230313.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20230313.ebuild
deleted file mode 100644
index da8506a49996..000000000000
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20230313.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-DESCRIPTION="Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		completionsdir="$(get_bashcompdir)" \
-		helpersdir="$(get_bashhelpersdir)" \
-		compatdir="${EPREFIX}/etc/bash_completion.d"
-}
diff --git a/app-shells/gentoo-bashcomp/metadata.xml b/app-shells/gentoo-bashcomp/metadata.xml
index 61a2682c0b37..94d6aeedb23f 100644
--- a/app-shells/gentoo-bashcomp/metadata.xml
+++ b/app-shells/gentoo-bashcomp/metadata.xml
@@ -9,7 +9,9 @@
 		<email>arthurzam@gentoo.org</email>
 		<name>Arthur Zamarin</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="gentoo">proj/gentoo-bashcomp</remote-id>
+		<remote-id type="github">gentoo/gentoo-bashcomp</remote-id>
 	</upstream>
 </pkgmetadata>