8 files changed, 0 insertions, 270 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 7572f68cd538..0a9d92a6fe56 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 4be34ef14899..5300b5268cf3 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,12 +1,6 @@
-AUX gentoolkit-0.5.0-python3_9.patch 1425 BLAKE2B 51663e01d48f6f192cfe96972c584337e62495d553251ffe360c4e928e208d528b453faefeb3c2d1641c9e662151b8ba91ebb7f1ec6b3a2c67fcb18eaefe3495 SHA512 327ff6d6aa77293f7bff3be6e543e3bb1b4fcf226d3e913668c69fdb9de2d2e04a73d9e73526910ae4e2c3b0bce3f87249cb31d55928b58a9c4274b97525e9d3
-AUX gentoolkit-0.5.0-r1-python3_9.patch 1220 BLAKE2B ce01d9a8cdd214d585b0e4ee61ce21aba2880deb76c666f6a0fd5833d340a24b741be68e6923a942353d53ad0c4d66014290548d52fe76bad4cc0069b6322d29 SHA512 19ab5bd0bd76571106e12f361ef41a7eb4fb573afe5e5d61c547e4df1d2697c80db8307623edbdffcdaee9472ab56c1b61e133cfbf3845b174a10f4e7aec7d44
 AUX gentoolkit-0.6.1-data_files.patch 1157 BLAKE2B 1b6bebcc9de77532df7f3eef8e19cb82ed011e36eb20e8dc7f0fcaaabf856c7845cf3c46722c947b8235e3745e2754f227ac02f7ca48ed14af5aa0c4ff7ae906 SHA512 309d36852d4b631cb8767b85059a33f430021598b83fd26cffbddf4ce6487f10a8588ccd835335c48b62ebfd36ddf5f6cf6bc0cc980192f7ceaea90991089891
 AUX gentoolkit-0.6.1-pkgindex.patch 1637 BLAKE2B 836024b833e516dcf2aa005b1ca8ed7a542c9cf4ac5eef7b79f0e05474a0994ef02aa3f14b7fe71b8e4e823f79743e40f7f61bc5e8b0481d3d1ea261ffd90606 SHA512 6afb4dad8a74f8fe2cc285d34f70c7a50db5977dee22129b81160d2e2a069ca8fd7f9b67f57d59e6ebe750a1518447e6cf4f85c6468777a3cfe7e54162c496bc
-DIST gentoolkit-0.5.0.tar.gz 3206598 BLAKE2B a379dcbbaba9d52c241fea020b87c458384e44092539947909e14fd6c63fd9cc06d076b8081874edf17fc50e80fe48ceab3400c90046867dc409e7ac39c17231 SHA512 8a5c344f3a17c4c779abbcaa35b5e3f147106dbc61310d0d1a816ec8080914271fa45c311a8feeb1bfe14195af7cf34c0b29142d6e43e2de232dae96fbd00861
-DIST gentoolkit-0.5.1.tar.gz 3203805 BLAKE2B de2cd69aec9be79f498b1180a90afb54e77f9d8a47636cd722f2028a906d43874132d55a71bf373b3d10c7c10034f5d8ce0280a35041b0c60a1d5aa2ed6296a1 SHA512 667e464853b17ae297c59fb06e8f4563119a1382470d064c5721ae898e61173e9af5b071c7618d315232e6974fec205e27559785d2816253711de3e83d9e1911
 DIST gentoolkit-0.6.1.tar.gz 3195781 BLAKE2B 27e370de77586b375dc70caa1abba4c2bc4207e8f08e0a7ea2953097135506949db71ff9102a0ead198e4dea425440c57b94ac7a811ca2d5e0016fc7e234bb0d SHA512 1ffc466b69a9c53f1bbd40f6f4d1eb33d5f0f4287bb65ba1a7b1b2675ad61ecffa55ed9fda7c1ae8148744f0a77e224315eb1903dfd61a2a3dab1600fc672d2d
-EBUILD gentoolkit-0.5.0-r3.ebuild 2394 BLAKE2B 7d6c2bebced30bc804774fda19aee9068064ba0cb6d4fb1c746a0411f08601272754634761b4700f61743be13ab60a5566230d8068e82b4b49c890bc4d655b7c SHA512 b99f36ea74cdbcf3dfe884766e030c1bc49df75006e10fb35889a2fcd8058405b03dfa473a500a3c292c1ffb94bbd62eba42190d5fa6b9dba2d2bad5d24772e7
-EBUILD gentoolkit-0.5.1-r1.ebuild 1934 BLAKE2B c1add1c298e78de59cf63de91e0b607fd482655443a1788d431489a0ac229760e21943f4b5d6a63e3b10d6498b0ec22e5117a3cde180033b804ac4d0cd056341 SHA512 f4be82efd6bbfa3b57548728a1b9dace6406549a41e1d8232c67472f782f5568fae1682cd35e085e2c5dc5e7b8e9d88f70957b5aaf14fc58ce52d2a995718d11
 EBUILD gentoolkit-0.6.1-r3.ebuild 2105 BLAKE2B 8a27c0b439bdf084bbc09e32d6b96d759c92b026aa8bd8351248ccf5692a2779bb35c856ff576af6094cdded062edbee27cb020a5b1dbe011d71ef0f7a3051c7 SHA512 64184b6674ebf33a872a49ca65be2a56c4105b0ebd6b1bb4c66769bdd56e59da4dcb554ab5882a9f848b8ee61ca0ff3e10878a52605f7fe7b07a0fe5e0023550
 EBUILD gentoolkit-9999.ebuild 2003 BLAKE2B a12f879536f34b1a79cca8bb85b164bd70e4708c0df8ac5fccf3bba974421b249bff4518e0ba6066969fd267e4ea4a5504635a89c4d6a0017ee116355ed71834 SHA512 93834c0c8f6aeb53aae762865d7aa6f5326e8e3a03241246ae110e02164a6f39439e8711ead04633a9e1cc6b5a79c28a8cea2f530132672adf44f22a30038ee5
 MISC metadata.xml 594 BLAKE2B 561658dbdd487878d968905ee697a95cb5ec86605bce543c0eef36702caf25f758df33cf64c8d10d67540ba910699fe34e5dd85832a6ae8a2867cc2b430b2eec SHA512 f202400cfed9b1f3bbb0e9396d469ad95c9afd9a54f638d005aa65b22cdfca4c8b5719e61397f7dd4c2459a5281947b40cf1d08272abd5bc623629ee33ddb088
diff --git a/app-portage/gentoolkit/files/gentoolkit-0.5.0-python3_9.patch b/app-portage/gentoolkit/files/gentoolkit-0.5.0-python3_9.patch
deleted file mode 100644
index 6a50db9ca669..000000000000
--- a/app-portage/gentoolkit/files/gentoolkit-0.5.0-python3_9.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-# https://github.com/gentoo/gentoolkit/pull/11
-# https://bugs.gentoo.org/747034
-diff --git a/pym/gentoolkit/metadata.py b/pym/gentoolkit/metadata.py
-index 22c249e..c3dba98 100644
---- a/pym/gentoolkit/metadata.py
-+++ b/pym/gentoolkit/metadata.py
-@@ -73,8 +73,7 @@ class _Maintainer(object):
- 		self.description = None
- 		self.restrict = node.get('restrict')
- 		self.status = node.get('status')
--		maint_attrs = node.getchildren()
--		for attr in maint_attrs:
-+		for attr in node.iter():
- 			setattr(self, attr.tag, attr.text)
- 
- 	def __repr__(self):
-@@ -101,7 +100,7 @@ class _Useflag(object):
- 		_desc = ''
- 		if node.text:
- 			_desc = node.text
--		for child in node.getchildren():
-+		for child in node.iter():
- 			_desc += child.text if child.text else ''
- 			_desc += child.tail if child.tail else ''
- 		# This takes care of tabs and newlines left from the file
-@@ -213,7 +212,7 @@ class MetaData(object):
- 		if herd in ('no-herd', 'maintainer-wanted', 'maintainer-needed'):
- 			return None
- 
--		for node in self._herdstree.getiterator('herd'):
-+		for node in self._herdstree.iter('herd'):
- 			if node.findtext('name') == herd:
- 				return node.findtext('email')
- 
-@@ -283,7 +282,7 @@ class MetaData(object):
- 			return self._useflags
- 
- 		self._useflags = []
--		for node in self._xml_tree.getiterator('flag'):
-+		for node in self._xml_tree.iter('flag'):
- 			self._useflags.append(_Useflag(node))
- 
- 		return self._useflags
diff --git a/app-portage/gentoolkit/files/gentoolkit-0.5.0-r1-python3_9.patch b/app-portage/gentoolkit/files/gentoolkit-0.5.0-r1-python3_9.patch
deleted file mode 100644
index a9dae6150454..000000000000
--- a/app-portage/gentoolkit/files/gentoolkit-0.5.0-r1-python3_9.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f14b6198d1dd9cb7f4a83f3822e4a1782a5581e8 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Tue, 13 Oct 2020 10:04:07 -0400
-Subject: [PATCH] metadata.py: Fix duplicated use flag text bug 748129
-
-Regression from commit: 517581df206766
-link: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=517581df206766fabf10273cde565e0a6dc62829
-Gentoo bug: https://bugs.gentoo.org/748129
-Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
----
- pym/gentoolkit/metadata.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/pym/gentoolkit/metadata.py b/pym/gentoolkit/metadata.py
-index c3dba98..0b58392 100644
---- a/pym/gentoolkit/metadata.py
-+++ b/pym/gentoolkit/metadata.py
-@@ -101,8 +101,11 @@ class _Useflag(object):
- 		if node.text:
- 			_desc = node.text
- 		for child in node.iter():
--			_desc += child.text if child.text else ''
--			_desc += child.tail if child.tail else ''
-+			# prevent duplicate text
-+			if child.text and child.text not in _desc:
-+				_desc += child.text
-+			if child.tail and not child.tail in _desc:
-+				_desc += child.tail
- 		# This takes care of tabs and newlines left from the file
- 		self.description = re.sub(r'\s+', ' ', _desc)
- 
---
-libgit2 1.0.1
-
diff --git a/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild
deleted file mode 100644
index 095948f10c8d..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_9 pypy3 )
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1 tmpfiles
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
-
-DEPEND="
-	sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	sys-apps/gawk
-	sys-apps/gentoo-functions"
-
-distutils_enable_tests setup.py
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.0-python3_9.patch
-	"${FILESDIR}"/${PN}-0.5.0-r1-python3_9.patch
-)
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
-
-	if use prefix-guest ; then
-		# use correct repo name, bug #632223
-		sed -i \
-			-e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \
-			pym/gentoolkit/profile.py || die
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.4.0"; then
-		SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process revdep-rebuild.conf
-
-	if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
-		elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
-		elog "part of the gentoolkit package."
-		elog "The gentoolkit-dev package is now deprecated in favor of a single"
-		elog "gentoolkit package.   The remaining tools from gentoolkit-dev"
-		elog "are now obsolete/unused with the git based tree."
-	fi
-
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "For further information on gentoolkit, please read the gentoolkit"
-		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
-		elog
-		elog "Another alternative to equery is app-portage/portage-utils"
-		elog
-		elog "Additional tools that may be of interest:"
-		elog
-		elog "    app-admin/eclean-kernel"
-		elog "    app-portage/diffmask"
-		elog "    app-portage/flaggie"
-		elog "    app-portage/portpeek"
-		elog "    app-portage/smart-live-rebuild"
-	fi
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild
deleted file mode 100644
index 1ab50e71d23e..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1 tmpfiles
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
-	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"
-fi
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="
-	sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	sys-apps/gawk
-	sys-apps/gentoo-functions"
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
-
-	if use prefix-guest ; then
-		# use correct repo name, bug #632223
-		sed -i \
-			-e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \
-			pym/gentoolkit/profile.py || die
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process revdep-rebuild.conf
-
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "For further information on gentoolkit, please read the gentoolkit"
-		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
-		elog
-		elog "Another alternative to equery is app-portage/portage-utils"
-		elog
-		elog "Additional tools that may be of interest:"
-		elog
-		elog "    app-admin/eclean-kernel"
-		elog "    app-portage/diffmask"
-		elog "    app-portage/flaggie"
-		elog "    app-portage/portpeek"
-		elog "    app-portage/smart-live-rebuild"
-	fi
-}
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index 299c98ac26ee..4feeeab8e8b0 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,6 +1,4 @@
 DIST tatt-0.10.tar.gz 22675 BLAKE2B 4272cd0bf65a2181ba70d12fe8ca593403d7217aebf2f4dffd2f69397e686c79bc93ec70c756f1e94c548ed2acd8af7470c022611c16b5f3571af860aeca4b9c SHA512 1993f597e92b0b1f004e492aa164d7de6cf6776285850e5245f3328de0396c54cfc58943c767afe1fd1c49a771a1f33c65b6bed3c7d164223767567c05e12af1
-DIST tatt-0.9.tar.gz 22659 BLAKE2B c67da6d71bd46a7a1e73810f6f837cbe18b4fcfdf18da2401ab696e69d05c3ccbdeacaf152999dbf49d39c20e0e9e656e05c294a5eb7128015ee06d25bf95fcb SHA512 4f8d4f6d56ce1389caee8a67d1ae13967692fad90e1bc484ec9ffd9fa057e858c2fc4e6cefa496b33c7565b06e7f71e012a94653de4a501f3b25ec77d07cea92
 EBUILD tatt-0.10.ebuild 847 BLAKE2B 7fa91be1ed18978b9b85dd3062ed8ef90672abe6b394cab44b08a8cf19fdc7256ffa473732b272435f12b49c130badd6d8c308d8f0f3b0e888a1dd31702e80e0 SHA512 30325ef671d211082ede37b209bb3b48dcbb1d2868886a0323b1beb4de2923b8ec79efdf3cfef3edba8d52410b1099f024cb6454c33630007baea0adb1240779
-EBUILD tatt-0.9.ebuild 840 BLAKE2B ab4aceed18527ea071f8b31018f4745b58971d61e064ffb6a912bf2aaaf7688194c062c954072df4f6ef66ff341d362d91a08e26f121d5ca5c92b2e2c4ed3632 SHA512 7aaff41567232a94c28f3f3939240277fce63af689dc4aedc9ef8279dfc6f62fcd68fe5fc5739ce4a46a30da07bb6ca78c3d580531897d7ce1cd4da62d8d9c17
 EBUILD tatt-9999.ebuild 765 BLAKE2B a2b130fc4a64f54e299452252d104cbaaff2ddad913fee9bbbaefd020f37d5d7ccd8550b28e64b50dbdcf540ef8f06e8c8480da6c9432c0553487bb464d6e02d SHA512 71f5e9ac4c9190c65979e7d24f160a861dee3313e9fe03297eb9620bebc32dc349cd6204a7401dd77fa378617fd21dd851773f269ce862880acfcbd195512d25
 MISC metadata.xml 751 BLAKE2B 5b6715b02cbb774a14a382cde64c0b2bf0896311aa553a1f8f8563a4374343bdf996b2b93238e4be2a53d3d648216e380f57706856489da2ce44f88017f14e1b SHA512 6f3ec390dd310176c49f6d7d298bb6782307afaf5439ce54aa6fa560b3fdf9be5d50e6f8afe30eee220a6d9fd61e7ac030e7fa79e8e0068519cf3089f9c46332
diff --git a/app-portage/tatt/tatt-0.9.ebuild b/app-portage/tatt/tatt-0.9.ebuild
deleted file mode 100644
index 7c14d2aff58c..000000000000
--- a/app-portage/tatt/tatt-0.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Arch testing tool"
-HOMEPAGE="https://github.com/gentoo/tatt"
-SRC_URI="https://github.com/gentoo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+templates"
-
-RDEPEND="
-	app-portage/eix
-	app-portage/gentoolkit[${PYTHON_USEDEP}]
-	app-portage/nattka[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	www-client/pybugz
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use templates; then
-		insinto "/usr/share/${PN}"
-		doins -r templates
-	fi
-	doman tatt.1
-	doman tatt.5
-}