summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/buildbot/buildbot-3.6.1.ebuild7
-rw-r--r--dev-util/codespell/codespell-2.2.2.ebuild3
-rw-r--r--dev-util/cram/cram-0.7-r2.ebuild3
-rw-r--r--dev-util/gertty/gertty-1.6.0-r1.ebuild2
-rw-r--r--dev-util/gertty/gertty-9999.ebuild2
-rw-r--r--dev-util/howdoi/howdoi-2.0.19.ebuild3
-rw-r--r--dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-pkgcore-0.12.18.patch65
-rw-r--r--dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-setup.patch22
-rw-r--r--dev-util/pkgcheck/files/pkgcheck-0.10.20-fix-replay-bin.patch109
-rw-r--r--dev-util/yamllint/yamllint-1.29.0.ebuild3
-rw-r--r--dev-util/ydiff/ydiff-1.2-r1.ebuild3
11 files changed, 8 insertions, 214 deletions
diff --git a/dev-util/buildbot/buildbot-3.6.1.ebuild b/dev-util/buildbot/buildbot-3.6.1.ebuild
index 1d3129757b33..dcafdd2e2045 100644
--- a/dev-util/buildbot/buildbot-3.6.1.ebuild
+++ b/dev-util/buildbot/buildbot-3.6.1.ebuild
@@ -6,17 +6,12 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_REQ_USE="sqlite"
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit readme.gentoo-r1 systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
+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/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
LICENSE="GPL-2"
SLOT="0"
diff --git a/dev-util/codespell/codespell-2.2.2.ebuild b/dev-util/codespell/codespell-2.2.2.ebuild
index ebbb0a4ccec3..cc6eefa46734 100644
--- a/dev-util/codespell/codespell-2.2.2.ebuild
+++ b/dev-util/codespell/codespell-2.2.2.ebuild
@@ -6,11 +6,10 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Check text files for common misspellings"
HOMEPAGE="https://pypi.org/project/codespell https://github.com/codespell-project/codespell"
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
# Code licensed under GPL-2, dictionary licensed under CC-BY-SA-3.0
LICENSE="GPL-2 CC-BY-SA-3.0"
diff --git a/dev-util/cram/cram-0.7-r2.ebuild b/dev-util/cram/cram-0.7-r2.ebuild
index e0394e3b64ad..0bdfa0d8c478 100644
--- a/dev-util/cram/cram-0.7-r2.ebuild
+++ b/dev-util/cram/cram-0.7-r2.ebuild
@@ -6,11 +6,10 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Functional testing framework for command line applications"
HOMEPAGE="https://bitheap.org/cram/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/dev-util/gertty/gertty-1.6.0-r1.ebuild b/dev-util/gertty/gertty-1.6.0-r1.ebuild
index baabb3f60197..a254fc88acf5 100644
--- a/dev-util/gertty/gertty-1.6.0-r1.ebuild
+++ b/dev-util/gertty/gertty-1.6.0-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]];then
EGIT_REPO_URI="https://opendev.org/ttygroup/gertty"
EGIT_BRANCH="master"
else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ inherit pypi
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
fi
diff --git a/dev-util/gertty/gertty-9999.ebuild b/dev-util/gertty/gertty-9999.ebuild
index 7655115c0a28..8700f78637dc 100644
--- a/dev-util/gertty/gertty-9999.ebuild
+++ b/dev-util/gertty/gertty-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]];then
EGIT_REPO_URI="https://opendev.org/ttygroup/gertty"
EGIT_BRANCH="master"
else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ inherit pypi
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
fi
diff --git a/dev-util/howdoi/howdoi-2.0.19.ebuild b/dev-util/howdoi/howdoi-2.0.19.ebuild
index d7ee7819c1f5..69116ffe7209 100644
--- a/dev-util/howdoi/howdoi-2.0.19.ebuild
+++ b/dev-util/howdoi/howdoi-2.0.19.ebuild
@@ -5,11 +5,10 @@ EAPI=8
DISTUTILS_USE_SETUPTOOLS="manual"
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="A code search tool"
HOMEPAGE="https://pypi.org/project/howdoi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-pkgcore-0.12.18.patch b/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-pkgcore-0.12.18.patch
deleted file mode 100644
index c2c452c42c7f..000000000000
--- a/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-pkgcore-0.12.18.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -8,8 +8,8 @@ requires = [
- "lxml",
- "pathspec",
- "tree-sitter>=0.19.0",
-- "snakeoil~=0.10.3",
-- "pkgcore~=0.12.17",
-+ "snakeoil~=0.10.4",
-+ "pkgcore~=0.12.18",
- ]
- build-backend = "setuptools.build_meta"
-
-@@ -40,8 +40,8 @@ dependencies = [
- "lxml",
- "pathspec",
- "tree-sitter>=0.19.0",
-- "snakeoil~=0.10.3",
-- "pkgcore~=0.12.17",
-+ "snakeoil~=0.10.4",
-+ "pkgcore~=0.12.18",
- ]
-
- [project.optional-dependencies]
-@@ -53,7 +53,7 @@ test = [
- doc = [
- "sphinx",
- "tomli; python_version < '3.11'",
-- "snakeoil~=0.10.3",
-+ "snakeoil~=0.10.4",
- ]
- network = [
- "requests",
---- a/src/pkgcheck/checks/metadata.py
-+++ b/src/pkgcheck/checks/metadata.py
-@@ -210,11 +210,10 @@ class IuseCheck(Check):
- def __init__(self, *args, use_addon):
- super().__init__(*args)
- self.iuse_handler = use_addon
-- self.valid_use = atom_mod.valid_use_flag.match
- self.bad_defaults = tuple(['-'] + [f'+{x}_' for x in self.use_expand_groups])
-
- def feed(self, pkg):
-- if invalid := sorted(x for x in pkg.iuse_stripped if not self.valid_use(x)):
-+ if invalid := sorted(x for x in pkg.iuse_stripped if not pkg.eapi.is_valid_use_flag(x)):
- yield InvalidUseFlags(invalid, pkg=pkg)
-
- if pkg.eapi.options.iuse_defaults and (bad_defaults := sorted(
---- a/testdata/data/repos/standalone/SourcingCheck/InvalidEapi/expected.json
-+++ b/testdata/data/repos/standalone/SourcingCheck/InvalidEapi/expected.json
-@@ -1,2 +1,2 @@
- {"__class__": "InvalidEapi", "category": "SourcingCheck", "package": "InvalidEapi", "version": "0", "attr": "eapi", "msg": "EAPI '9999' is not supported"}
--{"__class__": "InvalidEapi", "category": "SourcingCheck", "package": "InvalidEapi", "version": "1", "attr": "eapi", "msg": "invalid EAPI: 'invalid!'"}
-+{"__class__": "InvalidEapi", "category": "SourcingCheck", "package": "InvalidEapi", "version": "1", "attr": "eapi", "msg": "invalid EAPI 'invalid!'"}
---- a/tests/checks/test_metadata.py
-+++ b/tests/checks/test_metadata.py
-@@ -430,7 +430,7 @@ class TestSourcingCheck(misc.ReportTestCase, misc.Tmpdir):
- """))
- r = self.assertReport(check, self.repo)
- assert isinstance(r, metadata.InvalidEapi)
-- assert f"invalid EAPI: '{eapi}'" in str(r)
-+ assert f"invalid EAPI '{eapi}'" in str(r)
-
- def test_sourcing_error(self):
- check = self.mk_check()
diff --git a/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-setup.patch b/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-setup.patch
deleted file mode 100644
index 8366e435a1e9..000000000000
--- a/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-setup.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/pkgcore/pkgcheck/commit/b4c34a95f4c66db9c658f6dd75d9193c6e55dab4
-
---- a/setup.py
-+++ b/setup.py
-@@ -36,12 +36,12 @@ class build_treesitter(Command, SubCommand):
- pass
-
- def get_source_files(self):
-- cwd = Path(__file__).parent / "tree-sitter-bash/src"
-+ src = "tree-sitter-bash/src/"
- return [
-- str(cwd / "GNUmakefile"),
-- str(cwd / "tree_sitter/parser.h"),
-- str(cwd / "parser.c"),
-- str(cwd / "scanner.cc"),
-+ src + "GNUmakefile",
-+ src + "tree_sitter/parser.h",
-+ src + "parser.c",
-+ src + "scanner.cc",
- ]
-
- library_path = Path(__file__).parent / "src/pkgcheck/bash/lang.so"
diff --git a/dev-util/pkgcheck/files/pkgcheck-0.10.20-fix-replay-bin.patch b/dev-util/pkgcheck/files/pkgcheck-0.10.20-fix-replay-bin.patch
deleted file mode 100644
index e20c0b3f53f5..000000000000
--- a/dev-util/pkgcheck/files/pkgcheck-0.10.20-fix-replay-bin.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-test_pkgcheck_replay: fix test_replay_pipe_stdin from sdist
-
-Bug: https://bugs.gentoo.org/888896
-Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
---- a/tests/scripts/test_pkgcheck_replay.py
-+++ b/tests/scripts/test_pkgcheck_replay.py
-@@ -1,20 +1,18 @@
--import os
--import subprocess
- import tempfile
- from functools import partial
- from unittest.mock import patch
-
- import pytest
-+from snakeoil.formatters import PlainTextFormatter
-+
- from pkgcheck import __title__ as project
- from pkgcheck.checks.profiles import ProfileWarning
- from pkgcheck.reporters import JsonStream
- from pkgcheck.scripts import run
--from snakeoil.formatters import PlainTextFormatter
-
-
- class TestPkgcheckReplay:
--
-- script = partial(run, project)
-+ script = staticmethod(partial(run, project))
-
- @pytest.fixture(autouse=True)
- def _setup(self, testconfig):
-@@ -33,11 +31,11 @@ class TestPkgcheckReplay:
-
- def test_replay(self, capsys):
- result = ProfileWarning("profile warning: foo")
-- with tempfile.NamedTemporaryFile() as f:
-- out = PlainTextFormatter(f)
-+ with tempfile.NamedTemporaryFile() as file:
-+ out = PlainTextFormatter(file)
- with JsonStream(out) as reporter:
- reporter.report(result)
-- with patch("sys.argv", self.args + ["-R", "StrReporter", f.name]):
-+ with patch("sys.argv", self.args + ["-R", "StrReporter", file.name]):
- with pytest.raises(SystemExit) as excinfo:
- self.script()
- out, err = capsys.readouterr()
-@@ -47,13 +45,13 @@ class TestPkgcheckReplay:
-
- def test_corrupted_resuts(self, capsys):
- result = ProfileWarning("profile warning: foo")
-- with tempfile.NamedTemporaryFile() as f:
-- out = PlainTextFormatter(f)
-+ with tempfile.NamedTemporaryFile() as file:
-+ out = PlainTextFormatter(file)
- with JsonStream(out) as reporter:
- reporter.report(result)
-- f.write(b"corrupted")
-- f.seek(0)
-- with patch("sys.argv", self.args + ["-R", "StrReporter", f.name]):
-+ file.write(b"corrupted")
-+ file.seek(0)
-+ with patch("sys.argv", self.args + ["-R", "StrReporter", file.name]):
- with pytest.raises(SystemExit) as excinfo:
- self.script()
- out, err = capsys.readouterr()
-@@ -61,26 +59,28 @@ class TestPkgcheckReplay:
- assert excinfo.value.code == 2
-
- def test_invalid_file(self, capsys):
-- with tempfile.NamedTemporaryFile(mode="wt") as f:
-- f.write("invalid file")
-- f.seek(0)
-- with patch("sys.argv", self.args + ["-R", "StrReporter", f.name]):
-+ with tempfile.NamedTemporaryFile(mode="wt") as file:
-+ file.write("invalid file")
-+ file.seek(0)
-+ with patch("sys.argv", self.args + ["-R", "StrReporter", file.name]):
- with pytest.raises(SystemExit) as excinfo:
- self.script()
- out, err = capsys.readouterr()
- assert err.strip() == "pkgcheck replay: error: invalid or unsupported replay file"
- assert excinfo.value.code == 2
-
-- def test_replay_pipe_stdin(self):
-- script = pytest.REPO_ROOT / "bin/pkgcheck"
-- result = ProfileWarning("profile warning: foo")
-- with tempfile.NamedTemporaryFile() as f:
-- out = PlainTextFormatter(f)
-+ def test_replay_pipe_stdin(self, capsys):
-+ with tempfile.NamedTemporaryFile() as file:
-+ out = PlainTextFormatter(file)
- with JsonStream(out) as reporter:
-- reporter.report(result)
-- f.seek(0)
-- p = subprocess.run(
-- [script, "replay", "-R", "StrReporter", "-"], stdin=f, stdout=subprocess.PIPE
-- )
-- assert p.stdout.decode() == "profile warning: foo\n"
-- assert p.returncode == 0
-+ reporter.report(ProfileWarning("profile warning: foo"))
-+ file.seek(0)
-+
-+ with open(file.name) as stdin, patch("sys.stdin", stdin), patch(
-+ "sys.argv", [*self.args, "-R", "StrReporter", "-"]
-+ ), pytest.raises(SystemExit) as excinfo:
-+ self.script()
-+ out, err = capsys.readouterr()
-+ assert not err
-+ assert out == "profile warning: foo\n"
-+ assert excinfo.value.code == 0
diff --git a/dev-util/yamllint/yamllint-1.29.0.ebuild b/dev-util/yamllint/yamllint-1.29.0.ebuild
index 923a833bd6bd..1ea92ace3d70 100644
--- a/dev-util/yamllint/yamllint-1.29.0.ebuild
+++ b/dev-util/yamllint/yamllint-1.29.0.ebuild
@@ -6,11 +6,10 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="A linter for YAML files"
HOMEPAGE="https://pypi.org/project/yamllint/ https://github.com/adrienverge/yamllint/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
diff --git a/dev-util/ydiff/ydiff-1.2-r1.ebuild b/dev-util/ydiff/ydiff-1.2-r1.ebuild
index bc1dfcc7938a..65962468b630 100644
--- a/dev-util/ydiff/ydiff-1.2-r1.ebuild
+++ b/dev-util/ydiff/ydiff-1.2-r1.ebuild
@@ -6,11 +6,10 @@ EAPI=8
PYTHON_COMPAT=( python3_{7,8,9,10,11} )
DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Colored, side-by-side diff terminal viewer (ex. cdiff)"
HOMEPAGE="https://github.com/ymattw/ydiff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
generated by cgit v1.3 (git 2.53.0) at 2026-10-14 00:37:33 +0000