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

2024-02-17 Thread Brian Dolbec
commit: f410ba4ae94c801564f5b0bd3003e429adf2b12e
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sat Feb 17 02:34:39 2024 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sun Feb 18 02:16:28 2024 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=f410ba4a

eclean/search.py: Fix find_packages docstring for invalid_paths

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/eclean/search.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pym/gentoolkit/eclean/search.py b/pym/gentoolkit/eclean/search.py
index 47df3a1..b696b63 100644
--- a/pym/gentoolkit/eclean/search.py
+++ b/pym/gentoolkit/eclean/search.py
@@ -591,7 +591,6 @@ def findPackages(
 ) -> tuple[dict[str, list[str]], dict[str, list[str]]]:
 """Find obsolete binary packages.
 
-@param invalid_paths:
 @param options: dict of options determined at runtime
 @type  options: dict
 @param exclude: exclusion dict (as defined in the exclude.parseExcludeFile 
class)
@@ -610,8 +609,8 @@ def findPackages(
 @param  var_dbapi: defaults to portage.db[portage.root]["vartree"].dbapi
Can be overridden for tests.
 
-@return binary packages to remove. e.g. {'cat/pkg-ver': [filepath]}
-@rtype: dict
+@return binary packages to remove. e.g. {'cat/pkg-ver': [filepath]}, 
invalid_paths
+@rtype: dict, dict
 """
 if exclude is None:
 exclude = {}



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

2024-02-17 Thread Brian Dolbec
commit: 70cb55fa5fd2af7c7e46c94dc423a96bbedd83a5
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Feb  4 21:00:49 2024 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sun Feb 18 02:16:03 2024 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=70cb55fa

eclean: Handle InvalidDepstring info in _deps_equal

Add try/except pair to _deps_equal() to output relavent details
causing the exception in order to aid the user to fix the issue.
Mark binpkg dep failures as a non match for possible deletion.
Make the ebuild dep failure a warning only, return True to save
the binpkg.
Add parameter docstring info

Bug: https://bugs.gentoo.org/923439
Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/eclean/search.py | 54 -
 1 file changed, 48 insertions(+), 6 deletions(-)

diff --git a/pym/gentoolkit/eclean/search.py b/pym/gentoolkit/eclean/search.py
index 2eebcfd..47df3a1 100644
--- a/pym/gentoolkit/eclean/search.py
+++ b/pym/gentoolkit/eclean/search.py
@@ -17,6 +17,7 @@ import portage
 from portage.dep import Atom, use_reduce
 from portage.dep._slot_operator import strip_slots
 from portage.dep.libc import find_libc_deps, strip_libc_deps
+from portage.exception import InvalidDependString
 
 import gentoolkit.pprinter as pp
 from gentoolkit.eclean.exclude import (
@@ -526,13 +527,51 @@ class DistfilesSearch:
 return clean_me, saved
 
 
-def _deps_equal(deps_a, eapi_a, deps_b, eapi_b, libc_deps, uselist=None):
-"""Compare two dependency lists given a set of USE flags"""
+def _deps_equal(deps_a, eapi_a, deps_b, eapi_b, libc_deps, uselist=None, 
cpv=None):
+"""Compare two dependency lists given a set of USE flags
+
+@param deps_a: binpkg DEPEND string (for InvalidDependString errors)
+@rtype: string
+@param eapi_a: EAPI
+@rtype: string
+@param deps_b: ebuild DEPEND string (for InvalidDependString errors)
+@rtype: string
+@param eapi_b: EAPI
+@rtype: string
+@param libc_deps: List of libc packages (or atoms if realized is passed).
+@rtype: list
+@param uselist: use flag list
+@rtype: frozenset
+@param cpv: Cat/Pkg-version
+@rtype: string
+"""
 if deps_a == deps_b:
 return True
+try:
+deps_a = use_reduce(deps_a, uselist=uselist, eapi=eapi_a, 
token_class=Atom)
+except InvalidDependString:  # the binpkg depend string is bad
+print(
+pp.warn(
+"Warning: Invalid binpkg DEPEND string found for: %s, %s"
+" | tagging for removal" % (cpv, deps_a)
+),
+file=sys.stderr,
+)
+return False
+try:
+deps_b = use_reduce(deps_b, uselist=uselist, eapi=eapi_b, 
token_class=Atom)
+except InvalidDependString as er:  # the ebuild depend string is bad
+print(
+pp.warn("Warning: Invalid ebuild DEPEND String found for: %s" % 
cpv),
+file=sys.stderr,
+)
+print(
+pp.warn("Warning: DEPEND string for ebuild: %s" % deps_b),
+file=sys.stderr,
+)
+print(er, file=sys.stderr)
+return True
 
-deps_a = use_reduce(deps_a, uselist=uselist, eapi=eapi_a, token_class=Atom)
-deps_b = use_reduce(deps_b, uselist=uselist, eapi=eapi_b, token_class=Atom)
 strip_libc_deps(deps_a, libc_deps)
 strip_libc_deps(deps_b, libc_deps)
 strip_slots(deps_a)
@@ -656,13 +695,16 @@ def findPackages(
 binpkg_metadata = dict(zip(keys, bin_dbapi.aux_get(cpv, keys)))
 ebuild_metadata = dict(zip(keys, port_dbapi.aux_get(cpv, keys)))
 
+deps_binpkg = " ".join(binpkg_metadata[key] for key in dep_keys)
+deps_ebuild = " ".join(ebuild_metadata[key] for key in dep_keys)
 if _deps_equal(
-" ".join(binpkg_metadata[key] for key in dep_keys),
+deps_binpkg,
 binpkg_metadata["EAPI"],
-" ".join(ebuild_metadata[key] for key in dep_keys),
+deps_ebuild,
 ebuild_metadata["EAPI"],
 libc_deps,
 frozenset(binpkg_metadata["USE"].split()),
+cpv,
 ):
 continue
 



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

2024-02-17 Thread Brian Dolbec
commit: a1e25deeab64dcb7334381854db23a564d2d2c02
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Feb 18 00:59:22 2024 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sun Feb 18 02:16:28 2024 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=a1e25dee

Initial tests for _deps_equal()

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/test/eclean/test_search.py | 157 ++
 1 file changed, 157 insertions(+)

diff --git a/pym/gentoolkit/test/eclean/test_search.py 
b/pym/gentoolkit/test/eclean/test_search.py
index 32d360c..0bbad46 100755
--- a/pym/gentoolkit/test/eclean/test_search.py
+++ b/pym/gentoolkit/test/eclean/test_search.py
@@ -26,8 +26,11 @@ from gentoolkit.test.eclean.distsupport import (
 )
 import gentoolkit.eclean.search as search
 from gentoolkit.eclean.search import DistfilesSearch
+from gentoolkit.eclean.search import _deps_equal
 from gentoolkit.eclean.exclude import parseExcludeFile
 
+from portage.dep import Atom
+
 """Tests for eclean's distfiles search functions."""
 
 
@@ -670,12 +673,166 @@ class TestRemoveProtected(unittest.TestCase):
 )
 
 
+class TestDepsEqual(unittest.TestCase):
+
+def test_deps_equal(self):
+# def _deps_equal(deps_a, eapi_a, deps_b, eapi_b, libc_deps, 
uselist=None, cpv=None):
+all_tests = [
+# 1 equal
+(
+"x11-misc/xdg-user-dirs-gtk-0.11",
+{
+"deps_a": "dev-libs/glib:2 >=x11-libs/gtk+-3.5.1:3 
>=x11-misc/xdg-user-dirs-0.14",
+"eapi_a": "8",
+"deps_b": "dev-libs/glib:2 >=x11-libs/gtk+-3.5.1:3 
>=x11-misc/xdg-user-dirs-0.14",
+"eapi_b": "8",
+"libc_deps": {Atom("sys-libs/glibc:2.2")},
+"uselist": frozenset(
+{
+"elibc_glibc",
+"amd64",
+"abi_x86_64",
+"kernel_linux",
+"userland_GNU",
+}
+),
+},
+True,
+),
+# 2 ebuild different gtk+ dep
+(
+"x11-misc/xdg-user-dirs-gtk-0.11",
+{
+"deps_a": "dev-libs/glib:2 >=x11-libs/gtk+-3.5.1:3 
>=x11-misc/xdg-user-dirs-0.14",
+"eapi_a": "8",
+"deps_b": "dev-libs/glib:2 >=x11-libs/gtk+-3.5.2:3 
>=x11-misc/xdg-user-dirs-0.14",
+"eapi_b": "8",
+"libc_deps": {Atom("sys-libs/glibc:2.2")},
+"uselist": frozenset(
+{
+"elibc_glibc",
+"amd64",
+"abi_x86_64",
+"kernel_linux",
+"userland_GNU",
+}
+),
+},
+False,
+),
+# 3 different eapi, but is not currently tested
+(
+"x11-misc/xdg-user-dirs-gtk-0.11",
+{
+"deps_a": "dev-libs/glib:2 >=x11-libs/gtk+-3.5.1:3 
>=x11-misc/xdg-user-dirs-0.14",
+"eapi_a": "7",
+"deps_b": "dev-libs/glib:2 >=x11-libs/gtk+-3.5.1:3 
>=x11-misc/xdg-user-dirs-0.14",
+"eapi_b": "8",
+"libc_deps": {Atom("sys-libs/glibc:2.2")},
+"uselist": frozenset(
+{
+"elibc_glibc",
+"amd64",
+"abi_x86_64",
+"kernel_linux",
+"userland_GNU",
+}
+),
+},
+True,
+),
+# 4 valid/False
+(
+"x11-misc/xdg-user-dirs-0.18",
+{
+"deps_a": "dev-libs/glib:2 >=x11-libs/gtk+-3.5.1:3 
>=x11-misc/xdg-user-dirs-0.14",
+"eapi_a": "8",
+"deps_b": "gtk? ( x11-misc/xdg-user-dirs-gtk )",
+"eapi_b": "8

[gentoo-commits] repo/gentoo:master commit in: dev-python/pypugjs/

2023-08-24 Thread Brian Dolbec
commit: 222b252b2a52940c4207c2d2ff3f6481adc352ff
Author: Brian Dolbec  gentoo  org>
AuthorDate: Fri Aug 25 01:04:22 2023 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Fri Aug 25 01:07:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=222b252b

dev-python/pypugjs: bump to 5.9.12-r1, Apply pytest patch from upstream

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-python/pypugjs/Manifest |  1 +
 dev-python/pypugjs/pypugjs-5.9.12-r1.ebuild | 53 +
 2 files changed, 54 insertions(+)

diff --git a/dev-python/pypugjs/Manifest b/dev-python/pypugjs/Manifest
index 4abcc510d4cd..d4795415db7e 100644
--- a/dev-python/pypugjs/Manifest
+++ b/dev-python/pypugjs/Manifest
@@ -1 +1,2 @@
+DIST pypugjs-5.9.12-nose.patch.xz 12616 BLAKE2B 
0cb8e8cce8af20c301e5781bca466c26f0ef97365fb67c0c46b241c0c110010a6dbf0bcc63dc7e8e886a875d2827b4fd3abd080f69022d9247d8c71c8ee80e07
 SHA512 
c575600273069f0395ceb55abc7dac3bf0889c8b17c89b5bf5562aa919d8818464c27eee6d7518c796b37bdbd3d265ac8301e845f024122c3cab87b0ccfaf617
 DIST pypugjs-5.9.12.gh.tar.gz 51164 BLAKE2B 
32b7bbc2bde966ea53c6f52a77482f4f6ca1e0cb09948c1c9850cdd66e4449ecc60e2f6b812f57a7ade5bc323c48be5d105d63ab6680d5e2197cd203fce40d85
 SHA512 
c6e4bd3bb27d321e3721504e7c01f97d869eb2e29e3ac8f086aa696ca29436978ceaa420ef8ac9b5addd859f7764817b1f159e0f41784a3fdb9cd3a0620eb7dd

diff --git a/dev-python/pypugjs/pypugjs-5.9.12-r1.ebuild 
b/dev-python/pypugjs/pypugjs-5.9.12-r1.ebuild
new file mode 100644
index ..0ad4e6035f54
--- /dev/null
+++ b/dev-python/pypugjs/pypugjs-5.9.12-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Pug (Jade) syntax adapter for Django, Jinja2 and Mako templates"
+HOMEPAGE="https://github.com/kakulukia/pypugjs;
+SRC_URI="
+   https://github.com/kakulukia/pypugjs/archive/v${PV}.tar.gz
+   -> ${P}.gh.tar.gz
+"
+SRC_URI+=" https://dev.gentoo.org/~dolsen/distfiles/${P}-nose.patch.xz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+RDEPEND="
+   >=dev-python/six-1.15.0[${PYTHON_USEDEP}]
+   >=dev-python/chardet-4.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   test? (
+   dev-python/django[${PYTHON_USEDEP}]
+   >=dev-python/jinja-3.1.1[${PYTHON_USEDEP}]
+   >=dev-python/mako-1.1.3[${PYTHON_USEDEP}]
+   >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
+   )
+"
+
+PATCHES=(
+   "${WORKDIR}/pypugjs-5.9.12-nose.patch"
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+   # Remove pyramid backend as pyramid isn't packaged
+   rm -r pypugjs/ext/pyramid || die
+   distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+   optfeature "converting to Django output" dev-python/django
+   optfeature "converting to Jinja2 output" dev-python/jinja
+   optfeature "converting to Mako output" dev-python/mako
+   optfeature "converting to Tornado output" dev-python/tornado
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/

2023-08-24 Thread Brian Dolbec
commit: f2da904c18fd8191c7c9138752abcf02da11fc78
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 24 23:18:42 2023 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 24 23:33:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2da904c

dev-util/buildbot:

Update  ebuild (sort deps)
Add Zorry to maintainers
Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot/Manifest |  1 +
 ...{buildbot-.ebuild => buildbot-3.9.0.ebuild} | 41 +++---
 dev-util/buildbot/buildbot-.ebuild | 35 +-
 dev-util/buildbot/metadata.xml |  4 +++
 4 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index c2083c50a18d..c0ec66e0e9b9 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1 +1,2 @@
 DIST buildbot-3.6.1.tar.gz 2458176 BLAKE2B 
4587ed222e2fae424f3c4f275e67e72bf25b0ce88231a29f931582d82fbe93a846f85b14bdc64740939466ccdc3f15dab3774244aa5c0a293250b52b542014ea
 SHA512 
62a993d1acd8bc5cc916f009909b4b099d9f64007fe790dc219104f248bb21e0ab8f1771c354ef61e6d8ba497451cdef5e7a7de17a87cfd1e941b3b49fbf2206
+DIST buildbot-3.9.0.tar.gz 2505725 BLAKE2B 
144a16655a8ec23d74ba190a7867a2dce9c65ea6009aa53ea11494be6f03f8d45bc6568a36511812e7664bcc7de9540728b91264251a46301cbd7ebec04c2069
 SHA512 
9103c5e08f9d5335c0281403d81fc939cc91b81e8051d4590f29e00779392ac706934d209312e51aafc44a35ab768ad54cbd251afe50e326c52e2f1b0d72196b

diff --git a/dev-util/buildbot/buildbot-.ebuild 
b/dev-util/buildbot/buildbot-3.9.0.ebuild
similarity index 94%
copy from dev-util/buildbot/buildbot-.ebuild
copy to dev-util/buildbot/buildbot-3.9.0.ebuild
index 98d27d9c50ca..29e65c350941 100644
--- a/dev-util/buildbot/buildbot-.ebuild
+++ b/dev-util/buildbot/buildbot-3.9.0.ebuild
@@ -6,34 +6,34 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{10..11} )
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git;
-inherit readme.gentoo-r1 git-r3 systemd distutils-r1
+inherit readme.gentoo-r1 systemd distutils-r1 pypi
 
 DESCRIPTION="BuildBot build automation system"
 HOMEPAGE="https://buildbot.net/
https://github.com/buildbot/buildbot
https://pypi.org/project/buildbot/;
-S="${S}/master"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
 IUSE="crypt docker examples irc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
acct-user/buildbot
-   >=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
-   >=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-   >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-   >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-   =dev-python/alembic-1.6.0[${PYTHON_USEDEP}]
-   >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-   >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+   >=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+   >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
dev-python/pyjwt[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
-   dev-util/buildbot-worker[${PYTHON_USEDEP}]
+   >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+   =dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
+   >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+   >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
crypt? (
>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
dev-python/service-identity[${PYTHON_USEDEP}]
@@ -54,18 +54,19 @@ RDEPEND="
 BDEPEND="
test? (
${RDEPEND}
-   dev-python/treq[${PYTHON_USEDEP}]
-   dev-python/txrequests[${PYTHON_USEDEP}]
-   dev-python/pypugjs[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+   dev-util/buildbot-worker[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
-   dev-python/moto[${PYTHON_USEDEP}]
-   >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-   >=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
dev-python/lz4[${PYTHON_USEDEP}]
dev-python/ldap3[${PYTHON_USEDEP}]
-   dev-util/buildbot-pkg[${PYTHON_USEDEP}]
-   dev-util/buildbot-worker[${PYTHON_USEDEP}]
-   dev-util/buildbot-www[${PYTHON_USEDEP}]
+   dev-python/markdown[${PYTHON_USEDEP}]
+   dev-python/moto[${PYTHON_USEDEP}]
+   >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+   dev-python/parameterized[${PYTHON_USEDEP}]
+   dev-python/pypugjs[${PYTHON_USEDEP}]
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-react-grid-view/

2023-08-24 Thread Brian Dolbec
commit: 5dacef2ec52571b18aae44ddee70212492be748b
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 24 23:25:42 2023 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 24 23:33:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dacef2e

dev-util/buildbot-react-grid-view: new package, add 3.9.0

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-react-grid-view/Manifest |  1 +
 .../buildbot-react-grid-view-3.9.0.ebuild  | 24 ++
 dev-util/buildbot-react-grid-view/metadata.xml | 24 ++
 3 files changed, 49 insertions(+)

diff --git a/dev-util/buildbot-react-grid-view/Manifest 
b/dev-util/buildbot-react-grid-view/Manifest
new file mode 100644
index ..bb06113df104
--- /dev/null
+++ b/dev-util/buildbot-react-grid-view/Manifest
@@ -0,0 +1 @@
+DIST buildbot-react-grid-view-3.9.0.tar.gz 13096 BLAKE2B 
8999df8e3e8b389769003b6694fb22eafc31ebeedbfd559eadfa38fb7ac152c968b3de278c51b54a35372d3d90b5df39ee121a74e44e68bc51777dd058e2e0bc
 SHA512 
22624e5be3b638de4a0f826770a249d4da7fb47109586a2f4a3bada76202a639cdd98be62c9a108b48fddb41294b3c0a8594c0cb4b8cc33cae4b198607924d81

diff --git 
a/dev-util/buildbot-react-grid-view/buildbot-react-grid-view-3.9.0.ebuild 
b/dev-util/buildbot-react-grid-view/buildbot-react-grid-view-3.9.0.ebuild
new file mode 100644
index ..3ca04b7da413
--- /dev/null
+++ b/dev-util/buildbot-react-grid-view/buildbot-react-grid-view-3.9.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="BuildBot react based grid view web interface"
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-react-grid-view/;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+   ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-www-react-${PV}[${PYTHON_USEDEP}]
+"

diff --git a/dev-util/buildbot-react-grid-view/metadata.xml 
b/dev-util/buildbot-react-grid-view/metadata.xml
new file mode 100644
index ..2834b84c3a3b
--- /dev/null
+++ b/dev-util/buildbot-react-grid-view/metadata.xml
@@ -0,0 +1,24 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   dol...@gentoo.org
+   Brian Dolbec
+   
+   
+   zo...@gentoo.org
+   Magnus Granberg
+   
+   
+   The buildbot-react-grid-view plugin is the new react based user 
interface
+   code used to display information about the builds.
+   
+   
+   
+   de...@buildbot.net
+   Developers List
+   
+   buildbot-react-grid-view
+   buildbot/buildbot
+   
+



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-worker/

2023-08-24 Thread Brian Dolbec
commit: 445038f151894f63bd2c24079bf6e54422b3bf4c
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 24 23:13:42 2023 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 24 23:33:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=445038f1

dev-util/buildbot-worker:

Update  ebuild (sort deps)
Add Zorry to maintainers
Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-worker/Manifest|  1 +
 ...t-worker-.ebuild => buildbot-worker-3.9.0.ebuild} | 16 ++--
 dev-util/buildbot-worker/buildbot-worker-.ebuild |  4 ++--
 dev-util/buildbot-worker/metadata.xml|  4 
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/dev-util/buildbot-worker/Manifest 
b/dev-util/buildbot-worker/Manifest
index aec8d3312aff..5f1865d7aa29 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1 +1,2 @@
 DIST buildbot-worker-3.6.1.tar.gz 120224 BLAKE2B 
010893b7b4e5710654299b2541c4cdcdad47b3b763dbc7e2336e5480c841908e04d8350c7cb42edd9ea99d16fd26f36a524a6d6bec8c0f933665a02ded369f89
 SHA512 
f1e3bf7c0da2f31dd446dc16487e32fddaecc0c2f9c17c469146707322a3d7bb2cc77db4f6145c62530bce58dd61aa19e008e944a7f39a17dc66f1317ee26e1b
+DIST buildbot-worker-3.9.0.tar.gz 125913 BLAKE2B 
e053cd150cf21cc0e5dfb2d49c186c49d340670429b760ce9f697aa97a245d0e6a12f0ea84eb1256a610891042096877c89244b1f2862bf74160502170f9124c
 SHA512 
08b74d6f019ca85f65c598a34c81bc47fdf873abad17205072788d938fcd5450f80aa6ca9d324edc01893947f4ac8e2968889dd73be854a82b4ea54e4730613b

diff --git a/dev-util/buildbot-worker/buildbot-worker-.ebuild 
b/dev-util/buildbot-worker/buildbot-worker-3.9.0.ebuild
similarity index 92%
copy from dev-util/buildbot-worker/buildbot-worker-.ebuild
copy to dev-util/buildbot-worker/buildbot-worker-3.9.0.ebuild
index d399f27dd277..479a08e9fdd4 100644
--- a/dev-util/buildbot-worker/buildbot-worker-.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-3.9.0.ebuild
@@ -4,30 +4,30 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{10..11} )
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git;
-inherit readme.gentoo-r1 git-r3 distutils-r1
+inherit readme.gentoo-r1 systemd distutils-r1 pypi
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
 HOMEPAGE="https://buildbot.net/
https://github.com/buildbot/buildbot
https://pypi.org/project/buildbot-worker/;
-S="${S}/worker"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64 ~arm64 ~riscv ~sparc ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
acct-user/buildbot
+   !=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-   >=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
dev-python/future[${PYTHON_USEDEP}]
-   !=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
+   >=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
-   >=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
test? (
${RDEPEND}
dev-python/mock[${PYTHON_USEDEP}]
@@ -57,12 +57,16 @@ python_test() {
 }
 
 python_install_all() {
+
distutils-r1_python_install_all
 
doman docs/buildbot-worker.1
 
newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
+   systemd_dounit "${FILESDIR}/buildbot_worker.target"
+   systemd_newunit "${FILESDIR}/buildbot_worker_at.service" 
"buildbot_worker@.service"
+   systemd_install_serviced "${FILESDIR}/buildbot_worker_at.service.conf" 
"buildbot_worker@.service"
 
dodir /var/lib/buildbot_worker
cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| 
die "Install failed!"

diff --git a/dev-util/buildbot-worker/buildbot-worker-.ebuild 
b/dev-util/buildbot-worker/buildbot-worker-.ebuild
index d399f27dd277..a372eb1a754b 100644
--- a/dev-util/buildbot-worker/buildbot-worker-.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-.ebuild
@@ -21,10 +21,10 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
acct-user/buildbot
+   !=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-   >=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
dev-python/future[${PYTHON_USEDEP}]
-   !=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]

diff --git a/dev-util/buildbot-worker/metadata.xml 
b/dev-util/buildbot-worker/metadata.xml
index 8987b1c0b79c..866f0d75fdbb 100644
--- a/dev-util/buildbot-worker/metadata.xml
+++ b/dev-util/buildbot-worker/metadata.xml
@@ -5,6 +5,10 @@
dol...@gentoo.org
Brian Dolbec

+   
+   zo...@gentoo.org
+   Magnus Granberg
+   


de...@buildbot.net



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-www-react/

2023-08-24 Thread Brian Dolbec
commit: b3c10a331f0bf3e490f5d0fe526cc1fb85c54449
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 24 23:24:13 2023 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 24 23:33:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3c10a33

dev-util/buildbot-www-react: new package, add 3.9.0

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-www-react/Manifest   |  1 +
 .../buildbot-www-react-3.9.0.ebuild| 22 
 dev-util/buildbot-www-react/metadata.xml   | 24 ++
 3 files changed, 47 insertions(+)

diff --git a/dev-util/buildbot-www-react/Manifest 
b/dev-util/buildbot-www-react/Manifest
new file mode 100644
index ..ab2f6c0f9904
--- /dev/null
+++ b/dev-util/buildbot-www-react/Manifest
@@ -0,0 +1 @@
+DIST buildbot-www-react-3.9.0.tar.gz 38431 BLAKE2B 
e32edbd846c131670f8bc3c84fbc9456bd5757a09ed1e3b145f8cbb13707a31866527b3d1d16b7d77a2cf05d90923037841034c835ba5d7bc92ee47d9a00be92
 SHA512 
bdc1db5a21ff47b8f8c416e1eae38b561b2480d7643b91b598ae25bf6ffa362e6eeadf90c6a0e109dca6b80c15400562529d7b4dfe9e0ed1588e33a69b8c132f

diff --git a/dev-util/buildbot-www-react/buildbot-www-react-3.9.0.ebuild 
b/dev-util/buildbot-www-react/buildbot-www-react-3.9.0.ebuild
new file mode 100644
index ..086a404d6277
--- /dev/null
+++ b/dev-util/buildbot-www-react/buildbot-www-react-3.9.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="BuildBot base web interface, use with 
buildbot-react-{console-view,grid-view}..."
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-www-react/;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"

diff --git a/dev-util/buildbot-www-react/metadata.xml 
b/dev-util/buildbot-www-react/metadata.xml
new file mode 100644
index ..b15ec83b52fd
--- /dev/null
+++ b/dev-util/buildbot-www-react/metadata.xml
@@ -0,0 +1,24 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   dol...@gentoo.org
+   Brian Dolbec
+   
+   
+   zo...@gentoo.org
+   Magnus Granberg
+   
+   
+   The BuildBot-www-react package is the base or common code used 
for the other
+   react based user interface packages such as the grid and 
console views.
+   
+   
+   
+   de...@buildbot.net
+   Developers List
+   
+   buildbot-www-react
+   buildbot/buildbot
+   
+



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-waterfall-view/

2023-08-24 Thread Brian Dolbec
commit: 176633793eacf2467523f90c7e45b17138db3392
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 24 23:11:56 2023 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 24 23:32:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17663379

dev-util/buildbot-waterfall-view: add 3.9.0

Add Zorry to maintainers
Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-waterfall-view/Manifest  |  1 +
 .../buildbot-waterfall-view-3.9.0.ebuild   | 26 ++
 dev-util/buildbot-waterfall-view/metadata.xml  |  4 
 3 files changed, 31 insertions(+)

diff --git a/dev-util/buildbot-waterfall-view/Manifest 
b/dev-util/buildbot-waterfall-view/Manifest
index 8aabe766b347..08fa1fb526a6 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1 +1,2 @@
 DIST buildbot-waterfall-view-3.6.1.tar.gz 193914 BLAKE2B 
401dd8b1c042fe2dc5bc1c696607d3c0ab3188975757feb8a242049fb73c28f1f5f4dc1dc027ccf37f7a942e1a7d3093b917c1c3a4f81d5181bf8f8d6196
 SHA512 
f1bf080fa7b8e1dc17d52367e1e3dc3e4224c2de6db128bc2f061c338ef69c88732b39d487dcf92d06e2855902d6f078d76e97ddd0d38e348d4e83d0728ad634
+DIST buildbot-waterfall-view-3.9.0.tar.gz 194360 BLAKE2B 
30aeaee85bfcaf2b6079decca6c976d0dd13a83962a3b5c95fc9f2ec2b9601b58830ca9d9293647d05a94f3d0b16d8b57827f0f3d07b58aa2039fdeef5536e20
 SHA512 
815926d177de53048c39442639d85ae3ff4f861f181882896be187962464dcc51e7ff4a9e25e9cc1c31de6eb70442efb0dc20567e26316c5941ae7daa4572e6d

diff --git 
a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.9.0.ebuild 
b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.9.0.ebuild
new file mode 100644
index ..03d3f4022a46
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.9.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="Buildbot waterfall-view plugin"
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-waterfall-view/;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="
+   ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"

diff --git a/dev-util/buildbot-waterfall-view/metadata.xml 
b/dev-util/buildbot-waterfall-view/metadata.xml
index ec70a5ff22f4..1226a6380d96 100644
--- a/dev-util/buildbot-waterfall-view/metadata.xml
+++ b/dev-util/buildbot-waterfall-view/metadata.xml
@@ -5,6 +5,10 @@
dol...@gentoo.org
Brian Dolbec

+   
+   zo...@gentoo.org
+   Magnus Granberg
+   

The buildbot-waterfall-view plugin is the user interface code 
used to
generate the web pages used to display information about the 
builds.



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-react-console-view/

2023-08-24 Thread Brian Dolbec
commit: c68ffc6c40d51c7e3baabf1ae290d86df190ccc7
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 24 23:25:05 2023 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 24 23:33:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c68ffc6c

dev-util/buildbot-react-console-view: new package, add 3.9.0

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-react-console-view/Manifest  |  1 +
 .../buildbot-react-console-view-3.9.0.ebuild   | 25 ++
 dev-util/buildbot-react-console-view/metadata.xml  | 24 +
 3 files changed, 50 insertions(+)

diff --git a/dev-util/buildbot-react-console-view/Manifest 
b/dev-util/buildbot-react-console-view/Manifest
new file mode 100644
index ..4c0f257bc907
--- /dev/null
+++ b/dev-util/buildbot-react-console-view/Manifest
@@ -0,0 +1 @@
+DIST buildbot-react-console-view-3.9.0.tar.gz 25184 BLAKE2B 
672e80e9bfd04232a292da0807b1bbc024be2bdcaadec54ecf4ab9f2ee562a2bada92a48965339b3f56f2ceade127faf0903ed09f5e064e0a1f604c2aaba626c
 SHA512 
51d398dadf7e0874061efefc62e3b0d08ce2d29fc8bd686a4f700d12858edc733e114e99d44d2fc97cd891f32faa0751a423be5bce2ae06ebd6ce0c6903e1a0d

diff --git 
a/dev-util/buildbot-react-console-view/buildbot-react-console-view-3.9.0.ebuild 
b/dev-util/buildbot-react-console-view/buildbot-react-console-view-3.9.0.ebuild
new file mode 100644
index ..f822a2f76023
--- /dev/null
+++ 
b/dev-util/buildbot-react-console-view/buildbot-react-console-view-3.9.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="Buildbot react based console-view plugin"
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-react-console-view/;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="
+   ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-www-react-${PV}[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"

diff --git a/dev-util/buildbot-react-console-view/metadata.xml 
b/dev-util/buildbot-react-console-view/metadata.xml
new file mode 100644
index ..f49f90b24118
--- /dev/null
+++ b/dev-util/buildbot-react-console-view/metadata.xml
@@ -0,0 +1,24 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   dol...@gentoo.org
+   Brian Dolbec
+   
+   
+   zo...@gentoo.org
+   Magnus Granberg
+   
+   
+   The buildbot-react-console-view plugin is the new react based 
user interface
+   code used to display information about the builds to the 
console.
+   
+   
+   
+   de...@buildbot.net
+   Developers List
+   
+   buildbot-react-console-view
+   buildbot/buildbot
+   
+



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-wsgi-dashboards/

2023-08-24 Thread Brian Dolbec
commit: ea7d2365292b00e0473dec7ead66a4ad450f572b
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 24 23:12:30 2023 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 24 23:33:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea7d2365

dev-util/buildbot-wsgi-dashboards: add 3.9.0

Add Zorry to maintainers
Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-wsgi-dashboards/Manifest |  1 +
 .../buildbot-wsgi-dashboards-3.9.0.ebuild  | 24 ++
 dev-util/buildbot-wsgi-dashboards/metadata.xml |  4 
 3 files changed, 29 insertions(+)

diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest 
b/dev-util/buildbot-wsgi-dashboards/Manifest
index 96fb064880e3..5ab5fe72f313 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1 +1,2 @@
 DIST buildbot-wsgi-dashboards-3.6.1.tar.gz 5584 BLAKE2B 
f0b82de52022c3a8a0d0747aa4ade67345af177be70a8767d66163fe98ceff63e0b297ba547619de874a66e381b721c48d864361fdb82a818f2450c339d687cc
 SHA512 
7ecd4fd71786258deab1fb1d96b4999ef929df4486d09404cb1bc3d1a7f831c90f8253f5bf0474258ba472ac9e8f960f4c4eb1f7993a0a8070eaa68e34e9
+DIST buildbot-wsgi-dashboards-3.9.0.tar.gz 6224 BLAKE2B 
462dc93c1334ba8daba5eb01b85eb7747a2ce4a9dfc17f5e96f1fd4dc8c5d54d1740d4a041d667cd38e67d1d4e25c44845a90758e3d3a7925f12802d78152ed0
 SHA512 
fbdf567fe08d83b62ad0b4a5eca35a01567a1bdccd749adced1dad89805c102fdb6d6a35d8d7b07b2b47b9762a411c62a86aaa28c28b370363383a9130091352

diff --git 
a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.9.0.ebuild 
b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.9.0.ebuild
new file mode 100644
index ..05f2c64c59fd
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.9.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to 
buildbot UI"
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-wsgi-dashboards/;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+   ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"

diff --git a/dev-util/buildbot-wsgi-dashboards/metadata.xml 
b/dev-util/buildbot-wsgi-dashboards/metadata.xml
index f58ca0f337a8..2fcfc2398316 100644
--- a/dev-util/buildbot-wsgi-dashboards/metadata.xml
+++ b/dev-util/buildbot-wsgi-dashboards/metadata.xml
@@ -5,6 +5,10 @@
dol...@gentoo.org
Brian Dolbec

+   
+   zo...@gentoo.org
+   Magnus Granberg
+   

The buildbot-wsgi-dashboards plugin is the user interface code 
used to
integrate flask or bottle dashboards to buildbot's web 
interface.



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-www/

2023-08-24 Thread Brian Dolbec
commit: 237136786f063136d43e95d328c4adcd8442f514
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 24 23:07:51 2023 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 24 23:32:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23713678

dev-util/buildbot-www: add 3.9.0

Add Zorry to maintainers
Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-www/Manifest  |  1 +
 dev-util/buildbot-www/buildbot-www-3.9.0.ebuild | 22 ++
 dev-util/buildbot-www/metadata.xml  |  4 
 3 files changed, 27 insertions(+)

diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 37443f8b4330..390f4ebc0e2f 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1 +1,2 @@
 DIST buildbot-www-3.6.1.tar.gz 3210526 BLAKE2B 
6db8be32ee85cab63ad3f92d0e24042ed1ebece3b7be1b67e6f72240f61f3af2c31f1b3b31315db0d7ca18dddab1351eacffb92e762d1f1d68ce414349e52eee
 SHA512 
d2fb3f97412e4a1b21fe7637458dffa8e8e005693ad2275222e908d35551ec64f89a88e696859a09f64b2b5be5fbdb386fbd71324356dbe8c2adc92b1c6b9f01
+DIST buildbot-www-3.9.0.tar.gz 3211620 BLAKE2B 
d5a75845941b456537be50484d341e450f545cf14ccafdc245d4b4d296df154e333d2797f8e5f5dc42c872a83360c675b0e747564cbcc3c182c4c1c0138205fb
 SHA512 
2c88e0f41d5f4de37eecebc43b21f5f741771e0ecaed79865744503b939335f1f1dd426cd2e1cdbcf75a7573aa89ab5913e4c64aa6dea9e13fa19646dd717c0b

diff --git a/dev-util/buildbot-www/buildbot-www-3.9.0.ebuild 
b/dev-util/buildbot-www/buildbot-www-3.9.0.ebuild
new file mode 100644
index ..4d6c55e0d5ca
--- /dev/null
+++ b/dev-util/buildbot-www/buildbot-www-3.9.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="BuildBot base web interface, use with 
buildbot-{console-view,waterfall-view}..."
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-www/;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"

diff --git a/dev-util/buildbot-www/metadata.xml 
b/dev-util/buildbot-www/metadata.xml
index c438d214f139..f12a732fccff 100644
--- a/dev-util/buildbot-www/metadata.xml
+++ b/dev-util/buildbot-www/metadata.xml
@@ -5,6 +5,10 @@
dol...@gentoo.org
Brian Dolbec

+   
+   zo...@gentoo.org
+   Magnus Granberg
+   

The BuildBot-www package is the base or common code used for 
the other
user interface packages such as the waterfall and console views.



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-console-view/

2023-08-24 Thread Brian Dolbec
commit: 19290578c9f930e17ba0968ab0e93180527afcd2
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 24 23:10:31 2023 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 24 23:32:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19290578

dev-util/buildbot-console-view: add 3.9.0

Add Zorry to maintainers
Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-console-view/Manifest|  1 +
 .../buildbot-console-view-3.9.0.ebuild | 25 ++
 dev-util/buildbot-console-view/metadata.xml|  4 
 3 files changed, 30 insertions(+)

diff --git a/dev-util/buildbot-console-view/Manifest 
b/dev-util/buildbot-console-view/Manifest
index 377105e12b38..acbaf680fea5 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1 +1,2 @@
 DIST buildbot-console-view-3.6.1.tar.gz 18731 BLAKE2B 
b572b0c2bedfb1149056237a5b7417c933cdd75b8a723edcb5b37cbf33c8d6d1c1fa5d490955a119eb6ca6df7317b89182c45462ceebb310d3b78f44712f4d33
 SHA512 
3489579c02db7f2b02aaeab8d9cc2eb60d72e5a12eca51c63cf10491c683ba7b99069de6ca2348fcf44dd6ce81d58d437a7d03749815a3fad55162e50df912e0
+DIST buildbot-console-view-3.9.0.tar.gz 19013 BLAKE2B 
8e4adcbbe1aa545dfe314e31a13ec5b50dfb074e7c7c945f30a099937307fe4b76b058cde35e9726e030ea925670b570f8fbb8489e2162c7d0594d0f4227a557
 SHA512 
4cff6c23f3b8959b49db9d04447730eabdf3794050c2a8602f111c7b7a144de6fb53f2ee4035a63e27f25954034af04e39e81db1b1b9c785168670aa8660a631

diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.9.0.ebuild 
b/dev-util/buildbot-console-view/buildbot-console-view-3.9.0.ebuild
new file mode 100644
index ..d8b774611b0b
--- /dev/null
+++ b/dev-util/buildbot-console-view/buildbot-console-view-3.9.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="Buildbot console-view plugin"
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-console-view/;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="
+   ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"

diff --git a/dev-util/buildbot-console-view/metadata.xml 
b/dev-util/buildbot-console-view/metadata.xml
index a2c9ebf97a34..8ab57748face 100644
--- a/dev-util/buildbot-console-view/metadata.xml
+++ b/dev-util/buildbot-console-view/metadata.xml
@@ -5,6 +5,10 @@
dol...@gentoo.org
Brian Dolbec

+   
+   zo...@gentoo.org
+   Magnus Granberg
+   

The buildbot-console-view plugin is the user interface code 
used to
display information about the builds to the console.



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-grid-view/

2023-08-24 Thread Brian Dolbec
commit: 5c4b0046e599d3dc9854d08b1434ea71fae4adb3
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 24 23:11:03 2023 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 24 23:32:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c4b0046

dev-util/buildbot-grid-view: add 3.9.0

Add Zorry to maintainers
Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-grid-view/Manifest   |  1 +
 .../buildbot-grid-view-3.9.0.ebuild| 24 ++
 dev-util/buildbot-grid-view/metadata.xml   |  4 
 3 files changed, 29 insertions(+)

diff --git a/dev-util/buildbot-grid-view/Manifest 
b/dev-util/buildbot-grid-view/Manifest
index 02943aadf61e..dbf90a74adb8 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1 +1,2 @@
 DIST buildbot-grid-view-3.6.1.tar.gz 13706 BLAKE2B 
808d663b397459c7dd2d537a1a6eab2a0cc839ef0ba42bf56722ee53628bc9e6d41d03f549f0adb0fa92b0b8f416ca8c0a4bc310d67b4b06823eefe33b1ed02b
 SHA512 
7605a5af1428ff08c96751f9c93fddd7b54f57a8879b85c270338e94eeb4ed55ddcfb7066519a2a3ff6d07b537a6ac28bb388b48eecb81c477aa1b6fbaa361dd
+DIST buildbot-grid-view-3.9.0.tar.gz 14091 BLAKE2B 
f598e0718ad80d439d15a9b88205d3aef448bd350da8ed3fe3260b1f71770c530c1a0d8cc2a18516cf5e1f5e97f5836c540e578749aa1ad3be2088e62705a750
 SHA512 
e7ec9e082a3339f72fb2089f727de009db2b155069aad1ce073235ad4b36701d27c2f77ccbe2b02862f52cb1512620797705d32d317588db17431477b02e897c

diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.9.0.ebuild 
b/dev-util/buildbot-grid-view/buildbot-grid-view-3.9.0.ebuild
new file mode 100644
index ..fdfb25b728e9
--- /dev/null
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-3.9.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="BuildBot grid view web interface"
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-grid-view/;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+   ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"

diff --git a/dev-util/buildbot-grid-view/metadata.xml 
b/dev-util/buildbot-grid-view/metadata.xml
index b9d2a9d72fb9..cb9cabd2f221 100644
--- a/dev-util/buildbot-grid-view/metadata.xml
+++ b/dev-util/buildbot-grid-view/metadata.xml
@@ -5,6 +5,10 @@
dol...@gentoo.org
Brian Dolbec

+   
+   zo...@gentoo.org
+   Magnus Granberg
+   

The buildbot-grid-view plugin is the user interface code used to
display information about the builds.



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-badges/

2023-08-24 Thread Brian Dolbec
commit: eab7bcd81ade9ca22f5b9a809ff57aa62b97b1ed
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 24 23:09:54 2023 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 24 23:32:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eab7bcd8

dev-util/buildbot-badges: add 3.9.0

Add Zorry to maintainers
Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-badges/Manifest  |  1 +
 .../buildbot-badges/buildbot-badges-3.9.0.ebuild   | 29 ++
 dev-util/buildbot-badges/metadata.xml  |  4 +++
 3 files changed, 34 insertions(+)

diff --git a/dev-util/buildbot-badges/Manifest 
b/dev-util/buildbot-badges/Manifest
index 760cdc1a7bef..e54b554d6b9b 100644
--- a/dev-util/buildbot-badges/Manifest
+++ b/dev-util/buildbot-badges/Manifest
@@ -1 +1,2 @@
 DIST buildbot-badges-3.6.1.tar.gz 3967 BLAKE2B 
07763a458c0eb32db13fd7b39a20186c2772ff53ea30e3b199f0dd64008346c218d550b10b238b63deb2ee64064b3f1fb19c95013f6647ec4992b8fee12ca2e5
 SHA512 
4326f49c2d69d86e9c49250c261c59d67553d6cb63098f19c391f3bfb83c4f99ea783d2351930fcfed40fe83dbfc8466294d77609e39e79e76c6c7b42e557c0f
+DIST buildbot-badges-3.9.0.tar.gz 4677 BLAKE2B 
acbeb9b1dc850c77caa2d8cec67da2649dd79b4da27f0cb224e007919b12571f5766fe8c0652ef63a98ced8f8f3385b06479cd008e50e98f3f16f1efa17d60e6
 SHA512 
f718a9c9b44296cb4636106945fc0f214f1bbef494cfdc65f14b415f4f36b746659751778e13104145aa1d771b969d176e67930a49a0f9fc30385e47e20bdab1

diff --git a/dev-util/buildbot-badges/buildbot-badges-3.9.0.ebuild 
b/dev-util/buildbot-badges/buildbot-badges-3.9.0.ebuild
new file mode 100644
index ..ad7526a97942
--- /dev/null
+++ b/dev-util/buildbot-badges/buildbot-badges-3.9.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-grid-view/;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+   ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+   dev-python/cairocffi[${PYTHON_USEDEP}]
+   media-gfx/cairosvg[${PYTHON_USEDEP}]
+   >=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+   dev-python/klein[${PYTHON_USEDEP}]
+"

diff --git a/dev-util/buildbot-badges/metadata.xml 
b/dev-util/buildbot-badges/metadata.xml
index d15725c28e1b..450a2d29b98e 100644
--- a/dev-util/buildbot-badges/metadata.xml
+++ b/dev-util/buildbot-badges/metadata.xml
@@ -5,6 +5,10 @@
dol...@gentoo.org
Brian Dolbec

+   
+   zo...@gentoo.org
+   Magnus Granberg
+   

The Buildbot badges plugin produces an image in SVG or PNG 
format with
information about the last build for the given builder name. PNG



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-pkg/

2023-08-24 Thread Brian Dolbec
commit: a62a7dcf9dc9ea16ba0b85108c5417eae47b4ed4
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 24 23:02:41 2023 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 24 23:32:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a62a7dcf

dev-util/buildbot-pkg: add 3.9.0

Add Zorry to maintaners
Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-pkg/Manifest  |  1 +
 dev-util/buildbot-pkg/buildbot-pkg-3.9.0.ebuild | 30 +
 dev-util/buildbot-pkg/metadata.xml  |  4 
 3 files changed, 35 insertions(+)

diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index 8b4dab297664..320ffad3aaeb 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1 +1,2 @@
 DIST buildbot-pkg-3.6.1.tar.gz 4807 BLAKE2B 
d492d0ca36fa8634e877bbc56ffd06ff6a7bb477c98bde2e3586dfc64f4b9d394ec1e5bb1a113aad9d2905277805b9f8737babcad669e2b73abb67d156d3126c
 SHA512 
5833581b4551dc204a52a8356bdb110d57a9de022c33b09b7efdc14f5f4a7c0b0e26f9f9a6a076945aec3a5b7089c040ddaaad8d94c6e0217c2cb6b7742c1ac2
+DIST buildbot-pkg-3.9.0.tar.gz 4987 BLAKE2B 
b7a05d0401efbecbab718c60e40e87d154e42d0a1b3e298d738f291853fd3a96ae984474e55b52b34eb43959bc2399aaaef90582a7bb2fef7e9b60943076ea13
 SHA512 
96500b53bdcb955146bd3115a93c7b96019da62f81baf81cd736eb0b236b1cec8e2c24c8048c54bd298c15147b807f6e6c6a90bd71fc0dc95a50fffe3aa9f07b

diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.9.0.ebuild 
b/dev-util/buildbot-pkg/buildbot-pkg-3.9.0.ebuild
new file mode 100644
index ..552d4880c8f3
--- /dev/null
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.9.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="BuildBot common www build tools for packaging releases"
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-pkg/;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+# No real integration tests for this pkg.
+# all tests are related to making releases and final checks for distribution
+RESTRICT="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+   sed -e "/version/s/=.*$/=\"${PV/_p/.post}\",/" -i setup.py || die
+   distutils-r1_src_prepare
+}

diff --git a/dev-util/buildbot-pkg/metadata.xml 
b/dev-util/buildbot-pkg/metadata.xml
index 1e3ebf4755df..843974e6055d 100644
--- a/dev-util/buildbot-pkg/metadata.xml
+++ b/dev-util/buildbot-pkg/metadata.xml
@@ -5,6 +5,10 @@
dol...@gentoo.org
Brian Dolbec

+   
+   zo...@gentoo.org
+   Magnus Granberg
+   

BuildBot is a system to automate the compile/test cycle required
by most software projects to validate code changes.



[gentoo-commits] proj/mirrorselect: New tag: 2.3.0-rc1

2023-01-09 Thread Brian Dolbec
commit: 
Commit: Brian Dolbec  gentoo  org>
CommitDate: Mon Jan  9 16:23:20 2023 +

New tag: 2.3.0-rc1




[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-pkg/

2022-09-22 Thread Brian Dolbec
commit: 23995f2059d39569a11f584b3bf0f2777925
Author: Brian Dolbec  gentoo  org>
AuthorDate: Fri Sep 23 01:53:09 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Fri Sep 23 03:00:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23995f20

dev-util/buildbot-pkg: Version bump to 3.6.1

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-pkg/Manifest  |  1 +
 dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild | 34 +
 2 files changed, 35 insertions(+)

diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index 1f6ac023bbde..a8516f134d5f 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-pkg-3.4.0.tar.gz 4809 BLAKE2B 
6d3e549e7b44b5ad95bb7520ef8765828da587e3940a9f352ede63346b3303127313fe4b71338ff65ef9ab2c0ac6258793bd9ef664153a0b45b0b6d7d2d92943
 SHA512 
ca1ef22fb6113bfe0106360ba1eacb167a8335ba15f94a0635bc4d00f999818704f8cfebd7889b6b3df5e1ca7ab79b96f4656e481d6b1f25f5fb7404af0d7ff6
 DIST buildbot-pkg-3.5.0.tar.gz 4806 BLAKE2B 
41e217bc029bb8dbdb0f95218640d57d9f9ecabfbc0310118898042bbb543d9d4e5ba88075e934a9be9b1653e2a3d3d1e159547b832f9cde08c262713a817968
 SHA512 
08b3ec93dfbef87d90cfd4b7b1402003df785ceff8c43bf0320de79ff0efcb74f4cb4f0ec736e0d7231b54a82761d40df66e21540f1756fe74f68bb550850b1c
 DIST buildbot-pkg-3.6.0.tar.gz 4807 BLAKE2B 
3b632ef4c0c1f2dc9c39fbe37ba6165a01162e41e77e28c08b9c820425cceac08d20193e0cc74d83c35cb6ff89e9576194cf35b8cac803e9b1f04076c9f96532
 SHA512 
0145a7ff7dddfb139f502193e0b04ab10a39b325ae65ca01c0f0d88c251c18798ebe4713a3ff1aa376c72aa8d3155a5edb58055a50f5f9ccd1bb43de0ff8e63e
+DIST buildbot-pkg-3.6.1.tar.gz 4807 BLAKE2B 
d492d0ca36fa8634e877bbc56ffd06ff6a7bb477c98bde2e3586dfc64f4b9d394ec1e5bb1a113aad9d2905277805b9f8737babcad669e2b73abb67d156d3126c
 SHA512 
5833581b4551dc204a52a8356bdb110d57a9de022c33b09b7efdc14f5f4a7c0b0e26f9f9a6a076945aec3a5b7089c040ddaaad8d94c6e0217c2cb6b7742c1ac2

diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild 
b/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild
new file mode 100644
index ..4d4e95e9196c
--- /dev/null
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot common www build tools for packaging releases"
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-pkg/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+# No real integration tests for this pkg.
+# all tests are related to making releases and final checks for distribution
+RESTRICT="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+   sed -e "/version/s/=.*$/=\"${MY_PV}\",/" -i setup.py || die
+   distutils-r1_src_prepare
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-badges/

2022-09-22 Thread Brian Dolbec
commit: a42214d2cc776d0faaa09f90afe63f20a0fe2a10
Author: Brian Dolbec  gentoo  org>
AuthorDate: Fri Sep 23 02:14:03 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Fri Sep 23 03:00:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a42214d2

dev-util/buildbot-badges: Version bump to 3.6.1

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-badges/Manifest  |  1 +
 .../buildbot-badges/buildbot-badges-3.6.1.ebuild   | 33 ++
 2 files changed, 34 insertions(+)

diff --git a/dev-util/buildbot-badges/Manifest 
b/dev-util/buildbot-badges/Manifest
index 85e38daeb3d2..88f41c531d80 100644
--- a/dev-util/buildbot-badges/Manifest
+++ b/dev-util/buildbot-badges/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-badges-3.4.0.tar.gz 3966 BLAKE2B 
cb94a63dec1e16bb52f5f84174d204137e7da582d3a62effa2d298fbc5f1c25541a8a96d8366efac650488b3810b37eadf9e650db277d6d04c33c1ff9cab32b1
 SHA512 
3b440b9d36f4e5d310886fd4b0e11607574d312093ce8c9654f07650c2ccf90b27c078c950fb7008f9d834d1cf4f15813c113b85c2d0d1181fac370f7a3472f6
 DIST buildbot-badges-3.5.0.tar.gz 3962 BLAKE2B 
48f4865136845300e447835c348736ee15a3d520db03b4e6e70b45366e723f10eeff3d7e37a1f166682374dc6c1dabb051ad6f15c9730da969a846b606bc5730
 SHA512 
7817e0c2127892ee32a8c14e1f4204d724ce1c584f15c55b77902cdadfe9c2ff0e0df92d282fd8157aebcab067605c56ac776c7f8e37dae0a53672c14e002e19
 DIST buildbot-badges-3.6.0.tar.gz 3964 BLAKE2B 
e11db574b7245396c6532a3427b7494fbfcb68762b7a76b3f63ec49a2f460a2e1d8023ea1d54d7a27714990b9c8d2a0895442c41d8b65584e178f2af02b4ade3
 SHA512 
d133efad8d7171d122279f4e32fd7b0fa7d84bdeb0d40b175d94d64f4344044dda186d2f1f6d5d2f2f6654461f739c90450a51843ce6314b457edc75
+DIST buildbot-badges-3.6.1.tar.gz 3967 BLAKE2B 
07763a458c0eb32db13fd7b39a20186c2772ff53ea30e3b199f0dd64008346c218d550b10b238b63deb2ee64064b3f1fb19c95013f6647ec4992b8fee12ca2e5
 SHA512 
4326f49c2d69d86e9c49250c261c59d67553d6cb63098f19c391f3bfb83c4f99ea783d2351930fcfed40fe83dbfc8466294d77609e39e79e76c6c7b42e557c0f

diff --git a/dev-util/buildbot-badges/buildbot-badges-3.6.1.ebuild 
b/dev-util/buildbot-badges/buildbot-badges-3.6.1.ebuild
new file mode 100644
index ..37e3828ead37
--- /dev/null
+++ b/dev-util/buildbot-badges/buildbot-badges-3.6.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-grid-view/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+   ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+   dev-python/cairocffi[${PYTHON_USEDEP}]
+   media-gfx/cairosvg[${PYTHON_USEDEP}]
+   >=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+   dev-python/klein[${PYTHON_USEDEP}]
+"



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-waterfall-view/

2022-09-22 Thread Brian Dolbec
commit: 35f236a7e74f6ddd7f5272015c34515f72c0cb61
Author: Brian Dolbec  gentoo  org>
AuthorDate: Fri Sep 23 02:12:10 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Fri Sep 23 03:00:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35f236a7

dev-util/buildbot-waterfall-view: Version bump to  3.6.1

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-waterfall-view/Manifest  |  1 +
 .../buildbot-waterfall-view-3.6.1.ebuild   | 30 ++
 2 files changed, 31 insertions(+)

diff --git a/dev-util/buildbot-waterfall-view/Manifest 
b/dev-util/buildbot-waterfall-view/Manifest
index 7db967201afc..5b654f46230f 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-waterfall-view-3.4.0.tar.gz 192456 BLAKE2B 
7375e22b86b4dfe2cde88d4190accea50bf49c9615358ec55b341e6720551b4605015938ed15bfac6bf80805a32457081389bd150d762e90132af4f18295cfe5
 SHA512 
a9a381e8b520919f71011083face8760f864f5bbe5080446c64c0a63c38d787e486cddd20c3548b01d78534a206221ed2bec85bb78681fe3dceaef2bc1f172d9
 DIST buildbot-waterfall-view-3.5.0.tar.gz 192440 BLAKE2B 
46ef4e839dabb5006c740c6f04235b123be420b4d0108cf59bab075fde3dbf6bbe0b4fdfc37fd8606da3696d15f45ee4363f8c35434f944af70f884e2de1edff
 SHA512 
381ce3bb976aa0e1cadd541af44ab0bf1450a3e47351a55b32bda24ad824dbba0f075ee8204a3f26c3ab62a5a615c6ca5027b1894852f8d5308fb27b64e9c177
 DIST buildbot-waterfall-view-3.6.0.tar.gz 193903 BLAKE2B 
3029015580dedd9003ae7b723ce79b335d58fd198c4d294483377c34bb88eaade53cd704652c240670c1bab488ab60056e03aba698dcb294f09fe62def59d5f8
 SHA512 
520e5e1653ceb92a4eb144530fa3cc6d893c4baae15f5ffcc29f2bc66ef02f1a41d287b3d85864a5ddf0a127c0fcf2d19a0ae136e39e394228713112487af8c2
+DIST buildbot-waterfall-view-3.6.1.tar.gz 193914 BLAKE2B 
401dd8b1c042fe2dc5bc1c696607d3c0ab3188975757feb8a242049fb73c28f1f5f4dc1dc027ccf37f7a942e1a7d3093b917c1c3a4f81d5181bf8f8d6196
 SHA512 
f1bf080fa7b8e1dc17d52367e1e3dc3e4224c2de6db128bc2f061c338ef69c88732b39d487dcf92d06e2855902d6f078d76e97ddd0d38e348d4e83d0728ad634

diff --git 
a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.1.ebuild 
b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.1.ebuild
new file mode 100644
index ..591aebc7cf5b
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot waterfall-view plugin"
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-waterfall-view/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="
+   ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-www/

2022-09-22 Thread Brian Dolbec
commit: 49b919b1ea00995f7506ea221702d83e017e9607
Author: Brian Dolbec  gentoo  org>
AuthorDate: Fri Sep 23 02:04:08 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Fri Sep 23 03:00:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b919b1

dev-util/buildbot-www: Version bump to 3.6.1

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-www/Manifest  |  1 +
 dev-util/buildbot-www/buildbot-www-3.6.1.ebuild | 26 +
 2 files changed, 27 insertions(+)

diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 53d1c2e0ebf7..ed19ccd2e562 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-www-3.4.0.tar.gz 3182445 BLAKE2B 
350606158ae68aba1b82c43d202e6140f433905e9913c7f4fcd3f4ebd328f7b70940f0a4e76a4a1f89731f6364dd285f08052bd1d96badac4e69cd1e16643d4e
 SHA512 
7be83f35b6042accae77db1133d54282d0d27ce15a9b34220cc015255935d7463c1a327ee289740325bbb73d6a6a162f384da2b3cc731719e7f99a911faf86cd
 DIST buildbot-www-3.5.0.tar.gz 3182531 BLAKE2B 
dcdd6487eff9d9a0429554d79f9ee83a9086dee3524b49fa8362085dddb969e088373a843a9d872e16d18350e1623ba65258799b9b93327e218f760540ece4fa
 SHA512 
f40101624cf14f88f2796855845d13ee81471d7a1b4911461747aa073735352f21294c17f3a011229c5e1c99867013ff4b306bf32c2c37b3c57d530a6fccc01e
 DIST buildbot-www-3.6.0.tar.gz 3210526 BLAKE2B 
ab54213c457a9f5777075d00adb96863b4327cbbbc489c97609f29182fb8630cc77479ffa7e324d0d20e453bbcdc70f8ad0537a8bf55fd23d8410b8003e1399f
 SHA512 
77a0671caa5c8a240301c7f3a2c2a26ecc69924546b7b7e641577e0f46c84380a80de43271dced0fa24a24b58b32d485d70d9af1d41a31af78af22a380653910
+DIST buildbot-www-3.6.1.tar.gz 3210526 BLAKE2B 
6db8be32ee85cab63ad3f92d0e24042ed1ebece3b7be1b67e6f72240f61f3af2c31f1b3b31315db0d7ca18dddab1351eacffb92e762d1f1d68ce414349e52eee
 SHA512 
d2fb3f97412e4a1b21fe7637458dffa8e8e005693ad2275222e908d35551ec64f89a88e696859a09f64b2b5be5fbdb386fbd71324356dbe8c2adc92b1c6b9f01

diff --git a/dev-util/buildbot-www/buildbot-www-3.6.1.ebuild 
b/dev-util/buildbot-www/buildbot-www-3.6.1.ebuild
new file mode 100644
index ..7834a034d6b5
--- /dev/null
+++ b/dev-util/buildbot-www/buildbot-www-3.6.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot base web interface, use with 
buildbot-{console-view,waterfall-view}..."
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-www/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-worker/files/, dev-util/buildbot-worker/

2022-09-22 Thread Brian Dolbec
commit: fca5d7800b100f298b2f75b58ed733a0585e03af
Author: Brian Dolbec  gentoo  org>
AuthorDate: Fri Sep 23 02:16:07 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Fri Sep 23 03:00:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fca5d780

dev-util/buildbot-worker: Version bump to 3.6.1

Update 
Add systemd service files

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-worker/Manifest  |  1 +
 ...er-.ebuild => buildbot-worker-3.6.1.ebuild} | 24 ++
 .../buildbot-worker/buildbot-worker-.ebuild|  8 
 .../buildbot-worker/files/buildbot_worker.confd2   |  2 +-
 .../buildbot-worker/files/buildbot_worker.service  | 12 +++
 .../buildbot-worker/files/buildbot_worker.target   |  5 +
 .../files/buildbot_worker_at.service   | 14 +
 .../files/buildbot_worker_at.service.conf  |  5 +
 8 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/dev-util/buildbot-worker/Manifest 
b/dev-util/buildbot-worker/Manifest
index f922e58e8ae9..79bd8d18300c 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-worker-3.4.0.tar.gz 102910 BLAKE2B 
c38a806e8d0475a8c18176310f628b829fc359f013b315e82715e71071213fe4a0cdf38273ad7df39a66675f4ebc9fb1881fb990290f2bbedf4c8777ec93d4dc
 SHA512 
411a2bf496622c2b9a3e0dea1ea8a71b347566010086c57ffc5d1114546cc5052af39a8ff7b10ffe6e7afdb6fc8ff73a9ffba23b96a76ff1cc0e3eff81cc59a7
 DIST buildbot-worker-3.5.0.tar.gz 111349 BLAKE2B 
90d193fb89ac65ca03274e0ad5c7fde8fc478bb932ccc4240495437f79171d49f623f50731c7619336386b7d1d7df3f955e10bf006ad86b8dcf294d75c874774
 SHA512 
1df67b6332753f91179863cca76b0578e4f36954e0aa4eb9c28f98d6451d6972e247849fb9d4e20b753b5702d100406b306ce4982181510ad81de0d35a9828ed
 DIST buildbot-worker-3.6.0.tar.gz 120158 BLAKE2B 
c762237d802f6eff1c6b74f0ed364ecf085d762c80f6cc90edc1fed0084c7bf6a0b74b6fcaf8611b9c21b6249bde547d5a10bc7ff5b4588d138b2ebf76e823a3
 SHA512 
6b5f50694fe1559dacba599f8641c6b370cad4b68c8182e8a6e31528ffbeeed81c405fd764e3718003913fe5fe8d9faa920a2ad81373fbd028cbf046ed0d3136
+DIST buildbot-worker-3.6.1.tar.gz 120224 BLAKE2B 
010893b7b4e5710654299b2541c4cdcdad47b3b763dbc7e2336e5480c841908e04d8350c7cb42edd9ea99d16fd26f36a524a6d6bec8c0f933665a02ded369f89
 SHA512 
f1e3bf7c0da2f31dd446dc16487e32fddaecc0c2f9c17c469146707322a3d7bb2cc77db4f6145c62530bce58dd61aa19e008e944a7f39a17dc66f1317ee26e1b

diff --git a/dev-util/buildbot-worker/buildbot-worker-.ebuild 
b/dev-util/buildbot-worker/buildbot-worker-3.6.1.ebuild
similarity index 87%
copy from dev-util/buildbot-worker/buildbot-worker-.ebuild
copy to dev-util/buildbot-worker/buildbot-worker-3.6.1.ebuild
index 6fb30ec0ecab..e2d1ed832b13 100644
--- a/dev-util/buildbot-worker/buildbot-worker-.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-3.6.1.ebuild
@@ -5,29 +5,33 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git;
-inherit readme.gentoo-r1 git-r3 distutils-r1
+inherit readme.gentoo-r1 systemd distutils-r1
+
+MY_V="${PV/_p/.post}"
+MY_P="${PN}-${MY_V}"
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
 HOMEPAGE="https://buildbot.net/
https://github.com/buildbot/buildbot
https://pypi.org/project/buildbot-worker/;
-S="${S}/worker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
acct-user/buildbot
>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+   >=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
dev-python/future[${PYTHON_USEDEP}]
!

[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/files/, dev-util/buildbot/

2022-09-22 Thread Brian Dolbec
commit: d99f955327514ef544f5deecb4f0ef8dc0bac656
Author: Brian Dolbec  gentoo  org>
AuthorDate: Fri Sep 23 02:20:35 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Fri Sep 23 03:00:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d99f9553

dev-util/buildbot: Version bump to 3.6.1

Update , confd file

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot/Manifest  |  1 +
 .../{buildbot-.ebuild => buildbot-3.6.1.ebuild} | 17 +++--
 dev-util/buildbot/buildbot-.ebuild  |  2 +-
 dev-util/buildbot/files/buildmaster.confd   |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 2a4093a0408e..ad7526384cac 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-3.4.0.tar.gz 2446868 BLAKE2B 
a58b268fd4569105f1c0ba48c9ed86210a3fee4725f167d6b6847960bbb56a092d0c0db427ecf5932a91d44065da8843fbb4046d289800a019b0b1d8b1f53fea
 SHA512 
92e5085862ac37a6c3c059870a3998fbaac2019c48384295f3e209788ea14bddff6704f1b987a8f3b1550c1b0255d228f8a0b2a20b5cb760b22a513db465863b
 DIST buildbot-3.5.0.tar.gz 2450653 BLAKE2B 
0e923f2a3a334241b25c6a151b397356d7ba81ab2ff19c17c50a5996494d0f99fa198b63aa18a27ab60c5ad53c0154494bf4dea4e2bd306f4b709858a64dc3c4
 SHA512 
9730305540db3cdf166fdfc071142061926bbb895aa941046ad25e8350d3c161d4175f3518cd8a3ab51f320b0a5980517e5e53d9f5ddc342492ee56a0f6f266f
 DIST buildbot-3.6.0.tar.gz 2458029 BLAKE2B 
5f41702d4d61fbcbfa878c6febbb89a38da2648403c4fdcab24bde246adc225e9ac3f72eb7dc893e03763f00c2d3548c31b2d6597904032e4b75e660bb1faf72
 SHA512 
c0bec931d08adb1eec51114619d2a085fbef224944a4c0acf3ab396f84d846fd620b84379affee238d02dd90ca1294fdb2b7fb8ea6e82d95c4cfeae93a0b5e73
+DIST buildbot-3.6.1.tar.gz 2458176 BLAKE2B 
4587ed222e2fae424f3c4f275e67e72bf25b0ce88231a29f931582d82fbe93a846f85b14bdc64740939466ccdc3f15dab3774244aa5c0a293250b52b542014ea
 SHA512 
62a993d1acd8bc5cc916f009909b4b099d9f64007fe790dc219104f248bb21e0ab8f1771c354ef61e6d8ba497451cdef5e7a7de17a87cfd1e941b3b49fbf2206

diff --git a/dev-util/buildbot/buildbot-.ebuild 
b/dev-util/buildbot/buildbot-3.6.1.ebuild
similarity index 94%
copy from dev-util/buildbot/buildbot-.ebuild
copy to dev-util/buildbot/buildbot-3.6.1.ebuild
index b0ebb30b9273..9ca1baf06d21 100644
--- a/dev-util/buildbot/buildbot-.ebuild
+++ b/dev-util/buildbot/buildbot-3.6.1.ebuild
@@ -6,17 +6,22 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git;
-inherit readme.gentoo-r1 git-r3 systemd distutils-r1
+inherit readme.gentoo-r1 systemd distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot build automation system"
 HOMEPAGE="https://buildbot.net/
https://github.com/buildbot/buildbot
https://pypi.org/project/buildbot/;
-S="${S}/master"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
 IUSE="crypt docker examples irc test"
 RESTRICT="!test? ( test )"
 
@@ -60,12 +65,12 @@ BDEPEND="
>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
dev-python/moto[${PYTHON_USEDEP}]
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-   >=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
+   dev-python/parameterized[${PYTHON_USEDEP}]
dev-python/lz4[${PYTHON_USEDEP}]
dev-python/ldap3[${PYTHON_USEDEP}]
-   dev-util/buildbot-pkg[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
dev-util/buildbot-worker[${PYTHON_USEDEP}]
-   dev-util/buildbot-www[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
)"
 
 DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has 
been added

diff --git a/dev-util/buildbot/buildbot-.ebuild 
b/dev-util/buildbot/buildbot-.ebuild
index b0ebb30b9273..17faf70a4028 100644
--- a/dev-util/buildbot/buildbot-.ebuild
+++ b/dev-util/buildbot/buildbot-.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
dev-python/pyjwt[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
-   ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+   dev-util/buildbot-worker[${PYTHON_USEDEP}]
crypt? (
>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
dev-python/service_identity[${PYTHON_USEDEP}]

diff --git a/dev-util/buildbot/files/buildmaster.confd 
b/dev-util/buildbot/fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-console-view/

2022-09-22 Thread Brian Dolbec
commit: 4a0faa85a21133885dea46ac6b5647edff3c5293
Author: Brian Dolbec  gentoo  org>
AuthorDate: Fri Sep 23 02:05:37 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Fri Sep 23 03:00:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a0faa85

dev-util/buildbot-console-view: Version bump to 3.6.1

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-console-view/Manifest|  1 +
 .../buildbot-console-view-3.6.1.ebuild | 29 ++
 2 files changed, 30 insertions(+)

diff --git a/dev-util/buildbot-console-view/Manifest 
b/dev-util/buildbot-console-view/Manifest
index 5d1301cd4595..d69bbcae4ab3 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-console-view-3.4.0.tar.gz 18732 BLAKE2B 
caeb78d4d3cc616edafccc5f78c1104469f77ead6ec31e7b9a741e43cb8d7140f8c44b57449bd6d97e35912787cbbeee5617bdf90ce7a15ebd023721160edc06
 SHA512 
072a4ca8d5677e68d2893684d68d4742d7a5546e128ae99bbec0385772a5df6c885bb62b855484543a42c95471aa828f8f3375770fc079997e5183cf3eda9db8
 DIST buildbot-console-view-3.5.0.tar.gz 18741 BLAKE2B 
a2c4043bdc9eef6189cc15617212aefd7cbdf6db6d4c547c191e0a07bacc9d0cb3e9898867af207d969b294ab15664132636dec4a3c16e620fea9872ae4d0f57
 SHA512 
4a86a2e803dd4547b3cc3018e1284e4fa9eaf1b29ccb78035a1823fd44fd873acb0a746882e8b961f10e8dc533043383c4a6e60622027a248c10766dab7ac266
 DIST buildbot-console-view-3.6.0.tar.gz 18728 BLAKE2B 
0a206e80a311deed2666a297394b7d4e31e47c703fed2040d2d6340be0cb81a6977ac54e2d215dcad02b14ec21db58dd6e677a9d2155e84110cdf37d99ae1401
 SHA512 
8d03b0c640b72d986e48bc5cfd1decf91f4b7bd46889d16a76ea71972e17f9504b377762e1c589448431d7c26446c01208b5f8e1b63c86bdbfb6dbc063b94472
+DIST buildbot-console-view-3.6.1.tar.gz 18731 BLAKE2B 
b572b0c2bedfb1149056237a5b7417c933cdd75b8a723edcb5b37cbf33c8d6d1c1fa5d490955a119eb6ca6df7317b89182c45462ceebb310d3b78f44712f4d33
 SHA512 
3489579c02db7f2b02aaeab8d9cc2eb60d72e5a12eca51c63cf10491c683ba7b99069de6ca2348fcf44dd6ce81d58d437a7d03749815a3fad55162e50df912e0

diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.6.1.ebuild 
b/dev-util/buildbot-console-view/buildbot-console-view-3.6.1.ebuild
new file mode 100644
index ..5b7624cd297c
--- /dev/null
+++ b/dev-util/buildbot-console-view/buildbot-console-view-3.6.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot console-view plugin"
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-console-view/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="
+   ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-grid-view/

2022-09-22 Thread Brian Dolbec
commit: 40cbc5c3057f3627302ec65d3864ff8dc1bdc5e0
Author: Brian Dolbec  gentoo  org>
AuthorDate: Fri Sep 23 02:11:35 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Fri Sep 23 03:00:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40cbc5c3

dev-util/buildbot-grid-view: Version bump to 3.6.1

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-grid-view/Manifest   |  1 +
 .../buildbot-grid-view-3.6.1.ebuild| 28 ++
 2 files changed, 29 insertions(+)

diff --git a/dev-util/buildbot-grid-view/Manifest 
b/dev-util/buildbot-grid-view/Manifest
index b6bf765623cc..e3acccf5f678 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-grid-view-3.4.0.tar.gz 13698 BLAKE2B 
bc819f87db76ec217dd91cf1f43d2ad18e1aa27c661f37db893946b22e87a3de752f67fe04df8a10499e0659b618e24c3a15de18dd3f3e93523cdf4234d6907f
 SHA512 
69369694e993365644416ea8223b546e147930dac41c74d000e8b1419e6b889158999cdf5cfb7079c3456a9135071f2d1983472faaed82ad410e7cd873c8c77f
 DIST buildbot-grid-view-3.5.0.tar.gz 13704 BLAKE2B 
3b577c4108abb65677015a29f9af1410588f962a572e31518ac981e937e6a9bb9c7ce7f4435d573d82c5b337331eed2e9dee5c3e0722ebda6591d19e2b30b76f
 SHA512 
a97c5df81b7ff670b26f170895a5a59b9324b7bc1c3714d58c9294848067b0387c93c295db91fd735a3aaa68bd70875aae45b8d6c1549592ad2b066c40ddc2f1
 DIST buildbot-grid-view-3.6.0.tar.gz 13701 BLAKE2B 
c877439926a6862aba51d4ef7d4326f66967bbd9c43dff44554c9346d0beb4b890c5e9cdd20998ca9796ab86030445776ff67f85ce27e87b1fdefaeaf0895d98
 SHA512 
6810b5be3649e38648b1205742bb24f1d63eded41f5fb420dd3f65734fba74a1ad350d68cf750f6be752f178e6d09dba56d5b42f46c20808212f72c8c4d7326d
+DIST buildbot-grid-view-3.6.1.tar.gz 13706 BLAKE2B 
808d663b397459c7dd2d537a1a6eab2a0cc839ef0ba42bf56722ee53628bc9e6d41d03f549f0adb0fa92b0b8f416ca8c0a4bc310d67b4b06823eefe33b1ed02b
 SHA512 
7605a5af1428ff08c96751f9c93fddd7b54f57a8879b85c270338e94eeb4ed55ddcfb7066519a2a3ff6d07b537a6ac28bb388b48eecb81c477aa1b6fbaa361dd

diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.1.ebuild 
b/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.1.ebuild
new file mode 100644
index ..32ac344a514e
--- /dev/null
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot grid view web interface"
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-grid-view/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+   ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-wsgi-dashboards/

2022-09-22 Thread Brian Dolbec
commit: 5f418ec97507e046cbcc46e1fa5b4195b8b6d25c
Author: Brian Dolbec  gentoo  org>
AuthorDate: Fri Sep 23 02:13:07 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Fri Sep 23 03:00:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f418ec9

dev-util/buildbot-wsgi-dashboards: Version bump to 3.6.1

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-wsgi-dashboards/Manifest |  1 +
 .../buildbot-wsgi-dashboards-3.6.1.ebuild  | 28 ++
 2 files changed, 29 insertions(+)

diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest 
b/dev-util/buildbot-wsgi-dashboards/Manifest
index e677fd23fdb7..ff13d27b3231 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-wsgi-dashboards-3.4.0.tar.gz 5583 BLAKE2B 
0eed4a375330d58bd6caf95f8cdc2ebfaebc9c123450461d4e0f938745bb1b6afe0e9786bd886c6e6cb6a522da2b645bf1ad3237b2049f86bc1bca83829b15a1
 SHA512 
56411bb34a1f40d02a814e8d33dcd3c6de65627728c3bb9cad776c43c48707e648ccdbb4a58cbfb8ed080c219fc37252304c88ab363eb6deb6057b2debde1071
 DIST buildbot-wsgi-dashboards-3.5.0.tar.gz 5585 BLAKE2B 
94c365d4140de539a0ea85b78e24acd5d789fe022eb5ff2474ebc07554d139d964c9625b684b312b2134c3fd4bf3a6628178ac72d52283bb6fcfd7b7820d51f1
 SHA512 
d233273c05f9c2f6d81091dd620469dd19377848d5958c26cc746b6340ea9451c49aff8f8a36986741b3775fcc60065e0fbc402183f60f43d4afce238b907fd0
 DIST buildbot-wsgi-dashboards-3.6.0.tar.gz 5585 BLAKE2B 
91de620cdb911b75ad745549e6fa7d1589206d8b17878b1779b40b84633dc9788d3dca46a34866c40d2403ed1a16c20d6159d0f0ce69d3e10f35d132cba06f35
 SHA512 
8377ef27f46b65ebb5e5dc638cab0e251070b940386b4681ea410562e6eaef04d4a76bfd3be229c081edb2f9df01c1385aad34a7763dcd5ce607fb0061b741e4
+DIST buildbot-wsgi-dashboards-3.6.1.tar.gz 5584 BLAKE2B 
f0b82de52022c3a8a0d0747aa4ade67345af177be70a8767d66163fe98ceff63e0b297ba547619de874a66e381b721c48d864361fdb82a818f2450c339d687cc
 SHA512 
7ecd4fd71786258deab1fb1d96b4999ef929df4486d09404cb1bc3d1a7f831c90f8253f5bf0474258ba472ac9e8f960f4c4eb1f7993a0a8070eaa68e34e9

diff --git 
a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.1.ebuild 
b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.1.ebuild
new file mode 100644
index ..b67bfb3e65bf
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to 
buildbot UI"
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-wsgi-dashboards/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+   ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-waterfall-view/

2022-08-25 Thread Brian Dolbec
commit: d61209f54c29ced664f8978c3ff114ee4f99d35d
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 25 22:58:26 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 25 23:24:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d61209f5

dev-util/buildbot-waterfall-view: Version bump to 3.6.0

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-waterfall-view/Manifest  |  1 +
 .../buildbot-waterfall-view-3.6.0.ebuild   | 30 ++
 2 files changed, 31 insertions(+)

diff --git a/dev-util/buildbot-waterfall-view/Manifest 
b/dev-util/buildbot-waterfall-view/Manifest
index e268e2d943b8..7db967201afc 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,2 +1,3 @@
 DIST buildbot-waterfall-view-3.4.0.tar.gz 192456 BLAKE2B 
7375e22b86b4dfe2cde88d4190accea50bf49c9615358ec55b341e6720551b4605015938ed15bfac6bf80805a32457081389bd150d762e90132af4f18295cfe5
 SHA512 
a9a381e8b520919f71011083face8760f864f5bbe5080446c64c0a63c38d787e486cddd20c3548b01d78534a206221ed2bec85bb78681fe3dceaef2bc1f172d9
 DIST buildbot-waterfall-view-3.5.0.tar.gz 192440 BLAKE2B 
46ef4e839dabb5006c740c6f04235b123be420b4d0108cf59bab075fde3dbf6bbe0b4fdfc37fd8606da3696d15f45ee4363f8c35434f944af70f884e2de1edff
 SHA512 
381ce3bb976aa0e1cadd541af44ab0bf1450a3e47351a55b32bda24ad824dbba0f075ee8204a3f26c3ab62a5a615c6ca5027b1894852f8d5308fb27b64e9c177
+DIST buildbot-waterfall-view-3.6.0.tar.gz 193903 BLAKE2B 
3029015580dedd9003ae7b723ce79b335d58fd198c4d294483377c34bb88eaade53cd704652c240670c1bab488ab60056e03aba698dcb294f09fe62def59d5f8
 SHA512 
520e5e1653ceb92a4eb144530fa3cc6d893c4baae15f5ffcc29f2bc66ef02f1a41d287b3d85864a5ddf0a127c0fcf2d19a0ae136e39e394228713112487af8c2

diff --git 
a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.0.ebuild 
b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.0.ebuild
new file mode 100644
index ..591aebc7cf5b
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot waterfall-view plugin"
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-waterfall-view/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="
+   ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-console-view/

2022-08-25 Thread Brian Dolbec
commit: 899cf4e0a621586030fb7cb440b5830c09fe9607
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 25 22:56:08 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 25 23:24:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=899cf4e0

dev-util/buildbot-console-view: Version bump to 3.6.0

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-console-view/Manifest|  1 +
 .../buildbot-console-view-3.6.0.ebuild | 29 ++
 2 files changed, 30 insertions(+)

diff --git a/dev-util/buildbot-console-view/Manifest 
b/dev-util/buildbot-console-view/Manifest
index 587f8729c8c2..5d1301cd4595 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,2 +1,3 @@
 DIST buildbot-console-view-3.4.0.tar.gz 18732 BLAKE2B 
caeb78d4d3cc616edafccc5f78c1104469f77ead6ec31e7b9a741e43cb8d7140f8c44b57449bd6d97e35912787cbbeee5617bdf90ce7a15ebd023721160edc06
 SHA512 
072a4ca8d5677e68d2893684d68d4742d7a5546e128ae99bbec0385772a5df6c885bb62b855484543a42c95471aa828f8f3375770fc079997e5183cf3eda9db8
 DIST buildbot-console-view-3.5.0.tar.gz 18741 BLAKE2B 
a2c4043bdc9eef6189cc15617212aefd7cbdf6db6d4c547c191e0a07bacc9d0cb3e9898867af207d969b294ab15664132636dec4a3c16e620fea9872ae4d0f57
 SHA512 
4a86a2e803dd4547b3cc3018e1284e4fa9eaf1b29ccb78035a1823fd44fd873acb0a746882e8b961f10e8dc533043383c4a6e60622027a248c10766dab7ac266
+DIST buildbot-console-view-3.6.0.tar.gz 18728 BLAKE2B 
0a206e80a311deed2666a297394b7d4e31e47c703fed2040d2d6340be0cb81a6977ac54e2d215dcad02b14ec21db58dd6e677a9d2155e84110cdf37d99ae1401
 SHA512 
8d03b0c640b72d986e48bc5cfd1decf91f4b7bd46889d16a76ea71972e17f9504b377762e1c589448431d7c26446c01208b5f8e1b63c86bdbfb6dbc063b94472

diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.6.0.ebuild 
b/dev-util/buildbot-console-view/buildbot-console-view-3.6.0.ebuild
new file mode 100644
index ..5b7624cd297c
--- /dev/null
+++ b/dev-util/buildbot-console-view/buildbot-console-view-3.6.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot console-view plugin"
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-console-view/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="
+   ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-wsgi-dashboards/

2022-08-25 Thread Brian Dolbec
commit: d7c647404a632309810851c52c1d350cafc26949
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 25 23:02:19 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 25 23:24:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7c64740

dev-util/buildbot-wsgi-dashboards: Version bump to 3.6.0

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-wsgi-dashboards/Manifest |  1 +
 .../buildbot-wsgi-dashboards-3.6.0.ebuild  | 28 ++
 2 files changed, 29 insertions(+)

diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest 
b/dev-util/buildbot-wsgi-dashboards/Manifest
index 161555be404f..e677fd23fdb7 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,2 +1,3 @@
 DIST buildbot-wsgi-dashboards-3.4.0.tar.gz 5583 BLAKE2B 
0eed4a375330d58bd6caf95f8cdc2ebfaebc9c123450461d4e0f938745bb1b6afe0e9786bd886c6e6cb6a522da2b645bf1ad3237b2049f86bc1bca83829b15a1
 SHA512 
56411bb34a1f40d02a814e8d33dcd3c6de65627728c3bb9cad776c43c48707e648ccdbb4a58cbfb8ed080c219fc37252304c88ab363eb6deb6057b2debde1071
 DIST buildbot-wsgi-dashboards-3.5.0.tar.gz 5585 BLAKE2B 
94c365d4140de539a0ea85b78e24acd5d789fe022eb5ff2474ebc07554d139d964c9625b684b312b2134c3fd4bf3a6628178ac72d52283bb6fcfd7b7820d51f1
 SHA512 
d233273c05f9c2f6d81091dd620469dd19377848d5958c26cc746b6340ea9451c49aff8f8a36986741b3775fcc60065e0fbc402183f60f43d4afce238b907fd0
+DIST buildbot-wsgi-dashboards-3.6.0.tar.gz 5585 BLAKE2B 
91de620cdb911b75ad745549e6fa7d1589206d8b17878b1779b40b84633dc9788d3dca46a34866c40d2403ed1a16c20d6159d0f0ce69d3e10f35d132cba06f35
 SHA512 
8377ef27f46b65ebb5e5dc638cab0e251070b940386b4681ea410562e6eaef04d4a76bfd3be229c081edb2f9df01c1385aad34a7763dcd5ce607fb0061b741e4

diff --git 
a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.0.ebuild 
b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.0.ebuild
new file mode 100644
index ..b67bfb3e65bf
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to 
buildbot UI"
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-wsgi-dashboards/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+   ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/

2022-08-25 Thread Brian Dolbec
commit: 702c0ce282993021b942db1d3b94a02583715ea3
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 25 22:51:46 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 25 23:24:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=702c0ce2

dev-util/buildbot: Version bump to 3.6.0

Update  twisted dep.
Fix test failure due to improper PEP517 migration in
commit: c79608691d5137156f43094b4dafb26c798de3ac
for 3.5.0-r1 and 3.4.0-r1, 

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

 dev-util/buildbot/Manifest | 1 +
 dev-util/buildbot/buildbot-3.4.0-r1.ebuild | 1 -
 dev-util/buildbot/buildbot-3.5.0-r1.ebuild | 1 -
 .../buildbot/{buildbot-3.5.0-r1.ebuild => buildbot-3.6.0.ebuild}   | 7 +++
 dev-util/buildbot/buildbot-.ebuild | 7 +++
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 28cea4cfa214..2a4093a0408e 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,2 +1,3 @@
 DIST buildbot-3.4.0.tar.gz 2446868 BLAKE2B 
a58b268fd4569105f1c0ba48c9ed86210a3fee4725f167d6b6847960bbb56a092d0c0db427ecf5932a91d44065da8843fbb4046d289800a019b0b1d8b1f53fea
 SHA512 
92e5085862ac37a6c3c059870a3998fbaac2019c48384295f3e209788ea14bddff6704f1b987a8f3b1550c1b0255d228f8a0b2a20b5cb760b22a513db465863b
 DIST buildbot-3.5.0.tar.gz 2450653 BLAKE2B 
0e923f2a3a334241b25c6a151b397356d7ba81ab2ff19c17c50a5996494d0f99fa198b63aa18a27ab60c5ad53c0154494bf4dea4e2bd306f4b709858a64dc3c4
 SHA512 
9730305540db3cdf166fdfc071142061926bbb895aa941046ad25e8350d3c161d4175f3518cd8a3ab51f320b0a5980517e5e53d9f5ddc342492ee56a0f6f266f
+DIST buildbot-3.6.0.tar.gz 2458029 BLAKE2B 
5f41702d4d61fbcbfa878c6febbb89a38da2648403c4fdcab24bde246adc225e9ac3f72eb7dc893e03763f00c2d3548c31b2d6597904032e4b75e660bb1faf72
 SHA512 
c0bec931d08adb1eec51114619d2a085fbef224944a4c0acf3ab396f84d846fd620b84379affee238d02dd90ca1294fdb2b7fb8ea6e82d95c4cfeae93a0b5e73

diff --git a/dev-util/buildbot/buildbot-3.4.0-r1.ebuild 
b/dev-util/buildbot/buildbot-3.4.0-r1.ebuild
index 48e0f782f784..2805b245be55 100644
--- a/dev-util/buildbot/buildbot-3.4.0-r1.ebuild
+++ b/dev-util/buildbot/buildbot-3.4.0-r1.ebuild
@@ -86,7 +86,6 @@ src_prepare() {
 }
 
 python_test() {
-   distutils_install_for_testing
"${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with 
${EPYTHON}"
 }
 

diff --git a/dev-util/buildbot/buildbot-3.5.0-r1.ebuild 
b/dev-util/buildbot/buildbot-3.5.0-r1.ebuild
index e6a1f69bd613..38fdc881f1a2 100644
--- a/dev-util/buildbot/buildbot-3.5.0-r1.ebuild
+++ b/dev-util/buildbot/buildbot-3.5.0-r1.ebuild
@@ -86,7 +86,6 @@ src_prepare() {
 }
 
 python_test() {
-   distutils_install_for_testing
"${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with 
${EPYTHON}"
 }
 

diff --git a/dev-util/buildbot/buildbot-3.5.0-r1.ebuild 
b/dev-util/buildbot/buildbot-3.6.0.ebuild
similarity index 97%
copy from dev-util/buildbot/buildbot-3.5.0-r1.ebuild
copy to dev-util/buildbot/buildbot-3.6.0.ebuild
index e6a1f69bd613..63802dfa22aa 100644
--- a/dev-util/buildbot/buildbot-3.5.0-r1.ebuild
+++ b/dev-util/buildbot/buildbot-3.6.0.ebuild
@@ -27,7 +27,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
acct-user/buildbot
-   >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+   >=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
@@ -43,8 +43,8 @@ RDEPEND="
>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
dev-python/service_identity[${PYTHON_USEDEP}]
|| (
-   >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},ssl(-)]
-   >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt(-)]
+   >=dev-python/twisted-18.7.0[${PYTHON_USEDEP},ssl(-)]
+   >=dev-python/twisted-18.7.0[${PYTHON_USEDEP},crypt(-)]
)
dev-python/idna[${PYTHON_USEDEP}]
)
@@ -86,7 +86,6 @@ src_prepare() {
 }
 
 python_test() {
-   distutils_install_for_testing
"${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with 
${EPYTHON}"
 }
 

diff --git a/dev-util/buildbot/buildbot-.ebuild 
b/dev-util/buildbot/buildbot-.ebuild
index 2f299e4c1c37..b0ebb30b9273 100644
--- a/dev-util/buildbot/buildbot-.ebuild
+++ b/dev-util/buildbot/buildbot-.ebuild
@@ -22,7 +22,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
acct-user/buildbot
-   >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+   >=dev-python/twisted-18.7

[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-grid-view/

2022-08-25 Thread Brian Dolbec
commit: 0ccf955ddcd96af0ba032c6f372a9fa3401b2799
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 25 22:57:18 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 25 23:24:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ccf955d

dev-util/buildbot-grid-view: Version bump to 3.6.0

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-grid-view/Manifest   |  1 +
 .../buildbot-grid-view-3.6.0.ebuild| 28 ++
 2 files changed, 29 insertions(+)

diff --git a/dev-util/buildbot-grid-view/Manifest 
b/dev-util/buildbot-grid-view/Manifest
index 80ba3fddd7b4..b6bf765623cc 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,2 +1,3 @@
 DIST buildbot-grid-view-3.4.0.tar.gz 13698 BLAKE2B 
bc819f87db76ec217dd91cf1f43d2ad18e1aa27c661f37db893946b22e87a3de752f67fe04df8a10499e0659b618e24c3a15de18dd3f3e93523cdf4234d6907f
 SHA512 
69369694e993365644416ea8223b546e147930dac41c74d000e8b1419e6b889158999cdf5cfb7079c3456a9135071f2d1983472faaed82ad410e7cd873c8c77f
 DIST buildbot-grid-view-3.5.0.tar.gz 13704 BLAKE2B 
3b577c4108abb65677015a29f9af1410588f962a572e31518ac981e937e6a9bb9c7ce7f4435d573d82c5b337331eed2e9dee5c3e0722ebda6591d19e2b30b76f
 SHA512 
a97c5df81b7ff670b26f170895a5a59b9324b7bc1c3714d58c9294848067b0387c93c295db91fd735a3aaa68bd70875aae45b8d6c1549592ad2b066c40ddc2f1
+DIST buildbot-grid-view-3.6.0.tar.gz 13701 BLAKE2B 
c877439926a6862aba51d4ef7d4326f66967bbd9c43dff44554c9346d0beb4b890c5e9cdd20998ca9796ab86030445776ff67f85ce27e87b1fdefaeaf0895d98
 SHA512 
6810b5be3649e38648b1205742bb24f1d63eded41f5fb420dd3f65734fba74a1ad350d68cf750f6be752f178e6d09dba56d5b42f46c20808212f72c8c4d7326d

diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.0.ebuild 
b/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.0.ebuild
new file mode 100644
index ..32ac344a514e
--- /dev/null
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot grid view web interface"
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-grid-view/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+   ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-pkg/

2022-08-25 Thread Brian Dolbec
commit: b320eb7a76652c72c0204587ea59dba8f58caca1
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 25 22:43:32 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 25 23:24:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b320eb7a

dev-util/buildbot-pkg: Version bump to 3.6.0

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-pkg/Manifest  |  1 +
 dev-util/buildbot-pkg/buildbot-pkg-3.6.0.ebuild | 34 +
 2 files changed, 35 insertions(+)

diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index b24d38f62009..1f6ac023bbde 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,2 +1,3 @@
 DIST buildbot-pkg-3.4.0.tar.gz 4809 BLAKE2B 
6d3e549e7b44b5ad95bb7520ef8765828da587e3940a9f352ede63346b3303127313fe4b71338ff65ef9ab2c0ac6258793bd9ef664153a0b45b0b6d7d2d92943
 SHA512 
ca1ef22fb6113bfe0106360ba1eacb167a8335ba15f94a0635bc4d00f999818704f8cfebd7889b6b3df5e1ca7ab79b96f4656e481d6b1f25f5fb7404af0d7ff6
 DIST buildbot-pkg-3.5.0.tar.gz 4806 BLAKE2B 
41e217bc029bb8dbdb0f95218640d57d9f9ecabfbc0310118898042bbb543d9d4e5ba88075e934a9be9b1653e2a3d3d1e159547b832f9cde08c262713a817968
 SHA512 
08b3ec93dfbef87d90cfd4b7b1402003df785ceff8c43bf0320de79ff0efcb74f4cb4f0ec736e0d7231b54a82761d40df66e21540f1756fe74f68bb550850b1c
+DIST buildbot-pkg-3.6.0.tar.gz 4807 BLAKE2B 
3b632ef4c0c1f2dc9c39fbe37ba6165a01162e41e77e28c08b9c820425cceac08d20193e0cc74d83c35cb6ff89e9576194cf35b8cac803e9b1f04076c9f96532
 SHA512 
0145a7ff7dddfb139f502193e0b04ab10a39b325ae65ca01c0f0d88c251c18798ebe4713a3ff1aa376c72aa8d3155a5edb58055a50f5f9ccd1bb43de0ff8e63e

diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.6.0.ebuild 
b/dev-util/buildbot-pkg/buildbot-pkg-3.6.0.ebuild
new file mode 100644
index ..4d4e95e9196c
--- /dev/null
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot common www build tools for packaging releases"
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-pkg/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+# No real integration tests for this pkg.
+# all tests are related to making releases and final checks for distribution
+RESTRICT="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+   sed -e "/version/s/=.*$/=\"${MY_PV}\",/" -i setup.py || die
+   distutils-r1_src_prepare
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-badges/

2022-08-25 Thread Brian Dolbec
commit: 0509005d06f370742b1dd2b0a2fd015da0991924
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 25 23:00:27 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 25 23:24:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0509005d

dev-util/buildbot-badges: Version bump to 3.6.0

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-badges/Manifest  |  1 +
 .../buildbot-badges/buildbot-badges-3.6.0.ebuild   | 33 ++
 2 files changed, 34 insertions(+)

diff --git a/dev-util/buildbot-badges/Manifest 
b/dev-util/buildbot-badges/Manifest
index 2f98deb09c42..85e38daeb3d2 100644
--- a/dev-util/buildbot-badges/Manifest
+++ b/dev-util/buildbot-badges/Manifest
@@ -1,2 +1,3 @@
 DIST buildbot-badges-3.4.0.tar.gz 3966 BLAKE2B 
cb94a63dec1e16bb52f5f84174d204137e7da582d3a62effa2d298fbc5f1c25541a8a96d8366efac650488b3810b37eadf9e650db277d6d04c33c1ff9cab32b1
 SHA512 
3b440b9d36f4e5d310886fd4b0e11607574d312093ce8c9654f07650c2ccf90b27c078c950fb7008f9d834d1cf4f15813c113b85c2d0d1181fac370f7a3472f6
 DIST buildbot-badges-3.5.0.tar.gz 3962 BLAKE2B 
48f4865136845300e447835c348736ee15a3d520db03b4e6e70b45366e723f10eeff3d7e37a1f166682374dc6c1dabb051ad6f15c9730da969a846b606bc5730
 SHA512 
7817e0c2127892ee32a8c14e1f4204d724ce1c584f15c55b77902cdadfe9c2ff0e0df92d282fd8157aebcab067605c56ac776c7f8e37dae0a53672c14e002e19
+DIST buildbot-badges-3.6.0.tar.gz 3964 BLAKE2B 
e11db574b7245396c6532a3427b7494fbfcb68762b7a76b3f63ec49a2f460a2e1d8023ea1d54d7a27714990b9c8d2a0895442c41d8b65584e178f2af02b4ade3
 SHA512 
d133efad8d7171d122279f4e32fd7b0fa7d84bdeb0d40b175d94d64f4344044dda186d2f1f6d5d2f2f6654461f739c90450a51843ce6314b457edc75

diff --git a/dev-util/buildbot-badges/buildbot-badges-3.6.0.ebuild 
b/dev-util/buildbot-badges/buildbot-badges-3.6.0.ebuild
new file mode 100644
index ..37e3828ead37
--- /dev/null
+++ b/dev-util/buildbot-badges/buildbot-badges-3.6.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-grid-view/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+   ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+   ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+   dev-python/cairocffi[${PYTHON_USEDEP}]
+   media-gfx/cairosvg[${PYTHON_USEDEP}]
+   >=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+   dev-python/klein[${PYTHON_USEDEP}]
+"



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-worker/

2022-08-25 Thread Brian Dolbec
commit: aaa22ff099045e1678df84969aa7001e46d3606f
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 25 22:51:01 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 25 23:24:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaa22ff0

dev-util/buildbot-worker: Version bump to 3.6.0

Update  twisted dep
Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-worker/Manifest  |  1 +
 ...bot-worker-.ebuild => buildbot-worker-3.6.0.ebuild} | 14 +-
 dev-util/buildbot-worker/buildbot-worker-.ebuild   |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/dev-util/buildbot-worker/Manifest 
b/dev-util/buildbot-worker/Manifest
index 8cdd489c081c..f922e58e8ae9 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,2 +1,3 @@
 DIST buildbot-worker-3.4.0.tar.gz 102910 BLAKE2B 
c38a806e8d0475a8c18176310f628b829fc359f013b315e82715e71071213fe4a0cdf38273ad7df39a66675f4ebc9fb1881fb990290f2bbedf4c8777ec93d4dc
 SHA512 
411a2bf496622c2b9a3e0dea1ea8a71b347566010086c57ffc5d1114546cc5052af39a8ff7b10ffe6e7afdb6fc8ff73a9ffba23b96a76ff1cc0e3eff81cc59a7
 DIST buildbot-worker-3.5.0.tar.gz 111349 BLAKE2B 
90d193fb89ac65ca03274e0ad5c7fde8fc478bb932ccc4240495437f79171d49f623f50731c7619336386b7d1d7df3f955e10bf006ad86b8dcf294d75c874774
 SHA512 
1df67b6332753f91179863cca76b0578e4f36954e0aa4eb9c28f98d6451d6972e247849fb9d4e20b753b5702d100406b306ce4982181510ad81de0d35a9828ed
+DIST buildbot-worker-3.6.0.tar.gz 120158 BLAKE2B 
c762237d802f6eff1c6b74f0ed364ecf085d762c80f6cc90edc1fed0084c7bf6a0b74b6fcaf8611b9c21b6249bde547d5a10bc7ff5b4588d138b2ebf76e823a3
 SHA512 
6b5f50694fe1559dacba599f8641c6b370cad4b68c8182e8a6e31528ffbeeed81c405fd764e3718003913fe5fe8d9faa920a2ad81373fbd028cbf046ed0d3136

diff --git a/dev-util/buildbot-worker/buildbot-worker-.ebuild 
b/dev-util/buildbot-worker/buildbot-worker-3.6.0.ebuild
similarity index 94%
copy from dev-util/buildbot-worker/buildbot-worker-.ebuild
copy to dev-util/buildbot-worker/buildbot-worker-3.6.0.ebuild
index 3c8df2e78a33..34360f39c453 100644
--- a/dev-util/buildbot-worker/buildbot-worker-.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-3.6.0.ebuild
@@ -5,29 +5,33 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git;
-inherit readme.gentoo-r1 git-r3 distutils-r1
+inherit readme.gentoo-r1 distutils-r1
+
+MY_V="${PV/_p/.post}"
+MY_P="${PN}-${MY_V}"
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
 HOMEPAGE="https://buildbot.net/
https://github.com/buildbot/buildbot
https://pypi.org/project/buildbot-worker/;
-S="${S}/worker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
acct-user/buildbot
>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-   >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+   >=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
+   >=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
dev-python/future[${PYTHON_USEDEP}]
!

[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-worker/files/

2022-08-25 Thread Brian Dolbec
commit: 4714c80b46cdb669f1e02e11524cf80a518b30f6
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 18 00:20:04 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 25 23:24:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4714c80b

dev-util/buildbot-worker: Revert "dev-util/buildbot-worker: remove unused 
service file"

This reverts commit 560c38149d3a99c88fa60ae444899c54657670fc.

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

 dev-util/buildbot-worker/files/buildbot_worker.service | 12 
 1 file changed, 12 insertions(+)

diff --git a/dev-util/buildbot-worker/files/buildbot_worker.service 
b/dev-util/buildbot-worker/files/buildbot_worker.service
new file mode 100644
index ..e75a2d51e4f3
--- /dev/null
+++ b/dev-util/buildbot-worker/files/buildbot_worker.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=buildbot worker (slave) instances
+After=local-fs.target network.target
+
+[Service]
+Type=forking
+User=buildbot
+ExecStart=/usr/bin/buildbot_worker start /var/lib/buildbot_worker
+ExecStop=/usr/bin/buildbot_worker stop /var/lib/buildbot_worker
+
+[Install]
+WantedBy=multi-user.target



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-www/

2022-08-25 Thread Brian Dolbec
commit: c0fab6791eb1549680615684935c30329d2fd7df
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Aug 25 22:49:40 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Aug 25 23:24:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0fab679

dev-util/buildbot-www: Version bump to 3.6.0

Signed-off-by: Brian Dolbec  gentoo.org>

 dev-util/buildbot-www/Manifest  |  1 +
 dev-util/buildbot-www/buildbot-www-3.6.0.ebuild | 26 +
 2 files changed, 27 insertions(+)

diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 897fedc4a878..53d1c2e0ebf7 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,2 +1,3 @@
 DIST buildbot-www-3.4.0.tar.gz 3182445 BLAKE2B 
350606158ae68aba1b82c43d202e6140f433905e9913c7f4fcd3f4ebd328f7b70940f0a4e76a4a1f89731f6364dd285f08052bd1d96badac4e69cd1e16643d4e
 SHA512 
7be83f35b6042accae77db1133d54282d0d27ce15a9b34220cc015255935d7463c1a327ee289740325bbb73d6a6a162f384da2b3cc731719e7f99a911faf86cd
 DIST buildbot-www-3.5.0.tar.gz 3182531 BLAKE2B 
dcdd6487eff9d9a0429554d79f9ee83a9086dee3524b49fa8362085dddb969e088373a843a9d872e16d18350e1623ba65258799b9b93327e218f760540ece4fa
 SHA512 
f40101624cf14f88f2796855845d13ee81471d7a1b4911461747aa073735352f21294c17f3a011229c5e1c99867013ff4b306bf32c2c37b3c57d530a6fccc01e
+DIST buildbot-www-3.6.0.tar.gz 3210526 BLAKE2B 
ab54213c457a9f5777075d00adb96863b4327cbbbc489c97609f29182fb8630cc77479ffa7e324d0d20e453bbcdc70f8ad0537a8bf55fd23d8410b8003e1399f
 SHA512 
77a0671caa5c8a240301c7f3a2c2a26ecc69924546b7b7e641577e0f46c84380a80de43271dced0fa24a24b58b32d485d70d9af1d41a31af78af22a380653910

diff --git a/dev-util/buildbot-www/buildbot-www-3.6.0.ebuild 
b/dev-util/buildbot-www/buildbot-www-3.6.0.ebuild
new file mode 100644
index ..7834a034d6b5
--- /dev/null
+++ b/dev-util/buildbot-www/buildbot-www-3.6.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot base web interface, use with 
buildbot-{console-view,waterfall-view}..."
+HOMEPAGE="https://buildbot.net/
+   https://github.com/buildbot/buildbot
+   https://pypi.org/project/buildbot-www/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"



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

2022-07-28 Thread Brian Dolbec
commit: 91721fcdb85ff67f7607dad60e82f11c1bf701fd
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue Jul 12 01:37:37 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Tue Jul 12 01:37:37 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=91721fcd

equery meta: Put maintainer description on the same line

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

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/equery/meta.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pym/gentoolkit/equery/meta.py b/pym/gentoolkit/equery/meta.py
index 124f59b..22e9ad8 100644
--- a/pym/gentoolkit/equery/meta.py
+++ b/pym/gentoolkit/equery/meta.py
@@ -167,7 +167,7 @@ def format_maintainers(maints):
 if CONFIG["verbose"]:
 maintstr += " (%s)" % (maint.name,) if maint.name else ""
 maintstr += " - %s" % (maint.restrict,) if maint.restrict else ""
-maintstr += "\n%s" % (maint.description,) if maint.description 
else ""
+maintstr += " - %s" % (maint.description,) if maint.description 
else ""
 result.append(maintstr)
 
 return result



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

2022-07-28 Thread Brian Dolbec
commit: 4a56a7feff4fe8ed427cddff6e6b2719f0fe58c3
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue Jul 12 00:58:23 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Tue Jul 12 00:58:23 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=4a56a7fe

revdep-rebuild.sh: Create its cache dir if it doesn't exist

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

Signed-off-by: Brian Dolbec  gentoo.org>

 bin/revdep-rebuild.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/revdep-rebuild.sh b/bin/revdep-rebuild.sh
index 5fecf97..7ee3647 100755
--- a/bin/revdep-rebuild.sh
+++ b/bin/revdep-rebuild.sh
@@ -570,7 +570,8 @@ verify_tmpdir() {
elif [[ -d $1 ]]; then
cd "$1"
else
-   die 1 "Unable to find a satisfactory location for temporary 
files ($1)"
+   mkdir -p "$1"
+   cd "$1"
fi
[[ $VERBOSE ]] && einfo "Temporary cache files are located in $PWD"
setup_rm



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

2022-07-28 Thread Brian Dolbec
commit: 9a402fba0d63240685a2326926060c3c8c523101
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Jul 28 15:22:55 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Jul 28 15:22:55 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=9a402fba

equery: Set nocolor for piping to after options are parsed

Fixes commit 84ffe42e5 which set nocolor before options were parsed.

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

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/equery/__init__.py | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pym/gentoolkit/equery/__init__.py 
b/pym/gentoolkit/equery/__init__.py
index 56b2caa..ae760c1 100644
--- a/pym/gentoolkit/equery/__init__.py
+++ b/pym/gentoolkit/equery/__init__.py
@@ -228,8 +228,6 @@ def initialize_configuration():
 # set extra wide, should disable wrapping unless
 # there is some extra long text
 CONFIG["termWidth"] = 600
-# turn off color
-pp.output.nocolor()
 
 CONFIG["debug"] = bool(os.getenv("DEBUG", False))
 
@@ -338,6 +336,10 @@ def main(argv):
 else:
 CONFIG["verbose"] = True
 
+if CONFIG["piping"]:
+# turn off color
+pp.output.nocolor()
+
 try:
 module_name, module_args = split_arguments(args)
 except IndexError:



[gentoo-commits] proj/portage:master commit in: lib/portage/xml/

2022-07-19 Thread Brian Dolbec
commit: 0ffb754d244871b21f0ccb52087fc7aca64bea85
Author: Brian Dolbec  gentoo  org>
AuthorDate: Wed Jul 20 03:19:44 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Wed Jul 20 03:19:44 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0ffb754d

xml/metadata.py: Fix intermittent duplicate use descriptions in equery uses

Fix commit b67c57cc2e0a17b8e6454dc316c59e8736582894  which incorrectly used
node.iter() which is sometimes returning duplicate descriptions.

Bug: https://bugs.gentoo.org/858791
Signed-off-by: Brian Dolbec  gentoo.org>

 lib/portage/xml/metadata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/portage/xml/metadata.py b/lib/portage/xml/metadata.py
index 672f64358..8eaa37a3f 100644
--- a/lib/portage/xml/metadata.py
+++ b/lib/portage/xml/metadata.py
@@ -106,7 +106,7 @@ class _Useflag:
 _desc = ""
 if node.text:
 _desc = node.text
-for child in node.iter():
+for child in node:
 _desc += child.text if child.text else ""
 _desc += child.tail if child.tail else ""
 # This takes care of tabs and newlines left from the file



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

2022-07-11 Thread Brian Dolbec
commit: 5a9ed13b884e19238869306e135ad4342bce86f4
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue Jul 12 00:35:04 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Tue Jul 12 00:36:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a9ed13b

app-portage/gentoolkit: Clean old python versions from compat

Closes: https://bugs.gentoo.org/849674
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Brian Dolbec  gentoo.org>

 app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild | 4 ++--
 app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild 
b/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild
index 436222faf8fa..2b97684c9887 100644
--- a/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{8,9} pypy3 )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1 tmpfiles

diff --git a/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild 
b/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild
index 2c446359a9f8..95844ae6161b 100644
--- a/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1 tmpfiles



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

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

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

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

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

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

diff --git a/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch 
b/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch
new file mode 100644
index ..193eacc2db8b
--- /dev/null
+++ b/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch
@@ -0,0 +1,45 @@
+From bf3eb16e451fd1bdee8ef03a0d22e0040e033f19 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec 
+Date: Sun, 10 Jul 2022 23:41:33 -0700
+Subject: [PATCH] eclean/pkgindex.py: Fix typo in function call
+
+  File "/usr/lib/python3.10/site-packages/gentoolkit/eclean/pkgindex.py", line
+60, in clean_pkgs_index
+if self.get_emaint_binhost():
+AttributeError: 'PkgIndex' object has no attribute 'get_emaint_binhost'. Did
+you mean: '_get_emaint_binhost'?
+
+Also fix too many parameters in line 68 for the self.controller() call
+
+Bug: https://bugs.gentoo.org/857555
+
+Signed-off-by: Brian Dolbec 
+---
+ pym/gentoolkit/eclean/pkgindex.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pym/gentoolkit/eclean/pkgindex.py 
b/pym/gentoolkit/eclean/pkgindex.py
+index d0878a1..7d6fade 100644
+--- a/pym/gentoolkit/eclean/pkgindex.py
 b/pym/gentoolkit/eclean/pkgindex.py
+@@ -57,15 +57,15 @@ class PkgIndex:
+ statinfo = os.stat(file_)
+ size1 = statinfo.st_size
+ show_progress = not quiet
+-if self.get_emaint_binhost():
++if self._get_emaint_binhost():
+ self.taskmaster = TaskHandler(show_progress_bar=show_progress)
+ tasks = [self.binhost]
+ self.taskmaster.run_tasks(tasks)
+ else:
+ self.call_emaint()
+ statinfo = os.stat(file_)
+ clean_size = size1 - statinfo.st_size
+-self.controller("\n", clean_size, "Packages Index", file_, "Index")
++self.controller(clean_size, "Packages Index", file_, "Index")
+ return clean_size
+ 
+ def call_emaint(self):
+--
+libgit2 1.4.3
+

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



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

2022-07-11 Thread Brian Dolbec
commit: bf3eb16e451fd1bdee8ef03a0d22e0040e033f19
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Jul 11 06:41:33 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Mon Jul 11 06:53:33 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=bf3eb16e

eclean/pkgindex.py: Fix typo in function call

  File "/usr/lib/python3.10/site-packages/gentoolkit/eclean/pkgindex.py", line
60, in clean_pkgs_index
if self.get_emaint_binhost():
AttributeError: 'PkgIndex' object has no attribute 'get_emaint_binhost'. Did
you mean: '_get_emaint_binhost'?

Also fix too many parameters in line 68 for the self.controller() call

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

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/eclean/pkgindex.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pym/gentoolkit/eclean/pkgindex.py 
b/pym/gentoolkit/eclean/pkgindex.py
index d0878a1..7d6fade 100644
--- a/pym/gentoolkit/eclean/pkgindex.py
+++ b/pym/gentoolkit/eclean/pkgindex.py
@@ -57,7 +57,7 @@ class PkgIndex:
 statinfo = os.stat(file_)
 size1 = statinfo.st_size
 show_progress = not quiet
-if self.get_emaint_binhost():
+if self._get_emaint_binhost():
 self.taskmaster = TaskHandler(show_progress_bar=show_progress)
 tasks = [self.binhost]
 self.taskmaster.run_tasks(tasks)
@@ -65,7 +65,7 @@ class PkgIndex:
 self.call_emaint()
 statinfo = os.stat(file_)
 clean_size = size1 - statinfo.st_size
-self.controller("\n", clean_size, "Packages Index", file_, "Index")
+self.controller(clean_size, "Packages Index", file_, "Index")
 return clean_size
 
 def call_emaint(self):



[gentoo-commits] proj/portage:master commit in: lib/portage/xml/

2022-07-10 Thread Brian Dolbec
commit: b67c57cc2e0a17b8e6454dc316c59e8736582894
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Jul 11 01:49:01 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Mon Jul 11 03:59:02 2022 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b67c57cc

xml.metadata.py: Fix gentoolkit traceback in _Useflag class

brian@storm ~/Dev/git/gentoolkit $ equery u smartmontools
Traceback (most recent call last):
  File "/home/brian/Dev/git/gentoolkit/bin/equery", line 44, in 
equery.main(sys.argv)
  File "/home/brian/Dev/git/gentoolkit/pym/gentoolkit/equery/__init__.py", line 
359, in main
loaded_module.main(module_args)
  File "/home/brian/Dev/git/gentoolkit/pym/gentoolkit/equery/uses.py", line 
341, in main
output = get_output_descriptions(pkg, global_usedesc)
  File "/home/brian/Dev/git/gentoolkit/pym/gentoolkit/equery/uses.py", line 
201, in get_output_descriptions
local_usedesc = pkg.metadata.use()
  File "/usr/lib/python3.10/site-packages/portage/xml/metadata.py", line 337, 
in use
self._useflags = tuple(_Useflag(node) for node in iterate("flag"))
  File "/usr/lib/python3.10/site-packages/portage/xml/metadata.py", line 337, 
in 
self._useflags = tuple(_Useflag(node) for node in iterate("flag"))
  File "/usr/lib/python3.10/site-packages/portage/xml/metadata.py", line 109, 
in __init__
for child in node.getchildren():
AttributeError: 'xml.etree.ElementTree.Element' object has no attribute 
'getchildren'

Reported by: IRC user kurly

gentoolkit code class used node.iter()
Found another commmit where getchidren was deprecated and replaced.

Bug:https://bugs.gentoo.org/857537
Signed-off-by: Brian Dolbec  gentoo.org>

 lib/portage/xml/metadata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/portage/xml/metadata.py b/lib/portage/xml/metadata.py
index 807847d7e..672f64358 100644
--- a/lib/portage/xml/metadata.py
+++ b/lib/portage/xml/metadata.py
@@ -106,7 +106,7 @@ class _Useflag:
 _desc = ""
 if node.text:
 _desc = node.text
-for child in node.getchildren():
+for child in node.iter():
 _desc += child.text if child.text else ""
 _desc += child.tail if child.tail else ""
 # This takes care of tabs and newlines left from the file



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

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

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

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

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

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

diff --git a/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch 
b/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch
new file mode 100644
index ..8039864d69f9
--- /dev/null
+++ b/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch
@@ -0,0 +1,47 @@
+From 5b52ee6c6efab68111d128d45f386ac21eaf84f6 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec 
+Date: Sun, 10 Jul 2022 13:41:36 -0700
+Subject: [PATCH] Revert "setup.py: migrate to setuptools"
+
+This reverts commit bbbde97b5e625a49a1a66e307931548cb33f260b.
+setuptools only installs data files to the python pkg directory
+---
+ setup.py | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 36995de..23e9b36 100755
+--- a/setup.py
 b/setup.py
+@@ -3,8 +3,8 @@
+ import re
+ import sys
+ import subprocess
+-
+-from setuptools import setup, Command
++from distutils import core
++from distutils.cmd import Command
+ from glob import glob
+ 
+ import os
+@@ -67,7 +67,7 @@ manpages = [
+ ]
+ 
+ 
+-class set_version(Command):
++class set_version(core.Command):
+ """Set python __version__ and bash VERSION to our __version__."""
+ 
+ description = "hardcode scripts' version using VERSION from environment"
+@@ -130,7 +130,7 @@ test_data = {
+ ]
+ }
+ 
+-setup(
++core.setup(
+ name="gentoolkit",
+ version=__version__,
+ description="Set of tools that work with and enhance portage.",
+--
+libgit2 1.4.3
+

diff --git a/app-portage/gentoolkit/gentoolkit-0.6.1.ebuild 
b/app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild
similarity index 95%
rename from app-portage/gentoolkit/gentoolkit-0.6.1.ebuild
rename to app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild
index c9406219f5e3..d176540989f7 100644
--- a/app-portage/gentoolkit/gentoolkit-0.6.1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.6.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{8..11} pypy3 )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
@@ -29,6 +29,10 @@ RDEPEND="${DEPEND}
virtual/awk
sys-apps/gentoo-functions"
 
+PATCHES=(
+   "${FILESDIR}/gentoolkit-0.6.1-data_files.patch"
+)
+
 distutils_enable_tests setup.py
 
 python_prepare_all() {

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



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

2022-07-10 Thread Brian Dolbec
commit: 3e66ce81e752dd4ce2ac7a0544df616746ade837
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jul 10 21:17:51 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sun Jul 10 21:19:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e66ce81

app-portage/mirrorselect: Bump to 2.3.0-r1 to fix man page issue

Revert use of setuptools due to incorrect data_files install location

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

 .../files/mirrorselect-2.3.0-setup.py.patch| 81 ++
 ...t-2.3.0.ebuild => mirrorselect-2.3.0-r1.ebuild} |  6 +-
 app-portage/mirrorselect/mirrorselect-.ebuild  |  2 +-
 3 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/app-portage/mirrorselect/files/mirrorselect-2.3.0-setup.py.patch 
b/app-portage/mirrorselect/files/mirrorselect-2.3.0-setup.py.patch
new file mode 100644
index ..6b2e074c0878
--- /dev/null
+++ b/app-portage/mirrorselect/files/mirrorselect-2.3.0-setup.py.patch
@@ -0,0 +1,81 @@
+From 5444d0ddb5268325aac63dcdeb908b614916dd0f Mon Sep 17 00:00:00 2001
+From: Brian Dolbec 
+Date: Sun, 10 Jul 2022 13:54:45 -0700
+Subject: [PATCH] Revert "setup.py: Migrate from deprecated distutils to 
setuptools"
+
+This reverts commit 4cd4fb6280433f301ad9159f7473dc32ceb063d6.
+setuptools is installing data_file to the pkg dir inside python.
+Reverting back to distutils for correct install for now.
+
+Signed-off-by: Brian Dolbec 
+---
+ setup.py | 22 +++---
+ 1 file changed, 19 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 9111d5e..a9728fa 100755
+--- a/setup.py
 b/setup.py
+@@ -5,10 +5,13 @@
+ import logging
+ import re
+ import sys
++from distutils import core, log
++from distutils.command.sdist import sdist
++from distutils.core import Command
++
+ import os
+ import io
+ import unittest
+-from setuptools import setup, Command
+ 
+ 
+ __version__ = os.getenv('VERSION', default=os.getenv('PVR', default=''))
+@@ -34,7 +37,7 @@ manpage = [os.path.join(cwd, path) for path in (
+ )]
+ 
+ 
+-class set_version(Command):
++class set_version(core.Command):
+   """Set python version to our __version__."""
+   description = "hardcode scripts' version using VERSION from environment"
+   user_options = []  # [(long_name, short_name, desc),]
+@@ -66,6 +69,18 @@ class set_version(Command):
+   sub(manpage, man_re)
+ 
+ 
++class x_sdist(sdist):
++  """sdist defaulting to archive files owned by root."""
++
++  def finalize_options(self):
++  if self.owner is None:
++  self.owner = 'root'
++  if self.group is None:
++  self.group = 'root'
++
++  sdist.finalize_options(self)
++
++
+ class TestCommand(Command):
+   user_options = []
+ 
+@@ -89,7 +104,7 @@ test_data = {
+   ]
+ }
+ 
+-setup(
++core.setup(
+   name='mirrorselect',
+   version=__version__,
+   description='Tool for selecting Gentoo source and rsync mirrors.',
+@@ -109,6 +124,7 @@ setup(
+   ),
+   cmdclass={
+   'test': TestCommand,
++  'sdist': x_sdist,
+   'set_version': set_version,
+   },
+ )
+--
+libgit2 1.4.3
+

diff --git a/app-portage/mirrorselect/mirrorselect-2.3.0.ebuild 
b/app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild
similarity index 92%
rename from app-portage/mirrorselect/mirrorselect-2.3.0.ebuild
rename to app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild
index 140f530d2904..063dbe74d8c3 100644
--- a/app-portage/mirrorselect/mirrorselect-2.3.0.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
 
@@ -26,6 +26,10 @@ RDEPEND="
>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
 "
 
+PATCHES=(
+   "${FILESDIR}/mirrorselect-2.3.0-setup.py.patch"
+)
+
 python_prepare_all() {
python_setup
eprefixify setup.py mirrorselect/main.py

diff --git a/app-portage/mirrorselect/mirrorselect-.ebuild 
b/app-portage/mirrorselect/mirrorselect-.ebuild
index 505417a219e3..b84d0b9c191a 100644
--- a/app-portage/mirrorselect/mirrorselect-.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
 



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

2022-07-10 Thread Brian Dolbec
commit: 5444d0ddb5268325aac63dcdeb908b614916dd0f
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jul 10 20:54:45 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sun Jul 10 20:54:45 2022 +
URL:https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=5444d0dd

Revert "setup.py: Migrate from deprecated distutils to setuptools"

This reverts commit 4cd4fb6280433f301ad9159f7473dc32ceb063d6.
setuptools is installing data_file to the pkg dir inside python.
Reverting back to distutils for correct install for now.

Signed-off-by: Brian Dolbec  gentoo.org>

 setup.py | 22 +++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 9111d5e..a9728fa 100755
--- a/setup.py
+++ b/setup.py
@@ -5,10 +5,13 @@
 import logging
 import re
 import sys
+from distutils import core, log
+from distutils.command.sdist import sdist
+from distutils.core import Command
+
 import os
 import io
 import unittest
-from setuptools import setup, Command
 
 
 __version__ = os.getenv('VERSION', default=os.getenv('PVR', default=''))
@@ -34,7 +37,7 @@ manpage = [os.path.join(cwd, path) for path in (
 )]
 
 
-class set_version(Command):
+class set_version(core.Command):
"""Set python version to our __version__."""
description = "hardcode scripts' version using VERSION from environment"
user_options = []  # [(long_name, short_name, desc),]
@@ -66,6 +69,18 @@ class set_version(Command):
sub(manpage, man_re)
 
 
+class x_sdist(sdist):
+   """sdist defaulting to archive files owned by root."""
+
+   def finalize_options(self):
+   if self.owner is None:
+   self.owner = 'root'
+   if self.group is None:
+   self.group = 'root'
+
+   sdist.finalize_options(self)
+
+
 class TestCommand(Command):
user_options = []
 
@@ -89,7 +104,7 @@ test_data = {
]
 }
 
-setup(
+core.setup(
name='mirrorselect',
version=__version__,
description='Tool for selecting Gentoo source and rsync mirrors.',
@@ -109,6 +124,7 @@ setup(
),
cmdclass={
'test': TestCommand,
+   'sdist': x_sdist,
'set_version': set_version,
},
 )



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

2022-07-10 Thread Brian Dolbec
commit: 9ab5d996f33c219ced4c9ca53d66fb2e6e45a691
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jul 10 20:41:36 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sun Jul 10 20:48:48 2022 +
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  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] repo/gentoo:master commit in: app-portage/gentoolkit/

2022-07-10 Thread Brian Dolbec
commit: 96c3a205db773112ed987fa6e3d632febd58092a
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jul 10 19:18:34 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sun Jul 10 19:19:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96c3a205

app-portage/gentoolkit: Bump to 0.6.1, update 

too many bug fixes to list here.
See NEWS file or git log.
Adds py3.11, removes py3.7
Migrated to setuptools

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

 app-portage/gentoolkit/Manifest   | 1 +
 .../{gentoolkit-.ebuild => gentoolkit-0.6.1.ebuild}   | 8 
 app-portage/gentoolkit/gentoolkit-.ebuild | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 08bf8c5a57b2..492c0d8e388b 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,2 +1,3 @@
 DIST gentoolkit-0.5.0.tar.gz 3206598 BLAKE2B 
a379dcbbaba9d52c241fea020b87c458384e44092539947909e14fd6c63fd9cc06d076b8081874edf17fc50e80fe48ceab3400c90046867dc409e7ac39c17231
 SHA512 
8a5c344f3a17c4c779abbcaa35b5e3f147106dbc61310d0d1a816ec8080914271fa45c311a8feeb1bfe14195af7cf34c0b29142d6e43e2de232dae96fbd00861
 DIST gentoolkit-0.5.1.tar.gz 3203805 BLAKE2B 
de2cd69aec9be79f498b1180a90afb54e77f9d8a47636cd722f2028a906d43874132d55a71bf373b3d10c7c10034f5d8ce0280a35041b0c60a1d5aa2ed6296a1
 SHA512 
667e464853b17ae297c59fb06e8f4563119a1382470d064c5721ae898e61173e9af5b071c7618d315232e6974fec205e27559785d2816253711de3e83d9e1911
+DIST gentoolkit-0.6.1.tar.gz 3195781 BLAKE2B 
27e370de77586b375dc70caa1abba4c2bc4207e8f08e0a7ea2953097135506949db71ff9102a0ead198e4dea425440c57b94ac7a811ca2d5e0016fc7e234bb0d
 SHA512 
1ffc466b69a9c53f1bbd40f6f4d1eb33d5f0f4287bb65ba1a7b1b2675ad61ecffa55ed9fda7c1ae8148744f0a77e224315eb1903dfd61a2a3dab1600fc672d2d

diff --git a/app-portage/gentoolkit/gentoolkit-.ebuild 
b/app-portage/gentoolkit/gentoolkit-0.6.1.ebuild
similarity index 95%
copy from app-portage/gentoolkit/gentoolkit-.ebuild
copy to app-portage/gentoolkit/gentoolkit-0.6.1.ebuild
index 9c1afefeba26..c9406219f5e3 100644
--- a/app-portage/gentoolkit/gentoolkit-.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.6.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1 tmpfiles
@@ -26,7 +26,7 @@ SLOT="0"
 DEPEND="
sys-apps/portage[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-   sys-apps/gawk
+   virtual/awk
sys-apps/gentoo-functions"
 
 distutils_enable_tests setup.py

diff --git a/app-portage/gentoolkit/gentoolkit-.ebuild 
b/app-portage/gentoolkit/gentoolkit-.ebuild
index 9c1afefeba26..d030b9327a92 100644
--- a/app-portage/gentoolkit/gentoolkit-.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1 tmpfiles
@@ -26,7 +26,7 @@ SLOT="0"
 DEPEND="
sys-apps/portage[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-   sys-apps/gawk
+   virtual/awk
sys-apps/gentoo-functions"
 
 distutils_enable_tests setup.py



[gentoo-commits] proj/gentoolkit: New tag: gentoolkit-0.6.1

2022-07-10 Thread Brian Dolbec
commit: 
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sun Jul 10 19:01:01 2022 +

New tag: gentoolkit-0.6.1




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

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

NEWS: update for point release

Signed-off-by: Brian Dolbec  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: pym/gentoolkit/equery/

2022-07-10 Thread Brian Dolbec
commit: 68159035c6479e313c33dd31d19d42d3178f1235
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jul 10 18:25:18 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sun Jul 10 18:25:18 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=68159035

equery check.py: Fix flake 8 qa for unused variable

flake8 did not correctly detect the way the variable is used.
Add an assert to eliminate the false detection.

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/equery/check.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pym/gentoolkit/equery/check.py b/pym/gentoolkit/equery/check.py
index 7e580b1..2ef881c 100644
--- a/pym/gentoolkit/equery/check.py
+++ b/pym/gentoolkit/equery/check.py
@@ -144,6 +144,7 @@ class VerifyContents:
 obj_errs.append(err % locals())
 return obj_errs
 except Exception as ex:
+assert ex  # to silence unused variable ex
 err = "Problem checking %(cfile)s: %(ex)s"
 obj_errs.append(err % locals())
 return obj_errs



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

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

setup.py: migrate to setuptools

Signed-off-by: Brian Dolbec  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: pym/gentoolkit/equery/

2022-07-10 Thread Brian Dolbec
commit: d755f0f7c8e6b21f926837d46440768d58281b04
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jul 10 17:58:42 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sun Jul 10 17:58:42 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=d755f0f7

depends.py: Fix 3e35553df46 missing Package import

Remove unused FORMAT_TMPL_VARS import

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/equery/depends.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pym/gentoolkit/equery/depends.py b/pym/gentoolkit/equery/depends.py
index fe56148..8ec5f75 100644
--- a/pym/gentoolkit/equery/depends.py
+++ b/pym/gentoolkit/equery/depends.py
@@ -18,7 +18,7 @@ from gentoolkit.dependencies import Dependencies
 from gentoolkit.equery import format_options, mod_usage, CONFIG
 from gentoolkit.helpers import get_cpvs, get_installed_cpvs
 from gentoolkit.cpv import CPV
-from gentoolkit.package import PackageFormatter, FORMAT_TMPL_VARS
+from gentoolkit.package import PackageFormatter, Package
 
 # ===
 # Globals



[gentoo-commits] proj/gentoolkit: New tag: gentoolkit-0.6.0

2022-07-10 Thread Brian Dolbec
commit: 
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sun Jul 10 17:21:12 2022 +

New tag: gentoolkit-0.6.0




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

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

v0.6.0

Signed-off-by: Brian Dolbec  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: pym/gentoolkit/equery/

2022-07-10 Thread Brian Dolbec
commit: c1c66b84d3e14b887b7b460111664e62238172fb
Author: Alexander Miller  gmx  de>
AuthorDate: Sun Jul 10 15:55:25 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sun Jul 10 15:55:25 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=c1c66b84

equery check: Fix exception handling for Insufficient permissions

A quick look into the source reveals that there is actually code to handle the 
case,
but it expects the wrong exception type.
This patch fixes that and also avoids a crash for other errors.

Bug: https://bugs.gentoo.org/494134
Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/equery/check.py | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pym/gentoolkit/equery/check.py b/pym/gentoolkit/equery/check.py
index 7a7c3db..7e580b1 100644
--- a/pym/gentoolkit/equery/check.py
+++ b/pym/gentoolkit/equery/check.py
@@ -16,6 +16,7 @@ from functools import partial
 from getopt import gnu_getopt, GetoptError
 
 import portage.checksum as checksum
+from portage.exception import PermissionDenied
 
 import gentoolkit.pprinter as pp
 from gentoolkit import errors
@@ -138,10 +139,14 @@ class VerifyContents:
 md5sum = files[cfile][2]
 try:
 cur_checksum = checksum.perform_md5(real_cfile, calc_prelink=1)
-except IOError:
+except PermissionDenied:
 err = "Insufficient permissions to read %(cfile)s"
 obj_errs.append(err % locals())
 return obj_errs
+except Exception as ex:
+err = "Problem checking %(cfile)s: %(ex)s"
+obj_errs.append(err % locals())
+return obj_errs
 if cur_checksum != md5sum:
 err = "%(cfile)s has incorrect MD5sum"
 obj_errs.append(err % locals())



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

2022-07-10 Thread Brian Dolbec
commit: 9b9711bf1bd0bdc24e4be6fc226758738d7a
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jul 10 16:16:40 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sun Jul 10 16:16:40 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=9b9711bf

equery depends: Fix a traceback due to UnboundLocalError:

  File "/home/brian/Dev/git/gentoolkit/pym/gentoolkit/equery/depends.py"
  , line 106, in format_depend
self.print_fn(indent, str(dep.cpv), use_conditional, formatted_dep)
UnboundLocalError: local variable 'formatted_dep' referenced before
assignment

The statement appears to be added as preliminary debug info.
Removed it.

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/equery/depends.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pym/gentoolkit/equery/depends.py b/pym/gentoolkit/equery/depends.py
index f65e846..fe56148 100644
--- a/pym/gentoolkit/equery/depends.py
+++ b/pym/gentoolkit/equery/depends.py
@@ -103,7 +103,6 @@ class DependPrinter:
 pkg = Package(str(dep.cpv))
 self.print_formated(pkg)
 else:
-self.print_fn(indent, str(dep.cpv), use_conditional, formatted_dep)
 if mdep.use_conditional:
 use_conditional = " & ".join(
 pp.useflag(u) for u in mdep.use_conditional.split()



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

2022-07-10 Thread Brian Dolbec
commit: eb9a4d026ef453e392faff35925537bee74c9d80
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jul 10 07:45:34 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sun Jul 10 07:49:28 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=eb9a4d02

equery meta: Migrate to portage's MetadataXML class

Portage's metadata handling code was originally ported from gentoolkit.
Finally get around to migrating, eliminating duplicate code.

Bug: https://bugs.gentoo.org/573030
Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/metadata.py | 256 -
 pym/gentoolkit/package.py  |  10 +-
 2 files changed, 7 insertions(+), 259 deletions(-)

diff --git a/pym/gentoolkit/metadata.py b/pym/gentoolkit/metadata.py
deleted file mode 100644
index 479456a..000
--- a/pym/gentoolkit/metadata.py
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright(c) 2009, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-
-"""Provides an easy-to-use python interface to Gentoo's metadata.xml file.
-
-Example usage:
->>> pkg_md = 
MetaData('/var/db/repos/gentoo/app-accessibility/espeak-ng/metadata.xml')
->>> pkg_md
-
->>> for maint in pkg_md.maintainers():
-... print('{0} ({1})'.format(maint.email, maint.name))
-...
-willi...@gentoo.org (William Hubbs)
->>> for flag in pkg_md.use():
-... print(flag.name, '->', flag.description)
-...
-async -> Enables asynchronous commands
-klatt -> Enables Klatt formant synthesis and implementation
-l10n_ru -> Builds extended Russian Dictionary file
-l10n_zh -> Builds extended Chinese (Mandarin and Cantonese) Dictionary 
files
-man -> Builds and installs manpage with app-text/ronn
-mbrola -> Adds support for mbrola voices
->>> upstream = pkg_md.upstream()
->>> upstream
-[<_Upstream {'node': ,
- 'maintainers': [<_Maintainer 'mscl...@gmail.com'>],
- 'changelogs': ['https://github.com/espeak-ng/espeak-ng/releases.atom'],
- 'docs': [], 'bugtrackers': [],
- 'remoteids': [('espeak-ng/espeak-ng', 'github')]}>]
->>> upstream[0].maintainers[0].name
-'Reece H. Dunn'
-"""
-
-__all__ = ("MetaData",)
-__docformat__ = "epytext"
-
-# ===
-# Imports
-# ===
-
-import re
-import xml.etree.cElementTree as etree
-
-# ===
-# Classes
-# ===
-
-
-class _Maintainer:
-"""An object for representing one maintainer.
-
-@type email: str or None
-@ivar email: Maintainer's email address. Used for both Gentoo and upstream.
-@type name: str or None
-@ivar name: Maintainer's name. Used for both Gentoo and upstream.
-@type description: str or None
-@ivar description: Description of what a maintainer does. Gentoo only.
-@type restrict: str or None
-@ivar restrict: e.g. =portage-2.2 means only maintains versions
-of Portage greater than 2.2. Should be DEPEND string with < and >
-converted to  and  respectively.
-@type status: str or None
-@ivar status: If set, either 'active' or 'inactive'. Upstream only.
-"""
-
-def __init__(self, node):
-self.email = None
-self.name = None
-self.description = None
-self.restrict = node.get("restrict")
-self.status = node.get("status")
-for attr in node.iter():
-setattr(self, attr.tag, attr.text)
-
-def __repr__(self):
-return "<%s %r>" % (self.__class__.__name__, self.email)
-
-
-class _Useflag:
-"""An object for representing one USE flag.
-
-@todo: Is there any way to have a keyword option to leave in
- and  for later processing?
-@type name: str or None
-@ivar name: USE flag
-@type restrict: str or None
-@ivar restrict: e.g. =portage-2.2 means flag is only avaiable in
-versions greater than 2.2
-@type description: str
-@ivar description: description of the USE flag
-"""
-
-def __init__(self, node):
-self.name = node.get("name")
-self.restrict = node.get("restrict")
-_desc = ""
-if node.text:
-_desc = node.text
-for child in node.iter():
-# prevent duplicate text
-if child.text and child.text not in _desc:
-_desc += child.text
-if child.tail and not child.tail in _desc:
-_desc += child.tail
-# This takes care of tabs and newlines left from the file
-self.description = re.sub(r"\s+", " ", _desc)
-
-def __repr__(self):
-return "<%s %r>" % (self.__class__.__name__, self.name)
-
-
-class _Upstream:
-"

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

2022-07-10 Thread Brian Dolbec
commit: 6fcf53bcf3579e4439623315875a4303af9af41f
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jul 10 07:47:28 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sun Jul 10 07:53:23 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=6fcf53bc

package.py: code cleanup via black

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/package.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pym/gentoolkit/package.py b/pym/gentoolkit/package.py
index 51bb329..612fbd3 100644
--- a/pym/gentoolkit/package.py
+++ b/pym/gentoolkit/package.py
@@ -448,7 +448,9 @@ class Package(CPV):
 @rtype: list
 """
 
-return portage.db[portage.root]["porttree"].dbapi.aux_get(self.cpv, 
["DESCRIPTION"])
+return portage.db[portage.root]["porttree"].dbapi.aux_get(
+self.cpv, ["DESCRIPTION"]
+)
 
 
 class PackageFormatter:



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

2022-07-09 Thread Brian Dolbec
commit: cc0b45fde4d333bd62da9988bc35418cd383c9ee
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jul 10 03:41:54 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sun Jul 10 03:44:38 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=cc0b45fd

equery meta: Fix missing description when not in metadata.xml

Add description property to Package class.
If no description in metadata.xml, get the description from the ebuild.

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

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/equery/meta.py | 2 ++
 pym/gentoolkit/package.py | 9 +
 2 files changed, 11 insertions(+)

diff --git a/pym/gentoolkit/equery/meta.py b/pym/gentoolkit/equery/meta.py
index 2e8dc36..124f59b 100644
--- a/pym/gentoolkit/equery/meta.py
+++ b/pym/gentoolkit/equery/meta.py
@@ -331,6 +331,8 @@ def call_format_functions(best_match, matches):
 
 if QUERY_OPTS["description"]:
 desc = best_match.metadata.descriptions()
+if not desc:
+desc = best_match.description
 print_sequence(format_list(desc))
 
 if QUERY_OPTS["useflags"]:

diff --git a/pym/gentoolkit/package.py b/pym/gentoolkit/package.py
index 92bc3a3..1110bf5 100644
--- a/pym/gentoolkit/package.py
+++ b/pym/gentoolkit/package.py
@@ -437,6 +437,15 @@ class Package(CPV):
 )
 return self.cpv not in unmasked
 
+@property
+def description(self):
+"""Returns the DESCRIPTION from the ebuild
+
+@rtype: list
+"""
+
+return portage.db[portage.root]["porttree"].dbapi.aux_get(self.cpv, 
["DESCRIPTION"])
+
 
 class PackageFormatter:
 """When applied to a L{gentoolkit.package.Package} object, determine the



[gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/eshowkw/, pym/gentoolkit/revdep_rebuild/

2022-07-09 Thread Brian Dolbec
commit: 8c9b533343801fcab49a150c1e49dddf7bdaf4f3
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jul 10 01:21:14 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sun Jul 10 01:21:14 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=8c9b5333

Fix typo "informations" revdep-rebuild & eshowkw

original Author: buchner.johannes  gmx.at
Bug: https://bugs.gentoo.org/648444

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/eshowkw/keywords_content.py | 2 +-
 pym/gentoolkit/revdep_rebuild/analyse.py   | 2 +-
 pym/gentoolkit/revdep_rebuild/settings.py  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pym/gentoolkit/eshowkw/keywords_content.py 
b/pym/gentoolkit/eshowkw/keywords_content.py
index 4f9e3e1..d70be72 100644
--- a/pym/gentoolkit/eshowkw/keywords_content.py
+++ b/pym/gentoolkit/eshowkw/keywords_content.py
@@ -106,7 +106,7 @@ class keywords_content:
 return [self.__separateVersion(x, repo, revlength) for x, repo in 
packages]
 
 def __getRevision(self, cpv):
-"""Get revision informations for each package for nice further 
alignment"""
+"""Get revision information for each package for nice further 
alignment"""
 rev = port.catpkgsplit(cpv)[3]
 return rev if rev != "r0" else ""
 

diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py 
b/pym/gentoolkit/revdep_rebuild/analyse.py
index c9c4a77..b176943 100644
--- a/pym/gentoolkit/revdep_rebuild/analyse.py
+++ b/pym/gentoolkit/revdep_rebuild/analyse.py
@@ -384,7 +384,7 @@ def analyse(
 ftime = current_milli_time()
 logger.debug("\ttime to complete task: %d milliseconds" % (ftime - 
stime))
 stime = current_milli_time()
-logger.info(green(" * ") + bold("Collecting dynamic linking 
informations"))
+logger.info(green(" * ") + bold("Collecting dynamic linking 
information"))
 
 libraries, la_libraries, libraries_links = collect_libraries_from_dir(
 lib_dirs, all_masks, logger

diff --git a/pym/gentoolkit/revdep_rebuild/settings.py 
b/pym/gentoolkit/revdep_rebuild/settings.py
index 5551855..2a880fd 100644
--- a/pym/gentoolkit/revdep_rebuild/settings.py
+++ b/pym/gentoolkit/revdep_rebuild/settings.py
@@ -64,7 +64,7 @@ def parse_options():
 "-V",
 "--version",
 action="version",
-help="Show version informations",
+help="Show version information",
 version="%(prog)s " + VERSION,
 )
 
@@ -116,7 +116,7 @@ def parse_options():
 help="Be more verbose (also passed to emerge command)",
 )
 parser.add_argument(
-"-d", "--debug", action="store_true", help="Print debug informations"
+"-d", "--debug", action="store_true", help="Print debug information"
 )
 
 parser.add_argument("portage_options", nargs="*")



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

2022-07-09 Thread Brian Dolbec
commit: 84ffe42e52d06fd90a21c93d60dbec7c64b621cf
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jul 10 01:06:50 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sun Jul 10 01:06:50 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=84ffe42e

equery: Turn off color when piping is set

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

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/equery/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pym/gentoolkit/equery/__init__.py 
b/pym/gentoolkit/equery/__init__.py
index cecb5be..56b2caa 100644
--- a/pym/gentoolkit/equery/__init__.py
+++ b/pym/gentoolkit/equery/__init__.py
@@ -228,6 +228,8 @@ def initialize_configuration():
 # set extra wide, should disable wrapping unless
 # there is some extra long text
 CONFIG["termWidth"] = 600
+# turn off color
+pp.output.nocolor()
 
 CONFIG["debug"] = bool(os.getenv("DEBUG", False))
 



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

2022-07-09 Thread Brian Dolbec
commit: 0db35305e9ff05ef792ae18b9721772f4bdd3efb
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sat Jul  9 23:44:44 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  9 23:44:44 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=0db35305

enalyze: Fix missing newline at end of saved rebuild files

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

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/enalyze/rebuild.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pym/gentoolkit/enalyze/rebuild.py 
b/pym/gentoolkit/enalyze/rebuild.py
index f341680..e3396f3 100644
--- a/pym/gentoolkit/enalyze/rebuild.py
+++ b/pym/gentoolkit/enalyze/rebuild.py
@@ -401,6 +401,7 @@ class Rebuild(ModuleBase):
 encoding=_encodings["content"],
 ) as output:
 output.write("\n".join(data))
+output.write("\n")
 print("   - Done")
 
 



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

2022-07-09 Thread Brian Dolbec
commit: 125142667c338eddb3777433e513fbe58e7bfd45
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sat Jul  9 22:35:33 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  9 22:42:48 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=12514266

eclean: add early return for empty DISTDIR

Gentoo-bug-url: https://bugs.gentoo.org/703282

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/eclean/search.py | 4 
 1 file changed, 4 insertions(+)

diff --git a/pym/gentoolkit/eclean/search.py b/pym/gentoolkit/eclean/search.py
index 365970c..60ced02 100644
--- a/pym/gentoolkit/eclean/search.py
+++ b/pym/gentoolkit/eclean/search.py
@@ -111,6 +111,10 @@ class DistfilesSearch:
 saved = {}
 deprecated = {}
 installed_included = False
+# Check if DISTDIR is empty, return early
+if not os.listdir(_distdir):
+return clean_me, saved, deprecated
+
 # create a big CPV->SRC_URI dict of packages
 # whose distfiles should be kept
 if (not destructive) or fetch_restricted:



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

2022-07-09 Thread Brian Dolbec
commit: 680dd160e1e5a41f008bd1a47afa2da2eb25714f
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sat Jul  9 21:41:39 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  9 21:45:04 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=680dd160

eclean: Complete migration to imported emaint code

eclean-pkg now uses imported emaint binhost code to run,
Properly handle --quiet option for progressbar suppression from emaint.
Keeps the standalone emaint binhost subprocess call as backup.

Closes: https://bugs.gentoo.org/688550

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/eclean/clean.py|  5 ++--
 pym/gentoolkit/eclean/cli.py  |  2 +-
 pym/gentoolkit/eclean/pkgindex.py | 56 ++-
 3 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/pym/gentoolkit/eclean/clean.py b/pym/gentoolkit/eclean/clean.py
index a6358a4..37a042a 100644
--- a/pym/gentoolkit/eclean/clean.py
+++ b/pym/gentoolkit/eclean/clean.py
@@ -19,8 +19,9 @@ class CleanUp:
or bypassing/ignoring
 """
 
-def __init__(self, controller):
+def __init__(self, controller, quiet):
 self.controller = controller
+self.quiet = quiet
 
 def clean_dist(self, clean_dict):
 """Calculate size of each entry for display, prompt user if needed,
@@ -64,7 +65,7 @@ class CleanUp:
 # emaint is not yet importable so call it
 # print a blank line here for separation
 print()
-clean_size += index_control.call_emaint()
+clean_size += index_control.clean_pkgs_index(self.quiet)
 # return total size of deleted or to delete files
 return clean_size
 

diff --git a/pym/gentoolkit/eclean/cli.py b/pym/gentoolkit/eclean/cli.py
index e3bc21a..23c7f3b 100644
--- a/pym/gentoolkit/eclean/cli.py
+++ b/pym/gentoolkit/eclean/cli.py
@@ -555,7 +555,7 @@ def doAction(action, options, exclude={}, output=None):
 )
 
 # initialize our cleaner
-cleaner = CleanUp(output.progress_controller)
+cleaner = CleanUp(output.progress_controller, options["quiet"])
 
 # actually clean files if something was found
 if clean_me:

diff --git a/pym/gentoolkit/eclean/pkgindex.py 
b/pym/gentoolkit/eclean/pkgindex.py
index 617b437..d0878a1 100644
--- a/pym/gentoolkit/eclean/pkgindex.py
+++ b/pym/gentoolkit/eclean/pkgindex.py
@@ -11,6 +11,11 @@ import gentoolkit.pprinter as pp
 from gentoolkit.eprefix import EPREFIX
 
 import portage
+from portage.module import (
+InvalidModuleName,
+Modules,
+)
+from portage.emaint.main import TaskHandler
 
 
 class PkgIndex:
@@ -32,37 +37,36 @@ class PkgIndex:
 @sets: self.binhost to BinhostHandler class
 @rtype: boolean
 """
-# About noqa below: I don't understand how this code can run at all.
-# TODO: verify soundness
 try:
-self.emaint_control = Modules()  # noqa
+self.emaint_control = Modules()
 self.binhost = self.emaint_control._get_class("binhost")
-except InvalidModuleName as er:  # noqa
+except InvalidModuleName as er:
 print(pp.error("Error importing emaint binhost module"), 
file=sys.stderr)
 print(pp.error("Original error: " + er), file=sys.stderr)
 except:
 return False
 return True
 
-def _load_modules(self):
-"""Import the emaint modules and report the success/fail of them"""
-try:
-from emaint.module import Modules  # noqa
-from emaint.main import TaskHandler  # noqa
-except ImportError:
-return False
-return True
+def clean_pkgs_index(self, quiet):
+"""This will clean the binpkgs packages index file
 
-def clean_pkgs_index(
-self,
-):
-"""This will clean the binpkgs packages index file"""
-go = self._load_modules()
-if go:
-if self.get_emaint_binhost():
-self.taskmaster = TaskHandler(show_progress_bar=True)  # noqa
-tasks = [self.binhost]
-self.taskmaster.run_tasks(tasks)
+@param quiet: boolean
+@return: the difference in file size
+"""
+file_ = os.path.join(portage.settings["PKGDIR"], "Packages")
+statinfo = os.stat(file_)
+size1 = statinfo.st_size
+show_progress = not quiet
+if self.get_emaint_binhost():
+self.taskmaster = TaskHandler(show_progress_bar=show_progress)
+tasks = [self.binhost]
+self.taskmaster.run_tasks(tasks)
+else:
+self.call_emaint()
+statinfo = os.stat(file_)
+clean_size = size1

[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-worker/

2022-07-09 Thread Brian Dolbec
commit: 06ac60ea97b758187bc2921cdbebf067a3d08ff0
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sat Jul  9 20:01:55 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  9 20:07:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06ac60ea

dev-util/buildbot-worker: amd64 Stable

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

 dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild 
b/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild
index 9da9100eb30d..2a3f7714573d 100644
--- a/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 



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

2022-07-09 Thread Brian Dolbec
commit: b22f6af5e32950859390dc2efd0379c572258bda
Author: Hadrien Lacour  posteo  net>
AuthorDate: Sat Mar 31 20:39:01 2018 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  9 19:29:48 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=b22f6af5

revdep-rebuild.sh: use awk instead of gawk

Bug: https://bugs.gentoo.org/652078
Signed-off-by: Zac Medico  gentoo.org>
Closes: https://github.com/gentoo/gentoolkit/pull/6
Signed-off-by: Brian Dolbec  gentoo.org>

 bin/revdep-rebuild.sh | 28 +++-
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/bin/revdep-rebuild.sh b/bin/revdep-rebuild.sh
index 633701e..5fecf97 100755
--- a/bin/revdep-rebuild.sh
+++ b/bin/revdep-rebuild.sh
@@ -235,9 +235,19 @@ countdown() {
 # Replace whitespace with linebreaks, normalize repeated '/' chars, and sort -u
 # (If any libs have whitespace in their filenames, someone needs punishment.)
 clean_var() {
-   gawk 'BEGIN {RS="[[:space:]]"}
-/-\*/ {exit}
-/[^[:space:]]/ {gsub(/\/\/+/, "/"); print}' | sort -u
+   awk '
+   BEGIN {FS = "[[:space:]]"}
+
+   {
+   for(i = 1; i <= NF; ++i) {
+   if($i ~ /-\*/)
+   exit
+   else if($i){
+   gsub(/\/\/+/, "/", $i)
+   print $i
+   }
+   }
+   }' | sort -u
 }
 ##
 # Exit and optionally output to sterr
@@ -805,8 +815,8 @@ main_checks() {
# Look for symbol not defined errors
if grep -vF "${LD_LIBRARY_MASK:=$'\a'}" 
<<< "$ldd_output" |
grep -q -E 'symbol .* not 
defined'; then
-   message=$(gawk '/symbol .* not 
defined/ {NF--; print $0}' <<< "$ldd_output")
-   broken_lib=$(gawk '/symbol .* 
not defined/ {print $NF}' <<< "$ldd_output" | \
+   message=$(awk '/symbol .* not 
defined/ {ORS = FS; for(i = 1; i < NF; ++i) print $i; printf "\n"}' <<< 
"$ldd_output")
+   broken_lib=$(awk '/symbol .* 
not defined/ {print $NF}' <<< "$ldd_output" | \
sed 's/[()]//g')
echo "obj $broken_lib" >> 
"$BROKEN_FILE"
echo_v "  broken $broken_lib 
($message)"
@@ -820,7 +830,7 @@ main_checks() {
*)
if grep -vF 
"${LD_LIBRARY_MASK:=$'\a'}" <<< "$ldd_output" |
grep -q -F 'undefined 
symbol:'; then
-   message=$(gawk 
'/undefined symbol:/ {print $3}' <<< "$ldd_output")
+   message=$(awk 
'/undefined symbol:/ {print $3}' <<< "$ldd_output")

message="${message//$'\n'/ }"
echo "obj $target_file" 
>> "$BROKEN_FILE"
echo_v "  broken 
$target_file (undefined symbols(s): $message)"
@@ -835,7 +845,7 @@ main_checks() {
la_broken=""
la_lib=""
for depend in $(
-   gawk -F"[=']" '/^dependency_libs/{
+   awk -F"[=']" '/^dependency_libs/{
print $3
}' "$target_file"
); do
@@ -876,7 +886,7 @@ main_checks() {
done < <(
# Regexify LD_LIBRARY_MASK. Exclude it from the 
search.
LD_LIBRARY_MASK="${LD_LIBRARY_MASK//$'\n'/|}"
-   gawk -v ldmask="(${LD_LIBRARY_MASK//./.})" '
+   awk -v ldmask="(${LD_LIBRARY_MASK//./.})" '
/no version information available/ && 
$0 !~ ldmask {
   

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

2022-07-09 Thread Brian Dolbec
commit: 04e8fd5252c9bc1efad66fdb8cb40d376550d580
Author: Zac Medico  gentoo  org>
AuthorDate: Tue Dec 29 02:00:42 2020 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  9 19:46:35 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=04e8fd52

ekeyword: remove .ebuild file suffix requirement (bug 762331)

We'd like to use ekeyword in a git merge driver implementation, but the
files that the driver will pass to ekeyword do not necessarily have a
.ebuild suffix. Therefore, it would be handy to be able to distinguish
ebuild arguments some other way. If the ignorable_arg(arg) function
returns False and os.path.isfile(arg) returns True, then simply assume
that the argument is an ebuild.

Bug: https://bugs.gentoo.org/762331
Signed-off-by: Zac Medico  gentoo.org>
Closes: https://github.com/gentoo/gentoolkit/pull/13
Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/ekeyword/ekeyword.py | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pym/gentoolkit/ekeyword/ekeyword.py 
b/pym/gentoolkit/ekeyword/ekeyword.py
index 7d3a1ef..4d017d4 100755
--- a/pym/gentoolkit/ekeyword/ekeyword.py
+++ b/pym/gentoolkit/ekeyword/ekeyword.py
@@ -253,7 +253,7 @@ def process_content(
 
 else:
 # Chop the full path and the .ebuild suffix.
-disp_name = os.path.basename(ebuild)[:-7]
+disp_name, _, _ = os.path.basename(ebuild).partition(".ebuild")
 
 def logit(msg):
 print("%s: %s" % (disp_name, msg))
@@ -430,7 +430,9 @@ def args_to_work(args, arch_status=None, _repo=None, 
quiet=0):
 last_todo_arches = []
 
 for arg in args:
-if arg.endswith(".ebuild"):
+if ignorable_arg(arg, quiet=quiet):
+pass
+elif os.path.isfile(arg):
 if not todo_arches:
 todo_arches = last_todo_arches
 work.append([arg, todo_arches])
@@ -440,7 +442,7 @@ def args_to_work(args, arch_status=None, _repo=None, 
quiet=0):
 op = arg_to_op(arg)
 if not arch_status or op.arch in arch_status:
 todo_arches.append(op)
-elif not ignorable_arg(arg, quiet=quiet):
+else:
 raise ValueError("unknown arch/argument: %s" % arg)
 
 if todo_arches:



[gentoo-commits] proj/gentoolkit:master commit in: man/, pym/gentoolkit/equery/

2022-07-08 Thread Brian Dolbec
commit: 3e35553df4673ed05615adc088fdbbc3f212c876
Author: Arno Bauernöppel <https://github.com/gronkern>
AuthorDate: Sat Jul  9 03:36:17 2022 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  9 03:39:50 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=3e35553d

equery: Add -F TMPL option to depends module

Like in other modules it is now possible to format the
output of the equery module 'depends' with the commandline
switch '-F' and TMPL.

The man page was adujusted.

A new static method 'print_formated' was created.
In method 'format_depend' is checked if the new option is present.
Depending on the check the PackageFormatter is used to display
the dependencies.

manually apply github PR, some minor editing.
Signed-off-by: Brian Dolbec  gentoo.org>

 man/equery.1 |  4 +++
 pym/gentoolkit/equery/depends.py | 76 
 2 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/man/equery.1 b/man/equery.1
index ee7ad7b..9cb046f 100644
--- a/man/equery.1
+++ b/man/equery.1
@@ -129,6 +129,10 @@ Include dependencies that are not installed. This can take 
a while.
 .br
 Search for both direct and indirect dependencies.
 .HP
+.B \-F, \-\-format=\fITMPL\fP
+.br
+Customize the output format of the matched packages using the template string 
\fITMPL\fP. See the \fB\-\-format\fP option for \fBlist\fP below for a 
description of the \fITMPL\fP argument.
+.HP
 .BI "\-\-depth=" "NUM"
 .br
 Limit the indirect dependency tree to a depth of \fINUM\fP. \fB\-\-depth=0\fP 
is equivalent to not using \fB\-\-indirect\fP.

diff --git a/pym/gentoolkit/equery/depends.py b/pym/gentoolkit/equery/depends.py
index 581e2b6..93f0ec1 100644
--- a/pym/gentoolkit/equery/depends.py
+++ b/pym/gentoolkit/equery/depends.py
@@ -18,7 +18,7 @@ from gentoolkit.dependencies import Dependencies
 from gentoolkit.equery import format_options, mod_usage, CONFIG
 from gentoolkit.helpers import get_cpvs, get_installed_cpvs
 from gentoolkit.cpv import CPV
-
+from gentoolkit.package import PackageFormatter, FORMAT_TMPL_VARS
 # ===
 # Globals
 # ===
@@ -27,6 +27,7 @@ QUERY_OPTS = {
 "include_masked": False,
 "only_direct": True,
 "max_depth": -1,
+"package_format": None,
 }
 
 # ===
@@ -61,6 +62,26 @@ class DependPrinter:
 
 pp.uprint(indent + cpv)
 
+@staticmethod
+def print_formated(pkg):
+"""Print pkg as formatted output depending on CONFIG."""
+
+if pkg is None:
+return
+
+if CONFIG['verbose']:
+print (PackageFormatter(
+pkg,
+do_format=True,
+custom_format=QUERY_OPTS["package_format"]
+))
+else:
+print (PackageFormatter(
+pkg,
+do_format=False,
+custom_format=QUERY_OPTS["package_format"]
+))
+
 def format_depend(self, dep, dep_is_displayed):
 """Format a dependency for printing.
 
@@ -76,27 +97,34 @@ class DependPrinter:
 indent = " " * depth
 mdep = dep.matching_dep
 use_conditional = ""
-if mdep.use_conditional:
-use_conditional = " & ".join(
-pp.useflag(u) for u in mdep.use_conditional.split()
-)
-if mdep.operator == "=*":
-formatted_dep = "=%s*" % str(mdep.cpv)
-else:
-formatted_dep = mdep.operator + str(mdep.cpv)
-if mdep.slot:
-formatted_dep += pp.emph(":") + pp.slot(mdep.slot)
-if mdep.sub_slot:
-formatted_dep += pp.slot("/") + pp.slot(mdep.sub_slot)
-if mdep.use:
-useflags = pp.useflag(",".join(mdep.use.tokens))
-formatted_dep += pp.emph("[") + useflags + pp.emph("]")
-
-if dep_is_displayed:
-indent = indent + " " * len(str(dep.cpv))
-self.print_fn(indent, "", use_conditional, formatted_dep)
+
+if QUERY_OPTS["package_format"] != None:
+pkg = Package(str(dep.cpv))
+self.print_formated(pkg)
 else:
 self.print_fn(indent, str(dep.cpv), use_conditional, formatted_dep)
+if mdep.use_conditional:
+use_conditional = " & ".join(
+pp.useflag(u) for u in mdep.use_conditional.split()
+)
+if mdep.operator == '=*':
+formatted_dep = '=%s*' % str(mdep.cpv)
+else:
+formatted_dep = mdep.operator + str(mdep.cpv)
+if mdep.slot:
+formatted_dep += pp.emph(':') + pp.slot(mdep.slot)
+if mdep.su

[gentoo-commits] proj/gentoolkit:master commit in: bin/, pym/gentoolkit/equery/

2022-07-08 Thread Brian Dolbec
commit: 71c6d4d94a5bd5aac3fb090e2e306c278a83b954
Author: Marco Sirabella  sirabella  org>
AuthorDate: Sat May  8 13:45:08 2021 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  9 02:44:08 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=71c6d4d9

metadata.py: Don't fail on unmatched package

Added a warning hook too to reuse the GentoolkitNoMatches machinery

This allows users to do something like:
  equery list @selected | xargs equery metadata
successfuly, even if there are some selected packages that don't exist
anymore.

Signed-off-by: Marco Sirabella  sirabella.org>
Signed-off-by: Brian Dolbec  gentoo.org>

 bin/equery| 10 ++
 pym/gentoolkit/equery/meta.py |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/bin/equery b/bin/equery
index 0e52294..3b3e850 100755
--- a/bin/equery
+++ b/bin/equery
@@ -29,6 +29,16 @@ except KeyboardInterrupt:
 sys.exit(1)
 
 from gentoolkit import equery, errors
+import warnings
+
+
+def formatwarning(message, category, filename, llineno, line=None):
+from gentoolkit import pprinter as pp
+return pp.warn(str(message))
+
+
+if '--debug' not in sys.argv and not bool(os.getenv('DEBUG', False)):
+warnings.formatwarning = formatwarning
 
 try:
 equery.main(sys.argv)

diff --git a/pym/gentoolkit/equery/meta.py b/pym/gentoolkit/equery/meta.py
index 4cf4bc6..2e8dc36 100644
--- a/pym/gentoolkit/equery/meta.py
+++ b/pym/gentoolkit/equery/meta.py
@@ -13,6 +13,7 @@ __docformat__ = "epytext"
 import re
 import os
 import sys
+import warnings
 from getopt import gnu_getopt, GetoptError
 
 import gentoolkit.pprinter as pp
@@ -524,7 +525,8 @@ def main(input_args):
 best_match = query.find_best()
 matches = query.find(include_masked=True)
 if best_match is None or not matches:
-raise errors.GentoolkitNoMatches(query)
+warnings.warn(errors.GentoolkitNoMatches(query))
+continue
 
 if best_match.metadata is None:
 print(



[gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/equery/, man/

2022-07-08 Thread Brian Dolbec
commit: 6a9be2d05751558d7d34e900dfc06a721278b447
Author: Martin Matous  matous  dev>
AuthorDate: Sat Jul  9 03:05:58 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  9 03:10:24 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=6a9be2d0

equery: update linguas->l10n option

Signed-off-by: Martin Matous  matous.dev>

Signed-off-by: Brian Dolbec  gentoo.org>

 man/equery.1  | 4 ++--
 pym/gentoolkit/equery/uses.py | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/man/equery.1 b/man/equery.1
index 83aba0d..ee7ad7b 100644
--- a/man/equery.1
+++ b/man/equery.1
@@ -547,9 +547,9 @@ Display all package versions. Without this option, 
\fBequery\fP will choose the
 .br
 Show the forced and masked USE flags
 .HP
-.B \-i, \-\-ignore\-linguas
+.B \-i, \-\-ignore\-l10n
 .br
-Do not show the linguas USE flags
+Do not show the l10n USE flags
 .P
 .I R "EXAMPLES" ":"
 .EX

diff --git a/pym/gentoolkit/equery/uses.py b/pym/gentoolkit/equery/uses.py
index 7af7f43..89f011c 100644
--- a/pym/gentoolkit/equery/uses.py
+++ b/pym/gentoolkit/equery/uses.py
@@ -215,8 +215,7 @@ def get_output_descriptions(pkg, global_usedesc):
 
 if QUERY_OPTS["ignore_l10n"]:
 for a in usevar[:]:
-# TODO: Remove linguas after transition to l10n is complete
-if a.startswith("l10n_") or a.startswith("linguas_"):
+if a.startswith("l10n_"):
 usevar.remove(a)
 
 if pkg.is_installed():



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

2022-07-08 Thread Brian Dolbec
commit: 9c677b5b889d15653b20cb0c67af96dbb732b621
Author: Oskari Pirhonen  gmail  com>
AuthorDate: Fri Jun 10 04:48:16 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  9 02:40:24 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=9c677b5b

Add -f/--forced-masked to equery(1)

Signed-off-by: Oskari Pirhonen  gmail.com>
Signed-off-by: Brian Dolbec  gentoo.org>

 man/equery.1 | 4 
 1 file changed, 4 insertions(+)

diff --git a/man/equery.1 b/man/equery.1
index 13ee7cc..83aba0d 100644
--- a/man/equery.1
+++ b/man/equery.1
@@ -543,6 +543,10 @@ Display USE flag statuses and descriptions for a given 
\fRPKG\fP.
 .br
 Display all package versions. Without this option, \fBequery\fP will choose 
the best available version.
 .HP
+.B \-f, \-\-forced\-masked
+.br
+Show the forced and masked USE flags
+.HP
 .B \-i, \-\-ignore\-linguas
 .br
 Do not show the linguas USE flags



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

2022-07-08 Thread Brian Dolbec
commit: c33468ba1d8ddd5a69516e8a39796db8de08ff63
Author: Oskari Pirhonen  gmail  com>
AuthorDate: Wed Jun  8 05:51:35 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  9 02:40:24 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=c33468ba

Add -f/--forced-masked to equery uses

Option to include forced and masked USE flags in `equery uses` output.

- Marked with F / M in verbose/normal output
- Marked with (+flag) / (-flag) in non-verbose/piped output

Signed-off-by: Oskari Pirhonen  gmail.com>
Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/equery/uses.py | 62 ++-
 pym/gentoolkit/flag.py| 36 +++--
 2 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/pym/gentoolkit/equery/uses.py b/pym/gentoolkit/equery/uses.py
index 7c90b90..7af7f43 100644
--- a/pym/gentoolkit/equery/uses.py
+++ b/pym/gentoolkit/equery/uses.py
@@ -31,7 +31,11 @@ from gentoolkit.flag import get_flags, reduce_flags
 # Globals
 # ===
 
-QUERY_OPTS = {"all_versions": False, "ignore_l10n": False}
+QUERY_OPTS = {
+"all_versions": False,
+"forced_masked": False,
+"ignore_l10n": False,
+}
 
 # =
 # Functions
@@ -56,6 +60,7 @@ def print_help(with_description=True):
 (
 (" -h, --help", "display this help message"),
 (" -a, --all", "include all package versions"),
+(" -f, --forced-masked", "include forced/masked USE flags"),
 (" -i, --ignore-l10n", "don't show l10n USE flags"),
 )
 )
@@ -67,8 +72,14 @@ def display_useflags(output):
 
 @type output: list
 @param output: [(inuse, inused, flag, desc, restrict), ...]
-inuse (int) = 0 or 1; if 1, flag is set in make.conf
-inused (int) = 0 or 1; if 1, package is installed with flag enabled
+inuse (int) = 0, 1, 2, 3;
+if 1, flag is set in make.conf;
+if 2, flag is masked;
+if 3, flag is forced
+inused (int) = 0, 1, 2, 3;
+if 1, package is installed with flag enabled;
+if 2, flag is masked;
+if 3, flag is forced
 flag (str) = the name of the USE flag
 desc (str) = the flag's description
 restrict (str) = corresponds to the text of restrict in metadata
@@ -80,7 +91,8 @@ def display_useflags(output):
 twrap.width = CONFIG["termWidth"]
 twrap.subsequent_indent = " " * (maxflag_len + 8)
 
-markers = ("-", "+")
+markers = ("-", "+", "M", "F")
+# Colors for masked/forced = unset/set (mod 2)
 color = (partial(pp.useflag, enabled=False), partial(pp.useflag, 
enabled=True))
 for in_makeconf, in_installed, flag, desc, restrict in output:
 if CONFIG["verbose"]:
@@ -92,7 +104,7 @@ def display_useflags(output):
 else:
 flag_name += " %s %s" % (markers[in_makeconf], 
markers[in_installed])
 
-flag_name += " " + color[in_makeconf](flag.ljust(maxflag_len))
+flag_name += " " + color[in_makeconf % 2](flag.ljust(maxflag_len))
 flag_name += " : "
 
 # Strip initial whitespace at the start of the description
@@ -119,7 +131,11 @@ def display_useflags(output):
 twrap.initial_indent = flag_name
 print(twrap.fill(""))
 else:
-pp.uprint(markers[in_makeconf] + flag)
+# Match emerge -v output for forced/masked flags
+if in_makeconf > 1:
+pp.uprint("(" + markers[in_makeconf % 2] + flag + ")")
+else:
+pp.uprint(markers[in_makeconf] + flag)
 
 
 def get_global_useflags():
@@ -184,7 +200,16 @@ def get_output_descriptions(pkg, global_usedesc):
 else:
 local_usedesc = pkg.metadata.use()
 
-iuse, final_use = get_flags(pkg.cpv, final_setting=True)
+useforced = []
+usemasked = []
+if QUERY_OPTS["forced_masked"]:
+iuse, final_use, useforced, usemasked = get_flags(
+pkg.cpv, final_setting=True, include_forced_masked=True
+)
+else:
+iuse, final_use = get_flags(
+pkg.cpv, final_setting=True, include_forced_masked=False
+)
 usevar = reduce_flags(iuse)
 usevar.sort()
 
@@ -202,8 +227,8 @@ def get_output_descriptions(pkg, global_usedesc):
 # store (inuse, inused, flag, desc, restrict)
 output = []
 for flag in usevar:
-inuse = False
-inused = False
+inuse = 0
+inused = 0
 
 local_use 

[gentoo-commits] repo/gentoo:master commit in: app-portage/mirrorselect/

2022-06-23 Thread Brian Dolbec
commit: 31e6b9634e6be75108e499c6a150679cbb0de53c
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Jun 23 20:09:36 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Jun 23 20:11:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31e6b963

app-portage/mirrorselect: Bump to version 2.3.0

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

 app-portage/mirrorselect/Manifest  |  1 +
 app-portage/mirrorselect/mirrorselect-2.3.0.ebuild | 40 ++
 2 files changed, 41 insertions(+)

diff --git a/app-portage/mirrorselect/Manifest 
b/app-portage/mirrorselect/Manifest
index 3cfe5b8dc8b4..c3df53f89d10 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -1,2 +1,3 @@
 DIST mirrorselect-2.2.6.tar.gz 16727 BLAKE2B 
8875bf61e26ac474338d81a602297fa4fdf3fab3dbd478b02129dbe71f2d09445efa9b82792e3e654725c5e87a4ca00d37a3d924f8bd6f2decdf74148d1069c8
 SHA512 
ff2b88bf568f79182275e2c85cafbeee7cbeb0226225a7c3289f0a1d7a8b5eae9d41c69b099bb7e0cc9b0300b23afea43c3ac1baa13f37c696159bb1b3ac05f8
+DIST mirrorselect-2.3.0.tar.gz 18039 BLAKE2B 
eebc4a02257b734c3dfd05cee541369689b92548b5421e977dd451442e8c83e426a03845a46e92eaa01507e0cba2b3679c97db2c00f012619cf9f551cfa1e1af
 SHA512 
fc040bf6a9cc79f781157c7b65c6366c86dd54d583b4286845e3d037a2709c376e9132889e9dbe2cd40846cd7bd138aae7111d1a442a421101db756cc259b535
 DIST mirrorselect-test 102403 BLAKE2B 
8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f
 SHA512 
f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27

diff --git a/app-portage/mirrorselect/mirrorselect-2.3.0.ebuild 
b/app-portage/mirrorselect/mirrorselect-2.3.0.ebuild
new file mode 100644
index ..140f530d2904
--- /dev/null
+++ b/app-portage/mirrorselect/mirrorselect-2.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1 prefix
+
+DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect;
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz
+   https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+IUSE="ipv6"
+
+RDEPEND="
+   dev-util/dialog
+   >=net-analyzer/netselect-0.4[ipv6(+)?]
+   >=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+   python_setup
+   eprefixify setup.py mirrorselect/main.py
+   echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py 
set_version
+   VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py 
set_version failed"
+
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   esetup.py test || die "tests failed under ${EPYTHON}"
+}



[gentoo-commits] proj/mirrorselect:master commit in: /, bin/, mirrorselect/

2022-06-23 Thread Brian Dolbec
commit: 9afa1720b0c155a9120bd76f26de89aed4d32487
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Jun 23 19:26:57 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Thu Jun 23 19:26:57 2022 +
URL:https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=9afa1720

Some py2 compat. cleanup

Signed-off-by: Brian Dolbec  gentoo.org>

 bin/mirrorselect  | 4 
 mirrorselect/mirrorparser3.py | 2 +-
 setup.py  | 2 --
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/bin/mirrorselect b/bin/mirrorselect
index b14dd26..bcdd73f 100755
--- a/bin/mirrorselect
+++ b/bin/mirrorselect
@@ -29,10 +29,6 @@ Distributed under the terms of the GNU General Public 
License v2
 
 """
 
-from __future__ import print_function
-
-
-
 
 import sys
 

diff --git a/mirrorselect/mirrorparser3.py b/mirrorselect/mirrorparser3.py
index c9349cb..089f949 100644
--- a/mirrorselect/mirrorparser3.py
+++ b/mirrorselect/mirrorparser3.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # coding: utf-8
 
 """Mirrorselect 2.x

diff --git a/setup.py b/setup.py
index 0d68f07..9111d5e 100755
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 # coding: utf-8
 
-from __future__ import print_function
-
 
 import logging
 import re



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

2022-06-08 Thread Brian Dolbec
commit: 84fc1ec271328e064da8b2537112b724e5a4c3b5
Author: Brian Dolbec  gentoo  org>
AuthorDate: Wed Jun  8 20:06:01 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Wed Jun  8 20:06:01 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=84fc1ec2

eshowkw: Fix missing dash for -r? ebuilds in versionlist output

Turns out the real issue causing the row alignment issue was this.
The code inadvertently dropped the dash display which in turn caused the
 row alignment issue.

 Reverts: 4695379c1921865d7763669580ac909ea94db90d
 Gentoo-bug-url: https://bugs.gentoo.org/503366

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/eshowkw/__init__.py   | 2 +-
 pym/gentoolkit/eshowkw/display_pretty.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pym/gentoolkit/eshowkw/__init__.py 
b/pym/gentoolkit/eshowkw/__init__.py
index c33c47a..ba6c076 100644
--- a/pym/gentoolkit/eshowkw/__init__.py
+++ b/pym/gentoolkit/eshowkw/__init__.py
@@ -49,7 +49,7 @@ def process_display(package, keywords, dbapi):
 content.extend(sep)
 content.extend(keywords.extra)
 header_length = keywords.length
-content_length = portdata.version_length - 1
+content_length = portdata.version_length
 display(content, header, header_length, content_length, portdata.cp, 
topper)
 
 

diff --git a/pym/gentoolkit/eshowkw/display_pretty.py 
b/pym/gentoolkit/eshowkw/display_pretty.py
index 0629d7e..82fd446 100644
--- a/pym/gentoolkit/eshowkw/display_pretty.py
+++ b/pym/gentoolkit/eshowkw/display_pretty.py
@@ -125,6 +125,6 @@ class string_rotator:
 if x.find("+ -") != -1:
 x = x.replace(" ", "-")
 # strip all chars and remove empty lines
-if not strip or len(x.strip(" |-")) > 0:
+if not strip or len(x.strip(" |-")) > 0 or '-' in x:
 tmp.append(x)
 return tmp



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

2022-06-07 Thread Brian Dolbec
commit: 4695379c1921865d7763669580ac909ea94db90d
Author: Brian Dolbec  gentoo  org>
AuthorDate: Wed Jun  8 01:16:13 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Wed Jun  8 01:16:13 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=4695379c

eshowkw: Correctly fix row alignment issue bug 503366

Reverts: 42cf522c06080d
Changes the content_length correctly for versionlist output

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/eshowkw/__init__.py   | 2 +-
 pym/gentoolkit/eshowkw/display_pretty.py | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pym/gentoolkit/eshowkw/__init__.py 
b/pym/gentoolkit/eshowkw/__init__.py
index ba6c076..c33c47a 100644
--- a/pym/gentoolkit/eshowkw/__init__.py
+++ b/pym/gentoolkit/eshowkw/__init__.py
@@ -49,7 +49,7 @@ def process_display(package, keywords, dbapi):
 content.extend(sep)
 content.extend(keywords.extra)
 header_length = keywords.length
-content_length = portdata.version_length
+content_length = portdata.version_length - 1
 display(content, header, header_length, content_length, portdata.cp, 
topper)
 
 

diff --git a/pym/gentoolkit/eshowkw/display_pretty.py 
b/pym/gentoolkit/eshowkw/display_pretty.py
index 47d18d1..0629d7e 100644
--- a/pym/gentoolkit/eshowkw/display_pretty.py
+++ b/pym/gentoolkit/eshowkw/display_pretty.py
@@ -29,8 +29,7 @@ def display(
 # data
 corner_image = ["".ljust(plain_width) for x in range(rotated_height)]
 if toplist != "archlist":
-# DON'T add the first list item which is: "---", it will throw the 
row alignment off
-corner_image.extend(plain_list[1:])
+corner_image.extend(plain_list)
 data_printout = [
 "%s%s" % (x, y)
 for x, y in zip_longest(corner_image, rotated_list, 
fillvalue=corner_image[0])



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

2022-06-07 Thread Brian Dolbec
commit: 42cf522c06080d3b92d7c87d3e00d93d3a7e1a7f
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue Jun  7 23:55:35 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Wed Jun  8 00:09:54 2022 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=42cf522c

eshowkw: Fix bug 503366 row alignment issue

The first element in the plain_list was a "--" string.  This was causing
the corner image to throw off the row alignment between the two columns.
This fix corrects the alignment, but removes the "--" above the keywords
to complete the header seperator line.

Gentoo-bug-url: https://bugs.gentoo.org/503366

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/eshowkw/display_pretty.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pym/gentoolkit/eshowkw/display_pretty.py 
b/pym/gentoolkit/eshowkw/display_pretty.py
index d58036a..47d18d1 100644
--- a/pym/gentoolkit/eshowkw/display_pretty.py
+++ b/pym/gentoolkit/eshowkw/display_pretty.py
@@ -1,4 +1,4 @@
-#  vim:fileencoding=utf-8
+#   vim:fileencoding=utf-8
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
@@ -29,7 +29,8 @@ def display(
 # data
 corner_image = ["".ljust(plain_width) for x in range(rotated_height)]
 if toplist != "archlist":
-corner_image.extend(plain_list)
+# DON'T add the first list item which is: "---", it will throw the 
row alignment off
+corner_image.extend(plain_list[1:])
 data_printout = [
 "%s%s" % (x, y)
 for x, y in zip_longest(corner_image, rotated_list, 
fillvalue=corner_image[0])



[gentoo-commits] repo/gentoo:master commit in: app-portage/mirrorselect/

2022-05-31 Thread Brian Dolbec
commit: d0384abc2618181f6323557fe3ce0b3c11bbfe47
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue May 31 19:03:52 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Tue May 31 19:12:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0384abc

app-portage/mirrorselect: Update  for latest code

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

 app-portage/mirrorselect/mirrorselect-.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-portage/mirrorselect/mirrorselect-.ebuild 
b/app-portage/mirrorselect/mirrorselect-.ebuild
index 849766a764ce..505417a219e3 100644
--- a/app-portage/mirrorselect/mirrorselect-.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
-DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 git-r3 prefix
 
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/mirrorselect.git"
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mirrorselect.git;
 
 DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect;



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

2022-05-31 Thread Brian Dolbec
commit: 68a8b09d7dfd5d36c79b1076fff73c0e51613b45
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue May 31 18:55:35 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Tue May 31 18:55:35 2022 +
URL:https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=68a8b09d

setup.py:  Fix logging in set_version

Fixes regresiion in 4cd4fb6280433f301ad9159f7473dc32ceb063d6

Signed-off-by: Brian Dolbec  gentoo.org>

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

diff --git a/setup.py b/setup.py
index 7c4165c..0d68f07 100755
--- a/setup.py
+++ b/setup.py
@@ -4,6 +4,7 @@
 from __future__ import print_function
 
 
+import logging
 import re
 import sys
 import os
@@ -56,7 +57,7 @@ class set_version(Command):
for line in s:
newline = re.sub(pattern, 
'"%s"' % ver, line, 1)
if newline != line:
-   log.info("%s: %s" % (f, 
newline))
+   logging.info("%s: %s" % 
(f, newline))
updated_file.append(newline)
with io.open(f, 'w', 1, 'utf_8') as s:
s.writelines(updated_file)



[gentoo-commits] proj/mirrorselect:master commit in: mirrorselect/, tests/

2022-05-31 Thread Brian Dolbec
commit: a09b4d302e4cee79254d3ff4a5ac9f080b958acf
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue May 31 17:58:14 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Tue May 31 17:58:14 2022 +
URL:https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=a09b4d30

main.py: Add indented backslash capability to multilne GENTOO_MIRRORS

For multiple mirrors, use backslashes list additional mirrors with
indents for clarity.

Gentoo-bug-url: https://bugs.gentoo.org/543814

Signed-off-by: Brian Dolbec  gentoo.org>

 mirrorselect/main.py  |  2 +-
 tests/test_write_make_conf.py | 59 ++-
 2 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/mirrorselect/main.py b/mirrorselect/main.py
old mode 100644
new mode 100755
index 8a3094e..31f8e7b
--- a/mirrorselect/main.py
+++ b/mirrorselect/main.py
@@ -109,7 +109,7 @@ class MirrorSelect(object):
if var == "sync-uri" and out:
mirror_string = '%s = %s' % (var, ' '.join(hosts))
else:
-   mirror_string = '%s="%s"' % (var, ' '.join(hosts))
+   mirror_string = '%s="%s"' % (var, ' \\\n
'.join(hosts))
 
if out:
self.write_to_output(mirror_string)

diff --git a/tests/test_write_make_conf.py b/tests/test_write_make_conf.py
index fb84978..5d13bf5 100644
--- a/tests/test_write_make_conf.py
+++ b/tests/test_write_make_conf.py
@@ -12,31 +12,44 @@ from mirrorselect.output import Output
 class WriteMakeConfTestCase(unittest.TestCase):
def test_write_make_conf(self):
 
+   def __do_it(var, mirror_string, make_conf, expected_result):
+   tempdir = tempfile.mkdtemp()
+   status_output = open(os.devnull, 'w')
+   #print("--make_conf", make_conf, 
"--")
+   #print("*expect*\n", expected_result, 
"***")
+   try:
+   config_path = os.path.join(tempdir, 
'make.conf')
+   with open(config_path, 'wt') as f:
+   f.write(make_conf)
+   
write_make_conf(Output(out=status_output), config_path, var, mirror_string)
+   with open(config_path, 'rt') as f:
+   result = f.read()
+   #print("!!!result!!!\n", 
result, "!!\n")
+   self.assertEqual(result, 
"{}".format(expected_result).format(mirror_string))
+   finally:
+   shutil.rmtree(tempdir)
+   status_output.close()
+
var = 'GENTOO_MIRRORS'
-   mirror_string = '{}="a b"'.format(var)
+   mirrors = (
+   ('{}="a"'.format(var)),
+   ('{}="a b"'.format(var)),
+   ('{}="a b c"'.format(var)),
+   )
 
cases = (
-   ('{}="foo\nbar"\n'.format(var), 
'{}\n'.format(mirror_string)),
-   ('\n{}="foo\nbar"\n'.format(var), 
'\n{}\n'.format(mirror_string)),
-   ('\n{}="foo bar"\n'.format(var), 
'\n{}\n'.format(mirror_string)),
-   ('\n{}="foo bar"\n\n'.format(var), 
'\n\n{}\n'.format(mirror_string)),
-   ('\n{}="foo \\\nbar"\n'.format(var), 
'\n{}\n'.format(mirror_string)),
-   ('\n\n{}="foo \\\nbar"\n'.format(var), 
'\n\n{}\n'.format(mirror_string)),
-   ('\n\n{}="foo \\\nbar"\na="b"\n'.format(var), 
'\n\na="b"\n{}\n'.format(mirror_string)),
-   ('', '{}\n'.format(mirror_string)),
+   ('{}="foo\nbar"\n'.format(var), '{}\n'),
+   ('\n{}="foo\nbar"\n'.format(var), '\n{}\n'),
+   ('\n{}="foo bar"\n'.format(var), '\n{}\n'),
+   ('\n{}="foo bar"\n\n'.format(var), '\n\n{}\n'),
+   ('\n{}="foo \\\nbar"\n'.format(var), '\n{}\n'),
+   ('\n\n{}="foo \\\nbar"\n'.format(var), '\n\n{}\n'),
+   ('\n\n{}="foo \\\nbar"\na="b"\n'.format(var), 
'\n\na="b"\n{}\n'),
+   ('\n\n{}="foo \\\nbar"\na="b"\n'.format(var), 
'\n\na="b"\n{}\n'),
+   

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

2022-05-31 Thread Brian Dolbec
commit: c9552deb2d4b50b26e493e4a04b6adc5c65ed4df
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue May 31 15:01:15 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Tue May 31 15:01:15 2022 +
URL:https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=c9552deb

selectors.py: Change general exception output to print_warn

Signed-off-by: Brian Dolbec  gentoo.org>

 mirrorselect/selectors.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mirrorselect/selectors.py b/mirrorselect/selectors.py
index 1b1312c..8b5e28b 100644
--- a/mirrorselect/selectors.py
+++ b/mirrorselect/selectors.py
@@ -461,10 +461,10 @@ class Deep(object):
self.output.write(('deeptime(): connection to host %s '
'timed out for ip %s\n') % (url_parts.hostname, 
ip), 2)
except Exception as e:   # Add general exception to catch any 
other errors
-   self.output.write(('deeptime(): connection to host %s '
+   self.output.print_warn(('deeptime(): connection to host 
%s '
'errored for ip %s\n%s\n'
'  Please file a bug for this error at 
bugs.gentoo.org')
-   % (url_parts.hostname, ip, e), 2)
+   % (url_parts.hostname, ip, e), 0)
return f, test_url, early_out
 
 



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

2022-05-31 Thread Brian Dolbec
commit: c32caece8690c2a88bd12d4aa30cb27d8bdf25ef
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue May 31 17:51:17 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Tue May 31 17:51:17 2022 +
URL:https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=c32caece

Remove remaining SYNC code

Signed-off-by: Brian Dolbec  gentoo.org>

 mirrorselect/configs.py | 9 ++---
 mirrorselect/main.py| 4 ++--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/mirrorselect/configs.py b/mirrorselect/configs.py
index 2dd6cba..93b2108 100644
--- a/mirrorselect/configs.py
+++ b/mirrorselect/configs.py
@@ -138,12 +138,10 @@ def write_repos_conf(output, config_path, var, value):
" variable: %s\nChanges NOT SAVED" %var)
 
 
-def get_filesystem_mirrors(output, config_path, sync=False):
+def get_filesystem_mirrors(output, config_path):
"""Read the current mirrors and retain mounted filesystems mirrors
 
@param config_path: string
-   @param sync: boolean, used to switch between SYNC and GENTOO_MIRRORS
-   make.conf variable target
@rtype list
"""
 
@@ -158,10 +156,7 @@ def get_filesystem_mirrors(output, config_path, 
sync=False):
 
fsmirrors = []
 
-   if sync:
-   var = 'SYNC'
-   else:
-   var = 'GENTOO_MIRRORS'
+   var = 'GENTOO_MIRRORS'
 
output.write('get_filesystem_mirrors(): config_path = %s\n' % 
config_path, 2)
try:

diff --git a/mirrorselect/main.py b/mirrorselect/main.py
old mode 100755
new mode 100644
index 9cad25b..8a3094e
--- a/mirrorselect/main.py
+++ b/mirrorselect/main.py
@@ -95,7 +95,7 @@ class MirrorSelect(object):
@param out: boolean, used to redirect output to stdout
@param config_path; string
@param sync: boolean, used to switch between sync-uri 
repos.conf target,
-   SYNC and GENTOO_MIRRORS make.conf variable target
+   and GENTOO_MIRRORS make.conf variable target
"""
if sync:
var = "sync-uri"
@@ -371,7 +371,7 @@ class MirrorSelect(object):
self.output.print_err("main(); Exiting due to missing 
repos.conf/gentoo.conf file\n")
 
fsmirrors = get_filesystem_mirrors(self.output,
-   config_path, options.rsync)
+   config_path)
 
hosts = self.get_available_hosts(options)
 



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

2022-05-31 Thread Brian Dolbec
commit: 1d39a41a244b49b3e1fe1739eb8fdd2a01783877
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue May 31 17:53:22 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Tue May 31 17:53:22 2022 +
URL:https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=1d39a41a

configs.py: Add missing https:// to the re.compile

Signed-off-by: Brian Dolbec  gentoo.org>

 mirrorselect/configs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mirrorselect/configs.py b/mirrorselect/configs.py
index d72ddf3..6d901a8 100644
--- a/mirrorselect/configs.py
+++ b/mirrorselect/configs.py
@@ -165,7 +165,7 @@ def get_filesystem_mirrors(output, config_path):
lex = shlex.shlex(f, posix=True)
lex.wordchars = string.digits + letters + r"~!@#$%*_\:;?,./-+{}"
lex.quotes = "\"'"
-   p = re.compile('rsync://|http://|ftp://', re.IGNORECASE)
+   p = re.compile('rsync://|http://|https://|ftp://', re.IGNORECASE)
while 1:
key = get_token(lex)
#output.write('get_filesystem_mirrors(): processing key = %s\n' 
% key, 2)



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

2022-05-31 Thread Brian Dolbec
commit: 889a9ce7e114a453447d120dbea864899bfaae8e
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue May 31 17:52:26 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Tue May 31 17:52:26 2022 +
URL:https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=889a9ce7

configs.py: Remove py2 code

Signed-off-by: Brian Dolbec  gentoo.org>

 mirrorselect/configs.py | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/mirrorselect/configs.py b/mirrorselect/configs.py
index 93b2108..d72ddf3 100644
--- a/mirrorselect/configs.py
+++ b/mirrorselect/configs.py
@@ -37,10 +37,7 @@ import string
 import sys
 
 
-try: # py2
-   letters = string.letters
-except AttributeError: # py3
-   letters = string.ascii_letters
+letters = string.ascii_letters
 
 
 def get_make_conf_path(EPREFIX):



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

2022-05-30 Thread Brian Dolbec
commit: efa29410a1ae8194c9d40866a2c893d414639d5b
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue May 31 03:34:17 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Tue May 31 03:34:17 2022 +
URL:https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=efa29410

selectors.py: Fix bug 698528 clear screen on dialog exit

Signed-off-by: Brian Dolbec  gentoo.org>

 mirrorselect/selectors.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mirrorselect/selectors.py b/mirrorselect/selectors.py
index 35051ee..1b1312c 100644
--- a/mirrorselect/selectors.py
+++ b/mirrorselect/selectors.py
@@ -571,6 +571,7 @@ class Interactive(object):
 
self.urls = out.splitlines()
 
+   sys.stderr.write("\x1b[2J\x1b[H")
if self.urls:
if hasattr(self.urls[0], 'decode'):
self.urls = decode_selection(



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

2022-05-30 Thread Brian Dolbec
commit: c920bf656ab8d41ecc637741d49053a594302c3c
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue May 31 04:07:35 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Tue May 31 04:07:35 2022 +
URL:https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=c920bf65

version.py: Bump base version to 2.3.0 before release

Signed-off-by: Brian Dolbec  gentoo.org>

 mirrorselect/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mirrorselect/version.py b/mirrorselect/version.py
index ce4f7f4..c8216df 100644
--- a/mirrorselect/version.py
+++ b/mirrorselect/version.py
@@ -25,5 +25,5 @@ Distributed under the terms of the GNU General Public License 
v2
 
 """
 
-version = "2.2.6-git"
+version = "2.3.0-git"
 



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

2022-05-30 Thread Brian Dolbec
commit: 4cd4fb6280433f301ad9159f7473dc32ceb063d6
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue May 31 04:05:26 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Tue May 31 04:05:26 2022 +
URL:https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=4cd4fb62

setup.py: Migrate from deprecated distutils to setuptools

Gentoo-bug-url: https://bugs.gentoo.org/841131
Signed-off-by: Brian Dolbec  gentoo.org>

 setup.py | 22 +++---
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/setup.py b/setup.py
index 5571711..7c4165c 100755
--- a/setup.py
+++ b/setup.py
@@ -6,13 +6,10 @@ from __future__ import print_function
 
 import re
 import sys
-from distutils import core, log
-from distutils.command.sdist import sdist
-from distutils.core import Command
-
 import os
 import io
 import unittest
+from setuptools import setup, Command
 
 
 __version__ = os.getenv('VERSION', default=os.getenv('PVR', default=''))
@@ -38,7 +35,7 @@ manpage = [os.path.join(cwd, path) for path in (
 )]
 
 
-class set_version(core.Command):
+class set_version(Command):
"""Set python version to our __version__."""
description = "hardcode scripts' version using VERSION from environment"
user_options = []  # [(long_name, short_name, desc),]
@@ -70,18 +67,6 @@ class set_version(core.Command):
sub(manpage, man_re)
 
 
-class x_sdist(sdist):
-   """sdist defaulting to archive files owned by root."""
-
-   def finalize_options(self):
-   if self.owner is None:
-   self.owner = 'root'
-   if self.group is None:
-   self.group = 'root'
-
-   sdist.finalize_options(self)
-
-
 class TestCommand(Command):
user_options = []
 
@@ -105,7 +90,7 @@ test_data = {
]
 }
 
-core.setup(
+setup(
name='mirrorselect',
version=__version__,
description='Tool for selecting Gentoo source and rsync mirrors.',
@@ -125,7 +110,6 @@ core.setup(
),
cmdclass={
'test': TestCommand,
-   'sdist': x_sdist,
'set_version': set_version,
},
 )



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

2022-05-30 Thread Brian Dolbec
commit: 738c6f83b48c9f33ae17551b725756a1e94437fb
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue May 31 02:06:54 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Tue May 31 02:22:29 2022 +
URL:https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=738c6f83

main.py: Fix bug 600572 Remove SYNC variable usage

Signed-off-by: Brian Dolbec  gentoo.org>

 mirrorselect/main.py | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mirrorselect/main.py b/mirrorselect/main.py
index b0a68cc..9cad25b 100755
--- a/mirrorselect/main.py
+++ b/mirrorselect/main.py
@@ -343,12 +343,12 @@ class MirrorSelect(object):
@rtype: string
'''
if rsync:
-   # startwith repos.conf
+   # repos.conf
config_path = EPREFIX + 
'/etc/portage/repos.conf/gentoo.conf'
if not os.access(config_path, os.F_OK):
self.output.write("Failed access to 
gentoo.conf: "
"%s\n" % os.access(config_path, 
os.F_OK), 2)
-   return get_make_conf_path(EPREFIX)
+   config_path = None
return config_path
return get_make_conf_path(EPREFIX)
 
@@ -363,12 +363,12 @@ class MirrorSelect(object):
self.output.verbosity = options.verbosity
self.output.write("main(); config_path = %s\n" % config_path, 2)
 
-   # reset config_path to find repos.conf/gentoo.conf if it exists
+   # reset config_path to find repos.conf/gentoo.conf
if options.rsync:
config_path = self.get_conf_path(options.rsync)
self.output.write("main(); reset config_path = %s\n" % 
config_path, 2)
-   else:
-   self.output.write("main(); rsync = %s\n" % 
str(options.rsync),2)
+   if not config_path:
+   self.output.print_err("main(); Exiting due to missing 
repos.conf/gentoo.conf file\n")
 
fsmirrors = get_filesystem_mirrors(self.output,
config_path, options.rsync)



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

2022-05-30 Thread Brian Dolbec
commit: 25535069d5943b6e7bbbe4607e40685a7ed36ea4
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue May 31 01:32:43 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Tue May 31 02:21:52 2022 +
URL:https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=25535069

selectors.py: Bug 800149. Add general exception for any other server error

Catch any other server errors so that mirrorselect will ignore that
server without crashing.
It will also output the error and request it to be reported.

Signed-off-by: Brian Dolbec  gentoo.org>

 mirrorselect/selectors.py | 5 +
 1 file changed, 5 insertions(+)

diff --git a/mirrorselect/selectors.py b/mirrorselect/selectors.py
index 74405a7..35051ee 100644
--- a/mirrorselect/selectors.py
+++ b/mirrorselect/selectors.py
@@ -460,6 +460,11 @@ class Deep(object):
except TimeoutException:
self.output.write(('deeptime(): connection to host %s '
'timed out for ip %s\n') % (url_parts.hostname, 
ip), 2)
+   except Exception as e:   # Add general exception to catch any 
other errors
+   self.output.write(('deeptime(): connection to host %s '
+   'errored for ip %s\n%s\n'
+   '  Please file a bug for this error at 
bugs.gentoo.org')
+   % (url_parts.hostname, ip, e), 2)
return f, test_url, early_out
 
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-worker/

2022-05-30 Thread Brian Dolbec
commit: 21c827fc4ae16e95434c47eb55256291c1ad77b8
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue May 31 01:05:12 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Tue May 31 01:06:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21c827fc

dev-util/buildbot-worker: Move msgpack dep to RDEPEND

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

 .../{buildbot-worker-3.5.0.ebuild => buildbot-worker-3.5.0-r1.ebuild}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/buildbot-worker/buildbot-worker-3.5.0.ebuild 
b/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild
similarity index 100%
rename from dev-util/buildbot-worker/buildbot-worker-3.5.0.ebuild
rename to dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild
index e3fdf6bc561c..9da9100eb30d 100644
--- a/dev-util/buildbot-worker/buildbot-worker-3.5.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild
@@ -26,12 +26,12 @@ RESTRICT="!test? ( test )"
 RDEPEND="
acct-user/buildbot
>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+   >=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
dev-python/future[${PYTHON_USEDEP}]
!

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

2022-05-30 Thread Brian Dolbec
commit: b7defa1505c2e1207dc514523c21995f707943f4
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon May 30 22:22:29 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Mon May 30 23:11:22 2022 +
URL:https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=b7defa15

Remove obsolete __future__ import of print_function

Signed-off-by: Brian Dolbec  gentoo.org>

 mirrorselect/configs.py   | 3 ---
 mirrorselect/main.py  | 3 ---
 mirrorselect/mirrorparser3.py | 2 --
 3 files changed, 8 deletions(-)

diff --git a/mirrorselect/configs.py b/mirrorselect/configs.py
index 4cba14f..2dd6cba 100644
--- a/mirrorselect/configs.py
+++ b/mirrorselect/configs.py
@@ -29,9 +29,6 @@ Distributed under the terms of the GNU General Public License 
v2
 """
 
 
-from __future__ import print_function
-
-
 import os
 import re
 import shlex

diff --git a/mirrorselect/main.py b/mirrorselect/main.py
index c4f649f..c3b5633 100755
--- a/mirrorselect/main.py
+++ b/mirrorselect/main.py
@@ -30,9 +30,6 @@ Distributed under the terms of the GNU General Public License 
v2
 """
 
 
-from __future__ import print_function
-
-
 import os
 import socket
 import sys

diff --git a/mirrorselect/mirrorparser3.py b/mirrorselect/mirrorparser3.py
index 16cb1c6..c9349cb 100644
--- a/mirrorselect/mirrorparser3.py
+++ b/mirrorselect/mirrorparser3.py
@@ -27,8 +27,6 @@ Distributed under the terms of the GNU General Public License 
v2
 """
 
 
-from __future__ import print_function
-
 from xml.etree import ElementTree as ET
 
 # old url's



[gentoo-commits] proj/mirrorselect:master commit in: /, mirrorselect/

2022-05-30 Thread Brian Dolbec
commit: eb9a6203b721d7247f79cb8c991ef835f1b9e1f7
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon May 30 23:01:21 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Mon May 30 23:11:33 2022 +
URL:https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=eb9a6203

Apply bug 730994 https filtering patch

Author: Peter Levine
Signed-off-by: Brian Dolbec  gentoo.org>

 mirrorselect.8| 3 +++
 mirrorselect/extractor.py | 2 +-
 mirrorselect/main.py  | 7 +--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/mirrorselect.8 b/mirrorselect.8
index 8f0f56e..49caadd 100644
--- a/mirrorselect.8
+++ b/mirrorselect.8
@@ -44,6 +44,9 @@ ftp only mode. Will not consider hosts of other types.
 .B \-H, \-\-http
 http only mode. Will not consider hosts of other types.
 .TP
+.B \-S, \-\-https
+https only mode. Will not consider hosts of other types.
+.TP
 .B \-r, \-\-rsync
 rsync mode. Allows you to interactively select your rsync mirror.
  Requires -i to be used.

diff --git a/mirrorselect/extractor.py b/mirrorselect/extractor.py
index dca8302..19dc059 100644
--- a/mirrorselect/extractor.py
+++ b/mirrorselect/extractor.py
@@ -50,7 +50,7 @@ class Extractor(object):
filters[opt] = value
self.output.print_info('Limiting test to 
"%s=%s" hosts. \n'
%(opt, value))
-   for opt in ["ftp", "http"]:
+   for opt in ["ftp", "http", "https"]:
if getattr(options, opt):
filters["proto"] = opt
self.output.print_info('Limiting test to %s 
hosts. \n' % opt )

diff --git a/mirrorselect/main.py b/mirrorselect/main.py
index c3b5633..b0a68cc 100755
--- a/mirrorselect/main.py
+++ b/mirrorselect/main.py
@@ -181,6 +181,9 @@ class MirrorSelect(object):
group.add_option(
"-H", "--http", action="store_true", default=False,
help="http only mode. Will not consider hosts of other 
types")
+   group.add_option(
+   "-S", "--https", action="store_true", default=False,
+   help="https only mode. Will not consider hosts of other 
types")
group.add_option(
"-r", "--rsync", action="store_true", default=False,
help="rsync mode. Allows you to interactively select 
your"
@@ -255,8 +258,8 @@ class MirrorSelect(object):
# sanity checks
 
# hack: check if more than one of these is set
-   if options.http + options.ftp + options.rsync > 1:
-   self.output.print_err('Choose at most one of -H, -f and 
-r')
+   if options.http + options.https + options.ftp + options.rsync > 
1:
+   self.output.print_err('Choose at most one of -H, -S, -f 
and -r')
 
if options.ipv4 and options.ipv6:
self.output.print_err('Choose at most one of --ipv4 and 
--ipv6')



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

2022-05-30 Thread Brian Dolbec
commit: a61f2d061134d1a61254da4cd8c30cc9b4749cdb
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon May 30 22:19:30 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Mon May 30 23:11:03 2022 +
URL:https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=a61f2d06

selectors.py: Fix bug 771963 incorrect comparison

Signed-off-by: Brian Dolbec  gentoo.org>

 mirrorselect/selectors.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mirrorselect/selectors.py b/mirrorselect/selectors.py
index 4564f11..74405a7 100644
--- a/mirrorselect/selectors.py
+++ b/mirrorselect/selectors.py
@@ -63,7 +63,7 @@ from mirrorselect.output import encoder, get_encoding, 
decode_selection
 
 # The netselect --ipv4 and --ipv6 options are supported only
 # with >=net-analyzer/netselect-0.4[ipv6(+)].
-NETSELECT_SUPPORTS_IPV4_IPV6 = False
+NETSELECT_SUPPORTS_IPV4_IPV6 = True
 
 
 class Shallow(object):
@@ -260,7 +260,7 @@ class Deep(object):
for host in hosts:
 
prog += 1
-   if self.test_file is not 'mirrorselect-test':
+   if self.test_file != 'mirrorselect-test':
self.output.print_info(
'Downloading %s files from each 
mirror... [%s of %s]'
% (self.test_file, prog, num_hosts) )



[gentoo-commits] repo/gentoo:master commit in: dev-python/flatbuffers/

2022-05-30 Thread Brian Dolbec
commit: 46c52a52303dcabcf6f2c87e5f60c8cdbd2b2d1d
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon May 30 20:48:49 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Mon May 30 20:54:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46c52a52

dev-python/flatbuffers: Bump to 2.0.6

Pypi index has not been kept up to date.
Use the github tarball instead (same tarball as dev-libs/flatbuffers)

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

 dev-python/flatbuffers/Manifest |  1 +
 dev-python/flatbuffers/flatbuffers-2.0.6.ebuild | 22 ++
 2 files changed, 23 insertions(+)

diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index 65babcee572b..d5af86db6d68 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1 +1,2 @@
+DIST flatbuffers-2.0.6.tar.gz 1724250 BLAKE2B 
b6969b28dba753c4551b33d27409d9925c10a640ae860264f8054c19a470ce3da366c0bf7917bf7fe4f6cb57acbfbe1837f175fde40b84d311df6d1378d146ce
 SHA512 
be631f34064c28d81876bf137c796e9736623cf2cc4f2a05dd45372e7195729c99fad1fa795f8ce71a408756a842edbdc0c3bc714a7cf63203a1de8681d86fb6
 DIST flatbuffers-2.0.tar.gz 22462 BLAKE2B 
a07f1d27afd71aaa23ba26a061267f95bbb7e0ced8b2c110b3d60fdb9d922fd4b339d7abc63068a030e08e6d824871c61110a665edd6781ac54dd5ef8613975a
 SHA512 
76636449c107f1b2d1a1f395dfbb04c89c25946d8a731a257475ff2517f9667095f3527280b87fdd4081fd5a9f7aa0a112d5daae742c1575d29abb69da595b6d

diff --git a/dev-python/flatbuffers/flatbuffers-2.0.6.ebuild 
b/dev-python/flatbuffers/flatbuffers-2.0.6.ebuild
new file mode 100644
index ..963fd1f08d88
--- /dev/null
+++ b/dev-python/flatbuffers/flatbuffers-2.0.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
+HOMEPAGE="
+   https://github.com/google/flatbuffers/
+   https://pypi.org/project/flatbuffers/
+"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+S=${WORKDIR}/${P}/python



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-wsgi-dashboards/

2022-05-30 Thread Brian Dolbec
commit: 527fbf15ee7a0ed5e1046677b707f3b48b795aca
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon May 30 19:04:38 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Mon May 30 19:08:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=527fbf15

dev-util/buildbot-wsgi-dashboards: PEP 517 updates

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

 dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild | 1 +
 dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git 
a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild 
b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild
index 0bd0ca928a28..b67bfb3e65bf 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1

diff --git 
a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild 
b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild
index 0bd0ca928a28..b67bfb3e65bf 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-www/

2022-05-30 Thread Brian Dolbec
commit: 3a004c5d1c35b61c2a48148c62b168f7336aa90e
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon May 30 19:03:38 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Mon May 30 19:08:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a004c5d

dev-util/buildbot-www: PEP 517 updates

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

 dev-util/buildbot-www/buildbot-www-3.4.0.ebuild | 1 +
 dev-util/buildbot-www/buildbot-www-3.5.0.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild 
b/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild
index c63f1d6ffe14..7834a034d6b5 100644
--- a/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1

diff --git a/dev-util/buildbot-www/buildbot-www-3.5.0.ebuild 
b/dev-util/buildbot-www/buildbot-www-3.5.0.ebuild
index c63f1d6ffe14..7834a034d6b5 100644
--- a/dev-util/buildbot-www/buildbot-www-3.5.0.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-3.5.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-console-view/

2022-05-30 Thread Brian Dolbec
commit: 3e6d96713753abfe9698d0091e995088e29ed087
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon May 30 19:01:43 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Mon May 30 19:08:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e6d9671

dev-util/buildbot-console-view: PEP517 updates

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

 dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild | 1 +
 dev-util/buildbot-console-view/buildbot-console-view-3.5.0.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild 
b/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild
index b296e44eae5c..5b7624cd297c 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1

diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.5.0.ebuild 
b/dev-util/buildbot-console-view/buildbot-console-view-3.5.0.ebuild
index b296e44eae5c..5b7624cd297c 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-3.5.0.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-3.5.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1



[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-pkg/

2022-05-30 Thread Brian Dolbec
commit: 1bba279c9c996412ef88b567e0d61a40d9fc20fc
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon May 30 19:04:05 2022 +
Commit:     Brian Dolbec  gentoo  org>
CommitDate: Mon May 30 19:08:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bba279c

dev-util/buildbot-pkg: PEP 517 updates

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

 dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild | 1 +
 dev-util/buildbot-pkg/buildbot-pkg-3.5.0.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild 
b/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild
index edf7eaf4cf37..4d4e95e9196c 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1

diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.5.0.ebuild 
b/dev-util/buildbot-pkg/buildbot-pkg-3.5.0.ebuild
index edf7eaf4cf37..4d4e95e9196c 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.5.0.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.5.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1



  1   2   3   4   5   6   7   8   9   10   >