7 files changed, 4 insertions, 78 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index ab41d760e662..27569f16c7d8 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/flaggie/Manifest b/app-portage/flaggie/Manifest
index 1c516cf3b5fc..59907b1d5b5b 100644
--- a/app-portage/flaggie/Manifest
+++ b/app-portage/flaggie/Manifest
@@ -1,9 +1,5 @@
-DIST flaggie-0.2.1.tar.bz2 16767 BLAKE2B fea0fbc505bfa97e7bee2c05f0cc19077b9b23a021b01aafa2c4b064466677f9dd4ae95c36f6de65b4ad07c5046d539ceb0cb667dcb791b60410d7a5e688813f SHA512 3f273ebeceaaedce7a3807126fb3f450e420338a883440066d06a4d6a95b63bd538bb5da882fea23e0d390b28a83f50375dbda2624f656327775b2b700f2b2e4
-DIST flaggie-0.99.4.tar.gz 17731 BLAKE2B 460993edfad7dc13206c6ab96919a74a306534f69b5c2971c9bc4289e964052888c93ff4b935fdf722fc7490a250b33c9644472749b2dc060e7dfd0b0d8dacf3 SHA512 0a2225470a6cc1ee72d7c33abe40cae48b698ac24e0456f9e59bcfd04769c9c01154c62c9fbc2d384d086db06f8a9d76e0cefe761a18669fcbe8ae3bee495b92
 DIST flaggie-0.99.5.tar.gz 17792 BLAKE2B 0400d08383e80b7543fc18afa8d63e68d5b889327db119f53fb5b9f74959a10f5d918c9e284c590b403f30197275f0833b51313729b125c1f4e0feba8113afb7 SHA512 77e7b66148bb3779bf2f89507834ebcb587ad822126b282da9fea5361f4df54e6cd9a18311d23de8648ab6aba2e4aa18686296bfab9ae3823a4435252e431c7f
 DIST flaggie-0.99.6.tar.gz 17810 BLAKE2B da883826147536563d889e026e659a3bc69ac58808b5fd3672d89f047abd4accf567f1e9bebc1d69e0550498b48be03420f47ebfdcf4aeb24db17fa7149011a2 SHA512 c4a0407c65149169c6998629ac399eb9cb9a9a7a0d1c1ef0072d7c7aefb811ea1b91f5ba4987f0689341ab920fb7e8a13f979cc390596c31c4c82aa6172e3ee5
-EBUILD flaggie-0.2.1-r2.ebuild 1134 BLAKE2B 2708bee42590a08aebce95988dfcc2407d54bac0eef661af8346ecebb72648f68f42744f8b014d960f0055c4e5eefd16d190273296eefa61b36b67fe8a48feed SHA512 bdd64fa00b932b52d2407893615f5cdc61f8d9f926dc279d0c0fe9e1ff1aacac062416c51ba9fc24c081e2cd85fff65c0fd066f7db440d37aca0d08c98a09404
-EBUILD flaggie-0.99.4.ebuild 798 BLAKE2B ad5c8dba6cc746c1cd8493482cdd75ebcf1ae773f957fc2642f20fe141889b025b88a5bf79869f42ee9dc71a660368080977a42dd116c0adee25d6e4d1875bd8 SHA512 ed1ea4ae578b676afcb8b38ae79c79ae0dbd9ed1c4ae4be80ec291f0a43d97015ddfcc1a58c8749b00b2421a6b22b57ca4396ea74af5c0ad507b1581e8dafd2b
-EBUILD flaggie-0.99.5.ebuild 802 BLAKE2B a98dff91b2ab5d91a1b7409bb9f4e7b6aba6aa773e0e8466ef94645c2e92bede853395bb91ec623b5d571c1bebf62d0b5ca64b140920ccf5c9bdde23a76ecc3b SHA512 e0c03e46090f5f27aeac915f739625127fde30770badb176819983386dac707f8f2c5ec2dc98d5a0471a8bd2ef619bc1fbb8b4310e3c7a2d32c8540e11dad757
+EBUILD flaggie-0.99.5.ebuild 798 BLAKE2B ad5c8dba6cc746c1cd8493482cdd75ebcf1ae773f957fc2642f20fe141889b025b88a5bf79869f42ee9dc71a660368080977a42dd116c0adee25d6e4d1875bd8 SHA512 ed1ea4ae578b676afcb8b38ae79c79ae0dbd9ed1c4ae4be80ec291f0a43d97015ddfcc1a58c8749b00b2421a6b22b57ca4396ea74af5c0ad507b1581e8dafd2b
 EBUILD flaggie-0.99.6.ebuild 802 BLAKE2B a98dff91b2ab5d91a1b7409bb9f4e7b6aba6aa773e0e8466ef94645c2e92bede853395bb91ec623b5d571c1bebf62d0b5ca64b140920ccf5c9bdde23a76ecc3b SHA512 e0c03e46090f5f27aeac915f739625127fde30770badb176819983386dac707f8f2c5ec2dc98d5a0471a8bd2ef619bc1fbb8b4310e3c7a2d32c8540e11dad757
 MISC metadata.xml 459 BLAKE2B 8c47d946c2dddf9d86b5cd4115b7c3d477b6afeaceb58d8b6531efe7c1499f8fc2a533f987285079bf5e0bd801841d8234fcdc12d9add8b12f969cb2da480f5a SHA512 368bb0f61b89bd7769a4a52026fa7c76b5198cdd46eb7667c26ba6fcd646d6ccc0da93b52303edd6e59805cc3fa24cd014c0f1db25cd3d91b51c1c84c098c936
diff --git a/app-portage/flaggie/flaggie-0.2.1-r2.ebuild b/app-portage/flaggie/flaggie-0.2.1-r2.ebuild
deleted file mode 100644
index 52346d71fc0a..000000000000
--- a/app-portage/flaggie/flaggie-0.2.1-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="A smart CLI mangler for package.* files"
-HOMEPAGE="https://github.com/projg2/flaggie/"
-SRC_URI="https://github.com/projg2/flaggie/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	sys-apps/portage[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	newbashcomp contrib/bash-completion/${PN}.bash-completion ${PN}
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	ewarn "Please note that flaggie creates backups of your package.* files"
-	ewarn "before performing each change through appending a single '~'."
-	ewarn "If you'd like to keep your own backup of them, please use another"
-	ewarn "naming scheme (or even better some VCS)."
-	if ! has_version app-shells/gentoo-bashcomp; then
-		elog
-		elog "If you want to use bash-completion, you need to install:"
-		elog "	app-shells/gentoo-bashcomp"
-	fi
-}
diff --git a/app-portage/flaggie/flaggie-0.99.4.ebuild b/app-portage/flaggie/flaggie-0.99.4.ebuild
deleted file mode 100644
index 6b637e334d74..000000000000
--- a/app-portage/flaggie/flaggie-0.99.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A smart CLI mangler for package.* files"
-HOMEPAGE="
-	https://github.com/projg2/flaggie/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=app-portage/gentoopm-0.5.0[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-vcs/git
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	ewarn "This is a preview release of flaggie 1.x. It it not fully featured"
-	ewarn "yet and it may have significant bugs. Please back your /etc/portage"
-	ewarn "up before using it. Verify the results using --pretend."
-}
diff --git a/app-portage/flaggie/flaggie-0.99.5.ebuild b/app-portage/flaggie/flaggie-0.99.5.ebuild
index 171f784597fe..6b637e334d74 100644
--- a/app-portage/flaggie/flaggie-0.99.5.ebuild
+++ b/app-portage/flaggie/flaggie-0.99.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=app-portage/gentoopm-0.5.0[${PYTHON_USEDEP}]
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index ebc8623dd8ab..3da8b6f90c12 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -3,6 +3,6 @@ DIST portage-utils-0.96.1.tar.xz 1807156 BLAKE2B 6bf334c0083e5e8b0d6206ff43d4df0
 DIST portage-utils-0.96.tar.xz 1806032 BLAKE2B 93ef9658a4b0bae7fb0527462bd9d0d19f396262818380d8ec2022c9fda596265c50adc262bdf296a4dd8c6b891b064316281d21444c8b903db20ca2463879e3 SHA512 cc32f53532c082544cabe505d8b90b947b6ab48742678aa98cbe9ba291625e8449ed0ecd90e01dc00b06c209b34001ad57a060918658e53d3babdc5c76ea7b02
 EBUILD portage-utils-0.95-r1.ebuild 1584 BLAKE2B ac31f1b1f41e628f7e6b6f3a70bf274266912bd99f8eb4803a9d793017fbe09d489ea49b74d1100066481e8962e836864860146bba4ab412e98e682a9ad4a2ba SHA512 95fc8f824ec4cc84474cf33eb25df3b9cc8abdb1179672dbb8bb4762cea01c32c04a531ee430a6fdd85d5c321ff8d7f0dc22b1c9963e044bb7f3aab4c7991b2f
 EBUILD portage-utils-0.96-r1.ebuild 1584 BLAKE2B ac31f1b1f41e628f7e6b6f3a70bf274266912bd99f8eb4803a9d793017fbe09d489ea49b74d1100066481e8962e836864860146bba4ab412e98e682a9ad4a2ba SHA512 95fc8f824ec4cc84474cf33eb25df3b9cc8abdb1179672dbb8bb4762cea01c32c04a531ee430a6fdd85d5c321ff8d7f0dc22b1c9963e044bb7f3aab4c7991b2f
-EBUILD portage-utils-0.96.1.ebuild 1693 BLAKE2B 50f0304c702ccb077f5a6aae62366d6ea00efeb3b6895ec4be4db7bb937e28bd4c90da3129c4fb65705a50d01cc293e050fb29b062b8ed0ad7da19fb35479f60 SHA512 4aabbb86b697ec017b4005fd90b61e85db74bad5a51ae6a9f2a12741d59e39e5b46773271af7c22e21a92056715dd4779938b621bba187b27557ca0ce4f5bf23
+EBUILD portage-utils-0.96.1.ebuild 1688 BLAKE2B 6963f61409da2db7fbc0aed6d379cd491f174c168dc00c49d768f0df29ec4ee6ef46f5f42a3020ac77a90717e9fb71b1e7358c4a2c89b37665dc6bb83febee9b SHA512 4c570021447bfb7d0acd84539fee8eadcbeea57ec915244dae3e885d059897e1c5e91cf8cb932ffd99fd8553200b7a40a039ad5a00a5f2a5561180cdb496e0db
 EBUILD portage-utils-9999.ebuild 1693 BLAKE2B 50f0304c702ccb077f5a6aae62366d6ea00efeb3b6895ec4be4db7bb937e28bd4c90da3129c4fb65705a50d01cc293e050fb29b062b8ed0ad7da19fb35479f60 SHA512 4aabbb86b697ec017b4005fd90b61e85db74bad5a51ae6a9f2a12741d59e39e5b46773271af7c22e21a92056715dd4779938b621bba187b27557ca0ce4f5bf23
 MISC metadata.xml 698 BLAKE2B 335a707e4f6f17403d4cd0aec9cbbe5d016e6e8eb001db5ea6a95f1d541697e4a72fa2aa1d68bba8614b2a98e1a27eb23264bc68beadf473368eb363e11aada0 SHA512 698fd01dec54bf529470d4b03e58a972a82c365e6c7a58551c71d7ebf09289deaf65aeb03f32d57f22f8739cd43457f3259dfa389a1aefa93b5f6dd0da5bc15e
diff --git a/app-portage/portage-utils/portage-utils-0.96.1.ebuild b/app-portage/portage-utils/portage-utils-0.96.1.ebuild
index 31ad40ade17a..59bc6525151c 100644
--- a/app-portage/portage-utils/portage-utils-0.96.1.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.96.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	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"
+	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"