[gentoo-commits] repo/gentoo:master commit in: app-portage/gentoolkit/files/, app-portage/gentoolkit/

2022-07-11 Thread Brian Dolbec 
commit: f9b8dc221898a3f7c2173cb062fcc91097cd4ab4
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue Jul 12 00:27:34 2022 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Tue Jul 12 00:36:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b8dc22

app-portage/gentoolkit: Bump to 0.6.1-r2 to fix eclean-pkg

Patch includes two small fixes for running emaint fix binhost directly
from imported modules.

Closes: https://bugs.gentoo.org/857555
Signed-off-by: Brian Dolbec  gentoo.org>

 .../files/gentoolkit-0.6.1-pkgindex.patch  | 45 ++
 ...-0.6.1-r1.ebuild => gentoolkit-0.6.1-r2.ebuild} |  1 +
 2 files changed, 46 insertions(+)

diff --git a/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch 
b/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch
new file mode 100644
index ..193eacc2db8b
--- /dev/null
+++ b/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch
@@ -0,0 +1,45 @@
+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_)
+ clean_size = size1 - statinfo.st_size
+-self.controller("\n", clean_size, "Packages Index", file_, "Index")
++self.controller(clean_size, "Packages Index", file_, "Index")
+ return clean_size
+ 
+ def call_emaint(self):
+--
+libgit2 1.4.3
+

diff --git a/app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild 
b/app-portage/gentoolkit/gentoolkit-0.6.1-r2.ebuild
similarity index 97%
rename from app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild
rename to app-portage/gentoolkit/gentoolkit-0.6.1-r2.ebuild
index d176540989f7..ea872764365b 100644
--- a/app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.6.1-r2.ebuild
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
"${FILESDIR}/gentoolkit-0.6.1-data_files.patch"
+   "${FILESDIR}/gentoolkit-0.6.1-pkgindex.patch"
 )
 
 distutils_enable_tests setup.py

[gentoo-commits] repo/gentoo:master commit in: app-portage/gentoolkit/files/, app-portage/gentoolkit/

2022-07-10 Thread Brian Dolbec 
commit: 98494dea065dd498addba76b72c3bdfb1c8aa53f
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jul 10 20:52:57 2022 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sun Jul 10 21:19:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98494dea

app-portage/gentoolkit: Bump to 0.6.1-r1, update 

Revert setuptools use due to incorrect data_files location
Go back tio using distutils for now.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Brian Dolbec  gentoo.org>

 .../files/gentoolkit-0.6.1-data_files.patch| 47 ++
 ...kit-0.6.1.ebuild => gentoolkit-0.6.1-r1.ebuild} |  6 ++-
 app-portage/gentoolkit/gentoolkit-.ebuild  |  2 +-
 3 files changed, 53 insertions(+), 2 deletions(-)

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
new file mode 100644
index ..8039864d69f9
--- /dev/null
+++ b/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch
@@ -0,0 +1,47 @@
+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/gentoolkit-0.6.1.ebuild 
b/app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild
similarity index 95%
rename from app-portage/gentoolkit/gentoolkit-0.6.1.ebuild
rename to app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild
index c9406219f5e3..d176540989f7 100644
--- a/app-portage/gentoolkit/gentoolkit-0.6.1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{8..11} pypy3 )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
@@ -29,6 +29,10 @@ RDEPEND="${DEPEND}
virtual/awk
sys-apps/gentoo-functions"
 
+PATCHES=(
+   "${FILESDIR}/gentoolkit-0.6.1-data_files.patch"
+)
+
 distutils_enable_tests setup.py
 
 python_prepare_all() {

diff --git a/app-portage/gentoolkit/gentoolkit-.ebuild 
b/app-portage/gentoolkit/gentoolkit-.ebuild
index d030b9327a92..00ccd192438d 100644
--- a/app-portage/gentoolkit/gentoolkit-.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{8..11} pypy3 )
 PYTHON_REQ_USE="xml(+),threads(+)"

[gentoo-commits] repo/gentoo:master commit in: app-portage/gentoolkit/files/, app-portage/gentoolkit/

2020-10-09 Thread Georgy Yakovlev 
commit: 5198c0b71084c57b42ca1a070813afab2da2985e
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Oct  9 05:02:00 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Fri Oct  9 06:23:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5198c0b7

app-portage/gentoolkit: Bug #747034

Closes: https://bugs.gentoo.org/747034
Thanks to https://github.com/gentoo/gentoolkit/pull/11

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/17855
Signed-off-by: Georgy Yakovlev  gentoo.org>

 .../files/gentoolkit-0.5.0-python3_9.patch | 43 ++
 ...kit-0.5.0.ebuild => gentoolkit-0.5.0-r1.ebuild} |  2 +
 2 files changed, 45 insertions(+)

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
new file mode 100644
index 000..6a50db9ca66
--- /dev/null
+++ b/app-portage/gentoolkit/files/gentoolkit-0.5.0-python3_9.patch
@@ -0,0 +1,43 @@
+# 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/gentoolkit-0.5.0.ebuild 
b/app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild
similarity index 97%
rename from app-portage/gentoolkit/gentoolkit-0.5.0.ebuild
rename to app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild
index efc5e8be7d4..18ac36af876 100644
--- a/app-portage/gentoolkit/gentoolkit-0.5.0.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild
@@ -27,6 +27,8 @@ RDEPEND="${DEPEND}
 
 distutils_enable_tests setup.py
 
+PATCHES=( "${FILESDIR}"/${PN}-0.5.0-python3_9.patch)
+
 python_prepare_all() {
python_setup
echo VERSION="${PVR}" "${PYTHON}" setup.py set_version

[gentoo-commits] repo/gentoo:master commit in: app-portage/gentoolkit/files/, app-portage/gentoolkit/

2017-11-21 Thread Andreas Hüttel 
commit: 17ee4dbf1ddb843028d3a63e806d37303e55f054
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Wed Nov 22 00:21:54 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Wed Nov 22 00:21:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ee4dbf

app-portage/gentoolkit: Drop old

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 app-portage/gentoolkit/Manifest|  6 +-
 .../files/0.3.0.8-revdep-rebuild-476740.patch  | 33 -
 .../files/0.3.0.8-revdep-rebuild-484340.patch  | 46 
 .../gentoolkit/files/0.3.2-helpers.py-589686.patch | 30 
 .../gentoolkit/gentoolkit-0.3.0.8-r2.ebuild| 82 --
 app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild  | 74 ---
 6 files changed, 2 insertions(+), 269 deletions(-)

diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 6c44fed2047..dd6834288d6 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,4 +1,2 @@
-DIST gentoolkit-0.3.0.8.tar.gz 3192497 SHA256 
0338dee7c295c32b60a84e529b764d2bc61536fa3aca021cd5a75c6e534864a6 SHA512 
50efd701d0d056740bcf7c7cdce652ae7c9e2786f799f5d30946e752b8aa735489d3e0dc5c7664a5810a0f22cec05b9bc7ccc10292b07ac4dd0777658651f72d
 WHIRLPOOL 
5a2455e50d4e0f4df8abab5b81deb6bb00e078dfed1687ae046ce97a0427eafea2d3de9b83ac6de8155d207653d001c6684ac92226fa2320515c6e14c8fea6e0
-DIST gentoolkit-0.3.2.tar.gz 3198294 SHA256 
f3bb38d663c1b153447556b5265df5a11b6ed78411e761335b692111c823d9dd SHA512 
e174ac7f12d45703515876ea558a661e1d0c5d4cc71d2d64ee793786e2a2d3d2b309500b6e1891774e3415de74922efc77553c0103d695f5dda91def9a6ac637
 WHIRLPOOL 
67192702f72f437cc31aeeef8bf005c83a4a9322e9fa0de3c1e0d229bfb95d7363f14a8902da5ffbf49dee45cd587286899ea1ead017cd7d18d0f852cc7fd9fb
-DIST gentoolkit-0.3.3.tar.gz 3197037 SHA256 
bb1fd78a6063efffd4e8402cd799f2c22ed2bbf440c26390aab68bfb6f4ee982 SHA512 
ad142c2c66e7f7a2e4184c8f95e394ee783cd57808e6254e9f5df0f3f60ad842042f773716ca0fd6d7545bb8a2d11c1c167a4ec471eb3238c8ee3a519f70a691
 WHIRLPOOL 
81c2aa8cb36d9c6abef99729b07c9cc5402d66ccfd8523a4cee57ed99d2b4c2ab0db6c77dccdc90597bd11d60e11823130dd1136eeaba9b2a18383da3e9c5f25
-DIST gentoolkit-0.4.0.tar.gz 3215377 SHA256 
3696b45b304b4b789f21d897e09311cf08474dcd9247dd3143bce95ffba5a220 SHA512 
6cf693c588d4a2f5bd06fff4e78ef98007e613348048ec993c5430e168baef6c1da01e1843903f3e87ca8e47dd1ffb207acccbc5c0e881fa3093a7880fec9a56
 WHIRLPOOL 
0114e0e2274b198aca5bbadce6baf5b6595be92e48d322c759826d1143d7d82ea2deb91ba2f8133e5b554567b7ce62081b5e7df24fa3b029bb50041ce99509db
+DIST gentoolkit-0.3.3.tar.gz 3197037 BLAKE2B 
c2a45971f1f25e3008422b63b59042ca0f2b170b98e10fc4e449ee6be76c0422469cd8bce1b744830404d5a26ba87ded47aab679069965eea266719249475923
 SHA512 
ad142c2c66e7f7a2e4184c8f95e394ee783cd57808e6254e9f5df0f3f60ad842042f773716ca0fd6d7545bb8a2d11c1c167a4ec471eb3238c8ee3a519f70a691
+DIST gentoolkit-0.4.0.tar.gz 3215377 BLAKE2B 
404f81e2f5bce5da4df122156bc76d225497456ad8ec78a50c41e1183390f8e452a6ce8a3473b5371a6712ce1599be33034c5eed64a1852d116c745bc5a775f4
 SHA512 
6cf693c588d4a2f5bd06fff4e78ef98007e613348048ec993c5430e168baef6c1da01e1843903f3e87ca8e47dd1ffb207acccbc5c0e881fa3093a7880fec9a56

diff --git a/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-476740.patch 
b/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-476740.patch
deleted file mode 100644
index 8832838bd33..000
--- a/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-476740.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 87a01450ab33220f6f0821d4f4209004cdc3aa8b Mon Sep 17 00:00:00 2001
-From: Paul Varner 
-Date: Tue, 10 Sep 2013 13:52:28 -0500
-Subject: [PATCH] Fix Ctrl-C handling when running emerge (Bug 476740).
-

- bin/revdep-rebuild.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/bin/revdep-rebuild.sh b/bin/revdep-rebuild.sh
-index 6cb5608..09f5135 100755
 a/bin/revdep-rebuild.sh
-+++ b/bin/revdep-rebuild.sh
-@@ -1052,6 +1052,7 @@ portage_settings() {
-   if [[ -n ${REVDEP_REBUILD_DEFAULT_OPTS} ]]; then
-   EMERGE_DEFAULT_OPTS=("${REVDEP_REBUILD_DEFAULT_OPTS[@]}")
-   fi
-+
- }
- 
- ##
-@@ -1138,7 +1139,7 @@ rebuild() {
-   REBUILD_LIST=$(sort -u "$EBUILDS_FILE")
-   fi
- 
--  trap - SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM
-+  trap "kill 0" SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM
- 
-   [[ $QUIET -ne 1 ]] && einfo 'All prepared. Starting rebuild'
-   echo "emerge --complete-graph=y --oneshot ${EMERGE_DEFAULT_OPTS[@]} 
${EMERGE_OPTIONS[@]} $REBUILD_LIST"
--- 
-1.8.3.2
-

diff --git a/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-484340.patch 
b/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-484340.patch
deleted file mode 100644
index 1a0393dac48..000
--- a/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-484340.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From db997501ec8e0ef0c5e4426649c17d2498b40e06 Mon Sep

[gentoo-commits] repo/gentoo:master commit in: app-portage/gentoolkit/files/, app-portage/gentoolkit/

2017-03-13 Thread Paul Varner 
commit: ca3fb820f232eb5180418a7f9baf336af8d08e1b
Author: Paul Varner  gentoo  org>
AuthorDate: Mon Mar 13 20:04:18 2017 +
Commit: Paul Varner  gentoo  org>
CommitDate: Mon Mar 13 20:04:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca3fb820

app-portage/gentoolkit: Remove unused versions and files.

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 app-portage/gentoolkit/Manifest|  2 -
 .../gentoolkit/files/0.3.0.9-equery-508114.patch   | 37 -
 .../files/0.3.0.9-equery-strip-XXXFLAGS.patch  | 27 ---
 .../files/0.3.0.9-revdep-rebuild-526400.patch  | 26 ---
 .../files/0.3.0.9-revdep-rebuild-py-504654-1.patch | 26 ---
 .../files/0.3.0.9-revdep-rebuild-py-504654-2.patch | 30 
 .../gentoolkit/files/0.3.1-setup.py-print.patch| 29 ---
 .../gentoolkit/gentoolkit-0.3.0.9-r2.ebuild| 88 --
 app-portage/gentoolkit/gentoolkit-0.3.1.1.ebuild   | 70 -
 app-portage/gentoolkit/gentoolkit-0.3.2.ebuild | 70 -
 10 files changed, 405 deletions(-)

diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 6366ac6761c..0e9c54b24db 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,5 +1,3 @@
 DIST gentoolkit-0.3.0.8.tar.gz 3192497 SHA256 
0338dee7c295c32b60a84e529b764d2bc61536fa3aca021cd5a75c6e534864a6 SHA512 
50efd701d0d056740bcf7c7cdce652ae7c9e2786f799f5d30946e752b8aa735489d3e0dc5c7664a5810a0f22cec05b9bc7ccc10292b07ac4dd0777658651f72d
 WHIRLPOOL 
5a2455e50d4e0f4df8abab5b81deb6bb00e078dfed1687ae046ce97a0427eafea2d3de9b83ac6de8155d207653d001c6684ac92226fa2320515c6e14c8fea6e0
-DIST gentoolkit-0.3.0.9.tar.gz 3194703 SHA256 
c660d150dfccbaea6f291fb7fc2659c8e0e38eaebe6e68f92dee728c8c7e320d SHA512 
75b2d15b2b9ed08055840b56b239ed5d63838a10e8d31ec3ed8822cf1d3ef32841609763433736e17f93a5fdd293ccbda4a3dfa0f007241321aecbcde847
 WHIRLPOOL 
5e9dc038c161361eb2dd8f0cd17e8efaa41183a281d6fcf620c1631c6da661673d085c60572424cd48504222c29613473591f8dd276792ab96ba3cfda88f1fe1
-DIST gentoolkit-0.3.1.1.tar.gz 3198269 SHA256 
e3743ac526a8b9dd78af8ebc88ccf26cf487f2c31483b283b0e5df36bab881ce SHA512 
24736713761ead819da8f65148d7f8cae5e12414cbffafa1bcf0ce4f59587b6c589fed02edb48f054f24f015e4fe151333ebbba4ccfa9b1164a547717bee7a74
 WHIRLPOOL 
c33a468ca8fb01e4e236cd104abc10a7a570fc6a3372314407ee341672202ed2cef70e2647743ba4301277f01201a5999e6251167d66f7b1ffae5eb0872a5375
 DIST gentoolkit-0.3.2.tar.gz 3198294 SHA256 
f3bb38d663c1b153447556b5265df5a11b6ed78411e761335b692111c823d9dd SHA512 
e174ac7f12d45703515876ea558a661e1d0c5d4cc71d2d64ee793786e2a2d3d2b309500b6e1891774e3415de74922efc77553c0103d695f5dda91def9a6ac637
 WHIRLPOOL 
67192702f72f437cc31aeeef8bf005c83a4a9322e9fa0de3c1e0d229bfb95d7363f14a8902da5ffbf49dee45cd587286899ea1ead017cd7d18d0f852cc7fd9fb
 DIST gentoolkit-0.3.3.tar.gz 3197037 SHA256 
bb1fd78a6063efffd4e8402cd799f2c22ed2bbf440c26390aab68bfb6f4ee982 SHA512 
ad142c2c66e7f7a2e4184c8f95e394ee783cd57808e6254e9f5df0f3f60ad842042f773716ca0fd6d7545bb8a2d11c1c167a4ec471eb3238c8ee3a519f70a691
 WHIRLPOOL 
81c2aa8cb36d9c6abef99729b07c9cc5402d66ccfd8523a4cee57ed99d2b4c2ab0db6c77dccdc90597bd11d60e11823130dd1136eeaba9b2a18383da3e9c5f25

diff --git a/app-portage/gentoolkit/files/0.3.0.9-equery-508114.patch 
b/app-portage/gentoolkit/files/0.3.0.9-equery-508114.patch
deleted file mode 100644
index 3fc67d36654..000
--- a/app-portage/gentoolkit/files/0.3.0.9-equery-508114.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9a33ceffe2e0045bf75b1209a90e9a53530d4e0d Mon Sep 17 00:00:00 2001
-From: Tobias Heinlein 
-Date: Sat, 19 Apr 2014 18:39:03 +0200
-Subject: [PATCH 01/14] equery: Don't always print the license field (bug
- #508114).
-

- pym/gentoolkit/equery/meta.py | 13 +++--
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/pym/gentoolkit/equery/meta.py b/pym/gentoolkit/equery/meta.py
-index e2d2124..d3342cd 100644
 a/pym/gentoolkit/equery/meta.py
-+++ b/pym/gentoolkit/equery/meta.py
-@@ -373,12 +373,13 @@ def call_format_functions(best_match, matches):
-   useflags = format_useflags(best_match.metadata.use())
-   print_sequence(format_list(useflags))
- 
--  _license = best_match.environment(["LICENSE"])
--  if QUERY_OPTS["license"]:
--  _license = format_list(_license)
--  else:
--  _license = format_list(_license, "License: ", " " * 13)
--  print_sequence(_license)
-+  if QUERY_OPTS["license"] or not got_opts:
-+  _license = best_match.environment(["LICENSE"])
-+  if QUERY_OPTS["license"]:
-+  _license = format_list(_license)
-+  else:
-+  _license = format_list(_license, "License: ", " " * 
13)
-+  print_sequence(_license)
- 
-   if QUERY_OPTS["stablereq"]:
-   # Get {: [u'ia64', u'm68k',

[gentoo-commits] repo/gentoo:master commit in: app-portage/gentoolkit/files/, app-portage/gentoolkit/

2016-07-26 Thread Paul Varner 
commit: b8465c4e78e3ba4c13513b50853faa194fb41cb0
Author: Paul Varner  gentoo  org>
AuthorDate: Tue Jul 26 19:37:08 2016 +
Commit: Paul Varner  gentoo  org>
CommitDate: Tue Jul 26 19:37:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8465c4e

app-portage/gentoolkit: Revision bump to add patch

Add patch to fix compatability with python2.7 and equery changes.
This patch fixes Bug 589686

Package-Manager: portage-2.3.0

 .../gentoolkit/files/0.3.2-helpers.py-589686.patch | 30 +
 app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild  | 77 ++
 2 files changed, 107 insertions(+)

diff --git a/app-portage/gentoolkit/files/0.3.2-helpers.py-589686.patch 
b/app-portage/gentoolkit/files/0.3.2-helpers.py-589686.patch
new file mode 100644
index 000..282846c
--- /dev/null
+++ b/app-portage/gentoolkit/files/0.3.2-helpers.py-589686.patch
@@ -0,0 +1,30 @@
+From bc92540f8ce498e8305103619c7085b670ba19b1 Mon Sep 17 00:00:00 2001
+From: Paul Varner 
+Date: Mon, 25 Jul 2016 13:01:06 -0500
+Subject: Add missing import of io.open when using python2.7
+
+This fixes the traceback when running equery changes with Python 2.7
+
+X-Gentoo-bug: 589686
+X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=589686
+---
+ pym/gentoolkit/helpers.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/pym/gentoolkit/helpers.py b/pym/gentoolkit/helpers.py
+index 0d985b6..8d25393 100644
+--- a/pym/gentoolkit/helpers.py
 b/pym/gentoolkit/helpers.py
+@@ -26,6 +26,9 @@ __docformat__ = 'epytext'
+ # ===
+ 
+ import os
++import sys
++if sys.hexversion < 0x300:
++  from io import open
+ import re
+ from functools import partial
+ from itertools import chain
+-- 
+cgit v0.12
+

diff --git a/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild 
b/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild
new file mode 100644
index 000..75851dd
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5} pypy)
+PYTHON_REQ_USE="xml(+),threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="https://www.gentoo.org/proj/en/portage/tools/index.xml;
+SRC_URI="http://dev.gentoo.org/~dolsen/releases/gentoolkit/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux 
~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+
+DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+   !<=app-portage/gentoolkit-dev-0.2.7
+   || ( >=sys-apps/coreutils-8.15 app-misc/realpath 
sys-freebsd/freebsd-bin )
+   sys-apps/gawk
+   sys-apps/gentoo-functions
+   sys-apps/grep"
+
+PATCHES=(
+   "${FILESDIR}"/${PV}-helpers.py-589686.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
+}
+
+python_install_all() {
+   distutils-r1_python_install_all
+
+   # remove on Gentoo Prefix platforms where it's broken anyway
+   if use prefix; then
+   elog "The revdep-rebuild command is removed, the preserve-libs"
+   elog "feature of portage will handle issues."
+   rm "${ED}"/usr/bin/revdep-rebuild*
+   rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
+   rm -rf "${ED}"/etc/revdep-rebuild
+   rm -rf "${ED}"/var
+   fi
+}
+
+pkg_postinst() {
+   # Create cache directory for revdep-rebuild
+   mkdir -p -m 0755 "${EROOT%/}"/var/cache
+   mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
+
+   # 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://www.gentoo.org/doc/en/gentoolkit.xml;
+   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/install-mask"
+   elog "app-portage/portpeek"
+   elog "app-portage/smart-live-rebuild"
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: app-portage/gentoolkit/files/, app-portage/gentoolkit/

2015-12-20 Thread Mike Gilbert 
commit: 390008fd0c2ec917d4bef37c791418af2f7e695d
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Dec 20 20:38:31 2015 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Dec 20 20:38:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=390008fd

app-portage/gentoolkit: Fix TypeError in setup.py with python3

Bug: https://bugs.gentoo.org/568906

Package-Manager: portage-2.2.26_p32

 .../gentoolkit/files/0.3.1-setup.py-print.patch| 29 ++
 .../gentoolkit/gentoolkit-0.3.0.9-r2.ebuild|  3 ++-
 app-portage/gentoolkit/gentoolkit-0.3.1.ebuild |  3 ++-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/app-portage/gentoolkit/files/0.3.1-setup.py-print.patch 
b/app-portage/gentoolkit/files/0.3.1-setup.py-print.patch
new file mode 100644
index 000..29f7a18
--- /dev/null
+++ b/app-portage/gentoolkit/files/0.3.1-setup.py-print.patch
@@ -0,0 +1,29 @@
+From 4e06e9f032ed187ce682434955778c3241854e26 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Sun, 20 Dec 2015 15:19:06 -0500
+Subject: [PATCH] Remove useless print() in set_version
+
+This was causing a TypeError in python3.
+
+Bug: https://bugs.gentoo.org/568906
+---
+ setup.py | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index b32b7d6..01e4b3e 100755
+--- a/setup.py
 b/setup.py
+@@ -80,9 +80,6 @@ class set_version(core.Command):
+   with io.open(f[0], 'r', 1, 'utf_8') as s:
+   for line in s:
+   newline = re.sub(pattern %f[1], 
'"%s"' % ver, line, 1)
+-  if newline != line:
+-  #log.info("%s: %s" % 
(f, newline))
+-  print("%s: %s" % (f[0], 
newline.encode('utf_8').strip('\n')))
+   updated_file.append(newline)
+   with io.open(f[0], 'w', 1, 'utf_8') as s:
+   s.writelines(updated_file)
+-- 
+2.6.4
+

diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild 
b/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild
index 182dc47..f1d0497 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild
@@ -7,7 +7,7 @@ EAPI="5"
 PYTHON_COMPAT=(python{2_7,3_3,3_4} pypy)
 PYTHON_REQ_USE="xml(+),threads(+)"
 
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
 HOMEPAGE="https://www.gentoo.org/proj/en/portage/tools/index.xml;
@@ -36,6 +36,7 @@ PATCHES=(
 )
 
 python_prepare_all() {
+   epatch "${FILESDIR}/0.3.1-setup.py-print.patch"
python_setup
echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
VERSION="${PVR}" "${PYTHON}" setup.py set_version

diff --git a/app-portage/gentoolkit/gentoolkit-0.3.1.ebuild 
b/app-portage/gentoolkit/gentoolkit-0.3.1.ebuild
index 4311b00..7621d42 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.1.ebuild
@@ -7,7 +7,7 @@ EAPI="5"
 PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5} pypy)
 PYTHON_REQ_USE="xml(+),threads(+)"
 
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
 HOMEPAGE="https://www.gentoo.org/proj/en/portage/tools/index.xml;
@@ -28,6 +28,7 @@ RDEPEND="${DEPEND}
sys-apps/grep"
 
 python_prepare_all() {
+   epatch "${FILESDIR}/0.3.1-setup.py-print.patch"
python_setup
echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
VERSION="${PVR}" "${PYTHON}" setup.py set_version