[gentoo-commits] proj/gentoolkit:master commit in: /

[gentoo-commits] proj/gentoolkit:master commit in: /

[Matt Turner]

commit:     12722468eeb85e63bef3e0230ed9ffe9e85ede28
Author:     Wolfgang E. Sanyer <WolfgangESanyer <AT> gmail <DOT> com>
AuthorDate: Mon Sep 20 13:49:54 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Sep 20 22:53:38 2021 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=12722468

Rename README.dev to CONTRIBUTING.md. Also, add information...

...regarding how to use black for formatting code, and how to ignore
formatting-only commits in git.

Signed-off-by: Wolfgang E. Sanyer <WolfgangESanyer <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .gitignorerevs  |  2 ++
 CONTRIBUTING.md | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.dev      | 55 ---------------------------------------
 3 files changed, 82 insertions(+), 55 deletions(-)

diff --git a/.gitignorerevs b/.gitignorerevs
new file mode 100644
index 0000000..86287dd
--- /dev/null
+++ b/.gitignorerevs
@@ -0,0 +1,2 @@
+# Run entire repository through black. Also, change tabs to spaces
+bbcd72b5fe85fe9bbca1913f8aa22077d94e75d0

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..e91dac8
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,80 @@
+Contributing
+============
+Gentoo Developers have full priviledges to the gentoolkit repository and
+any Gentoo developer can do work on the gentoolkit source. We only ask that you
+keep the following in mind:
+
+- If you want to do a major change (i.e rewrite/refactor something), please talk
+  to us before pushing any commits. If you break something, please fix it.
+- All members of the Portage or Portage Tools projects are authorized to create
+  a new release of gentoolkit or gentoolkit-dev.
+- All other Gentoo Developers are authorized to create a new release if it is
+  coordinated with fuzzyray and/or dolsen.
+- If you create a release and it breaks, please fix it.
+
+Any non Gentoo developers who wish to contribute, the best way to get
+started is by cloning a copy of the repository and submitting patches to
+bugzilla.  Additionally, we can be found in the #gentoo-portage IRC
+channel.
+
+Formatting
+==========
+We use [black](https://pypi.org/project/black/) to format the code
+base. Please make sure you run it against any PRs prior to submitting
+(otherwise we'll probably reject it).
+
+There are [ways to integrate](https://black.readthedocs.io/en/stable/integrations/editors.html)
+black into your text editor and/or IDE.
+
+You can also set up a git hook to check your commits, in case you don't want
+editor integration. Something like this:
+
+```sh
+# .git/hooks/pre-commit (don't forget to chmod +x)
+
+#!/bin/bash
+black --check --diff .
+```
+
+To ignore reformatting commits (which are listed in `.gitignorerevs`) you can do
+the following:
+
+```sh
+git config blame.ignoreRevsFile .gitignorerevs
+```
+
+Adding or modifying code
+========================
+- If you add new code, best practice is to write a test for it.
+- If you're modifying code that doesn't have a test and you can write a test
+  for it, please do.
+- Before committing your changes, run "tox" to ensure that you didn't break
+  tests or introduced a flake8 error.
+- If flake8 raises a warning or error that you don't agree with, it's probably
+  better to just change your code. If you're sure you have a good reason for
+  doing what you're doing, you can add "# noqa" at the end of the line to
+  silence it.
+
+Creating a release
+==================
+Note: We are using VERSION="0.3.0" simply as an example.
+
+```sh
+# Run Gentoolkit's test suite, make sure it passes:
+# Note: requires dev-python/snakeoil
+./setup.py test
+
+# Create a source distribution (you need to add VERSION here):
+VERSION="0.3.0" ./setup.py sdist
+# Transfer dist/gentoolkit-0.3.0.tar.gz to dev.gentoo.org:/space/distfiles-local
+# scp dist/gentoolkit-0.3.0.tar.gz username@dev.gentoo.org:/space/distfiles-local
+
+# Clean up temporary files:
+./setup.py clean -a
+git status
+# rm or mv any untracked files/directories
+
+# Create a tag for the release
+git tag gentoolkit-0.3.0
+git push origin gentoolkit-0.3.0
+```

diff --git a/README.dev b/README.dev
deleted file mode 100644
index e2df152..0000000
--- a/README.dev
+++ /dev/null
@@ -1,55 +0,0 @@
-Contributing:
-=============
-Gentoo Developers have full priviledges to the gentoolkit repository and
-any Gentoo developer can do work on the gentoolkit source.
-
-We only have several requirements.  If you want to do a major change (i.e
-rewrite/refactor something), please talk to us before pushing any
-commits. If you break something, please fix it.
-
-All members of the Portage or Portage Tools projects are authorized to
-create a new release of gentoolkit or gentoolkit-dev.
-
-All other Gentoo Developers are authorized to create a new release if it is
-coordinated with fuzzyray and/or dolsen.
-
-If you create a release and it breaks, please fix it.
-
-Any non Gentoo developers who wish to contribute, the best way to get
-started is by cloning a copy of the repository and submitting patches to
-bugzilla.  Additionally, we can be found in the #gentoo-portage IRC
-channel.
-
-Adding or modifying code:
-=========================
-- If you add new code, best practice is to write a test for it.
-- If you're modifying code that doesn't have a test and you can write a test
-  for it, please do.
-- Before committing your changes, run "tox" to ensure that you didn't break
-  tests or introduced a flake8 error.
-- If flake8 raises a warning or error that you don't agree with, it's probably
-  better to just change your code. If you're sure you have a good reason for
-  doing what you're doing, you can add "# noqa" at the end of the line to
-  silence it.
-
-Creating a release:
-===================
-Note: We are using VERSION="0.3.0" simply as an example.
-
-- Run Gentoolkit's test suite, make sure it passes:
-Note: requires dev-python/snakeoil
-
-./setup.py test
-
-- Create a source distribution (you need to add VERSION here):
-VERSION="0.3.0" ./setup.py sdist
-Transfer dist/gentoolkit-0.3.0.tar.gz to dev.gentoo.org:/space/distfiles-local
-
-- Clean up temporary files:
-./setup.py clean -a
-git status
-rm or mv any untracked files/directories
-
-- Create a tag for the release
-git tag gentoolkit-0.3.0
-git push origin gentoolkit-0.3.0

[gentoo-commits] proj/gentoolkit:master commit in: /

[Matt Turner]

commit:     c0995c537473738ff3227fbb07bbd94e688da55d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 10 02:24:41 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Sep 10 02:24:41 2024 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=c0995c53

meson.build: prepare for gentoolkit-0.6.8

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index abf171f..4b47f76 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
     'gentoolkit',
     'c',
-    version : '0.6.7',
+    version : '0.6.8',
     license : 'GPL-2.0-or-later',
     meson_version : '>=0.64.0'
 )

[gentoo-commits] proj/gentoolkit:master commit in: /

[Sam James]

commit:     054afd492ef2c0d4897d93220b5543b698f8e06d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  8 21:42:57 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  8 21:42:57 2024 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=054afd49

meson.build: prepare for gentoolkit-0.6.7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 1c07ad1..abf171f 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
     'gentoolkit',
     'c',
-    version : '0.6.6',
+    version : '0.6.7',
     license : 'GPL-2.0-or-later',
     meson_version : '>=0.64.0'
 )

[gentoo-commits] proj/gentoolkit:master commit in: /

[Sam James]

commit:     f49f246f76db84d6c2d2d0ad2b1d19eb27aa1b2d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 25 20:37:33 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 20:37:33 2024 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=f49f246f

meson.build: prepare for gentoolkit-0.6.6

Signed-off-by: Sam James <sam <AT> gentoo.org>

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index b7b07c1..1c07ad1 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
     'gentoolkit',
     'c',
-    version : '0.6.5',
+    version : '0.6.6',
     license : 'GPL-2.0-or-later',
     meson_version : '>=0.64.0'
 )

[gentoo-commits] proj/gentoolkit:master commit in: /

[Sam James]

commit:     806d0cca43dfbdc124978381305361daf47677cb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 21:43:17 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 21:43:17 2024 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=806d0cca

Revert "meson: make tests optional"

This reverts commit 988e47557368df49035eeba94beca893f7b267c1.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 meson.build       | 6 ++----
 meson_options.txt | 4 ----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/meson.build b/meson.build
index b7b07c1..c3e83c5 100644
--- a/meson.build
+++ b/meson.build
@@ -39,10 +39,8 @@ endif
 subdir('bin')
 subdir('pym')
 
-if get_option('tests')
-    pytest = find_program('pytest')
-    test('pytest', pytest, args : ['-v', meson.current_source_dir() / 'pym'])
-endif
+pytest = find_program('pytest')
+test('pytest', pytest, args : ['-v', meson.current_source_dir() / 'pym'])
 
 if get_option('code-only')
     subdir_done()

diff --git a/meson_options.txt b/meson_options.txt
index 9949cbf..265d572 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -13,7 +13,3 @@ option('eprefix', type : 'string',
 option('docdir', type : 'string',
     description : 'Documentation directory'
 )
-
-option('tests', type : 'boolean', value: false,
-    description : 'Enable tests'
-)

[gentoo-commits] proj/gentoolkit:master commit in: /

[Sam James]

commit:     d00c9f8b80d8f6193810e7cb4b9175c498fc9c82
Author:     Greg Kubaryk <greg.kubaryk <AT> gmail <DOT> com>
AuthorDate: Tue Mar 12 21:41:48 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 21:43:41 2024 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=d00c9f8b

meson: make tests optional

Closes: https://bugs.gentoo.org/926427
Signed-off-by: Greg Kubaryk <greg.kubaryk <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
(cherry picked from commit 988e47557368df49035eeba94beca893f7b267c1)

 meson.build       | 6 ++++--
 meson_options.txt | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index c3e83c5..b7b07c1 100644
--- a/meson.build
+++ b/meson.build
@@ -39,8 +39,10 @@ endif
 subdir('bin')
 subdir('pym')
 
-pytest = find_program('pytest')
-test('pytest', pytest, args : ['-v', meson.current_source_dir() / 'pym'])
+if get_option('tests')
+    pytest = find_program('pytest')
+    test('pytest', pytest, args : ['-v', meson.current_source_dir() / 'pym'])
+endif
 
 if get_option('code-only')
     subdir_done()

diff --git a/meson_options.txt b/meson_options.txt
index 265d572..9949cbf 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -13,3 +13,7 @@ option('eprefix', type : 'string',
 option('docdir', type : 'string',
     description : 'Documentation directory'
 )
+
+option('tests', type : 'boolean', value: false,
+    description : 'Enable tests'
+)

[gentoo-commits] proj/gentoolkit:master commit in: /

[Sam James]

commit:     988e47557368df49035eeba94beca893f7b267c1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 21:41:48 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 21:41:48 2024 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=988e4755

meson: make tests optional

Closes: https://bugs.gentoo.org/926427
Signed-off-by: Greg Kubaryk <greg.kubaryk <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 meson.build       | 6 ++++--
 meson_options.txt | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index c3e83c5..b7b07c1 100644
--- a/meson.build
+++ b/meson.build
@@ -39,8 +39,10 @@ endif
 subdir('bin')
 subdir('pym')
 
-pytest = find_program('pytest')
-test('pytest', pytest, args : ['-v', meson.current_source_dir() / 'pym'])
+if get_option('tests')
+    pytest = find_program('pytest')
+    test('pytest', pytest, args : ['-v', meson.current_source_dir() / 'pym'])
+endif
 
 if get_option('code-only')
     subdir_done()

diff --git a/meson_options.txt b/meson_options.txt
index 265d572..9949cbf 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -13,3 +13,7 @@ option('eprefix', type : 'string',
 option('docdir', type : 'string',
     description : 'Documentation directory'
 )
+
+option('tests', type : 'boolean', value: false,
+    description : 'Enable tests'
+)

[gentoo-commits] proj/gentoolkit:master commit in: /

[Sam James]

commit:     dae7ee48695f96ff8fbe4f5b5ba34db3654b327a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 20:39:33 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 20:39:33 2024 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=dae7ee48

tox: fix for meson port

Signed-off-by: Sam James <sam <AT> gentoo.org>

 tox.ini | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/tox.ini b/tox.ini
index 01d9c88..b34c6dc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,17 +1,16 @@
 [tox]
-envlist = py39,py310,py311,py312,pypy3,flake8
-skip_missing_interpreters = True
+envlist = py{39,310,311,312,313}-test,pypy3-test,flake8
+skipsdist = True
 
 [testenv]
-commands =
-    python setup.py test
 sitepackages = True
-
-[testenv:flake8]
 deps =
-    flake8
+    test: pytest
+allowlist_externals =
+    pytest
 commands =
-    python -m flake8 pym
+    pylint: pylint pym
+    test: pytest -vv -ra -l -o console_output_style=count {posargs}
 
 [flake8]
 # We initially start small, but we probably want to expand that list with time.

[gentoo-commits] proj/gentoolkit:master commit in: /

[Sam James]

commit:     a7846cf9dc41f03559f64f4ae8b118868197e316
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 19 06:36:49 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 19 06:36:49 2024 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=a7846cf9

NEWS, meson.build: prepare for gentoolkit-0.6.5

Signed-off-by: Sam James <sam <AT> gentoo.org>

 NEWS        | 4 ++++
 meson.build | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 7d8b7d0..f3bd744 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 News (new features/major bug fixes)
 
+gentoolkit-0.6.5
+----------------
+  * eclean: fix eclean-dist with no git3-src dir (bug #922455)
+
 gentoolkit-0.6.4
 ----------------
   * Raise portage requirement to >=3.0.57

diff --git a/meson.build b/meson.build
index 109fa82..c771738 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
     'gentoolkit',
     'c',
-    version : '0.6.4',
+    version : '0.6.5',
     license : 'GPL-2.0-or-later',
     meson_version : '>=0.64.0'
 )

[gentoo-commits] proj/gentoolkit:master commit in: /

[Sam James]

commit:     13c09d81b4992169664dd77a2943b2962dc70863
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 19 04:54:39 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 19 04:54:39 2024 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=13c09d81

tox: update impls

Signed-off-by: Sam James <sam <AT> gentoo.org>

 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 56b255a..01d9c88 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py37,py38,py39,py310,py311,pypy3,flake8
+envlist = py39,py310,py311,py312,pypy3,flake8
 skip_missing_interpreters = True
 
 [testenv]

[gentoo-commits] proj/gentoolkit:master commit in: /

[Matt Turner]

commit:     34fe86949036b7b03af3942dd6901904b0f0313e
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 20:53:34 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 20:55:39 2024 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=34fe8694

NEWS: Populate for 0.6.2, 0.6.3, 0.6.4

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 NEWS | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 14325a8..7d8b7d0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,25 @@
 News (new features/major bug fixes)
 
+gentoolkit-0.6.4
+----------------
+  * Raise portage requirement to >=3.0.57
+  * Strip libc dependencies from eclean-pkg --changed-deps calculations
+
+
+gentoolkit-0.6.3
+----------------
+  * Fix handling invalid binpkgs
+  * Migrate to PEP517 meson-python build
+
+
+gentoolkit-0.6.2
+----------------
+  * Add --clean-invalid option for eclean-pkg
+  * Fix merge-driver-ekeyword compatibility with git >= 2.42
+  * Fix eclean-pkg compatibility with FEATURES=pkgdir-index-trusted
+  * Support the NO_COLOR environment variable
+
+
 gentoolkit-0.6.1
 ----------------
   * Fix custom TMPL implementation for depends commit 3e35553df4673
@@ -9,7 +29,7 @@ gentoolkit-0.6.1
 
 gentoolkit-0.6.0
 ----------------
-  * merge-driver-ekeyword Fis type annotations
+  * merge-driver-ekeyword Fix type annotations
   * equery changes removal
   * Convert from tab indent to spaces, format cleanup
   * Add github action to check formatting, add unit testing

[gentoo-commits] proj/gentoolkit:master commit in: /

[Matt Turner]

commit:     61df9f59ab0c13ed6cf8a3d9cd6a77fa1ee0929b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 20:56:09 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 20:56:09 2024 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=61df9f59

v0.6.4

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 3fbb278..109fa82 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
     'gentoolkit',
     'c',
-    version : '0.6.2',
+    version : '0.6.4',
     license : 'GPL-2.0-or-later',
     meson_version : '>=0.64.0'
 )

[gentoo-commits] proj/gentoolkit:master commit in: /

[Sam James]

commit:     eeb07714c0a924ac6d96543a05c609af19a18f35
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 16 09:26:24 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 07:51:53 2023 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=eeb07714

meson: drop find_program('sed') as it isn't used

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoolkit/pull/37
Signed-off-by: Sam James <sam <AT> gentoo.org>

 meson.build | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meson.build b/meson.build
index b609876..3fbb278 100644
--- a/meson.build
+++ b/meson.build
@@ -9,8 +9,6 @@ project(
 py_mod = import('python')
 py = py_mod.find_installation(pure : true)
 
-sed = find_program('sed', required : true)
-
 system_wide = get_option('system-wide')
 
 eprefix = get_option('eprefix')

[gentoo-commits] proj/gentoolkit:master commit in: /

[Sam James]

commit:     08af5752b8f433ed921ac13128c6f810df1f3fe3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 24 02:50:40 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 24 02:50:40 2023 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=08af5752

.editorconfig: add (import from portage)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .editorconfig | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..68c8e6c
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,21 @@
+# Copyright 2017-2020 Gentoo Authors
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = tab
+indent_size = 4
+tab_width = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{py,yaml,yml}]
+indent_style = space
+
+[pylintrc]
+indent_style = space
+
+[*.py]
+profile = black

[gentoo-commits] proj/gentoolkit:master commit in: /

[Sam James]

commit:     3bb68da27b4c47e86dbfd5f0ae6386a2a53f89f9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 20 04:41:16 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 20 04:41:16 2023 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=3bb68da2

.gitignorerevs: update for Black reformatting

See 5318fb2032cf24beafdda843af83c0a56d6c9dfe.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .gitignorerevs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignorerevs b/.gitignorerevs
index d9d4b22..a061025 100644
--- a/.gitignorerevs
+++ b/.gitignorerevs
@@ -2,3 +2,5 @@
 bbcd72b5fe85fe9bbca1913f8aa22077d94e75d0
 # Reformat with black 22.1.0
 76c188b5189375b3b3b7c92f31491990e29a1669
+# */*: Reformat with newer Black
+5318fb2032cf24beafdda843af83c0a56d6c9dfe

[gentoo-commits] proj/gentoolkit:master commit in: /

[Brian Dolbec]

commit:     9ab5d996f33c219ced4c9ca53d66fb2e6e45a691
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 20:41:36 2022 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 20:48:48 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=9ab5d996

Revert "setup.py: migrate to setuptools"

This reverts commit bbbde97b5e625a49a1a66e307931548cb33f260b.
setuptools only installs data files to the python pkg directory

Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 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.",

[gentoo-commits] proj/gentoolkit:master commit in: /

[Brian Dolbec]

commit:     3946fd19f21ade60c4212c4738292ea5d2e4098b
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 18:58:50 2022 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 18:58:50 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=3946fd19

NEWS: update for point release

Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 NEWS | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/NEWS b/NEWS
index 7976818..14325a8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 News (new features/major bug fixes)
 
+gentoolkit-0.6.1
+----------------
+  * Fix custom TMPL implementation for depends commit 3e35553df4673
+  * fix unused variable detection
+  * migrate setup.py to setuptools
+
+
 gentoolkit-0.6.0
 ----------------
   * merge-driver-ekeyword Fis type annotations

[gentoo-commits] proj/gentoolkit:master commit in: /

[Brian Dolbec]

commit:     bbbde97b5e625a49a1a66e307931548cb33f260b
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 18:33:11 2022 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 18:33:11 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=bbbde97b

setup.py: migrate to setuptools

Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 setup.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 23e9b36..36995de 100755
--- a/setup.py
+++ b/setup.py
@@ -3,8 +3,8 @@
 import re
 import sys
 import subprocess
-from distutils import core
-from distutils.cmd import Command
+
+from setuptools import setup, Command
 from glob import glob
 
 import os
@@ -67,7 +67,7 @@ manpages = [
 ]
 
 
-class set_version(core.Command):
+class set_version(Command):
     """Set python __version__ and bash VERSION to our __version__."""
 
     description = "hardcode scripts' version using VERSION from environment"
@@ -130,7 +130,7 @@ test_data = {
     ]
 }
 
-core.setup(
+setup(
     name="gentoolkit",
     version=__version__,
     description="Set of tools that work with and enhance portage.",

[gentoo-commits] proj/gentoolkit:master commit in: /

[Brian Dolbec]

commit:     ca7731ef8d12d23d5164de801dd2bfba2d3767e9
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 17:18:11 2022 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 17:18:11 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=ca7731ef

v0.6.0

Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 NEWS | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/NEWS b/NEWS
index b542cf1..7976818 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,37 @@
 News (new features/major bug fixes)
 
+gentoolkit-0.6.0
+----------------
+  * merge-driver-ekeyword Fis type annotations
+  * equery changes removal
+  * Convert from tab indent to spaces, format cleanup
+  * Add github action to check formatting, add unit testing
+  * Add flake testing to github action
+  * ChangeLog cleanups
+  * imlate: Remove 'experimental' code
+  * Remove remnants of herds support
+  * man page updates/fixes
+  * euse: migrate egrep -> grep -E
+  * Add python 3.10, 3.11 testing to tox.ini
+  * implement --unique-use option for eclean-pkg
+  * eshowkw: Fix bug 503366 row alignment issue
+  * revdep-rebuild: set up a child logger with propagate = False
+  * Add -f/--forced-masked to equery uses
+  * metadata.py: Don't fail on unmatched package
+  * equery: update linguas->l10n option
+  * equery: Add -F TMPL option to depends module
+  * revdep-rebuild.sh: use awk command instead of gawk
+  * ekeyword: remove .ebuild file suffix requirement (bug 762331)
+  * eclean: Complete migration to imported emaint code
+  * eclean: add early return for empty DISTDIR
+  * enalyze: Fix missing newline at end of saved rebuild files
+  * equery: Turn off color when piping is set
+  * equery meta: Fix missing description when not in metadata.xml
+  * equery meta: Migrate to portage's MetadataXML class
+  * equery check: Fix exception handling for Insufficient permissions
+  * equery depends: Fix a traceback due to UnboundLocalError:
+
+
 gentoolkit-0.5.1
 ----------------
   * Added support for Python 3.9

[gentoo-commits] proj/gentoolkit:master commit in: /

[Matt Turner]

commit:     ce483bc1151dfe5cae266ecf1547320051da0e73
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 10 04:23:54 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 04:23:54 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=ce483bc1

Remove AUTHORS*

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 AUTHORS                | 64 --------------------------------------------------
 AUTHORS.gentoolkit-dev |  6 -----
 2 files changed, 70 deletions(-)

diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index b7843a8..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1,64 +0,0 @@
-* Misc contributors
-  Brandon Low <lostlogic@gentoo.org>
-  Ian Leitch <port001@gentoo.org>
-
-* gentoolkit
-  Original author: Karl Trygve Kalleberg <karltk@gentoo.org>
-  Library additions and refactor: Douglas Anderson <douglasjanderson@gmail.com>
-  Current maintainer: Paul Varner <fuzzyray@gentoo.org>
-
-* glsa-check
-  Author: Marius Mauch <genone@gentoo.org>
-
-* ebump
-  Original author: Karl Trygve Kalleberg <karltk@gentoo.org>
-  Christian Ruppert <idl0r@gentoo.org>
-
-* eclean
-  Original author: Thomas de Grenier de Latour (tgl) <degrenier@easyconnect.fr>
-  re-write author Brian Dolbec <dolsen@gentoo.org>
-
-* enalyze
-  Original author: Brian Dolbec <dolsen@gentoo.org>
-
-* ekeyword
-  Current python version: Mike Frysinger <vapier@gentoo.org>
-  Previous perl version:
-    Christian Ruppert <idl0r@gentoo.org>
-    Paul Varner <fuzzyray@gentoo.org>
-    Mike Frysinger <vapier@gentoo.org>
-  Original author:
-    Aron Griffis <agriffis@gentoo.org>
-
-* epkginfo
-  Author: Ned Ludd <solar@gentoo.org>
-  earch: Eldad Zack <eldad@gentoo.org>
-  metadata: Olinger <EvvL AT RustedHalo DOT net>
-
-* equery
-  Original author: Karl Trygve Kalleberg <karltk@gentoo.org>
-  0.3.0 author: Douglas Anderson <douglasjanderson@gmail.com>
-  api rewrite work for 0.3.0 Brian Dolbec <dolsen@gentoo.org
-
-* eread
-  Original author: Donnie Berkholz <dberkholz@gentoo.org>
-  Updated by: Uwe Klosa <uwe.klosa@gmail.com>
-
-* eshowkw (python version)
-  Original author: "Tomáš Chvátal <scarabeus@gentoo.org>"
-
-* euse
-  Original perl version: Arun Bhanu <codebear@gentoo.org>
-  New bash version: Marius Mauch <genone@gentoo.org>
-  package.use support: Jared Hancock
-
-* imlate
-  Author: Christian Ruppert <idl0r@gentoo.org>
-
-* revdep-rebuild
-  Original author: Stanislav Brabec
-  Rewrite author: Michael A. Smith
-
-* revdep-rebuild (python version)
-  Original author: Slawek Lis
-

diff --git a/AUTHORS.gentoolkit-dev b/AUTHORS.gentoolkit-dev
deleted file mode 100644
index f8c9389..0000000
--- a/AUTHORS.gentoolkit-dev
+++ /dev/null
@@ -1,6 +0,0 @@
-Christian Ruppert <idl0r@gentoo.org>
-Paul Varner <fuzzyray@gentoo.org>
-Karl Trygve Kalleberg <karltk@gentoo.org>
-
-See the AUTHORS file in the various src/<foo> subdirectories for a full
-log of who's done what with whom and when.

[gentoo-commits] proj/gentoolkit:master commit in: /

[Matt Turner]

commit:     be0612a7698049ee7fb07149a0b9a7fa5ac443f3
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 10 04:23:38 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 04:23:38 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=be0612a7

Remove ChangeLog

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 ChangeLog | 934 --------------------------------------------------------------
 1 file changed, 934 deletions(-)

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index a7ff478..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,934 +0,0 @@
-Please see https://gitweb.gentoo.org/proj/gentoolkit.git/log/
-Alternatively, you can use 'git log' on a copy of the repository
-
-2010-01-04: Paul Varner <fuzzyray@gentoo.org>
-	* euse: Merge euse from bug #259318 written by Jared Hancock. This
-	version is a significant rewrite and add supports for utilizing
-	package.use.
-
-2010-11-24: Paul Varner <fuzzyray@gentoo.org>
-	* euse: Fix euse to look for portage configuration files in both the
-	old and new paths. bug 346519. Make euse work in prefix environments.
-
-2010-10-29: Tomáš Chvátal <scarabeus@gentoo.org>
-	* eshowkw: Add new module as drop-in replacement for eshowkw from
-	gentoolkit-dev
-
-2010-05-13: Christian Ruppert <idl0r@gentoo.org>
-	* eclean/cli.py: Fix typo, bug 319349, thanks to Ulrich Müller
-	<ulm@gentoo.org>.
-
-2010-05-06: Christian Ruppert <idl0r@gentoo.org>
-	* revdep-rebuild: Make revdep-rebuild more quiet, bug 97073. We might
-	improve that a bit more in the future.
-
-2010-04-17: Christian Ruppert <idl0r@gentoo.org>
-	* euse: Make python code of euse python-3 compatible, thanks to Arfrever
-	Frehtes Taifersar Arahesis <arfrever@gentoo.org>.
-
-2010-04-11: Christian Ruppert <idl0r@gentoo.org>
-	* euse: Fix check for /etc/make.profile, check if its readable and a
-	directory instead of checking if its a link. Thanks to Phillip Brink
-	(ohnobinki) <ohnobinki@ohnopublishing.net>.
-
-2010-04-06: Christian Ruppert <idl0r@gentoo.org>
-	* euse: Fix query to get USE, bug 181309, thanks to Jean-Baptiste Rouault
-	<jbrouault@gmail.com>.
-
-2010-04-01: Christian Ruppert <idl0r@gentoo.org>
-	* revdep-rebuild: Use EMERGE_OPTIONS _after_ EMERGE_DEFAULT_OPTS,
-	bug 307023, thanks to Albert W. Hopkins <marduk@python.net>.
-
-2010-03-31: Christian Ruppert <idl0r@gentoo.org>
-	* epkginfo: Fix epkginfo to handle ambiguous package names.
-	* revdep-rebuild: Check if $ERRORS_FILE exist before running gawk on it.
-
-2010-03-09: Paul Varner <fuzzyray@gentoo.org>
-	* gentoolkit: Add inital py3k support.
-	* analyse: Add new analyse utility from dol-sen. This will probably
-	change to a different name for final gentoolkit-0.3.0 release.
-
-2010-02-05: Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Update revdep-rebuild to use extended regular
-	expressions instead of basic regular expressions. (Bug 143498)
-
-2010-02-04: Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Fix revdep-rebuild to handle include statements in
-	/etc/ld.so.conf. (Bug 298651)
-
-2010-31-01: Christian Ruppert <idl0r@gentoo.org>
-	* revdep-rebuild: Check for eerror in die() since an invalid option(long) or
-	missing arg will end up in calling die() before /etc/init.d/functions.sh
-	has been sourced.
-
-2009-01-11: Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Set environment using 'portageq -v' (Bug 300229)
-
-2009-01-08: Paul Varner <fuzzyray@gentoo.org>
-	* epkginfo/equery: Fix expkinfo to not traceback if herds.xml is not
-	present in the tree. (Bug 300108)
-
-2009-12-17: Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Fix revdep-rebuild to properly honor
-	PORTAGE_NICENESS as an incremental to the current nice level (Bug
-	297174).
-
-2009-12-08: Paul Varner <fuzzyray@gentoo.org>
-	* gentoolkit: Merge rev 113 from djanderson's genscripts repo
-
-2009-10-30: Christian Ruppert <idl0r@gentoo.org>
-	* revdep-rebuild: Speedup portageq queries. Include FuzzyRay's patch to
-		respect EMERGE_DEFAULT_OPTS.
-
-2009-10-27: Christian Ruppert <idl0r@gentoo.org>
-	* revdep-rebuild: Use realpath in get_file_owner to be able to get the
-		package containing e.g. /lib/libreadline.so.6 on amd64, fixes bug 280341.
-
-2009-10-27: Christian Ruppert <idl0r@gentoo.org>
-	* revdep-rebuild.1: Fix bug 281050, thanks to Jesús Guerrero
-		<i92guboj@gentoo.org>.
-
-2009-10-26: Christian Ruppert <idl0r@gentoo.org>
-	* euse: Don't add an additional new line at the end of file.
-	* equery.1: Fix bug 248844, thanks to J M W <ultip@ymail.com>.
-
-2009-08-18: Robert Buchholz <rbu@gentoo.org>
-	* glsa-check: Remove 'new' target from glsa-list, everyone
-	should use 'affected' or 'all'
-	* glsa-check: fix getminupgrade API doc and TypeError (Bug 281101)
-	* glsa-check: Make --pretend output in glsa-check nicer.
-	Add colors and fix linebreaks.
-
-2009-06-22: Paul Varner <fuzzyray@gentoo.org>
-	* glsa-check: Fix traceback with glsa-check -f (Bug 275105)
-
-2009-06-05: Paul Varner <fuzzyray@gentoo.org>
-	* epkginfo: Add patch from Sebastian Mingramm to Make epkginfo slot
-	aware and only print keywords for the highest visible versions in each
-	slot. (Bug 232635)
-
-2009-05-20: Paul Varner <fuzzyray@gentoo.org>
-	* All: Convert from using /etc/gentoolkit-version to
-	/usr/share/gentoolkit/VERSION
-
-2009-05-20: Paul Varner <fuzzyray@gentoo.org>
-	* glsa-check: Add patches from Robert Buchholz to do the following:
-	Handle unicode encoding better, python tweaks to speedup execution,
-	change behavior of getMinUpgrade, restructure system affection
-	detection, and do not inject GLSAs into the checkfile when fixing.
-
-2009-05-07: Paul Varner <fuzzyray@gentoo.org>
-	* equery: Add patch from djanderson to make meta get and check package
-	dirs in a manner similar to other gentoolkit scripts and fix
-	some docstrings. (Bug 268895)
-
-2009-05-05: Paul Varner <fuzzyray@gentoo.org>
-	* equery: Added modular rewrite from djanderson
-	* gentoolkit: Added modular rewrite from djanderson
-	* All: converted to setup.py build system
-
-2009-04-30: Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Add patch from loki_val to check -l dependencies in 
-	.la files (Bug #267898)
-
-2009-04-24: Paul Varner <fuzzyray@gentoo.org>
-	* ekeyword: Fix to handle multiline KEYWORDS (Bug #267250)
-
-2009-01-08: Paul Varner <fuzzyray@gentoo.org>
-	* equery: Fix package.py to account for PORTDIR being a symbolic link
-	when checking if a package is in an overlay. (Bug #253968)
-
-2008-11-25: Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Fixes for non-linux Gentoo systems. Add patch from
-	igli to fix find command to comply with POSIX. Change awk calls to
-	gawk.
-
-2008-11-11: Paul Varner <fuzzyray@gentoo.org>
-	* echangelog: Add --strict option (Bug 246242).
-	* echangelog: Fix processing of virtual category (Bug 179530)
-
-2008-09-17: Paul Varner <fuzzyray@gentoo.org>
-	* euse: Fix check_sanity function to use get_all_make_defaults
-	function when checking for the make.defaults files in the profile.
-	(Bug #233651)
-
-2008-09-03: Paul Varner <fuzzyray@gentoo.org>
-	* equery: Fix depgraph function to print out dependencies that don't
-	resolve to a package (Bug #236492)
-
-2008-08-26: Paul Varner <fuzzyray@gentoo.org>
-	* glsa-check: Fix has_key() deprecation message. (Bug #232797)
-	* revdep-rebuild: Update fix for Bug 232270 to utilize better patch
-	from Ian Abbott.
-
-2008-08-22: Paul Varner <fuzzyray@gentoo.org>
-	* gentoolkit: Fix find_packages and find_installed_packages to print
-	a warning instead of a traceback when an InvalidAtom exception occurs.
-	(Bug #234358)
-	* equery: Fix equery belongs to strip multiple slashes from path
-	names. (Bug #234584)
-
-2008-07-24: Paul Varner <fuzzyray@gentoo.org>
-	* equery: Fix equery check to convert mtime to an integer so that
-	comparisions always work. Thanks to Alexey Parshin for discovering the
-	problem and providing a patch. (Bug 232803)
-
-2008-07-22: Paul Varner <fuzzyray@gentoo.org>
-	* gentoolkit: Fix gentoolkit.split_package_name to work with
-	newer portage.catpkgsplit that now returns a tuple instead of a
-	list. (Bug 232599)
-
-2008-07-21: Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Fix filtering of masked paths from SEARCH_DIRS
-	variable. (Bug 232270)
-
-2008-07-18: Paul Varner <fuzzyray@gentoo.org>
-	* equery: Remove prefixed '+/-' signs from IUSE for equery uses
-	command. (Bug 232019)
-
-2008-07-09: Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Fix revdep-rebuild to use TMPDIR instead of HOME for
-	temporary files. (Bug 203414)
-	* revdep-rebuild: Fix revdep-rebuild to not evaluate broken objects
-	multiple times. (Bug 220761)
-
-2008-07-09: Paul Varner <fuzzyray@gentoo.org>
-	* gentoolkit: Fix gentoolkit to work without thread support in 
-	python. (Bug 223255)
-
-2008-06-16: Marius Mauch <genone@gentoo.org>
-	* euse: Add support for multi-parent profiles, account for missing 
-	final newline in make.conf
-
-2008-03-19: Paul Varner <fuzzyray@gentoo.org>
-	* glsa-check: Fix imports so mail functionality in glsa-check works
-	with python versions less than 2.5 (Bug 211706)
-
-2008-03-13: Paul Varner <fuzzyray@gentoo.org>
-	* euse: Add --info-installed option from patch provided by Andreas
-	Waidler. (Bug 212573)
-
-2008-03-13: Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Fix trying to emerge an empty list of packages. (Bug
-	213294)
-
-2008-02-28: Paul Varner <fuzzyray@gentoo.org>
-	* gentoolkit: Fix traceback when accessing the portage
-	db. (Bug #211716)
-
-2008-02-21: Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: "Use /etc/init.d/functions.sh instead of
-	/sbin/functions.sh. (Bug 210940)
-
-2008-02-18: Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Apply patch to allow combined short options.
-	(Bug 188343)
-	* revdep-rebuild: Don't duplicate broken file output. (Bug 201319)
-	* revdep-rebuild: unset GREP_OPTIONS to prevent problems with grep.
-	(Bug 189257)
-	* revdep-rebuild: Apply patch to prevent false matches of object names.
-	(Bug 196460)
-	* revdep-rebuild: Apply patch to better handle masked and removed
-	packages. (Bug 205227)
-	* revdep-rebuild: Filter SEARCH_DIRS_MASK paths from SEARCH_DIRS.
-	(Bug 194993)
-	* revdep-rebuild: Apply patch for revdep-rebuild portable find function.
-	(Bug 194234)
-	* equery: Fix equery list to not generate an internal portage error when
-	fed input with too many slashes. (Bug 119806)
-	* equery: Assume the -p flag when equery list -I is used by itself.
-	(Bug 106278)
-
-
-2007-10-09: Marius Mauch <genone@gentoo.org>
-	* glsa-check: Change "affected" target so it's based on "new" instead of 
-	"all" (IOW: exclude already applied/injected GLSAs).
-
-2007-10-05: Marius Mauch <genone@gentoo.org>
-	* glsa-check: Use UTF-8 strings to avoid EncodeErrors if a GLSA contains
-	non-ascii characters (bug #162493)
-
-2007-09-19: Paul Varner <fuzzyray@gentoo.org>
-	* epkginfo: Fix handling of KEYWORDS="" in an ebuild. (Bug #193108)
-	* revdep-rebuild: Fix handling of /var/db/pkg when it is a symbolic
-	link. (Bug #179392)
-
-2007-09-18: Paul Varner <fuzzyray@gentoo.org>
-	* equery: Apply patch from Carlo Marcelo Arenas Belon to fix incorrect
-	display of masking status in list command. (Bug #188678)
-	* revdep-rebuild: Correctly handle LD_LIBRARY_MASK when checking for
-	"no version information" errors/ (Bug #182882)
-
-2007-09-12: Paul Varner <fuzzyray@gentoo.org>
-	* eclean: Fix processing of the long arguments to work correctly. (Bug
-	#192345)
-	* revdep-rebuild: Correctly handle the case where an ebuild no longer
-	exists for a package (Bug #188918)
-	* eread: Fix eread to not accept invalid input for file selection.
-	(Bug #189994)
-
-2007-08-08: Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Fix progress bar to only update when there is a
-	change (Bug #186945)
-	* revdep-rebuild: Ensure that we source functions.sh before calling
-	ewarn, etc.
-
-2007-08-06: Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Fix processing of .la files (Bug #187453)
-	* revdep-rebuild: Add -X option back for backwards compatibilty (Bug
-	#187366)
-
-2007-07-30: Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Fix grepping for non-existant package-owners file
-	(Bug #187141)
-
-2007-07-05: Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Added refactored revdep-rebuild from Michael A.
-	Smith (Bug #184042)
-
-2007-05-30: Marius Mauch <genone@gentoo.org>
-	* glsa-check: check SLOT when selecting and displaying upgrades
-	* glsa-check: new --emergelike option to use the best version 
-	within the same SLOT instead of the one with the smallest delta.
-	* glsa-check: prefer visible upgrades to masked upgrades
-	* equery: check for and warn about unknown options (bug 119674)
-	* equery,eclean,glsa-check,epkginfo: Only add /usr/lib/portage/pym 
-	to python search path when necessary
-
-2007-05-21: Paul Varner <fuzzyray@gentoo.org>
-	* echangelog: Add patch from genstef to fix issues from Bug 176337
-
-2007-05-11: Paul Varner <fuzzyray@gentoo.org>
-	* eclean: Changed permission check to see if you are either root or
-	belong to the portage group (Bug #177385)
-
-2007-05-11: Paul Varner <fuzzyray@gentoo.org>
-	* eclean: Updated eclean to not delete metadata.dtd by default (Bug
-	#176951)
-
-2007-05-10: Marius Mauch <genone@gentoo.org>
-	* euse: Fix incorrect flag status display when a flag appears multiple
-	times in a single location
-
-2007-04-25: Paul Varner <fuzzyray@gentoo.org>
-	* echangelog: Re-added subversion/git support with fixes from genstef.
-	(Bug #136048)
-
-2007-04-24: Paul Varner <fuzzyray@gentoo.org>
-	* etcat: Removed from Makefile (deprecated since 04-25-2005)
-	* qpkg: Removed from Makefile (deprecated since 04-25-2005)
-
-2007-04-23: Paul Varner <fuzzyray@gentoo.org>
-	* genpkgindex, epkginfo: Move to /usr/bin from
-	/usr/lib/gentoolkit/bin (Bug #175759)
-
-2007-04-10: Paul Varner <fuzzyray@gentoo.org>
-	* equery: Change equery uses to command to display the best matching
-	uninstalled package version if an uninstalled package is specified.
-	Changed the meaning of -a to mean display all versions. (Bug #152325)
-
-2007-04-01: Alec Warner <antarus@gentoo.org>
-	* eread: Fix path and fully qualified paths (Bug #172969)
-
-2007-03-31: Paul Varner <fuzzyray@gentoo.org>
-	* equery: Fix traceback in equery which (Bug #134053)
-
-2007-03-29: Paul Varner <fuzzyray@gentoo.org>
-	* gentoolkit: Change package.get_???_deps() methods to try the portage
-	tree first, since emerge always uses the portage tree for dependencies.
-	(Bug #164678)
-
-2007-03-29: Paul Varner <fuzzyray@gentoo.org>
-	* equery: Convert deprecated strings functions to str methods (Bug
-	#172694)
-
-2007-03-25: Paul Varner <fuzzyray@gentoo.org>
-	* echangelog: Remove subversion/git patch due to many bugs.
-
-2007-03-18 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Change --no-color to --nocolor for consistency
-	within gentoolkit. (Bug #165165)
-
-2007-03-16 Paul Varner <fuzzyray@gentoo.org>
-	* gentoolkit: Fix typo in package.py (Bug #168347)
-
-2007-03-15 Paul Varner <fuzzyray@gentoo.org>
-	* equery: Fix equery check to not fail for symlinks prefixed with ./
-	(Bug #170702)
-
-2007-03-14 Paul Varner <fuzzyray@gentoo.org>
-	* equery: Trim trailing slash from query for equery belongs command
-	(Bug #170981)
-
-2007-03-13 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Fix bug with --package-names option not rebuilding
-	packages (Bug #169761)
-
-2007-03-10 Paul Varner <fuzzyray@gentoo.org>
-	* equery: Add --depth option to equery depgraph to limit the depth of
-	the dependency graph. (Bug #115807)
-
-2007-03-09 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Add support to detect "no version information
-	available" message from ldd (Bug #169973)
-
-2007-03-08 Paul Varner <fuzzyray@gentoo.org>
-	* equery: Improved handling of KeyError in equery depends command
-	(Bug #169929)
-
-2007-03-07 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Change ordering algorithm to use --deep instead of
-	--emptytree on the advice of zmedico
-
-2007-02-26 Marius Mauch <genone@gentoo.org>
-	* glsa-check: Display access information in verbose list mode (bug 168482)
-
-2007-02-19 Paul Varner <fuzzyray@gentoo.org>
-	* echangelog: Updated to support git and subversion (Bug #136048)
-
-2007-01-10 Paul Varner <fuzzyray@gentoo.org>
-	* epkgmove: removed epkgmove command due to popular demand. (Bug
-	161360)
-	* gensync: Deprecated gensync in favor of app-portage/layman (multiple
-	bugs)
-
-2007-01-02 Paul Varner <fuzzyray@gentoo.org>
-	* equery: Fix equery depends --indirect command. (Bug #124552)
-
-2006-12-31 Paul Varner <fuzzyray@gentoo.org>
-	* equery: Reworked equery depends command to be more accurate.
-
-2006-12-13 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Fix handling of /etc/portage/package.mask (Bug
-	#158025) Thanks to Wolfram Schlich for the patch.
-
-2006-12-12 Paul Varner <fuzzyray@gentoo.org>
-	* equery: Add --tree option to equery files command. (Bug #62898)
-	Thanks to scope for the patch.
-
-2006-12-06 Paul Varner <fuzzyray@gentoo.org>
-	* equery: Modify equery size command to work like the equery list
-	command for pkgspec arguments
-
-2006-11-27 Paul Varner <fuzzyray@gentoo.org>
-	* eclean: Fix typographical error in help and man page. (Bug #156243)
-
-2006-10-11 Paul Varner <fuzzyray@gentoo.org>
-	* equery: Fix fileAsStr to understand device files.
-	(http://forums.gentoo.org/viewtopic-p-3639575.html)
-
-2006-10-07 Paul Varner <fuzzyray@gentoo.org>
-	* euse: Fix quoting bug in get_real_path() (Bug #150335).
-
-2006-09-21 Paul Varner <fuzzyray@gentoo.org>
-	* eread: Add eread script for reading and managing portage ELOG files.
-	Thanks to Donnie Berkholz for writing this.
-
-2006-09-03 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Remove unused environment variables before calling
-	emerge (Bug #142074). Check for permissions to write temporary files
-	(Bug #142308)
-
-2006-08-12 Marius Mauch <genone@gentoo.org>
-	* glsa-check: Add new --mail option to send out vulnerability reports
-	(output of --list plus --dump for each matched glsa as attachment),
-	using elog configuration.
-
-2006-07-31 Paul Varner <fuzzyray@gentoo.org>
-	* euse: Replace calls to readlink with bash function for Gentoo/ALT
-	compatibility. (Bugs #140477, #128960)
-
-2006-07-28 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Fix revdep-rebuild to correctly handle --ask being
-	passed to emerge. Thanks to Sal Gonzalez <ghostx@optonline.net> for
-	the patch. (Bug #37485)
-
-2006-07-07 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Rename --no-path to --no-ld-path and change
-	functionality to not set LD_LIBRARY_PATH.  This fixes bug #96946 as
-	well as bug #137313
-	* revdep-rebuild: Apply patch from truedfx to fix bug #38751
-
-2006-07-05 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Add --no-path option to revdep-rebuild for bug
-	#137313
-
-2006-06-25 Marius Mauch <genone@gentoo.org>
-	* glsa-check: update cve code for bug 128115
-
-2006-06-14 Paul Varner <fuzzyray@gentoo.org>
-	* gentoolkit: Fix package.py to honor $ROOT. (bug #136811)
-
-2006-05-22 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Use qfile to locate packages if portage-utils is
-	installed (Bug #128374). Be even more paranoid about extra slashes in
-	path names (Bug #128108). Remove unused code. Update configuration
-	section of manpage (Bug #126038).
-
-2006-04-02 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Remove double-slashes from path names (Bug #128108)
-
-2006-04-01 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Add fix so that packages no longer in the tree cause
-	errors (Bug #128174). Fix case where masked packages cause
-	revdep-rebuild to not rebuild any packages (Bug #128085)
-
-2006-03-29 Marius Mauch <genone@gentoo.org>
-	* euse: Add support for special %active argument as placeholder for
-	active use flags
-
-2006-03-26 Aron Griffis <agriffis@gentoo.org>
-	* echangelog: Don't warn about missing ebuilds when updating 
-	  copyrights #120061
-
-2006-03-25 Aron Griffis <agriffis@gentoo.org>
-	* eviewcvs: Update for sources.gentoo.org, add subversion support
-
-2006-03-21 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Fix to clear environment before portageq call. (Bug
-	#126038)
-
-2006-03-08 Paul Varner <fuzzyray@gentoo.org>
-	* genpkgindex: Add binary package indexing utility. (Bug 82132)
-
-2006-03-01 Paul Varner <fuzzyray@gentoo.org>
-	* gentoolkit: Fix depends parsing to properly handle conjunction. (bug
-	#123725). Thanks to tgl for the patch.
-	* gentoolkit: Added function to get post-merge dependencies (PDEPEND)
-	(bug #99191)
-	* gentoolkit: Change get_dependency functions to always use the
-	portage tree
-	* equery: Added post-merge dependencies to depends and depgraph
-	actions. (bug #99191)
-	* equery: Removed requirement for package to be installed to use
-	depgraph action.
-
-2006-02-16 Marius Mauch <genone@gentoo.org>
-	* euse: add/remove use flags even if there is no USE= statement in make.conf
-	(bug #95432)
-
-2006-02-16 Marius Mauch <genone@gentoo.org>
-	* glsa-check: Fix bug causing the wrong summary to be displayed 
-	for --test --verbose (bug #123084)
-
-2006-02-06 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Reset PORTAGE_NICENESS, so that emerge is not niced
-	twice. Thanks to Lukas Reck for the patch. (Bug 121482)
-
-2006-01-24 Marius Mauch <genone@gentoo.org>
-	* glsa-check: Use vbd information in verbose list mode (patch by solar)
-
-2006-01-18 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Add capability to check libtool .la files for
-	non-existant references.
-
-2006-01-06 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Fix revdep-rebuild to play nicely with portage-2.1
-	(Bug 118124)
-
-2005-12-28 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Fix to automatically determine how to call find (Bug 111203)
-
-2005-12-19 Paul Varner <fuzzyray@gentoo.org>
-	* eclean: Add regular expression matching for exclude files (Bug 114365)
-
-2005-12-13 Paul Varner <fuzzyray@gentoo.org>
-	* equery: Fix USE flag parsing. (Bug 115294)
-
-2005-12-07 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Fix revdep-rebuild to work with findutils-4.2.27.
-	(bug 111203)
-	* equery: Added note to error message about quoting redirection
-	characters. (Bug 113423)
-	* gentoolkit: Removed python-config call from make file. (Bug 113386)
-
-2005-11-23 Paul Varner <fuzzyray@gentoo.org>
-	* equery: Changed default behavior for equery list to search for
-	partial name matches. Added equery list examples to the equery man
-	page. (Bugs 113032, 113134)
-
-2005-11-15 Marius Mauch <genone@gentoo.org>
-	* glsa-check: Changed several messages to stderr instead of stdout
-	* glsa-check: Added new --cve option as requested by solar (bug 98589)
-	* glsa-check: Added support for a EMERGE_OPTS env variable to modify the emerge call of glsa-check --fix
-	* glsa-check: Added a new target "affected"
-	* glsa-check: Removed the warning message as it is now pretty much tested
-	* glsa-check: Show GLSA title on --test if --verbose is also used
-	
-2005-11-11 Paul Varner <fuzzyray@gentoo.org>
-	* equery: Added sanity check to equery files (Bug 75983)
-	* equery: Fix string matching for equery depends (Bug 85653)
-	* gentoolkit: Fix package.size() to report correct size for symbolic
-	links (Bug 90384)
-	* equery: Fix equery depgraph to show all dependencies (Bug 99191)
-	* equery: Fix traceback with invalid regular expression for equery
-	list (Bug 109392)
-
-2005-11-04 Paul Varner <fuzzyray@gentoo.org>
-	* equery: Fix equery belongs to correctly work when passed an argument
-	list of multiple files (Bug 111501)
-
-2005-11-02 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Fix to work with findutils-4.2.25 (Bug 111203)
-
-2005-10-18 Paul Varner <fuzzyray@gentoo.org>
-	* equery: Make equery look at both DEPEND and RDEPEND for dependencies
-	* gentoolkit: Fix _parse_deps to understand || syntax (Bug 101377)
-
-2005-10-14 Paul Varner <fuzzyray@gentoo.org>
-	* equery: Add qpkg --dups functionality to equery list command (bug
-	109156)
-
-2005-10-13 Paul Varner <fuzzyray@gentoo.org>
-	* equery: equery depgraph shows USE flags (Bug 74554)
-	* equery: equery should properly parse use.local.desc (Bug 74569)
-	* equery: equery list escapes regular expressions (Bug 77113)
-	* equery: equery uses displays flags correctly (Bug 86633)
-	* equery: equery -N option to disable pipe detection (Bug 90046)
-	* equery: equery list properly detects version string (Bug 91286)
-	* equery: equery belongs now requires a filename (Bug 94618)
-	* equery: equery files over a pipe only prints file names (Bug 100148)
-	* revdep-rebuild: Fix typo in man page (Bug 109147)
-
-2005-09-25 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Update to read configuration files from
-	/etc/revdep-rebuild
-
-2005-09-23 Paul Varner <fuzzyray@gentoo.org>
-	* equery: Sort output from equery list (bug 67152)
-	* equery: Update man page (Bugs 73893, 74944)
-	* equery: equery which returns best-visible ebuild (bug 78687)
-	* equery: equery --quiet is actually quiet (bug 78921)
-	* equery: Fixed typo in equery -h (bug 82352)
-	* gentoolkit: gentoolkit now uses a single portage.config object (bug
-	90680)
-	* equery: equery uses returns unique, sorted list (bug 91623)
-	* equery: equery always honors nocolor flag and settings (bug 98634)
-
-2005-09-08 Paul Varner <fuzzyray@gentoo.org>
-	* eclean: Inital commit of eclean 0.4.1 from Thomas de Grenier de
-	Latour (tgl) <degrenier@easyconnect.fr> (bug 33877)
-
-2005-06-28 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Revert fix for bug 93574 as it can cause packages to
-	be missed. (bug 97171)
-
-2005-06-07 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Delete temporary files if the environment does not 
-	match the previous environment (bug 95274)
-
-2005-06-05 Paul Varner <fuzzyray@gentoo.org>
-	* revdep-rebuild: Imported revdep-rebuild release from bug 62644
-	* revdep-rebuild: Major changes to the functionality when using 
-	--package-names/-X The script should now update slotted packages 
-	correctly. (bug 22161)
-	* revdep-rebuild: Customizable searching controlled through environment
-	variables.  This removes the need for end users to directly modify the
-	script. (bugs 32276, 38011, 59803)
-	* revdep-rebuild: The directories to search are no longer hard coded
-	into the script.  revdep-rebuild now determines the directories to
-	search based upon /etc/profile.env and /etc/ld.so.conf. (bugs 32276,
-	38011, 89781)
-	* revdep-rebuild: --ignore option to ignore temporary files left from
-	previous runs. Automatically ignore temporary files older than 24 hours.
-	(bug 34052)
-	* revdep-rebuild: Always return an exit status based upon success or
-	failure. (bug 38472)
-	* revdep-rebuild: Fixed to only emerge packages with direct missing
-	dependencies. (bug 38487)
-	* revdep-rebuild: New man page. (bug 40042)
-	* revdep-rebuild: emerge is no longer called with --nodeps. This allows
-	for needed dependencies to be pulled in. (bug 62893)
-	* revdep-rebuild: Cleaned up grammatical errors (bug 85278)
-	* revdep-rebuild: Added support for revdep-rebuild --soname 
-	/path/to/library.so (bug 91503)
-	* revdep-rebuild: Removed symbolically linked directories from search
-	(bug 93574)
-	* revdep-rebuild: --nocolor option to turn off colored output, the
-	script also obeys the NOCOLOR setting from /etc/make.conf.
-	* revdep-rebuild: Removed dependency on qpkg
-	* revdep-rebuild: Script uses PORTAGE_NICENESS from /etc/make.conf
-	* revdep-rebuild: Undocumented --keep-temp option.  This is primarily
-	for debugging/testing. This option prevents temporary files from being
-	deleted.
-	* revdep-rebuild: Changed --soname --soname-regexp options to --library
-	and treat all arguments as basic regular expressions. --soname and
-	--soname-regexp can still be used as options for backwards
-	compatability.
-	* revdep-rebuild: Removed requirement to keep revdep-rebuild and emerge
-	options distinct. Options that are unrecognized by revdep-rebuild are
-	passed directly to emerge.
-
-2005-04-30 Marius Mauch <genone@gentoo.org>
-	* glsa-check: add V to short option list so it actually works
-	* equery: added new option --name-only to belongs command to make it
-	"emerge-compatible"
-	
-2005-04-26 Marius Mauch <genone@gentoo.org>
-	* gentoolkit: fix broken Makefile
-	* gentoolkit: add some sticky tape to get the stupid thing working again
-	* equery: fix a few minor problems
-
-2005-04-25 Marius Mauch <genone@gentoo.org>
-	* qpkg: moving to /usr/share/doc/gentoolkit-*/deprecated
-	* etcat: moving to /usr/share/doc/gentoolkit-*/deprecated
-	* revdep-rebuild: replacing qpkg call with equivalent grep/sed call
-
-2005-04-07 Marius Mauch <genone@gentoo.org>
-	* euse: fixed bugs 74344, 75525 and 84521
-	* euse: add better support for cascaded profiles
-	* glsa-check: use --oneshot (bug 79819)
-	* glsa.py: fix stupid revision comparison bug (bug 75233)
-
-2005-03-12 Aron Griffis <agriffis@gentoo.org>
-	* Added eviewcvs to -dev, utility for generating viewcvs URLs
-
-2005-03-01 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* Dropped epkgmove from the -dev
-	* Released gentoolkit-dev-0.2.3
-
-2005-03-01 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* Released gentookit-dev-0.2.2
-
-2004-12-09 Marius Mauch <genone@gentoo.org>
-	* glsa.py: Another stupid bug, this time revisionMatch() broke as
-	~foobar-rN isn't valid anymore
-
-2004-12-08 Marius Mauch <genone@gentoo.org>
-	* equery: implemented the --category option
-	* glsa-check: fixed the bug where it wanted to unnecessary merge masked
-	packages
-	* glsa-check: added a check to verify that all non-option arguments are
-	valid GLSAs
-	* glsa.py: changed the outfile parameter in Glsa.dump() to outstream so
-	we don't have to open/close a file which breaks pipes
-	* glsa.py: checks now for python versions below 2.3 and throws an
-	exception
-
-2004-11-29 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* branched v0-3-0: major rework in equery is in progess. the main
-	branch is reserved for minor and incremental fixups.
-
-2004-10-20 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* release.sh: New script that automates the relase of a new gentoolkit
-	relase. Only works for gentoolkit-dev at the moment.
-	* src/echangelog/Makefile: Fixed spurious '}'
-	* Released gentoolkit-dev-0.2.1
-
-2004-10-31 Marius Mauch <genone@gentoo.org>
-	* qpkg: security fix for bug #68846
-
-2004-10-20 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* etcat: fixed get_use_vars to get_use_flags, fixes #67349.
-
-2004-10-18 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* gentoolkit: collapsed ChangeLog into base ChangeLog
-	* gentoolkit: reverted indenting back to tabs, due to loud protests
-	from Marius;)
-	* equery: collapsed ChangeLog into base ChangeLog
-	* equery: reverted indenting back to tabs, due to loud protests from
-	Marius;)
-	* equery: minor syntactical cleanups.
-	* equery: minor documentation improvements
-	* equery: added errors module that will hold various types of internal
-	errors raised.
-	* equery: added try block around on md5sum check, which fails on various
-	conditions like insufficient permission or stale temporary checksum
-	files.
-
-2004-10-17 Marius Mauch <genone@gentoo.org>
-	* equery: fix for bug #67473 (checking md5sums of prelinked binaries)
-	* equery: fix for bug #67275 (--nocolor didn't work as configure was
-	called before parsing the arguments
-	* equery: changed defaults for `equery depends` as making a depgraph for
-	the full portage tree isn't a good idea and find_all_packages() uses way
-	to much memory currently
-	* euse: replaced the old perl version with a newly written bash version.
-
-2004-10-12 Marius Mauch <genone@gentoo.org>
-	* equery: fix for bug #67210
-
-2004-10-10 Marius Mauch <genone@gentoo.org>
-	* Removed old-scripts directory from gentoolkit
-	* euse: added a errormessage that it doesn't support cascading profiles
-	* equery: small bugfixes
-	* equery: performance speedup for `equery belongs` by using portage
-	directly
-	* equery: added MD5 verification to `equery check`
-	* equery: renamed 'hasuses' to 'hasuse'
-	* equery: added filter patch for `equery files` from bug 43422, thanks
-	to degrenier@easyconnect.fr
-	* Released gentoolkit-0.2.0_pre10
-
-2004-10-10 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* equery: Added unit tests for all supported commands
-	* equery: Fixed printing order and recognition of overlay, #53432.
-
-2004-10-11 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* gentoolkit: Split gentoolkit.py into helpers.py and package.py
-
-2004-10-10 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* gentoolkit: Fixed Makefiles to work with posix-compatible shells
-	* gentoolkit: Fixed is_overlay() to report properly, #53432.
-
-2004-10-06 Marius Mauch <genone@gentoo.org>
-	* glsa.py: Convert Unicode strings to ascii before passing them to
-	portage
-	* glsa.py: Some formatting fixes for dump()
-	* glsa.py: changed the matching routines so the reports are hopefully
-	more accurate
-	* glsa-check: added color support 
-	* glsa-check: added a --verbose option to show the warnings about
-	invalid GLSAs
-
-2004-09-30 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* equery: Added unit tests for --help
-	* equery: Added unit tests for 'files'
-
-2004-09-27 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* gentoolkit: Added find_installed_packages
-	* equery: Added short commands
-	* equery: Fixed copyright dates
-	* equery: Fixed belongs to search only installed packages
-	* equery: Fixed reporting bug in uses command
-	* equery: Fixed reference to cppv
-	* equery: Added import of die
-	* equery: Added searching header to uses
-	* equery: Fixed hasuses to report properly
-	* Released gentoolkit-0.2.0_pre9
-	* Released gentoolkit-dev-0.2.0_pre4
-
-2004-09-08 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* equery: Added man page rewrites by Katerina Barone-Adesi
-	<katerinab@gmail.com>, fixes #63045
-	* equery: Fixed spacing issues with files, fixes #63036.
-	* equery: Added depends command by Olivier Crete <tester@gentoo.org>,
-	fixes #40830.
-	* equery: Reworked output yet again.
-	* equery: Belongs handles multiple files on the command line, partially
-	fixes #62361.
-	* gentoolkit: Reworked printing functions
-
-2004-08-29 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* gentoolkit: Added printing functions
-	* equery: Added check for bad regexp in belongs, fixes #58494
-	* equery: Added proper error reporting to stderr, fixes #57580
-
-2004-08-22 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* gentoolkit: Fixed Package.get_env_var to use the correct tree db.
-	* gentoolkit: Renamed Package.get_use_vars to Package.get_use_flags
-	* equery: Searches now include masked packages, when installed.
-	* equery: Fixed output to be piping-friendly
-	* equery: Added -N option to force non-piping output
-	* equery: Added hasuses command
-
-2004-08-01 Marius Mauch <genone@gentoo.org>
-	* Fixed grep expression for `qpkg -f`
-
-2004-05-04 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* equery: Added a -f/--full-regex option to belongs and some logic so
-	users can do belongs ant, belongs /usr/bin/ant and belongs -f ".*ant.*"
-	while getting sensible results. Fixes #37637.
-
-2004-04-14 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* Released gentoolkit-dev-0.2.0_pre3
-
-2004-03-31 Marius Mauch <genone@gentoo.org>
-	* glsa-check: updates, fixing #45528 and #45522, adding support for rXX
-	operators and passing filenames as arguments to Glsa()
-
-2004-03-13 Marius Mauch <genone@gentoo.org>
-	* Added glsa-check and glsa.py, please note:
-		- they are only temporary for testing, so no manpage/ChangeLog
-		- their CVS home is in gentoo-projects
-	* fixed bugs #42160, #40935, #43389
-	* equery: fixing descriptions for local USE flags
-	* equery: more checking on exceptions
-
-2004-02-08 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* Added ebump
-	* Added gensync
-	* Added epkgmove, closes #36663.
-
-2004-02-06 Marius Mauch <genone@gentoo.org>
-	* fixed bugs #40159, #39798, #39652, #39596, #39293
-	* changed etcat and equery behavior for ambigous package names,
-		they now return values for all matching packages rather
-		than erroring out
-	* added "will be phased out" messages to etcat and qpkg
-
-2004-01-23 Marius Mauch <genone@gentoo.org>
-	* lots of bugfixes
-	* equery: now catches Exceptions thrown by portage
-	* equery: minor bugfixes
-
-2004-01-14 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* Added src/ego to gentoolkit-dev
-
-2004-01-12 Marius Mauch <genone@gentoo.org>
-	* equery: added mask, keyword and slot information to list command
-	* equery: fixed traceback in equery
-	* equery: added more information on "equery list"
-
-2004-01-10 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* Added src/ego
-
-2004-01-07 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* equery: Added Makefile
-	* Added new build system
-	* Added src/old-scripts, the scripts from app-portage/gentoolkit
-	* Renamed gentool to equery
-	* Released 0.2.0_pre1
-
-2003-12-31 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* equery: Added which command
-	* equery: Added check command (not finished)
-
-2003-12-12 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* equery: Added size command
-	* equery: Added depgraph command
-
-2003-12-11 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* equery: Added list command
-	* equery: Added uses command
-
-2003-12-08 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* Removed emerge-rsync, emerge-webrsync
-	* Added moo
-	* Added skeleton man pages to all packages
-	* Added Makefile
-
-2003-10-05 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* equery: Added files command
-	* equery: Added belongs command
-
-2003-10-04 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* Rewrote dep-clean to python
-
-2003-06-31 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* Rewrote more of etcat; many of the functions now employ
-		gentoolkit.
-	* Replaced qpkg with stubs of a reimplementation in python.
-
-2003-06-27 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* Added patch to echangelog to consider PORTDIR, fixes #23881.
-
-2003-06-26 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* Added echangelog, by agenkin
-	* Added ekeyword, by agenkin
-	* Added gentoolkit, the common python library for all Gentoolkit tools.
-	* Revived pkg-size as a testbed for the gentoolkit library
-	* Fixed some minor issues in qpkg
-	* Added revdep-rebuild-1
-	* Added revdep-rebuild-2
-	* Restructuring etcat
-	* Fixed some minor issues in dep-clean
-
-2002-11-21 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* Renamed pkg-size to gentool-package-size
-	* Renamed pst-package-count to gentool-package-count
-	* Retired rest of pst-* stuff
-
-2002-08-06 Karl Trygve Kalleberg <karltk@gentoo.org>
-	* Created separate CVS module for Gentoolkit
-	* Restructured directory hierarchy

[gentoo-commits] proj/gentoolkit:master commit in: /

[Sam James]

commit:     c621bc4ee5cf6e65819eebd80718f2d6788185ac
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  9 10:48:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb  9 10:48:40 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=c621bc4e

.gitignorerevs: add Black 22.1.0 reformatting commit

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .gitignorerevs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignorerevs b/.gitignorerevs
index 86287dd..d9d4b22 100644
--- a/.gitignorerevs
+++ b/.gitignorerevs
@@ -1,2 +1,4 @@
 # Run entire repository through black. Also, change tabs to spaces
 bbcd72b5fe85fe9bbca1913f8aa22077d94e75d0
+# Reformat with black 22.1.0
+76c188b5189375b3b3b7c92f31491990e29a1669

[gentoo-commits] proj/gentoolkit:master commit in: /

[Matt Turner]

commit:     b404fbd432ab3e38d03e65c216fc10515dcd0133
Author:     Wolfgang E. Sanyer <WolfgangESanyer <AT> gmail <DOT> com>
AuthorDate: Tue Sep 21 14:59:33 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Sep 21 20:59:29 2021 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=b404fbd4

Add CI badge to README for unit tests

Signed-off-by: Wolfgang E. Sanyer <WolfgangESanyer <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index edc961b..2ad5e63 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Unit tests](https://github.com/gentoo/gentoolkit/actions/workflows/ci.yml/badge.svg)](https://github.com/gentoo/gentoolkit/actions/workflows/ci.yml)
+
 MOTIVATION
 ==========
 

[gentoo-commits] proj/gentoolkit:master commit in: /

[Matt Turner]

commit:     4dae464170a0cdd20bf42f88b16c57bf761149bf
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 20 23:01:40 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Sep 20 23:01:40 2021 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=4dae4641

README.md: Improve formatting and remove gentoolkit-dev refs

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 README.md | 40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 1e63c25..edc961b 100644
--- a/README.md
+++ b/README.md
@@ -1,34 +1,28 @@
 MOTIVATION
 ==========
 
-The gentoolkit and gentoolkit-dev packages contain a collection of useful
-administration scripts particular to the Gentoo Linux distribution. It contains
-rough drafts and implementations of features that may in time make it into
-Portage, or into full-fledged tools in their own right.
-
-The gentoolkit-dev package is intended primarily for Gentoo developers.
+The gentoolkit package contains a collection of useful administration scripts
+particular to the Gentoo Linux distribution. It contains rough drafts and
+implementations of features that may in time make it into Portage, or into
+full-fledged tools in their own right.
 
 CONTENTS
 ========
 
 gentoolkit
 ----------
-ebump          - Ebuild revision bumper
-eclean         - tool to clean up outdated distfiles and packages
-ekeyword       - modify package KEYWORDS
-enalyze        - Analyze all installed pkgs or rebuild package.* files
-epkginfo       - wrapper to equery: Display metadata about a given package.
-equery         - replacement for etcat and qpkg
-eread          - script to read portage log items from einfo, ewarn etc.
-eshowkw        - Display keywords for specified package(s)
-euse           - tool to manage USE flags
-imlate         - Displays candidates for keywords for an architecture...
-qpkg           - convient package query tool (deprecated)
-revdep-rebuild - scans/fixes broken shared libs and binaries
-
-gentoolkit-dev
---------------
-DEPRECATED
+- ebump          - Ebuild revision bumper
+- eclean         - tool to clean up outdated distfiles and packages
+- ekeyword       - modify package KEYWORDS
+- enalyze        - Analyze all installed pkgs or rebuild package.* files
+- epkginfo       - wrapper to equery: Display metadata about a given package.
+- equery         - replacement for etcat and qpkg
+- eread          - script to read portage log items from einfo, ewarn etc.
+- eshowkw        - Display keywords for specified package(s)
+- euse           - tool to manage USE flags
+- imlate         - Displays candidates for keywords for an architecture...
+- qpkg           - convient package query tool (deprecated)
+- revdep-rebuild - scans/fixes broken shared libs and binaries
 
 IMPROVEMENTS
 ============
@@ -36,4 +30,4 @@ IMPROVEMENTS
 Any suggestions for improvements should be sent to tools-portage@gentoo.org, or
 added as a bug assigned to us.
 
-We only accept new contributions if they are written in bash or python.
+We only accept new contributions if they are written in Bash or Python.

[gentoo-commits] proj/gentoolkit:master commit in: /

[Matt Turner]

commit:     9f1ba87c7d813c48ee3dc7655395dccd716efdcf
Author:     Wolfgang E. Sanyer <WolfgangESanyer <AT> gmail <DOT> com>
AuthorDate: Mon Sep 20 13:48:04 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Sep 20 22:51:52 2021 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=9f1ba87c

Change README to markdown and move authors to AUTHORS

Signed-off-by: Wolfgang E. Sanyer <WolfgangESanyer <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 AUTHORS             |  4 ++++
 README => README.md | 16 +++++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 6d98b5d..b7843a8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,7 @@
+* Misc contributors
+  Brandon Low <lostlogic@gentoo.org>
+  Ian Leitch <port001@gentoo.org>
+
 * gentoolkit
   Original author: Karl Trygve Kalleberg <karltk@gentoo.org>
   Library additions and refactor: Douglas Anderson <douglasjanderson@gmail.com>

diff --git a/README b/README.md
similarity index 78%
rename from README
rename to README.md
index 4ec4fc9..1e63c25 100644
--- a/README
+++ b/README.md
@@ -1,13 +1,5 @@
-Package: gentoolkit/gentoolkit-dev
-Authors: Aron Griffis <agriffis@gentoo.org>
-         Brandon Low <lostlogic@gentoo.org>
-         Ian Leitch <port001@gentoo.org>
-         Karl Trygve Kalleberg <karltk@gentoo.org>
-         Marius Mauch <genone@gentoo.org>
-         Paul Varner <fuzzyray@gentoo.org>
-         See src/<tool>/AUTHORS for tool-specific authors
-
 MOTIVATION
+==========
 
 The gentoolkit and gentoolkit-dev packages contain a collection of useful
 administration scripts particular to the Gentoo Linux distribution. It contains
@@ -17,9 +9,10 @@ Portage, or into full-fledged tools in their own right.
 The gentoolkit-dev package is intended primarily for Gentoo developers.
 
 CONTENTS
+========
 
 gentoolkit
-==========
+----------
 ebump          - Ebuild revision bumper
 eclean         - tool to clean up outdated distfiles and packages
 ekeyword       - modify package KEYWORDS
@@ -34,10 +27,11 @@ qpkg           - convient package query tool (deprecated)
 revdep-rebuild - scans/fixes broken shared libs and binaries
 
 gentoolkit-dev
-==============
+--------------
 DEPRECATED
 
 IMPROVEMENTS
+============
 
 Any suggestions for improvements should be sent to tools-portage@gentoo.org, or
 added as a bug assigned to us.

[gentoo-commits] proj/gentoolkit:master commit in: /

[Matt Turner]

commit:     2aa793a77774d9ad9cdf850ba8013cdf70a7b008
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 20 22:56:36 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Sep 20 22:56:36 2021 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=2aa793a7

tox: Update tested implementation list

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index dcaedad..2a5f581 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py37,py38,pypy3,flake8
+envlist = py37,py38,py39,pypy3,flake8
 skip_missing_interpreters = True
 
 [testenv]

[gentoo-commits] proj/gentoolkit:master commit in: /

[Matt Turner]

commit:     548c180f92cd4adfd42c2403e61629267fa32b73
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  2 03:25:32 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Mar  2 03:29:12 2021 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=548c180f

v0.5.1

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 NEWS | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/NEWS b/NEWS
index 21c4c86..b542cf1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,14 @@
 News (new features/major bug fixes)
 
+gentoolkit-0.5.1
+----------------
+  * Added support for Python 3.9
+  * Removed support for Python < 3.6 and other clean ups
+  * merge-driver-ekeyword: Added git merge driver for automatically resolving
+    conflicts involving the KEYWORDS=... line
+  * equery: Removed 'changes' subcommand
+  * Enable ekeyword unit tests
+
 gentoolkit-0.5.0
 ----------------
   * discontinued Support for Python 2

[gentoo-commits] proj/gentoolkit:master commit in: /

[Michał Górny]

commit:     31281f93a7e337d70768c10a5381d333b676f1cc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 08:33:47 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 08:33:47 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=31281f93

v0.5.0

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 NEWS | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/NEWS b/NEWS
index 3d5d3d3..21c4c86 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 News (new features/major bug fixes)
 
+gentoolkit-0.5.0
+----------------
+  * discontinued Support for Python 2
+  * ekeyword and eshowkw now share logic for determining arch status
+  * support for arches.desc to determine arch/~arch
+  * updated fallback ~arch list with ~ia64 and ~m68k
+
 gentoolkit-0.4.8
 ----------------
   * eclean packages: Add --changed-deps option to remove binpkgs

[gentoo-commits] proj/gentoolkit:master commit in: /

[Michał Górny]

commit:     112ba2f23bfaea56c4376ae22e24508b4a0ebd9e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 07:48:53 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 07:49:01 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=112ba2f2

Disable testing on py27

sys-apps/portage is no longer installed for py27, and the tests use
global installation.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 610e506..dcaedad 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py36,py37,py38,pypy3,flake8
+envlist = py36,py37,py38,pypy3,flake8
 skip_missing_interpreters = True
 
 [testenv]

[gentoo-commits] proj/gentoolkit:master commit in: /

[Matt Turner]

commit:     724a7a9061bc3c1aaf5635a9d3a3e41a96afbbc3
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 12 16:48:52 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 16:48:52 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=724a7a90

v0.4.8

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 NEWS | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/NEWS b/NEWS
index fc6919f..3d5d3d3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 News (new features/major bug fixes)
 
+gentoolkit-0.4.8
+----------------
+  * eclean packages: Add --changed-deps option to remove binpkgs
+                     whose runtime depenedencies have changed
+  * revdep-rebuild: Encode Popen arguments as utf8 (bug 709610)
+
 gentoolkit-0.4.7
 ----------------
   * eshowkw: Add alpha to ~arch-only arches

[gentoo-commits] proj/gentoolkit:master commit in: /

[Michał Górny]

commit:     3f97d7a554f40882a1b58f6d89b78cb04e38c76c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 26 15:21:32 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 05:44:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=3f97d7a5

Cherry-pick v0.4.7

Accidentally failed to push it to master.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 NEWS | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/NEWS b/NEWS
index a2c73fa..fc6919f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 News (new features/major bug fixes)
 
+gentoolkit-0.4.7
+----------------
+  * eshowkw: Add alpha to ~arch-only arches
+  * Fixed deprecation warnings
+
 gentoolkit-0.4.6
 ----------------
   * glsa-check moved to portage repository (bug 463952)

[gentoo-commits] proj/gentoolkit:master commit in: /

[Michał Górny]

commit:     999ece8c0090df89ba217fee249286d8eb4d6eac
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 26 15:19:54 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan 26 15:19:54 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=999ece8c

tox: Update tested implementation list

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 41306b1..610e506 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py35,py36,py37,flake8
+envlist = py27,py36,py37,py38,pypy3,flake8
 skip_missing_interpreters = True
 
 [testenv]

[gentoo-commits] proj/gentoolkit:master commit in: /

[Zac Medico]

commit:     7620bc05f60b38331e8c13bb1f909e153073e80c
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 03:49:30 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 03:49:30 2019 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=7620bc05

v0.4.6

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 NEWS | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/NEWS b/NEWS
index 8e498f5..a2c73fa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 News (new features/major bug fixes)
 
+gentoolkit-0.4.6
+----------------
+  * glsa-check moved to portage repository (bug 463952)
+  * equery: fix incorrect status for forced flags (bug 634824)
+  * revdep-rebuild: Fix pass_through_options to handle args containing
+    spaces
+
 gentoolkit-0.4.5
 ----------------
   * Include BDEPEND in dep checks

[gentoo-commits] proj/gentoolkit:master commit in: /

[Virgil Dupras]

commit:     af2acfa8d08a5503a8ce8fd95f8d965f6649da1e
Author:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Sat May 11 23:08:48 2019 +0000
Commit:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Sat May 11 23:08:48 2019 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=af2acfa8

v0.4.5

Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>

 NEWS | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/NEWS b/NEWS
index 7eacb10..8e498f5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,13 @@
 News (new features/major bug fixes)
 
+gentoolkit-0.4.5
+----------------
+  * Include BDEPEND in dep checks
+
+gentoolkit-0.4.4
+----------------
+  * eshowkw: Add riscv to ~arch-only arches
+
 gentoolkit-0.4.3
 ----------------
   * epkginfo: Add 'reverse' display option for equery

[gentoo-commits] proj/gentoolkit:master commit in: /

[Virgil Dupras]

commit:     7e1e18aeb7e6ab7528dbe09af73c6922cceee091
Author:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  1 01:42:44 2019 +0000
Commit:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Mon Apr  1 01:43:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=7e1e18ae

Updated NEWS for v0.4.{1,2,3}

Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>

 NEWS | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/NEWS b/NEWS
index 9309ab8..7eacb10 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,22 @@
 News (new features/major bug fixes)
 
+gentoolkit-0.4.3
+----------------
+  * epkginfo: Add 'reverse' display option for equery
+  * Speed up "equery depends" by a great deal
+  * Fix broken test suite and add new tests
+  * Add tox config
+
+gentoolkit-0.4.2
+----------------
+  * Improve keyword grouping and sorting in eshowkw
+  * Bug fixes in eshowkw
+
+gentoolkit-0.4.1
+----------------
+  * ekeyword: Support sorting keywords without additional changes
+  * Bug fixes in revdep_rebuild, equery, eclean
+
 gentoolkit-0.4.0
 ----------------
   * Merge ekeyword, ebump, imlate tools from gentoolkit-dev

[gentoo-commits] proj/gentoolkit:master commit in: /

[Virgil Dupras]

commit:     fdd23db536034e4e13fe2121ff155d9151744b45
Author:     Virgil Dupras <hsoft <AT> hardcoded <DOT> net>
AuthorDate: Tue Aug 14 13:41:21 2018 +0000
Commit:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Tue Aug 14 13:41:21 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=fdd23db5

Add tox.ini

The goal is for the `tox` command to be the only command to run to
verify the quality of the code before a commit.

 .gitignore |  1 +
 tox.ini    | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/.gitignore b/.gitignore
index 3b6d6ef..63ee53f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ build
 __pycache__
 *.py[c,o]
 dist
+/.tox

diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..b7bcbdb
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,15 @@
+[tox]
+envlist = py27,py35,py36,py37,pyflakes
+skip_missing_interpreters = True
+
+[testenv]
+commands =
+    python setup.py test
+sitepackages = True
+
+[testenv:pyflakes]
+deps =
+    pyflakes
+commands =
+    pyflakes pym
+sitepackages = False

[gentoo-commits] proj/gentoolkit:master commit in: /

[Mike Frysinger]

commit:     09eefa9f81a619ad2bf699345ed215ac0dcc1300
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 01:40:03 2017 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 01:40:50 2017 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=09eefa9f

AUTHORS: fix some typos

 AUTHORS.gentoolkit-dev | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AUTHORS.gentoolkit-dev b/AUTHORS.gentoolkit-dev
index ca985ba..f8c9389 100644
--- a/AUTHORS.gentoolkit-dev
+++ b/AUTHORS.gentoolkit-dev
@@ -2,5 +2,5 @@ Christian Ruppert <idl0r@gentoo.org>
 Paul Varner <fuzzyray@gentoo.org>
 Karl Trygve Kalleberg <karltk@gentoo.org>
 
-See the AUTHOR file in the various src/<foo> subdirectories for a full
-log of who's done what with whome and when.
+See the AUTHORS file in the various src/<foo> subdirectories for a full
+log of who's done what with whom and when.

[gentoo-commits] proj/gentoolkit:master commit in: /

[Brian Dolbec]

commit:     f9957006a58c366269f5812a99ccfca6c68b99cf
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 20:53:08 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 20:53:08 2017 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=f9957006

Update NEWS for a release

 NEWS | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/NEWS b/NEWS
index 512254a..9309ab8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 News (new features/major bug fixes)
 
+gentoolkit-0.4.0
+----------------
+  * Merge ekeyword, ebump, imlate tools from gentoolkit-dev
+  * Deprecate remaining gentoolkit-dev tools
+
+
 gentoolkit-0.3.2
 ----------------
   * revdep-rebuild masks fixed

[gentoo-commits] proj/gentoolkit:master commit in: /

[Brian Dolbec]

commit:     f689285ef0bd20553dd5b65ccf1868e0300c8570
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 20:12:23 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 20:12:44 2017 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=f689285e

setup.py: Add imlate man page for the version update

 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 23b986d..7d170e2 100755
--- a/setup.py
+++ b/setup.py
@@ -61,6 +61,7 @@ manpages = [(os.path.join(cwd, path[0]), path[1]) for path in (
 	('man/eshowkw.1', 'ESHOWKW'),
 	('man/euse.1', 'EUSE'),
 	('man/glsa-check.1', 'GLSA-CHECK'),
+	('man/imlate.1', 'IMLATE'),
 	('man/revdep-rebuild.1', 'REVDEP-REBUILD'),
 )]
 

[gentoo-commits] proj/gentoolkit:master commit in: /

[Brian Dolbec]

commit:     d36ae80991167884dc1a96da7d8b8e89a513f5ef
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 12:31:56 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 12:49:59 2017 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=d36ae809

Update .gitignore

 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 443cee8..3b6d6ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 build
 __pycache__
-*.pyc
+*.py[c,o]
+dist

[gentoo-commits] proj/gentoolkit:master commit in: /

[Brian Dolbec]

commit:     82b2756645937eea0bd05349736630cc7b86bc2f
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  1 04:08:04 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Aug  1 04:08:04 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=82b27566

Merge branch 'master' of git+ssh://git.gentoo.org/proj/gentoolkit

 pym/gentoolkit/helpers.py | 3 +++
 1 file changed, 3 insertions(+)

[gentoo-commits] proj/gentoolkit:master commit in: /

[Brian Dolbec]

commit:     b8d6b3893824222017ee2d64ab28857afe098bb5
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  8 15:53:59 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 15:53:59 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=b8d6b389

NEWS: Update for a release

 NEWS | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/NEWS b/NEWS
index 5e349be..512254a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,21 @@
 News (new features/major bug fixes)
 
+gentoolkit-0.3.2
+----------------
+  * revdep-rebuild masks fixed
+  * more unicode fixes
+  * More deprecation warning fixes
+  * glsa bug fix 400763 Apply listing only affected versions patch
+  * eclean fixes and updates
+  * eshowkw fixes and updates
+
+
+gentoolkit-0.3.1
+----------------
+  * Make the python version of revdep-rebuild the default
+  * more unicode fixes
+
+
 gentoolkit-0.3.0
 ----------------
 

[gentoo-commits] proj/gentoolkit:master commit in: /

[Mike Gilbert]

commit:     b9170459203eb1eb988992aebef6be7636e9b26a
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 15:08:57 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 15:10:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=b9170459

Install tmpfiles.d fragment in /usr/lib/tmpfiles.d

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

 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 01e4b3e..024b612 100755
--- a/setup.py
+++ b/setup.py
@@ -148,7 +148,7 @@ core.setup(
 		(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'etc/revdep-rebuild'), ['data/revdep-rebuild/99revdep-rebuild']),
 		(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'etc/eclean'), glob('data/eclean/*')),
 		(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/man1'), glob('man/*')),
-		(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'etc/tmpfiles.d'), ['data/tmpfiles.d/revdep-rebuild.conf']),
+		(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/lib/tmpfiles.d'), ['data/tmpfiles.d/revdep-rebuild.conf']),
 	),
 	cmdclass={
 		'test': load_test(),

[gentoo-commits] proj/gentoolkit:master commit in: /

[Mike Gilbert]

commit:     4e06e9f032ed187ce682434955778c3241854e26
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 20:19:06 2015 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 20:19:06 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=4e06e9f0

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)

[gentoo-commits] proj/gentoolkit:master commit in: /

[Paul Varner]

commit:     b58ce050071eac2208769bbd8241fbecc90e11af
Author:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 18:14:26 2015 +0000
Commit:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 18:14:26 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=b58ce050

Fix spelling error

 README.dev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.dev b/README.dev
index e7f81e6..5348867 100644
--- a/README.dev
+++ b/README.dev
@@ -16,7 +16,7 @@ coordinated with fuzzyray and/or dolsen.
 If you create a release and it breaks, please fix it.
 
 Any non Gentoo developers who wish to contribute, the best way to get
-started is by clonig a copy of the repository and submitting patches to
+started is by cloning a copy of the repository and submitting patches to
 bugzilla.  Additionally, we can be found in the #gentoo-portage IRC
 channel.
 

[gentoo-commits] proj/gentoolkit:master commit in: /

[Paul Varner]

commit:     1415ee6c58c52633b801bac79810f9cf463987d7
Author:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 18:10:01 2015 +0000
Commit:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 18:10:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=1415ee6c

Update documentation

Add a pointer to gitweb in Changelog
Update policy for creating releases in README.dev
Remove obsolete TODO file

 ChangeLog  |  3 +++
 README.dev | 11 ++++++++---
 TODO       | 33 ---------------------------------
 3 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7524886..a7ff478 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Please see https://gitweb.gentoo.org/proj/gentoolkit.git/log/
+Alternatively, you can use 'git log' on a copy of the repository
+
 2010-01-04: Paul Varner <fuzzyray@gentoo.org>
 	* euse: Merge euse from bug #259318 written by Jared Hancock. This
 	version is a significant rewrite and add supports for utilizing

diff --git a/README.dev b/README.dev
index 62a35fe..e7f81e6 100644
--- a/README.dev
+++ b/README.dev
@@ -7,11 +7,16 @@ We only have several requirements.  If you want to do a major change (i.e
 rewrite/refactor something), please talk to us before pushing any
 commits. If you break something, please fix it.
 
-If you want a new release of gentoolkit or gentoolkit-dev, please coordinate
-it with fuzzyray (gentoolkit) or idl0r (gentoolkit-dev).
+All members of the Portage or Portage Tools projects are authorized to
+create a new release of gentoolkit or gentoolkit-dev.
+
+All other Gentoo Developers are authorized to create a new release if it is
+coordinated with fuzzyray and/or dolsen.
+
+If you create a release and it breaks, please fix it.
 
 Any non Gentoo developers who wish to contribute, the best way to get
-started is by pulling a copy of the repository and submitting patches to
+started is by clonig a copy of the repository and submitting patches to
 bugzilla.  Additionally, we can be found in the #gentoo-portage IRC
 channel.
 

diff --git a/TODO b/TODO
deleted file mode 100644
index 1cee1a4..0000000
--- a/TODO
+++ /dev/null
@@ -1,33 +0,0 @@
-- equery:
- - add --overlay, --portdir to uses
- - add glsa pkgspec
-  - query for current GLSAs on installed package(s)
-- rewrite ekeywords and echangelog to use gentoolkit
-- merge change and echangelog
-- merge useflag and euse, have _one_ command line tool
-  - update ufed to rely on the CLI tool
-  - update ufed to rely on generate-use
-  - merge generate-use and ufed?
-- write efeatures for turning on/off FEATURES in make.conf
-- look at ekeys, ewatch
-- revision bump tool
- - bump versioned files in filesdir
- - -m for changelog entry
- - use ~/.gentoo/gentoolkit/ebump.conf
- - use /etc/gentoolkit/ebump.conf
-
-equery (modern):
-	Add more --debug stuff
-	Write tests for Dependencies._parser
-	Profile Dependencies._parser
-	Extend PackageFormatter usage to everything that outputs packages to
-	  allow for purvasive use of -F, --format goodness
-
-Ebuild changes:
-	- Add:
-		src_test() {
-			"${python}" setup.py test || die "testing returned non zero"
-		}
-
-For Next Release:
-	- write NEWS file

[gentoo-commits] proj/gentoolkit:master commit in: /

[Paul Varner]

commit:     d0aff719f8b1522c427d3caa9c48bc0fa06e8425
Author:     Slawek Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 12 07:14:47 2014 +0000
Commit:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
CommitDate: Wed Nov 12 07:14:47 2014 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=d0aff719

Merge branch 'gentoolkit' of git+ssh://git.overlays.gentoo.org/proj/gentoolkit into gentoolkit

 bin/revdep-rebuild.sh | 38 ++++++++++++++++++++++++++++++++++++--
 man/revdep-rebuild.1  |  3 +++
 2 files changed, 39 insertions(+), 2 deletions(-)

[gentoo-commits] proj/gentoolkit:master commit in: /

[Paul Varner]

commit:     10ae0f76a9aa56c467f0a9afc187411149444bf5
Author:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
AuthorDate: Fri Feb 11 05:54:34 2011 +0000
Commit:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 05:54:34 2011 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=10ae0f76

Merge branch 'gentoolkit' of git+ssh://git.overlays.gentoo.org/proj/gentoolkit into gentoolkit

 bin/glsa-check                             | 17 ++++++----
 pym/gentoolkit/eshowkw/keywords_content.py | 53 +++++++++++++++++-------------
 pym/gentoolkit/glsa/__init__.py            |  1 +
 3 files changed, 42 insertions(+), 29 deletions(-)

[gentoo-commits] proj/gentoolkit:master commit in: /

[Paul Varner]

commit:     4335bf979f374300ac6678765f490f92ee805ab4
Author:     slis <lis.slawek <AT> gmail <DOT> com>
AuthorDate: Tue Jan 21 10:48:32 2014 +0000
Commit:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 10:48:32 2014 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=4335bf97

Merged revdep-rebuild branch

 bin/{enalyze => revdep-ng}                      |   9 +-
 pym/gentoolkit/revdep_rebuild/analyse.py        | 200 +++++++++++++++++-------
 pym/gentoolkit/revdep_rebuild/assign.py         |  23 ++-
 pym/gentoolkit/revdep_rebuild/cache.py          |  50 +++---
 pym/gentoolkit/revdep_rebuild/collect.py        |  33 ++--
 pym/gentoolkit/revdep_rebuild/rebuild.py        |  30 ++--
 pym/gentoolkit/revdep_rebuild/revdep-rebuild.py |  17 ++
 pym/gentoolkit/revdep_rebuild/runner.py         | 114 ++++++++++++++
 pym/gentoolkit/revdep_rebuild/stuff.py          |   4 +
 9 files changed, 364 insertions(+), 116 deletions(-)

diff --cc pym/gentoolkit/revdep_rebuild/analyse.py
index aad8f81,e630bc9..7b17517
--- a/pym/gentoolkit/revdep_rebuild/analyse.py
+++ b/pym/gentoolkit/revdep_rebuild/analyse.py
@@@ -19,33 -14,35 +19,39 @@@ from .cache import save_cach
  
  
  def prepare_checks(files_to_check, libraries, bits, cmd_max_args):
 -	''' Calls scanelf for all files_to_check, then returns found libraries and dependencies
 +	''' Calls scanelf for all files_to_check,
 +	then returns found libraries and dependencies
  	'''
  
 -	libs = [] # libs found by scanelf
 -	dependencies = [] # list of lists of files (from file_to_check) that uses
 -					  # library (for dependencies[id] and libs[id] => id==id)
 +	# libs found by scanelf
 +	libs = []
 +	# list of lists of files (from file_to_check) that uses
 +	# library (for dependencies[id] and libs[id] => id==id)
 +	dependencies = []
- 	for line in scan(
- 		['-M', str(bits), '-nBF', '%F %n'],
- 		files_to_check, cmd_max_args
- 		):
 +
- 		parts = line.strip().split(' ')
- 		if len(parts) < 2: # no dependencies?
+ 	bits = []
+ 
+ 
+ #	from runner import ScanRunner
+ #	sr = ScanRunner(['-M', str(bits), '-nBF', '%F %n'], files_to_check, cmd_max_args)
+ #	sr.wait()
+ 
+ 	for line in scan(['-M', str(bits), '-nBF', '%F %n %M'], files_to_check, cmd_max_args):
+ 	#call_program(['scanelf', '-M', str(bits), '-nBF', '%F %n',]+files_to_check).strip().split('\n'):
+ 		r = line.strip().split(' ')
+ 		if len(r) < 2: # no dependencies?
  			continue
  
- 		deps = parts[1].split(',')
- 		for dep in deps:
- 			if dep in libs:
- 				index = libs.index(dep)
- 				dependencies[index].append(parts[0])
+ 		deps = r[1].split(',')
+ 		for d in deps:
+ 			if d in libs:
+ 				i = libs.index(d)
+ 				dependencies[i].append(r[0])
  			else:
- 				libs.append(dep)
- 				dependencies.append([parts[0],])
- 
+ 				#print d, 'bits:', r[2][8:] # 8: -> strlen('ELFCLASS')
+ 				libs.append(d)
+ 				dependencies.append([r[0],])
+ 	
  	return (libs, dependencies)
  
  
@@@ -122,21 -136,40 +149,40 @@@ def find_broken(found_libs, system_libr
  	return broken
  
  
+ def find_broken2(scanned_files, logger):
+ 	broken_libs = {}
+ 	for bits, libs in scanned_files.items():
+ 		logger.debug('Checking for bits: %s' % bits)
+ 		alllibs = '|'.join(libs.keys()) + '|'
+ 		for soname, needed in libs.items():
+ 			for l in needed[1]:
+ 				if not l+'|' in alllibs:
+ 					try:
+ 						broken_libs[bits][l].add(soname)
+ 					except KeyError:
+ 						try:
+ 							broken_libs[bits][l] = set([soname])
+ 						except KeyError:
+ 							broken_libs = {bits: {l: set([soname])}}
+ 
+ 	return broken_libs
+ 
+ 
 -def main_checks(found_libs, broken, dependencies, logger):
 +def main_checks(found_libs, broken_list, dependencies, logger):
  	''' Checks for broken dependencies.
  		found_libs have to be the same as returned by prepare_checks
 -		broken is list of libraries found by scanelf
 +		broken_list is list of libraries found by scanelf
  		dependencies is the value returned by prepare_checks
  	'''
  
  	broken_pathes = []
  
 -	for b in broken:
 -		f = found_libs[b]
 +	for broken in broken_list:
 +		found = found_libs[broken]
- 		logger.info('Broken files that requires: ' + bold(found))
+ 		logger.info('Broken files that requires: ' + bold(f))
 -		for d in dependencies[b]:
 -			logger.info(yellow(' * ') + d)
 -			broken_pathes.append(d)
 +		for dep_path in dependencies[broken]:
 +			logger.info(yellow(' * ') + dep_path)
 +			broken_pathes.append(dep_path)
  	return broken_pathes
  
  
@@@ -152,31 -197,20 +210,32 @@@ def analyse(settings, logger, libraries
  	"""
  
  	if libraries and la_libraries and libraries_links and binaries:
 -		logger.info(blue(' * ') + bold('Found a valid cache, skipping collecting phase'))
 +		logger.info(blue(' * ') +
 +			bold('Found a valid cache, skipping collecting phase'))
  	else:
 -		#TODO: add partial cache (for ex. only libraries) when found for some reason
 +		#TODO: add partial cache (for ex. only libraries)
 +		# when found for some reason
  
 -		logger.warn(green(' * ') + bold('Collecting system binaries and libraries'))
 +		logger.warn(green(' * ') +
 +			bold('Collecting system binaries and libraries'))
  		bin_dirs, lib_dirs = prepare_search_dirs(logger, settings)
  
 -		masked_dirs, masked_files, ld = parse_revdep_config(settings['REVDEP_CONFDIR'])
 +		masked_dirs, masked_files, ld = \
 +			parse_revdep_config(settings['REVDEP_CONFDIR'])
- 		lib_dirs.update(ld)
- 		bin_dirs.update(ld)
- 		masked_dirs.update([
- 			'/lib/modules',
- 			'/lib32/modules',
- 			'/lib64/modules'
- 			]
- 			)
+ 		lib_dirs = lib_dirs.union(ld)
+ 		bin_dirs = bin_dirs.union(ld)
 -		masked_dirs = masked_dirs.union(set(['/lib/modules', '/lib32/modules', '/lib64/modules',]))
 -
 -		logger.info(green(' * ') + bold('Collecting dynamic linking informations'))
 -		libraries, la_libraries, libraries_links, symlink_pairs = collect_libraries_from_dir(lib_dirs, masked_dirs, logger)
++		masked_dirs = masked_dirs.union(
++			set([
++				'/lib/modules',
++				'/lib32/modules',
++				'/lib64/modules',
++			])
++		)
 +
 +		logger.info(green(' * ') +
 +			bold('Collecting dynamic linking informations'))
 +		libraries, la_libraries, libraries_links, symlink_pairs = \
 +			collect_libraries_from_dir(lib_dirs, masked_dirs, logger)
  		binaries = collect_binaries_from_dir(bin_dirs, masked_dirs, logger)
  
  		if settings['USE_TMP_FILES']:
@@@ -188,56 -222,75 +247,79 @@@
  			)
  
  
- 	logger.debug('Found '+ str(len(libraries)) +
- 		' libraries (+' + str(len(libraries_links)) +
- 		' symlinks) and ' + str(len(binaries)) +
- 		' binaries')
 -	logger.debug('Found '+ str(len(libraries)) + ' libraries (+' + str(len(libraries_links)) + ' symlinks) and ' + str(len(binaries)) + ' binaries')
++	logger.debug('Found %i libraries (+%i symlinks) and %i binaries' % 
++		(len(libraries), len(libraries_links), len(binaries))
++	)
+ 	logger.info(green(' * ') + bold('Scanning files'))
+ 	
+ 	libs_and_bins = libraries+binaries
  
+ 	scanned_files = scan_files(libs_and_bins, settings['CMD_MAX_ARGS'])
+ 	
  	logger.warn(green(' * ') + bold('Checking dynamic linking consistency'))
- 	logger.debug('Search for ' + str(len(binaries)+len(libraries)) +
- 		' within ' + str(len(libraries)+len(libraries_links)))
- 	libs_and_bins = libraries+binaries
 -	logger.debug('Search for ' + str(len(binaries)+len(libraries)) + ' within ' + str(len(libraries)+len(libraries_links)))
++	logger.debug('Search for %i within %i' % 
++		(len(binaries)+len(libraries), len(libraries)+len(libraries_links))
++	)
+ 	
+ 	broken = find_broken2(scanned_files, logger)
+ 	broken_pathes = main_checks2(broken, scanned_files, logger)
+ 	
+ 	broken_la = extract_dependencies_from_la(la_libraries, libraries+libraries_links, _libs_to_check, logger)
+ 	broken_pathes += broken_la
  
- 	found_libs = []
- 	dependencies = []
+ 	logger.warn(green(' * ') + bold('Assign files to packages'))
+ 
+ 	return assign_packages(broken_pathes, logger, settings)
  
- 	if _libs_to_check:
- 		nltc = []
- 		for ltc in _libs_to_check:
- 			if os.path.isfile(ltc):
- 				ltc = scan(['-nBSF', '%S'], [ltc,], settings['CMD_MAX_ARGS'])[0].split()[0]
- 			nltc += [ltc,]
- 		_libs_to_check = nltc
+ 	import sys
+ 	sys.exit()
+ 	
+ 	#l = []
+ 	#for line in call_program(['scanelf', '-M', '64', '-BF', '%F',] + libraries).strip().split('\n'):
+ 		#l.append(line)
+ 	#libraries = l
  
- 	_bits, linkg = platform.architecture()
- 	if _bits.startswith('32'):
- 		bits = 32
- 	elif _bits.startswith('64'):
- 		bits = 64
+ 	## old version from here
+ 	#found_libs = []
+ 	#dependencies = []
  
- 	broken = []
- 	for av_bits in glob.glob('/lib[0-9]*') or ('/lib32',):
- 		bits = int(av_bits[4:])
+ 	#if _libs_to_check:
+ 		#nltc = []
+ 		#for ltc in _libs_to_check:
+ 			#if os.path.isfile(ltc):
+ 				#ltc = scan(['-nBSF', '%S'], [ltc,], settings['CMD_MAX_ARGS'])[0].split()[0]
+ 			#nltc += [ltc,]
+ 		#_libs_to_check = nltc
  
- 		_libraries = libraries+libraries_links
+ 	#_bits, linkg = platform.architecture()
+ 	#if _bits.startswith('32'):
+ 		#bits = 32
+ 	#elif _bits.startswith('64'):
+ 		#bits = 64
  
- 		found_libs, dependencies = prepare_checks(libs_and_bins,
- 			_libraries, bits, settings['CMD_MAX_ARGS'])
- 		broken = find_broken(found_libs, _libraries, _libs_to_check)
+ 	#import time
+ 	#broken = []
+ 	#for av_bits in glob.glob('/lib[0-9]*') or ('/lib32',):
+ 		#bits = int(av_bits[4:])
  
- 		bits /= 2
- 		bits = int(bits)
+ 		##_libraries = scan(['-M', str(bits), '-BF', '%F'], libraries+libraries_links, settings['CMD_MAX_ARGS'])
+ 		#_libraries = libraries+libraries_links
  
- 	broken_la = extract_dependencies_from_la(la_libraries,
- 		libraries+libraries_links, _libs_to_check, logger)
+ 		#found_libs, dependencies = prepare_checks(libs_and_bins, _libraries, bits, settings['CMD_MAX_ARGS'])
+ 		#broken = find_broken(found_libs, _libraries, _libs_to_check)
  
+ 		#bits /= 2
+ 		#bits = int(bits)
  
- 	broken_pathes = main_checks(found_libs, broken, dependencies, logger)
- 	broken_pathes += broken_la
+ 	#broken_la = extract_dependencies_from_la(la_libraries, libraries+libraries_links, _libs_to_check, logger)
  
- 	logger.warn(green(' * ') + bold('Assign files to packages'))
  
- 	return assign_packages(broken_pathes, logger, settings)
+ 	#broken_pathes = main_checks(found_libs, broken, dependencies, logger)
+ 	#broken_pathes += broken_la
+ 
+ 	#logger.warn(green(' * ') + bold('Assign files to packages'))
+ 
+ 	#return assign_packages(broken_pathes, logger, settings)
  
  
  
diff --cc pym/gentoolkit/revdep_rebuild/assign.py
index e8e87b3,bb9ec1f..2a93fe1
--- a/pym/gentoolkit/revdep_rebuild/assign.py
+++ b/pym/gentoolkit/revdep_rebuild/assign.py
@@@ -27,34 -13,26 +27,49 @@@ def assign_packages(broken, logger, set
  		Broken is list of files
  	'''
  	assigned = set()
- 	if not broken:
- 		return assigned
+ 	for group in os.listdir(settings['PKG_DIR']):
+ 		for pkg in os.listdir(settings['PKG_DIR'] + group):
+ 			f = settings['PKG_DIR'] + group + '/' + pkg + '/CONTENTS'
+ 			if os.path.exists(f):
+ 				try:
+ 					with open(f, 'r') as cnt:
+ 						for line in cnt.readlines():
+ 							m = re.match('^obj (/[^ ]+)', line)
+ 							if m is not None:
+ 								m = m.group(1)
+ 								if m in broken:
+ 									found = group+'/'+pkg
+ 									if found not in assigned:
+ 										assigned.add(found)
+ 									logger.info('\t' + m + ' -> ' + bold(found))
+ 				except Exception as e:
+ 					logger.warn(red(' !! Failed to read ' + f))
  
- 	pkgset = set(get_installed_cpvs())
+ 	return assigned
  
 +	# Map all files in CONTENTS database to package names
 +	fname_pkg_dict = {}
 +	for pkg in pkgset:
 +		contents = Package(pkg).parsed_contents()
 +		for fname in contents.keys():
 +			if contents[fname][0] == "obj":
 +				fname_pkg_dict[fname] = str(pkg)
 +
 +	for fname in broken:
 +		realname = os.path.realpath(fname)
 +		if realname in fname_pkg_dict.keys():
 +			pkgname = fname_pkg_dict[realname]
 +		elif fname in fname_pkg_dict.keys():
 +			pkgname = fname_pkg_dict[fname]
 +		else:
 +			pkgname = None
 +		if pkgname and pkgname not in assigned:
 +			assigned.add(pkgname)
 +		if not pkgname:
 +			pkgname = "(none)"
 +		logger.info('\t' + fname + ' -> ' + bold(pkgname))
 +
 +	return assigned
  
  def get_best_match(cpv, cp, logger):
  	"""Tries to find another version of the pkg with the same slot
diff --cc pym/gentoolkit/revdep_rebuild/cache.py
index d6ef7ce,8b1a8ed..1be8cb0
--- a/pym/gentoolkit/revdep_rebuild/cache.py
+++ b/pym/gentoolkit/revdep_rebuild/cache.py
@@@ -18,54 -12,42 +18,50 @@@ def read_cache(temp_path=DEFAULTS['DEFA
  		This function does not checks if files exists nor timestamps,
  		check_temp_files should be called first
  		@param temp_path: directory where all temp files should reside
 -		@return tuple with values of: libraries, la_libraries, libraries_links, symlink_pairs, binaries
 +		@return tuple with values of:
 +			libraries, la_libraries, libraries_links, symlink_pairs, binaries
  	'''
  
 -	ret = {'libraries':[], 'la_libraries':[], 'libraries_links':[], 'binaries':[]}
 +	ret = {
 +		'libraries':[],
 +		'la_libraries':[],
 +		'libraries_links':[],
 +		'binaries':[]
 +		}
  	try:
- 		for key, val in list(ret.items()):
- 			_file  = open(os.path.join(temp_path, key))
- 			for line in _file .readlines():
+ 		for key,val in ret.iteritems():
 -			f = open(os.path.join(temp_path, key))
 -			for line in f.readlines():
++			_file = open(os.path.join(temp_path, key))
++			for line in _file.readlines():
  				val.append(line.strip())
  			#libraries.remove('\n')
 -			f.close()
 +			_file .close()
  	except EnvironmentError:
  		pass
  
 -	return (ret['libraries'], ret['la_libraries'], ret['libraries_links'], ret['binaries'])
 +	return (ret['libraries'], ret['la_libraries'],
 +		ret['libraries_links'], ret['binaries'])
  
  
- def save_cache(logger, to_save=None, temp_path=DEFAULTS['DEFAULT_TMP_DIR']):
+ def save_cache(logger, to_save={}, temp_path=DEFAULTS['DEFAULT_TMP_DIR']):
  	''' Tries to store caching information.
  		@param logger
 -		@param to_save have to be dict with keys: libraries, la_libraries, libraries_links and binaries
 +		@param to_save have to be dict with keys:
 +			libraries, la_libraries, libraries_links and binaries
  	'''
  
- 	if to_save is None:
- 		to_save = {}
- 
- # TODO: Don't blindly make the cache directory, see Bug 203414
- #	if not os.path.exists(temp_path):
- #		os.makedirs(temp_path)
+ 	if not os.path.exists(temp_path):
+ 		os.makedirs(temp_path)
  
  	try:
 -		f = open(os.path.join(temp_path, 'timestamp'), 'w')
 -		f.write(str(int(time.time())))
 -		f.close()
 +		_file = open(os.path.join(temp_path, 'timestamp'), 'w')
 +		_file.write(str(int(time.time())))
 +		_file.close()
  
- 		for key, val in list(to_save.items()):
+ 		for key,val in to_save.iteritems():
 -			f = open(os.path.join(temp_path, key), 'w')
 +			_file = open(os.path.join(temp_path, key), 'w')
  			for line in val:
 -				f.write(line + '\n')
 -			f.close()
 +				_file.write(line + '\n')
 +			_file.close()
  	except Exception as ex:
  		logger.warn(red('Could not save cache: %s' %str(ex)))
  
@@@ -106,31 -84,23 +101,30 @@@ def check_temp_files(temp_path=DEFAULTS
  
  
  if __name__ == '__main__':
 -	print 'Preparing cache ... '
 +	print('Preparing cache ... ')
  
 -	from collect import *
 +	from .collect import (prepare_search_dirs, parse_revdep_config,
 +		collect_libraries_from_dir, collect_binaries_from_dir)
- 
  	import logging
  
- 	bin_dirs, lib_dirs = prepare_search_dirs(logging, DEFAULTS)
+ 	bin_dirs, lib_dirs = prepare_search_dirs()
  
- 	masked_dirs, masked_files, ld = parse_revdep_config("/etc/revdep-rebuild/")
- 	lib_dirs.update(ld)
- 	bin_dirs.update(ld)
- 	masked_dirs = masked_dirs.update([
- 			'/lib/modules',
- 			'/lib32/modules',
- 			'/lib64/modules'
- 			]
- 		)
+ 	masked_dirs, masked_files, ld = parse_revdep_config()
+ 	lib_dirs = lib_dirs.union(ld)
+ 	bin_dirs = bin_dirs.union(ld)
 -	masked_dirs = masked_dirs.union(set(['/lib/modules', '/lib32/modules', '/lib64/modules',]))
++	masked_dirs = masked_dirs.union(
++		set([
++			'/lib/modules', 
++			'/lib32/modules', 
++			'/lib64/modules',
++		])
++	)
  
- 	libraries, la_libraries, libraries_links, symlink_pairs = \
- 		collect_libraries_from_dir(lib_dirs, masked_dirs, logging)
+ 	libraries, la_libraries, libraries_links, symlink_pairs = collect_libraries_from_dir(lib_dirs, masked_dirs, logging)
  	binaries = collect_binaries_from_dir(bin_dirs, masked_dirs, logging)
  
- 	save_cache(logger=logging,
- 		to_save={'libraries':libraries, 'la_libraries':la_libraries,
+ 	save_cache(logger=logging, 
+ 		to_save={'libraries':libraries, 'la_libraries':la_libraries, 
  			'libraries_links':libraries_links, 'binaries':binaries}
  		)
  
diff --cc pym/gentoolkit/revdep_rebuild/collect.py
index 740ae32,b7ed469..f8ee60d
--- a/pym/gentoolkit/revdep_rebuild/collect.py
+++ b/pym/gentoolkit/revdep_rebuild/collect.py
@@@ -26,8 -22,8 +26,8 @@@ def parse_conf(conf_file, visited=None
  
  	for conf in conf_file:
  		try:
 -			with open(conf) as f:
 -				for line in f.readlines():
 +			with open(conf) as _file:
- 				for line in _file:
++				for line in _file.readlines():
  					line = line.strip()
  					if line.startswith('#'):
  						continue
@@@ -66,13 -62,12 +66,13 @@@ def prepare_search_dirs(logger, setting
  	lib_dirs = set(['/lib', '/usr/lib', ])
  
  	#try:
 -	with open(os.path.join(portage.root, settings['DEFAULT_ENV_FILE']), 'r') as f:
 -		for line in f.readlines():
 +	with open(os.path.join(
 +		portage.root, settings['DEFAULT_ENV_FILE']), 'r') as _file:
- 		for line in _file:
++		for line in _file.readlines():
  			line = line.strip()
 -			m = re.match("^export (ROOT)?PATH='([^']+)'", line)
 -			if m is not None:
 -				bin_dirs = bin_dirs.union(set(m.group(2).split(':')))
 +			match = re.match("^export (ROOT)?PATH='([^']+)'", line)
 +			if match is not None:
 +				bin_dirs.update(set(match.group(2).split(':')))
  	#except EnvironmentError:
  		#logger.debug(yellow('Could not open file %s' % f))
  
@@@ -250,21 -230,17 +250,26 @@@ def collect_binaries_from_dir(dirs, mas
  
  if __name__ == '__main__':
  	import logging
- 	from .settings import DEFAULTS
- 	mbin_dirs, mlib_dirs = prepare_search_dirs(logging, DEFAULTS)
- 
- 	mmasked_dirs, mmasked_files, mld = parse_revdep_config("/etc/revdep-rebuild/")
- 	mlib_dirs.update(mld)
- 	mbin_dirs.update(mld)
- 	mmasked_dirs.update(['/lib/modules', '/lib32/modules', '/lib64/modules'])
+ 	bin_dirs, lib_dirs = prepare_search_dirs(logging)
+ 
+ 	masked_dirs, masked_files, ld = parse_revdep_config()
+ 	lib_dirs = lib_dirs.union(ld)
+ 	bin_dirs = bin_dirs.union(ld)
 -	masked_dirs = masked_dirs.union(set(['/lib/modules', '/lib32/modules', '/lib64/modules',]))
 -
 -	libraries, la_libraries, libraries_links, symlink_pairs = collect_libraries_from_dir(lib_dirs, masked_dirs, logging)
 -	binaries = collect_binaries_from_dir(bin_dirs, masked_dirs, logging)
 -
 -	logging.debug('Found: %i binaries and %i libraries.' %(len(binaries), len(libraries)))
++	masked_dirs = masked_dirs.union(
++		set([
++			'/lib/modules',
++			'/lib32/modules',
++			'/lib64/modules',
++		])
++	)
 +
 +	libraries, la_libraries, libraries_links, msymlink_pairs = \
 +		collect_libraries_from_dir(mlib_dirs, mmasked_dirs, logging)
 +	binaries = collect_binaries_from_dir(mbin_dirs, mmasked_dirs, logging)
 +
 +	logging.debug(
 +		'Found: %i binaries and %i libraries.' %(
 +		len(binaries), len(libraries)))
  
  
  
diff --cc pym/gentoolkit/revdep_rebuild/rebuild.py
index 8d21b76,a943902..386ac33
--- a/pym/gentoolkit/revdep_rebuild/rebuild.py
+++ b/pym/gentoolkit/revdep_rebuild/rebuild.py
@@@ -103,10 -103,10 +103,11 @@@ def parse_options()
  			'keep-temp', 'library=', 'no-ld-path', 'no-order',
  			'pretend', 'no-pretend', 'no-progress', 'quiet', 'verbose'])
  
 +		do_help = False
  		for key, val in opts:
  			if key in ('-h', '--help'):
- 				do_help = True
+ 				print_usage()
+ 				sys.exit(0)
  			elif key in ('-q', '--quiet'):
  				settings['quiet'] = True
  				settings['VERBOSITY'] = 0
@@@ -134,9 -134,6 +135,7 @@@
  		print(red('Unrecognized option\n'))
  		print_usage()
  		sys.exit(2)
- 	if do_help:
- 		print_usage()
- 		sys.exit(0)
++
  	return settings
  
  
@@@ -195,25 -181,25 +194,33 @@@ def main(settings=None, logger=None)
  	if not settings['stdout'].isatty() or settings['nocolor']:
  		nocolor()
  
 +	#TODO: Development warning
 +	logger.warn(blue(' * ') +
 +		yellow('This is a development version, '
 +			'so it may not work correctly'))
 +	logger.warn(blue(' * ') +
 +		yellow('The original revdep-rebuild script is '
 +			'installed as revdep-rebuild.sh'))
 +
  	if os.getuid() != 0 and not settings['PRETEND']:
 -		logger.warn(blue(' * ') + 
 +		logger.warn(blue(' * ') +
  			yellow('You are not root, adding --pretend to portage options'))
  		settings['PRETEND'] = True
+ 	elif not settings['PRETEND'] \
+ 			and settings['IS_DEV'] \
+ 			and not settings['NO_PRETEND']:
+ 		logger.warn(blue(' * ') + 
+ 			yellow('This is a development version, '
+ 				'so it may not work correctly'))
+ 		logger.warn(blue(' * ') + 
+ 			yellow('Adding --pretend to portage options anyway'))
+ 		logger.info(blue(' * ') + 
+ 			'If you\'re sure, you can add --no-pretend to revdep options')
+ 		settings['PRETEND'] = True
  
- 	if settings['library']:
- 		logger.warn(green(' * ') +
- 			"Looking for libraries: %s" % (bold(', '.join(settings['library']))))
- 
+ 	analyze_cache = {}
  	if settings['USE_TMP_FILES'] \
- 			and check_temp_files(settings['DEFAULT_TMP_DIR'], logger=logger):
+ 			and check_temp_files(settings['DEFAULT_TMP_DIR']):
  		libraries, la_libraries, libraries_links, binaries = read_cache(
  			settings['DEFAULT_TMP_DIR'])
  		assigned = analyse(
diff --cc pym/gentoolkit/revdep_rebuild/stuff.py
index e78748c,7b287b1..0bebce2
--- a/pym/gentoolkit/revdep_rebuild/stuff.py
+++ b/pym/gentoolkit/revdep_rebuild/stuff.py
@@@ -43,12 -31,11 +43,16 @@@ def scan(params, files, max_args)
  	return out
  
  
+ def exithandler(signum, frame):
+ 	sys.exit(1)
+ 
+ 
  def get_masking_status(ebuild):
 +	"""returns the masking status of an ebuild
 +
 +	@param ebuild: str
 +	@return list
 +	"""
  	try:
  		status = portage.getmaskingstatus(ebuild)
  	except KeyError:

[gentoo-commits] proj/gentoolkit:master commit in: /

[Paul Varner]

commit:     879cf3ce1f3041854c9dc886b59ac7e136ae9b9b
Author:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 29 00:30:14 2010 +0000
Commit:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
CommitDate: Wed Dec 29 00:30:14 2010 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=879cf3ce

Merge branch 'gentoolkit' into euse

Conflicts:
	bin/euse

 AUTHORS                                            |    8 +-
 CREDITS                                            |   16 +
 ChangeLog                                          |   96 ++
 DEVELOPING                                         |  161 ++++
 MANIFEST.in                                        |   12 +-
 Makefile                                           |   25 -
 NEWS                                               |   40 +
 README.dev                                         |   39 +
 TODO                                               |   37 +-
 VERSION                                            |    1 -
 bin/analyse                                        |   48 +
 bin/eclean                                         |  849 +---------------
 bin/epkginfo                                       |  284 +-----
 bin/equery                                         |   28 +-
 bin/eshowkw                                        |    9 +
 bin/euse                                           |  137 ++-
 bin/glsa-check                                     |  126 +--
 bin/revdep-rebuild                                 |  192 ++--
 man/analyse.1                                      |  210 ++++
 man/eclean.1                                       |   31 +-
 man/epkginfo.1                                     |   60 +-
 man/equery.1                                       |  862 ++++++++++++-----
 man/eshowkw.1                                      |   47 +
 man/glsa-check.1                                   |   14 +-
 man/revdep-rebuild.1                               |    9 +-
 pylintrc                                           |  321 ++++++
 pym/gentoolkit/__init__.py                         |   45 +-
 pym/gentoolkit/analyse/__init__.py                 |  128 +++
 pym/gentoolkit/analyse/analyse.py                  |  378 ++++++++
 pym/gentoolkit/analyse/base.py                     |  134 +++
 pym/gentoolkit/analyse/lib.py                      |  352 +++++++
 pym/gentoolkit/analyse/output.py                   |  213 ++++
 pym/gentoolkit/analyse/rebuild.py                  |  235 +++++
 pym/gentoolkit/atom.py                             |  347 +++++++
 pym/gentoolkit/base.py                             |  149 +++
 pym/gentoolkit/cpv.py                              |  256 +++++
 pym/gentoolkit/dbapi.py                            |   17 +
 pym/gentoolkit/dependencies.py                     |  330 +++++++
 pym/gentoolkit/{ => deprecated}/helpers.py         |   61 +-
 pym/gentoolkit/eclean/__init__.py                  |    4 +
 pym/gentoolkit/eclean/clean.py                     |  149 +++
 pym/gentoolkit/eclean/cli.py                       |  504 ++++++++++
 pym/gentoolkit/eclean/exclude.py                   |  262 +++++
 pym/gentoolkit/eclean/output.py                    |  187 ++++
 pym/gentoolkit/eclean/pkgindex.py                  |   91 ++
 pym/gentoolkit/eclean/search.py                    |  569 +++++++++++
 pym/gentoolkit/eprefix.py                          |   34 +
 pym/gentoolkit/equery/__init__.py                  |  198 ++--
 pym/gentoolkit/equery/belongs.py                   |  168 ++--
 pym/gentoolkit/equery/changes.py                   |  310 ++----
 pym/gentoolkit/equery/check.py                     |  370 ++++---
 pym/gentoolkit/equery/depends.py                   |  283 +++---
 pym/gentoolkit/equery/depgraph.py                  |  265 +++--
 pym/gentoolkit/equery/files.py                     |  180 ++--
 pym/gentoolkit/equery/has.py                       |  213 ++++
 pym/gentoolkit/equery/hasuse.py                    |  152 +--
 pym/gentoolkit/equery/keywords.py                  |    8 +
 pym/gentoolkit/equery/list_.py                     |  203 ++--
 pym/gentoolkit/equery/meta.py                      |  609 ++++++------
 pym/gentoolkit/equery/size.py                      |  137 ++-
 pym/gentoolkit/equery/uses.py                      |  240 ++---
 pym/gentoolkit/equery/which.py                     |   51 +-
 pym/gentoolkit/errors.py                           |  164 ++--
 pym/gentoolkit/eshowkw/__init__.py                 |  130 +++
 pym/gentoolkit/eshowkw/display_pretty.py           |  103 ++
 pym/gentoolkit/eshowkw/keywords_content.py         |  325 +++++++
 pym/gentoolkit/eshowkw/keywords_header.py          |  100 ++
 pym/gentoolkit/flag.py                             |  165 ++++
 pym/gentoolkit/formatters.py                       |   99 ++
 pym/gentoolkit/glsa/__init__.py                    |  149 +--
 pym/gentoolkit/helpers.py                          |  616 +++++++++---
 pym/gentoolkit/helpers2.py                         |  437 ---------
 pym/gentoolkit/keyword.py                          |  144 +++
 pym/gentoolkit/metadata.py                         |  307 ++++++
 pym/gentoolkit/package.py                          |  860 +++++++++--------
 pym/gentoolkit/pprinter.py                         |  265 +++--
 pym/gentoolkit/query.py                            |  382 ++++++++
 pym/gentoolkit/sets.py                             |   57 ++
 pym/gentoolkit/test/__init__.py                    |   25 +
 pym/gentoolkit/test/eclean/Packages                | 1017 ++++++++++++++++++++
 pym/gentoolkit/test/eclean/__init__.py             |    6 +
 pym/gentoolkit/test/eclean/creator.py              |  242 +++++
 pym/gentoolkit/test/eclean/distfiles.exclude       |   11 +
 pym/gentoolkit/test/eclean/distsupport.py          |  482 ++++++++++
 pym/gentoolkit/test/eclean/test_clean.py           |  152 +++
 pym/gentoolkit/test/eclean/test_search.py          |  632 ++++++++++++
 pym/gentoolkit/test/equery/__init__.py             |    6 +
 pym/gentoolkit/{tests => test}/equery/test_init.py |   10 +-
 pym/gentoolkit/test/test_atom.py                   |  153 +++
 pym/gentoolkit/test/test_cpv.py                    |  142 +++
 pym/gentoolkit/test/test_helpers.py                |  122 +++
 pym/gentoolkit/test/test_keyword.py                |   57 ++
 pym/gentoolkit/test/test_query.py                  |  109 +++
 pym/gentoolkit/test/test_syntax.py                 |   34 +
 pym/gentoolkit/tests/test_helpers2.py              |   39 -
 pym/gentoolkit/tests/test_template.py              |   38 -
 pym/gentoolkit/textwrap_.py                        |  108 ++-
 pym/gentoolkit/versionmatch.py                     |  153 +--
 setup.py                                           |  156 ++-
 99 files changed, 14772 insertions(+), 4719 deletions(-)

diff --cc bin/euse
index fc9d60f,297d4f6..c54135f
--- a/bin/euse
+++ b/bin/euse
@@@ -7,13 -7,44 +7,53 @@@
  # Licensed under the GPL v2
  
  PROGRAM_NAME=euse
- PROGRAM_VERSION=$(cat /usr/share/gentoolkit/VERSION)
+ VERSION="svn"
  
- MAKE_CONF_PATH=/etc/make.conf
- MAKE_GLOBALS_PATH=/etc/make.globals
- MAKE_PROFILE_PATH=/etc/make.profile
- MAKE_CONF_BACKUP_PATH=/etc/make.conf.euse_backup
- PACKAGE_USE_PATH=/etc/portage/package.use
+ EPREFIX=${EPREFIX:-$(portageq envvar EPREFIX)}
+ ETC="${EPREFIX}/etc"
+ USR_SHARE_PORTAGE="${EPREFIX}/usr/share/portage"
+ 
 -# define error function so it can be used immediately
 -error() {
 -	echo "ERROR: ${1}"
++# define error functions so they can be used immediately
++fatal() {
++	echo -e "ERROR: ${*}"
+ 	set +f
+ 	exit 1
+ }
+ 
++error() {
++	echo -e "ERROR: ${*}"
++}
++
++warn() {
++	echo -e "WARNING: ${*}"
++}
++
+ # /etc/make.conf can now exist in /etc/portage/make.conf, prefer it over /etc/make.conf for changes
+ if [ -e "${ETC}/portage/make.conf" ]; then
+ 	MAKE_CONF_PATH="${ETC}/portage/make.conf"
+ elif [ -e "${ETC}/make.conf" ]; then
+ 	MAKE_CONF_PATH="${ETC}/make.conf"
+ else
 -	error "make.conf does not exist"
++	fatal "make.conf does not exist"
+ fi
+ MAKE_CONF_BACKUP_PATH="${MAKE_CONF_PATH}.euse_backup"
+ 
+ # /etc/make.globals has been moved to /usr/share/portage/config/make.globals
+ if [ -e "${USR_SHARE_PORTAGE}/config/make.globals" ]; then
+ 	MAKE_GLOBALS_PATH="${USR_SHARE_PORTAGE}/config/make.globals"
+ else
+ 	MAKE_GLOBALS_PATH="${ETC}/make.globals"
+ fi
+ 
+ # /etc/make.profile or /etc/portage/make.profile, if /etc/make.profile exists, it will be used
+ if [ -e "${ETC}/make.profile" ]; then
+ 	MAKE_PROFILE_PATH="${ETC}/make.profile"
+ elif [ -e "${ETC}/portage/make.profile" ]; then
+ 	MAKE_PROFILE_PATH="${ETC}/portage/make.profile"
+ else
 -	error "make.profile does not exist"
++	fatal "make.profile does not exist"
+ fi
++PACKAGE_USE_PATH=${ETC}/portage/package.use
  
  [ -z "${MODE}" ] && MODE="showhelp"		# available operation modes: showhelp, showversion, showdesc, showflags, modify
  
@@@ -79,22 -93,27 +105,28 @@@ check_sanity() 
  	# file permission tests
  	local descdir
  	local make_defaults
- 	
+ 	local make_conf
+ 
+ 	[[ ! -d "${MAKE_PROFILE_PATH}" || ! -r "${MAKE_PROFILE_PATH}" ]] && error "${MAKE_PROFILE_PATH} is not readable"
+ 	# 
+ 	for make_conf in $(get_all_make_conf); do
 -		[ ! -r "${make_conf}" ] && error "${make_conf} is not readable"
++		[ ! -r "${make_conf}" ] && fatal "${make_conf} is not readable"
+ 	done
+ 
  	descdir="$(get_portdir)/profiles"
 +	
- 	[ ! -r "${MAKE_CONF_PATH}" ] && fatal "${MAKE_CONF_PATH} is not readable"
 +	[ ! -r "${MAKE_GLOBALS_PATH}" ] && fatal "${MAKE_GLOBALS_PATH} is not readable"
- 	[ ! -h "${MAKE_PROFILE_PATH}" ] && fatal "${MAKE_PROFILE_PATH} is not a symlink"
 +	[ -z "$(get_portdir)" ] && fatal "\$PORTDIR couldn't be determined"
 +	[ ! -d "${descdir}" ] && fatal "${descdir} does not exist or is not a directory"
 +	[ ! -r "${descdir}/use.desc" ] && fatal "${descdir}/use.desc is not readable"
 +	[ ! -r "${descdir}/use.local.desc" ] && fatal "${descdir}/use.local.desc is not readable"
+ 
 -	[ ! -r "${MAKE_GLOBALS_PATH}" ] && error "${MAKE_GLOBALS_PATH} is not readable"
 -	[ -z "$(get_portdir)" ] && error "\$PORTDIR couldn't be determined"
 -	[ ! -d "${descdir}" ] && error "${descdir} does not exist or is not a directory"
 -	[ ! -r "${descdir}/use.desc" ] && error "${descdir}/use.desc is not readable"
 -	[ ! -r "${descdir}/use.local.desc" ] && error "${descdir}/use.local.desc is not readable"
  	for make_defaults in $(get_all_make_defaults); do
 -		[ ! -r "$make_defaults" ]  && error "$_make_defaults is not readable"
 +		[ ! -r "$make_defaults" ]  && fatal "$_make_defaults is not readable"
  	done
 -#	[ ! -r "$(get_make_defaults)" ] && error "$(get_make_defaults) is not readable"
 -	[ "${MODE}" == "modify" -a ! -w "${MAKE_CONF_PATH}" ] && error ""${MAKE_CONF_PATH}" is not writable"
 -}
 +	[ "${MODE}" == "modify" -a ! -w "${MAKE_CONF_PATH}" ] && fatal ""${MAKE_CONF_PATH}" is not writable"
 +	[ "${MODE}" == "modify" -a -s "${PACKAGE_USE_PATH}" -a ! -w "${PACKAGE_USE_PATH}" ] && fatal ""${PACKAGE_USE_PATH}" is not writable"
 +} # }}}
  
  showhelp() {
  cat << HELP
@@@ -235,11 -187,13 +267,13 @@@ get_useflags() 
  
  	# backup portdir so get_portdir() doesn't give false results later
  	portdir_backup="${PORTDIR}"
 -
 +	
  	ACTIVE_FLAGS[0]="$(reduce_incrementals ${USE})"
  	USE=""
- 	source "${MAKE_CONF_PATH}"
- 	ACTIVE_FLAGS[1]="$(reduce_incrementals ${USE})"
+ 	for x in $(get_all_make_conf); do
+ 		source "${x}"
+ 		ACTIVE_FLAGS[1]="$(reduce_incrementals ${ACTIVE_FLAGS[1]} ${USE})"
+ 	done
  	USE=""
  	for x in $(get_all_make_defaults); do
  		source "${x}"
@@@ -254,139 -207,36 +288,146 @@@
  	USE="${ACTIVE_FLAGS[0]}"
  	PORTDIR="${portdir_backup}"
  
 +	#
 +	# Traverse through use.mask and use.force (0.5s)
 +	# Flip signs of use.mask (it's interpreted oppositely), 
 +	ACTIVE_FLAGS[6]=$(reduce_incrementals_trump \
 +		$(cat $(traverse_profile "use.mask") | sed -re "/^#.*$/{d}") \
 +			| sed -re "s/(^| )-[^ ]*//g" -e "s/(^| )([a-z0-9])/ -\2/g")
 +	ACTIVE_FLAGS[7]=$(reduce_incrementals \
 +		$(cat $(traverse_profile "use.force") \
 +			| sed -re "/^#.*$/ {d}"))
 +
 +	USE_FLAGS_CALCULATED=1
 +} # }}}
 +
 +# Function: get_portageuseflags # {{{
 +# Fetch USE flags reported active by Portage
 +get_portageuseflags() {
 +	# only calculate once as calling emerge is painfully slow
 +	[ -n "${_PORTAGE_USE_FLAGS_CALCULATED}" ] && return
  	# get the currently active USE flags as seen by portage, this has to be after
  	# restoring USE or portage won't see the original environment
 +	# Bug 181309, emerge may complain if EMERGE_DEFAULT_OPTS="--ask" is set
- 	ACTIVE_FLAGS[9]="$(emerge --ignore-default-opts --info | grep 'USE=' | cut -b 5- | sed -e 's:"::g')" #'
+ 	ACTIVE_FLAGS[9]="$(portageq envvar USE)" #'
 -	USE_FLAGS_CALCULATED=1
 -}
 -
 -# get the list of all known USE flags by reading use.desc and/or use.local.desc
 -# (depending on the value of $SCOPE)
 +	_PORTAGE_USE_FLAGS_CALCULATED=1
 +} # }}}
 +
 +# Function: get_useflaglist {{{
 +# Get the list of all known USE flags by reading use.desc and/or 
 +# use.local.desc (depending on the value of $SCOPE). Also searches any 
 +# registered overlays after searching the main portage tree first.
 +# Use flags visible in both the main tree and overlays are trumped by
 +# the main tree. Overlays are indicated by brackets [xxx] at the 
 +# beginning of the description. 
 +#
 +# Returns:
 +# (written to stdout) Sorted, unique list of system-wide USE flags and
 +# descriptions. Flags defined in overlays have the overlay in brackets
 +# prepended to the descriptions.
 +#
 +# Environment:
 +# SCOPE - [local|global] constrain search to local (use.local.desc) or
 +# 		  global (use.desc)
  get_useflaglist() {
  	local descdir
 -
 -	descdir="$(get_portdir)/profiles"
 -
 -	if [ -z "${SCOPE}" -o "${SCOPE}" == "global" ]; then
 -		egrep "^[^# ]+ +-" "${descdir}/use.desc" | cut -d\  -f 1
 -	fi
 -	if [ -z "${SCOPE}" -o "${SCOPE}" == "local" ]; then
 -		egrep "^[^# :]+:[^ ]+ +-" "${descdir}/use.local.desc" | cut -d: -f 2 | cut -d\  -f 1
 +	local overlay
 +	for profiledir in ${ALL_PORTDIRS[@]}; do
 +		descdir="${profiledir}/profiles"
 +		if [[ -z ${SCOPE} || ${SCOPE} == "global" ]]; then
 +			[[ ! -s "${descdir}/use.desc" ]] && continue
 +			egrep "^[^# ]+ +-" "${descdir}/use.desc" 
 +		fi
 +		if [[ -z ${SCOPE} || ${SCOPE} == "local" ]]; then
 +			[[ ! -s "${descdir}/use.local.desc" ]] && continue
 +			egrep "^[^# :]+:[^ ]+ +-" "${descdir}/use.local.desc" \
 +				| cut -d: -f 2 
 +		fi
 +	done | cut -d " "  -f1 | sort --field=":" --key=1,1 --unique
 +} # }}}
 +
 +# Function: get_useflaglist_ebuild {{{
 +# Builds USE flag information for specified package atom into 
 +# ACTIVE_FLAGS[5]. For the atom, the versions available are found, and 
 +# for each, the corresponding SLOT, IUSE are stored along with which 
 +# overlay the ebuild lives in. Considering that the pieces of information 
 +# may be required in any order or any subsets, it is intended for the 
 +# function to cache the information and it be retrieved from 
 +# ACTIVE_FLAGS[5]. So the format of ACTIVE_FLAGS[5] is newline-separated 
 +# list of:
 +#
 +# category/packge;version;SLOT;IUSE;overlay
 +#
 +# Arguments:
 +# $1 - Package atom to lookup (app-editor/vim)
 +#
 +# Returns:
 +# Nothing significant
 +#
 +# Environment:
 +# PORTDIR - Root of portage tree
 +# ACTIVE_FLAGS - Array of current use flag info
 +#
 +get_useflaglist_ebuild() {
 +	local known=$(echo "${ACTIVE_FLAGS[5]}" | egrep "^${1}")
 +	if [[ -n $known ]]; then
 +		# No need to recache
 +		return
  	fi
 -}
 +	local pkg=$(echo ${1} | cut -d/ -f2)
 +	declare append
 +	for portdir in ${ALL_PORTDIRS[@]}; do
 +		# Open the ebuild file and retrieve defined USE flags
 +		[[ ! -d "$portdir/${1}" ]] && continue
 +		append=$(echo -n $portdir/${1}/*.ebuild "" \
 +			| perl -pne "s:$portdir/${1}/${pkg}-(([^.]|\.(?!e))+)\.ebuild:\1:g" \
 +			| while read -d " " version; do
 +				IFS=$'\n'
 +				if [[ $portdir == $PORTDIR ]]; then 
 +					overlay=""
 +				else
 +					if [[ -s $(dirname ${portdir}/repo_name) ]]; then
 +						overlay="$(cat "${portdir}/profiles/repo_name")"
 +					else
 +						# XXX: May be better to use full path
 +						overlay="$(basename "${portdir}")"
 +					fi
 +				fi
 +				if [[ ! -d "$portdir/metadata/cache" ]]; then
 +					echo "!!! Metadata cache not found. You need to run " >&2
 +					echo "!!! 'egencache --repo=$overlay --update'" >&2
 +					echo "!!! to generate metadata for your overlays" >&2
 +					return 1
 +				elif [[ ! -e "$portdir/metadata/cache/${1}-$version" ]]; then
 +					# Repo does not have this particular package
 +					continue
 +				fi
 +				iuse=$(head -11 "$portdir/metadata/cache/${1}-$version"|tail -1)
 +				slot=$(head -3 "$portdir/metadata/cache/${1}-$version"|tail -1)
 +				echo "${1};${version};${slot};${iuse};${overlay}"
 +			done
 +		)
 +		if [[ -z ${ACTIVE_FLAGS[5]} ]]; then ACTIVE_FLAGS[5]="$append"
 +		else ACTIVE_FLAGS[5]="${ACTIVE_FLAGS[5]}"$'\n'"$append"
 +		fi
 +	done
 +} # }}}
  
+ # get all make.conf files that exist on the system
+ get_all_make_conf() {
+ 	# At least one of the files exists or we would not have made it this far
+ 	for x in ${ETC}/make.conf ${ETC}/portage/make.conf; do
+ 		[ -e "${x}" ] && echo "${x}"
+ 	done
+ }
 -# get all make.defaults by traversing the cascaded profile directories
 -get_all_make_defaults() {
 +# Function: traverse_profile {{{
 +# General method of collecting the contents of a profile
 +# component by traversing through the cascading profile
 +#
 +# Arguments:
 +# $1 - Filename (make.profile)
 +# [$2] - Current directory (unspecified means to start at the top)
 +traverse_profile() {
  	local curdir
  	local parent
  	local rvalue
@@@ -684,10 -326,9 +727,10 @@@ showdesc() 
  	local current_desc
  	local found_one
  	local args
 -
 +	
 +	set -f
  	args="${*:-*}"
- 	
+ 
  	if [ -z "${SCOPE}" ]; then
  		SCOPE="global" showdesc ${args}
  		echo
@@@ -700,49 -341,37 +743,49 @@@
  	[ "${SCOPE}" == "global" ] && echo "global use flags (searching: ${args})"
  	[ "${SCOPE}" == "local" ] && echo "local use flags (searching: ${args})"
  	echo "************************************************************"
 -
 +	set +f
  	if [ "${args}" == "*" ]; then
 -		args="$(get_useflaglist | sort -u)"
 +		args="${useflags[*]}"
  	fi
- 	
+ 
  	set ${args}
  
  	foundone=0
 -	while [ -n "${1}" ]; do
 -		if [ "${SCOPE}" == "global" ]; then
 -			if grep "^${1}  *-" "${descdir}/use.desc" > /dev/null; then
 +	while [[ -n "${1}" ]]; do
 +		if [[ "${SCOPE}" == "global" ]]; then
 +			if array_contains "${useflags[*]}" "$1"; then
  				get_flagstatus "${1}"
 +				# XXX: Handle overlay
 +				grep "^${1}  *-" ${ALL_PORTDIRS[@]/%//profiles/use.desc} 2> /dev/null \
 +					| sed -re "s/^([^:]+)://"
  				foundone=1
  			fi
 -			grep "^${1}  *-" "${descdir}/use.desc"
  		fi
- 		# local flags are a bit more complicated as there can be multiple 
+ 		# local flags are a bit more complicated as there can be multiple
  		# entries per flag and we can't pipe into printf
 -		if [ "${SCOPE}" == "local" ]; then
 -			if grep ":${1}  *-" "${descdir}/use.local.desc" > /dev/null; then
 +		if [[ "${SCOPE}" == "local" ]]; then
 +			if array_contains "${useflags[*]}" "$1"; then
  				foundone=1
  			fi
 -			grep ":${1}  *-" "${descdir}/use.local.desc" \
 -				| sed -e "s/^\([^:]\+\):\(${1}\) *- *\(.\+\)/\1|\2|\3/g" \
 -				| while read line; do
 -					pkg="$(echo $line | cut -d\| -f 1)"
 -					flag="$(echo $line | cut -d\| -f 2)"
 -					desc="$(echo $line | cut -d\| -f 3)"
 -					get_flagstatus "${flag}"
 -					printf "%s (%s):\n%s\n\n" "${flag}" "${pkg}" "${desc}"
 -				done
 +			# Fetch all the packages data using this flag
 +			infos=$( grep ":${1}  *-" ${ALL_PORTDIRS[@]/%//profiles/use.local.desc} 2> /dev/null \
 +				| sed -re "s/^([^:]+):([^:]+):(${1}) *- *(.+)/\1|\2|\3|\4/g")
 +			OIFS=$IFS; IFS=$'\n'; infos=($infos); IFS=$OIFS;
 +			for line in "${infos[@]}"; do
 +				OIFS=$IFS; IFS="|"; line=($line); IFS=$OIFS
 +				pkg=${line[1]} 
 +				flag=${line[2]}
 +				desc=${line[3]}
 +				if get_flagstatus "${flag}"; then
 +					ACTIVE="+"
 +				else
 +					ACTIVE="-"
 +				fi
 +				printf "%s\n" "${flag}"
 +				printf "%s: %s\n" "${pkg}" "${desc}" \
 +					| fold --width=$((${COLUMNS:-80}-10)) -s | sed -e "s/^/    /g"
 +				get_flagstatus_pkg "${flag}" "${pkg}" "${ACTIVE}"
 +			done
  		fi
  		shift
  	done
@@@ -853,10 -466,9 +896,10 @@@ showflags() 
  	if [ "${args}" == "*" ]; then
  		args="$(get_useflaglist | sort -u)"
  	fi
- 	
+ 
  	set ${args}
 -
 +	get_portageuseflags
 +	
  	while [ -n "${1}" ]; do
  		if echo " ${ACTIVE_FLAGS[9]} " | grep " ${1} " > /dev/null; then
  			printf "%-20s" ${1}
@@@ -1226,9 -578,9 +1269,9 @@@ modify() 
  		echo -ne "${NEW_MAKE_CONF_USE_2%% }"
  		echo '"'
  	fi ) < "${MAKE_CONF_BACKUP_PATH}" | sed -e 's:\\ $:\\:' > "${MAKE_CONF_PATH}"
- 	
+ 
  	echo "${MAKE_CONF_PATH} was modified, a backup copy has been placed at ${MAKE_CONF_BACKUP_PATH}"
 -}
 +} # }}}
  
  ##### main program comes now #####
  

[gentoo-commits] proj/gentoolkit:master commit in: /

[Paul Varner]

commit:     c9bd257c7cdd4c64ccefb687643958098c3c6d75
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Sat May 28 21:22:12 2011 +0000
Commit:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
CommitDate: Sat May 28 21:22:12 2011 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=c9bd257c

Merge branch 'gentoolkit' of git+ssh://overlays.gentoo.org/proj/gentoolkit into gentoolkit

 bin/{analyse => enalyze}                           |   6 +-
 bin/euse                                           | 111 +++++++++++----------
 bin/revdep-rebuild                                 |  38 ++++---
 man/{analyse.1 => enalyze.1}                       |  46 ++++-----
 pym/gentoolkit/dependencies.py                     |  41 ++++----
 pym/gentoolkit/eclean/search.py                    |  16 ++-
 pym/gentoolkit/{analyse => enalyze}/__init__.py    |  10 +-
 .../{analyse/analyse.py => enalyze/analyze.py}     |  46 ++++-----
 pym/gentoolkit/{analyse => enalyze}/base.py        |   4 +-
 pym/gentoolkit/{analyse => enalyze}/lib.py         |   4 +-
 pym/gentoolkit/{analyse => enalyze}/output.py      |   2 +-
 pym/gentoolkit/{analyse => enalyze}/rebuild.py     |  26 ++---
 pym/gentoolkit/eprefix.py                          |  28 ++----
 pym/gentoolkit/equery/__init__.py                  |   3 +
 pym/gentoolkit/equery/meta.py                      |  10 ++
 pym/gentoolkit/eshowkw/__init__.py                 |  12 ++-
 pym/gentoolkit/eshowkw/display_pretty.py           |   9 +-
 pym/gentoolkit/eshowkw/keywords_content.py         |   6 +-
 pym/gentoolkit/eshowkw/keywords_header.py          |   4 +-
 pym/gentoolkit/flag.py                             |   3 +-
 pym/gentoolkit/helpers.py                          |   2 +-
 pym/gentoolkit/package.py                          |  10 +-
 pym/gentoolkit/test/eclean/test_search.py          |   2 +-
 setup.py                                           |   2 +-
 24 files changed, 243 insertions(+), 198 deletions(-)

[gentoo-commits] proj/gentoolkit:master commit in: /

[Paul Varner]

commit:     923f15361bc2ce6f015012e840c5a9e41717abf0
Author:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 02:52:13 2011 +0000
Commit:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
CommitDate: Thu May 12 02:52:13 2011 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=923f1536

Merge branch 'gentoolkit' of git+ssh://git.overlays.gentoo.org/proj/gentoolkit into gentoolkit

 bin/{analyse => enalyze}                           |  6 +--
 man/{analyse.1 => enalyze.1}                       | 46 +++++++++++-----------
 pym/gentoolkit/{analyse => enalyze}/__init__.py    | 10 ++---
 .../{analyse/analyse.py => enalyze/analyze.py}     | 46 +++++++++++-----------
 pym/gentoolkit/{analyse => enalyze}/base.py        |  4 +-
 pym/gentoolkit/{analyse => enalyze}/lib.py         |  4 +-
 pym/gentoolkit/{analyse => enalyze}/output.py      |  2 +-
 pym/gentoolkit/{analyse => enalyze}/rebuild.py     | 26 ++++++------
 8 files changed, 72 insertions(+), 72 deletions(-)

[gentoo-commits] proj/gentoolkit:master commit in: /

[Paul Varner]

commit:     040600057ca333a4285e321a08bdf69cc0f11231
Author:     dol-sen <brian.dolbec <AT> gmail <DOT> com>
AuthorDate: Thu Jul 14 01:43:17 2011 +0000
Commit:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 01:43:17 2011 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=04060005

Merge branch 'gentoolkit' of git+ssh://git.overlays.gentoo.org/proj/gentoolkit into gentoolkit

Conflicts:
	pym/gentoolkit/revdep_rebuild/collect.py
	pym/gentoolkit/revdep_rebuild/rebuild.py
	pym/gentoolkit/revdep_rebuild/settings.py
	pym/gentoolkit/revdep_rebuild/stuff.py

[gentoo-commits] proj/gentoolkit:master commit in: /

[Paul Varner]

commit:     d1ee16c4194e7a94c91924d62332363d06e64aae
Author:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  6 16:22:51 2012 +0000
Commit:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
CommitDate: Mon Feb  6 16:22:51 2012 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=d1ee16c4

Merge branch 'gentoolkit' of git+ssh://git.overlays.gentoo.org/proj/gentoolkit into gentoolkit

 pym/gentoolkit/base.py                   |  8 ++++++--
 pym/gentoolkit/eclean/cli.py             | 11 +++++++----
 pym/gentoolkit/equery/__init__.py        |  8 +++++---
 pym/gentoolkit/revdep_rebuild/rebuild.py |  7 +++++--
 4 files changed, 23 insertions(+), 11 deletions(-)

[gentoo-commits] proj/gentoolkit:master commit in: /

[Paul Varner]

commit:     b62586ede6c2716be976a538d41fac836875ed05
Author:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  4 18:52:47 2011 +0000
Commit:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
CommitDate: Tue Jan  4 18:54:59 2011 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=b62586ed

Merge euse from bug 259318

* euse:
  Add remove option. Remove perl code and change to sed. Add Jared Hancock to the authors.
  Change mode of eshowkw to 0755
  Added euse from bug 259318

 bin/eshowkw |    0
 bin/euse    | 1001 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
 man/euse.1  |    1 +
 3 files changed, 861 insertions(+), 141 deletions(-)

[gentoo-commits] proj/gentoolkit:master commit in: /

[Mike Gilbert]

commit:     9a744593eb7f122d6123dd11d5c174cc2cded432
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  3 22:53:44 2014 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Nov  3 22:53:44 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=9a744593

Add README to refer people to the real branches

---
 README | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README b/README
new file mode 100644
index 0000000..ea8c041
--- /dev/null
+++ b/README
@@ -0,0 +1,5 @@
+This is not the branch you are looking for. You probably want to checkout
+one of the branches below.
+
+gentoolkit
+gentoolkit-dev