From af929819f9adfd95dd0e667ce1fc598c65d63a4c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Dec 2022 02:11:45 +0000 Subject: gentoo auto-resync : 28:12:2022 - 02:11:45 --- dev-util/pkgcheck/Manifest | 10 +- .../pkgcheck-0.10.19-fix-pkgcore-0.12.18.patch | 65 +++++++++++++ dev-util/pkgcheck/pkgcheck-0.10.17.ebuild | 99 -------------------- dev-util/pkgcheck/pkgcheck-0.10.18.ebuild | 99 -------------------- dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild | 98 ++++++++++++++++++++ dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild | 102 +++++++++++++++++++++ dev-util/pkgcheck/pkgcheck-0.10.19.ebuild | 98 -------------------- dev-util/pkgcheck/pkgcheck-9999.ebuild | 4 +- 8 files changed, 271 insertions(+), 304 deletions(-) create mode 100644 dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-pkgcore-0.12.18.patch delete mode 100644 dev-util/pkgcheck/pkgcheck-0.10.17.ebuild delete mode 100644 dev-util/pkgcheck/pkgcheck-0.10.18.ebuild create mode 100644 dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild create mode 100644 dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild delete mode 100644 dev-util/pkgcheck/pkgcheck-0.10.19.ebuild (limited to 'dev-util/pkgcheck') diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest index 4dad71a75f63..5986a9b7b721 100644 --- a/dev-util/pkgcheck/Manifest +++ b/dev-util/pkgcheck/Manifest @@ -1,9 +1,7 @@ AUX 50pkgcheck-gentoo.el 125 BLAKE2B db546b7f4e1517fb4f3bc46eff6a3294c8d677be031ecb33987daa84c355c3628ab7f24bbab90afb24b0bcec6c0ebebb56339374fa35a345481aa9808bd538be SHA512 31bad085867ebecedf0c9c3ed1223e7512238892d69b5224e850d744c5965bf7a2d7cb90978d9cce6da8dc554dba36803d604b8c6ac2b7cc9f2718ef7d6fc644 -DIST pkgcheck-0.10.17.tar.gz 497163 BLAKE2B 600b51c5c034356fcfbbbb741681e7e304ccf14b9390207305d35c48dff7675e808101fa76f6a4ce250691b2fd99deae7d59cc91560d609c1a2c3d7421859849 SHA512 3539d877b63e739877f79340ff59c3592f43ac9e00b507ab63d7afc2bb3eaa32f863e7cc8029c5a05bcf7068de70fd3149447054f0d9d304d4e3548a0a25d676 -DIST pkgcheck-0.10.18.tar.gz 509039 BLAKE2B e352e355fbe624d5b90710ec0ad7d0492a5e3dfe8620f3a98a0581f1433f5964b61cbed62833adb2b5427b38ebbc1ece4876203ce43525d0295636112cad98c6 SHA512 2d962cfc42d371a1b1eec722bfc5f83da87d40a3c8bb1e679914fc8157b6ae45b58f07c422a13b42033aeb2530405f923107583b6cc365108c8cb861a31374f0 +AUX pkgcheck-0.10.19-fix-pkgcore-0.12.18.patch 2435 BLAKE2B 3e41b3ca1666aa8f88473bb3586312d77dfe2dee6748355346ef774dd8ddea4680abc329c653679eb97e634d86e63ef7c0b1593c9aa7ff4160ebf1e5d072519e SHA512 33607bcf237a542d043255f7a9f7f421f87d1a9e782a3f9a23cefaa91ea0fdfe815f50ff44125cd4e7c54aae36a6503998b9eb3c8c49e3626b46a1845ea39120 DIST pkgcheck-0.10.19.tar.gz 548636 BLAKE2B cc1626c1d5ad9ba6b43f99bcdb668092805eaf9797c9839812d8716ea9f454f631d2e6da4579bbf702da5aadc61adc8064a6b7d32f001aaed9a2e42f8392f24c SHA512 c3af623b5c38325f9afabaa217e29d23dce4355a0aebbed77a5efa469ac135238d0aa04b4973d84c52e68ada0cb3b391a82d58317e75a279f083470c7e69cdf6 -EBUILD pkgcheck-0.10.17.ebuild 2256 BLAKE2B 478e5ac7b887f585449c7045ba05aa3d1a5fdca32d95f5df2797c36add6abc40e09042a70f99f5105e4a566d2604dd73c9392bb04da417e92738598691a97c51 SHA512 9d3a5d2f45cd48210a7eb146d60ebbe975202a0d82b2abbafd63a06c781f0ed66c9084102de590994e97cf602609074d55cf9159d82ed876dd80901ae42ed7cf -EBUILD pkgcheck-0.10.18.ebuild 2256 BLAKE2B 75c0c3d18c860c47887e22a59c53fef6d14712ec185c3ac31d1cc54544b2740e05212debffde2543939de8a05661895bf84a69793825bcbdf8f086de7178637e SHA512 99d9626b70cac937d756ae4d174ec52e7da5165241e33147260daaa41d993f792f0a558ad69016f9bba3f21366ad5df1ed44f69ca3a678e1c0a50a2c620f2887 -EBUILD pkgcheck-0.10.19.ebuild 2305 BLAKE2B 861086cdab04f95828b8841e26498c3e5148b117f53687764f5c47376c129cd049d5b90f25c9dd7a4c6c4747b242aa654259da792cff1c01f3265fd70c3184b8 SHA512 4b787f01a35881401bad37db90d115ecffb254b53627a2c89f217655b0d9de4152ba7cf6558a498ff14c185a070327fa94873358a13f0ebb723042e79f3367a3 -EBUILD pkgcheck-9999.ebuild 2208 BLAKE2B 72e3294334362897470793bd5870f06b36c442a0940a124d6b258ac514077c2cb5b5ee1dbc687158c20703db765dd457528bf8bbc5487db2bceebab6df9f1c11 SHA512 eb490cc391e47684381f4b1693fae52a9c9b0f33a6cf75157f687bfbe4489da6ecd60dff1f83e3d32f27ddfdeca3e3c555ade4035593a6c0d7a822d494a7cbc6 +EBUILD pkgcheck-0.10.19-r1.ebuild 2304 BLAKE2B 78ddd76b86dc0a9d3b065340829fc1011b8536aa1fe520ceed432cb04ca6ead5c9ba56c26ce0a14c2445a51f15fea9686a102e0150a279b616e042a637bbe29f SHA512 c2e2a88b3cada968782bc1f070d3e6572fe87a3763da08c14de8ae6bfddd3b4e88dccaed733b568395f65d415620b5b4a25cacc261187c4e3d37857005dfcda9 +EBUILD pkgcheck-0.10.19-r2.ebuild 2372 BLAKE2B f655d02fa3cb3a1171d3f8eb81085f9b807c5f72c7f2e8f4fca0206565f123a93bc85e6624580c4a52708f5e74eacbe8de27a952dfdaaaf648ae2cbe019173dc SHA512 d9f1f4e477abd4593d553446c97fc918d20183182f318d2a381cc673851856c463f16ff0f3a7b414caaf3ef2bc62af9acb3a9bfa1dbedcd32b3ab83dd00d6080 +EBUILD pkgcheck-9999.ebuild 2208 BLAKE2B 9df86718b0572e354aecf6b68f251be51538dca36e4a42e79fdb0ab7a48911b5b79ebe033cbf7814f1c5a1105a4065d5790e3ba388c1d8f77c42e735a4d179ac SHA512 d63bf1d5c01fbd1e8d6a93e7176c0b6aceba20dfda43eff12ad12a91eca4f6f52aeb1d1d0a65c521205bb05244789b1fef563fbc5cff6a7c639d7b0221dec52c MISC metadata.xml 455 BLAKE2B b544db3532ef1da966833d5edbc79988cc1fd85b6d6276476684b49d4485814d6e2d969e742d3633c8176e7f37cae6614dae1654fd1424d71475f022166f6e6a SHA512 5abd1584f486e88992bab8c51c191b4915a5854752130f8a591147ff4b2af2102fdc8ab182e7358c3e4bbb3fdc8400563a250e2dba1793d365f0edc7c5f7c33a 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 new file mode 100644 index 000000000000..c2c452c42c7f --- /dev/null +++ b/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-pkgcore-0.12.18.patch @@ -0,0 +1,65 @@ +--- 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/pkgcheck-0.10.17.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.17.ebuild deleted file mode 100644 index 6caa77b54c59..000000000000 --- a/dev-util/pkgcheck/pkgcheck-0.10.17.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) -DISTUTILS_IN_SOURCE_BUILD=1 -inherit elisp-common distutils-r1 optfeature - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcheck.git - https://github.com/pkgcore/pkgcheck.git" - inherit git-r3 -else - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -fi - -DESCRIPTION="pkgcore-based QA utility for ebuild repos" -HOMEPAGE="https://github.com/pkgcore/pkgcheck" - -LICENSE="BSD MIT" -SLOT="0" -IUSE="emacs" - -if [[ ${PV} == *9999 ]]; then - RDEPEND=" - ~dev-python/snakeoil-9999[${PYTHON_USEDEP}] - ~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]" -else - RDEPEND=" - >=dev-python/snakeoil-0.10.1[${PYTHON_USEDEP}] - >=sys-apps/pkgcore-0.12.15[${PYTHON_USEDEP}]" -fi -RDEPEND+=" - dev-libs/tree-sitter - dev-libs/tree-sitter-bash - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/lazy-object-proxy[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pathspec[${PYTHON_USEDEP}] - >=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}] - emacs? ( - >=app-editors/emacs-24.1:* - app-emacs/ebuild-mode - app-emacs/flycheck - ) -" -BDEPEND=" - ${RDEPEND} - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-vcs/git - ) -" - -SITEFILE="50${PN}-gentoo.el" - -distutils_enable_tests setup.py - -export USE_SYSTEM_TREE_SITTER_BASH=1 - -src_compile() { - distutils-r1_src_compile - - if use emacs ; then - pushd "${S}"/contrib/emacs >/dev/null || die - elisp-compile *.el - popd >/dev/null || die - fi -} - -src_test() { - local -x PYTHONDONTWRITEBYTECODE= - distutils-r1_src_test -} - -python_install_all() { - local DOCS=( NEWS.rst ) - [[ ${PV} == *9999 ]] || doman man/* - distutils-r1_python_install_all - - if use emacs ; then - elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c} - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen - - optfeature "Network check support" dev-python/requests - optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/pkgcheck/pkgcheck-0.10.18.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.18.ebuild deleted file mode 100644 index 1cc4cfc66f17..000000000000 --- a/dev-util/pkgcheck/pkgcheck-0.10.18.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_IN_SOURCE_BUILD=1 -inherit elisp-common distutils-r1 optfeature - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcheck.git - https://github.com/pkgcore/pkgcheck.git" - inherit git-r3 -else - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -fi - -DESCRIPTION="pkgcore-based QA utility for ebuild repos" -HOMEPAGE="https://github.com/pkgcore/pkgcheck" - -LICENSE="BSD MIT" -SLOT="0" -IUSE="emacs" - -if [[ ${PV} == *9999 ]]; then - RDEPEND=" - ~dev-python/snakeoil-9999[${PYTHON_USEDEP}] - ~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]" -else - RDEPEND=" - >=dev-python/snakeoil-0.10.1[${PYTHON_USEDEP}] - >=sys-apps/pkgcore-0.12.15[${PYTHON_USEDEP}]" -fi -RDEPEND+=" - dev-libs/tree-sitter - dev-libs/tree-sitter-bash - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/lazy-object-proxy[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pathspec[${PYTHON_USEDEP}] - >=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}] - emacs? ( - >=app-editors/emacs-24.1:* - app-emacs/ebuild-mode - app-emacs/flycheck - ) -" -BDEPEND=" - ${RDEPEND} - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-vcs/git - ) -" - -SITEFILE="50${PN}-gentoo.el" - -distutils_enable_tests setup.py - -export USE_SYSTEM_TREE_SITTER_BASH=1 - -src_compile() { - distutils-r1_src_compile - - if use emacs ; then - pushd "${S}"/contrib/emacs >/dev/null || die - elisp-compile *.el - popd >/dev/null || die - fi -} - -src_test() { - local -x PYTHONDONTWRITEBYTECODE= - distutils-r1_src_test -} - -python_install_all() { - local DOCS=( NEWS.rst ) - [[ ${PV} == *9999 ]] || doman man/* - distutils-r1_python_install_all - - if use emacs ; then - elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c} - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen - - optfeature "Network check support" dev-python/requests - optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild new file mode 100644 index 000000000000..fdc0630f0197 --- /dev/null +++ b/dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild @@ -0,0 +1,98 @@ +# 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_{9..11} ) +inherit elisp-common distutils-r1 optfeature + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcheck.git + https://github.com/pkgcore/pkgcheck.git" + inherit git-r3 +else + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +fi + +DESCRIPTION="pkgcore-based QA utility for ebuild repos" +HOMEPAGE="https://github.com/pkgcore/pkgcheck" + +LICENSE="BSD MIT" +SLOT="0" +IUSE="emacs" + +if [[ ${PV} == *9999 ]]; then + RDEPEND=" + ~dev-python/snakeoil-9999[${PYTHON_USEDEP}] + ~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]" +else + RDEPEND=" + >=dev-python/snakeoil-0.10.3[${PYTHON_USEDEP}] + ~sys-apps/pkgcore-0.12.17[${PYTHON_USEDEP}]" +fi +RDEPEND+=" + dev-libs/tree-sitter + dev-libs/tree-sitter-bash + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/lazy-object-proxy[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/pathspec[${PYTHON_USEDEP}] + >=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}] + emacs? ( + >=app-editors/emacs-24.1:* + app-emacs/ebuild-mode + app-emacs/flycheck + ) +" +BDEPEND="${RDEPEND} + dev-python/wheel + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-vcs/git + ) +" + +SITEFILE="50${PN}-gentoo.el" + +distutils_enable_tests pytest + +EPYTEST_DESELECT=( + tests/scripts/test_pkgcheck_replay.py::TestPkgcheckReplay::test_replay_pipe_stdin +) + +export USE_SYSTEM_TREE_SITTER_BASH=1 + +src_compile() { + distutils-r1_src_compile + + if use emacs ; then + pushd "${S}"/contrib/emacs >/dev/null || die + elisp-compile *.el + popd >/dev/null || die + fi +} + +python_install_all() { + local DOCS=( NEWS.rst ) + [[ ${PV} == *9999 ]] || doman man/* + distutils-r1_python_install_all + + if use emacs ; then + elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c} + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen + + optfeature "Network check support" dev-python/requests + optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild new file mode 100644 index 000000000000..e8ce5bc43086 --- /dev/null +++ b/dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild @@ -0,0 +1,102 @@ +# 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_{9..11} ) +inherit elisp-common distutils-r1 optfeature + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcheck.git + https://github.com/pkgcore/pkgcheck.git" + inherit git-r3 +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +fi + +DESCRIPTION="pkgcore-based QA utility for ebuild repos" +HOMEPAGE="https://github.com/pkgcore/pkgcheck" + +LICENSE="BSD MIT" +SLOT="0" +IUSE="emacs" + +if [[ ${PV} == *9999 ]]; then + RDEPEND=" + ~dev-python/snakeoil-9999[${PYTHON_USEDEP}] + ~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]" +else + RDEPEND=" + >=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}] + >=sys-apps/pkgcore-0.12.18[${PYTHON_USEDEP}]" +fi +RDEPEND+=" + dev-libs/tree-sitter + dev-libs/tree-sitter-bash + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/lazy-object-proxy[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/pathspec[${PYTHON_USEDEP}] + >=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}] + emacs? ( + >=app-editors/emacs-24.1:* + app-emacs/ebuild-mode + app-emacs/flycheck + ) +" +BDEPEND="${RDEPEND} + dev-python/wheel + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-vcs/git + ) +" + +PATCHES=( + "${FILESDIR}/${P}-fix-pkgcore-0.12.18.patch" +) + +SITEFILE="50${PN}-gentoo.el" + +distutils_enable_tests pytest + +EPYTEST_DESELECT=( + tests/scripts/test_pkgcheck_replay.py::TestPkgcheckReplay::test_replay_pipe_stdin +) + +export USE_SYSTEM_TREE_SITTER_BASH=1 + +src_compile() { + distutils-r1_src_compile + + if use emacs ; then + pushd "${S}"/contrib/emacs >/dev/null || die + elisp-compile *.el + popd >/dev/null || die + fi +} + +python_install_all() { + local DOCS=( NEWS.rst ) + [[ ${PV} == *9999 ]] || doman man/* + distutils-r1_python_install_all + + if use emacs ; then + elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c} + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen + + optfeature "Network check support" dev-python/requests + optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-util/pkgcheck/pkgcheck-0.10.19.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.19.ebuild deleted file mode 100644 index df61c4ce7a2e..000000000000 --- a/dev-util/pkgcheck/pkgcheck-0.10.19.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# 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_{9..11} ) -inherit elisp-common distutils-r1 optfeature - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcheck.git - https://github.com/pkgcore/pkgcheck.git" - inherit git-r3 -else - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -fi - -DESCRIPTION="pkgcore-based QA utility for ebuild repos" -HOMEPAGE="https://github.com/pkgcore/pkgcheck" - -LICENSE="BSD MIT" -SLOT="0" -IUSE="emacs" - -if [[ ${PV} == *9999 ]]; then - RDEPEND=" - ~dev-python/snakeoil-9999[${PYTHON_USEDEP}] - ~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]" -else - RDEPEND=" - >=dev-python/snakeoil-0.10.3[${PYTHON_USEDEP}] - >=sys-apps/pkgcore-0.12.17[${PYTHON_USEDEP}]" -fi -RDEPEND+=" - dev-libs/tree-sitter - dev-libs/tree-sitter-bash - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/lazy-object-proxy[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pathspec[${PYTHON_USEDEP}] - >=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}] - emacs? ( - >=app-editors/emacs-24.1:* - app-emacs/ebuild-mode - app-emacs/flycheck - ) -" -BDEPEND="${RDEPEND} - dev-python/wheel - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-vcs/git - ) -" - -SITEFILE="50${PN}-gentoo.el" - -distutils_enable_tests pytest - -EPYTEST_DESELECT=( - tests/scripts/test_pkgcheck_replay.py::TestPkgcheckReplay::test_replay_pipe_stdin -) - -export USE_SYSTEM_TREE_SITTER_BASH=1 - -src_compile() { - distutils-r1_src_compile - - if use emacs ; then - pushd "${S}"/contrib/emacs >/dev/null || die - elisp-compile *.el - popd >/dev/null || die - fi -} - -python_install_all() { - local DOCS=( NEWS.rst ) - [[ ${PV} == *9999 ]] || doman man/* - distutils-r1_python_install_all - - if use emacs ; then - elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c} - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen - - optfeature "Network check support" dev-python/requests - optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild index 2a5d551d17a9..45516db85496 100644 --- a/dev-util/pkgcheck/pkgcheck-9999.ebuild +++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild @@ -29,8 +29,8 @@ if [[ ${PV} == *9999 ]]; then ~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]" else RDEPEND=" - >=dev-python/snakeoil-0.10.3[${PYTHON_USEDEP}] - >=sys-apps/pkgcore-0.12.17[${PYTHON_USEDEP}]" + >=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}] + >=sys-apps/pkgcore-0.12.18[${PYTHON_USEDEP}]" fi RDEPEND+=" dev-libs/tree-sitter -- cgit v1.2.3