commit: 99f78d4d96a20d36dbbee27278f49a169174cfa9 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jan 15 22:35:59 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jan 15 22:40:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99f78d4d
app-portage/gentoolkit: drop 0.5.0-r3, 0.5.1-r1 Signed-off-by: Sam James <sam <AT> gentoo.org> app-portage/gentoolkit/Manifest | 2 - .../files/gentoolkit-0.5.0-python3_9.patch | 43 ------------ .../files/gentoolkit-0.5.0-r1-python3_9.patch | 34 --------- app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild | 82 ---------------------- app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild | 67 ------------------ 5 files changed, 228 deletions(-) diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest index 492c0d8e388b..3b2e5a268698 100644 --- a/app-portage/gentoolkit/Manifest +++ b/app-portage/gentoolkit/Manifest @@ -1,3 +1 @@ -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 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 <dol...@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 <dol...@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 -}
