[gentoo-commits] repo/gentoo:master commit in: app-portage/gentoolkit/, app-portage/gentoolkit/files/
commit: 9a7a003f6e5df44ebb42faa9de2f7c4c5f7843f5
Author: Matt Turner gentoo org>
AuthorDate: Thu Jan 18 21:01:01 2024 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Jan 18 21:01:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a7a003f
app-portage/gentoolkit: Drop old versions
Signed-off-by: Matt Turner gentoo.org>
app-portage/gentoolkit/Manifest| 1 -
.../files/gentoolkit-0.6.1-data_files.patch| 47 --
.../files/gentoolkit-0.6.1-pkgindex.patch | 45 -
app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild | 73 --
4 files changed, 166 deletions(-)
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 6b329cabaf06..e62318728ee2 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,3 +1,2 @@
-DIST gentoolkit-0.6.1.tar.gz 3195781 BLAKE2B
27e370de77586b375dc70caa1abba4c2bc4207e8f08e0a7ea2953097135506949db71ff9102a0ead198e4dea425440c57b94ac7a811ca2d5e0016fc7e234bb0d
SHA512
1ffc466b69a9c53f1bbd40f6f4d1eb33d5f0f4287bb65ba1a7b1b2675ad61ecffa55ed9fda7c1ae8148744f0a77e224315eb1903dfd61a2a3dab1600fc672d2d
DIST gentoolkit-0.6.3.tar.bz2 3186163 BLAKE2B
0f9befac53faa2b578b461a55c7113934a60478fc5d8d5ab0e06cb836ff5a2de75bb290ed797a2b085ec9f33c8494e3c3d5d0d6b643c525fff4dd0a82657118f
SHA512
cf51480213fd4bac45d44f5eb5e4be4cb5c5b97ad63ecd832eb54fc7043ab8e974491005431f0897d6c41d251ae0f9fc95cfdfc4d613fc56340630a094bfc61d
DIST gentoolkit-0.6.4.tar.bz2 3186751 BLAKE2B
b6fa8a7acc40009d7b99e37bf30c79d603277f116d064a145b2032af651f56cf22b6412f4223afdb9270bfddbfe912803123ed181b63ea989beea0d45d8498cc
SHA512
67f85eb8fbaa28b0c28e79e8f8fe3384e65e44d824a2b123e5585348d6df7d69f1a0b74e7bc5d9592e93c0d6d597972a3e592cb7310555a2a5718723968d0277
diff --git a/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch
b/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch
deleted file mode 100644
index 8039864d69f9..
--- a/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 5b52ee6c6efab68111d128d45f386ac21eaf84f6 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec
-Date: Sun, 10 Jul 2022 13:41:36 -0700
-Subject: [PATCH] Revert "setup.py: migrate to setuptools"
-
-This reverts commit bbbde97b5e625a49a1a66e307931548cb33f260b.
-setuptools only installs data files to the python pkg directory
- setup.py | 8
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 36995de..23e9b36 100755
a/setup.py
-+++ b/setup.py
-@@ -3,8 +3,8 @@
- import re
- import sys
- import subprocess
--
--from setuptools import setup, Command
-+from distutils import core
-+from distutils.cmd import Command
- from glob import glob
-
- import os
-@@ -67,7 +67,7 @@ manpages = [
- ]
-
-
--class set_version(Command):
-+class set_version(core.Command):
- """Set python __version__ and bash VERSION to our __version__."""
-
- description = "hardcode scripts' version using VERSION from environment"
-@@ -130,7 +130,7 @@ test_data = {
- ]
- }
-
--setup(
-+core.setup(
- name="gentoolkit",
- version=__version__,
- description="Set of tools that work with and enhance portage.",
---
-libgit2 1.4.3
-
diff --git a/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch
b/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch
deleted file mode 100644
index 193eacc2db8b..
--- a/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From bf3eb16e451fd1bdee8ef03a0d22e0040e033f19 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec
-Date: Sun, 10 Jul 2022 23:41:33 -0700
-Subject: [PATCH] eclean/pkgindex.py: Fix typo in function call
-
- File "/usr/lib/python3.10/site-packages/gentoolkit/eclean/pkgindex.py", line
-60, in clean_pkgs_index
-if self.get_emaint_binhost():
-AttributeError: 'PkgIndex' object has no attribute 'get_emaint_binhost'. Did
-you mean: '_get_emaint_binhost'?
-
-Also fix too many parameters in line 68 for the self.controller() call
-
-Bug: https://bugs.gentoo.org/857555
-
-Signed-off-by: Brian Dolbec
- pym/gentoolkit/eclean/pkgindex.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pym/gentoolkit/eclean/pkgindex.py
b/pym/gentoolkit/eclean/pkgindex.py
-index d0878a1..7d6fade 100644
a/pym/gentoolkit/eclean/pkgindex.py
-+++ b/pym/gentoolkit/eclean/pkgindex.py
-@@ -57,15 +57,15 @@ class PkgIndex:
- statinfo = os.stat(file_)
- size1 = statinfo.st_size
- show_progress = not quiet
--if self.get_emaint_binhost():
-+if self._get_emaint_binhost():
- self.taskmaster = TaskHandler(show_progress_bar=show_progress)
- tasks = [self.binhost]
- self.taskmaster.run_tasks(tasks)
- else:
- self.call_emaint()
- statinfo = os.stat(file_)
-
[gentoo-commits] repo/gentoo:master commit in: app-portage/gentoolkit/, app-portage/gentoolkit/files/
commit: 99f78d4d96a20d36dbbee27278f49a169174cfa9
Author: Sam James gentoo org>
AuthorDate: Sun Jan 15 22:35:59 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Jan 15 22:40:10 2023 +
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 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..
--- 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..
--- 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
-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
- 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
[gentoo-commits] repo/gentoo:master commit in: app-portage/gentoolkit/, app-portage/gentoolkit/files/
commit: 8e426ccff148220423503c9a1c6c512c9b63ddfa
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Oct 13 14:27:14 2020 +
Commit: Brian Dolbec gentoo org>
CommitDate: Tue Oct 13 14:28:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e426ccf
app-portage/gentoolkit: Fix use flag desc. in 0.5.0-r1 bug 748129
Fix duplicated text in some use flag descriptions caused by
the -r1 py3.9 patch.
Closes: https://bugs.gentoo.org/748129
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Brian Dolbec gentoo.org>
.../files/gentoolkit-0.5.0-r1-python3_9.patch | 34 ++
...-0.5.0-r1.ebuild => gentoolkit-0.5.0-r2.ebuild} | 5 +++-
2 files changed, 38 insertions(+), 1 deletion(-)
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
new file mode 100644
index 000..a9dae615045
--- /dev/null
+++ b/app-portage/gentoolkit/files/gentoolkit-0.5.0-r1-python3_9.patch
@@ -0,0 +1,34 @@
+From f14b6198d1dd9cb7f4a83f3822e4a1782a5581e8 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec
+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
+---
+ 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-r1.ebuild
b/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild
similarity index 95%
rename from app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild
rename to app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild
index 18ac36af876..77fdfb33cf1 100644
--- a/app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild
@@ -27,7 +27,10 @@ RDEPEND="${DEPEND}
distutils_enable_tests setup.py
-PATCHES=( "${FILESDIR}"/${PN}-0.5.0-python3_9.patch)
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.5.0-python3_9.patch
+ "${FILESDIR}"/${PN}-0.5.0-r1-python3_9.patch
+)
python_prepare_all() {
python_setup
