commit: 1a279942bfe72b50aa5dbc561ab091432fc9ec97 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Sat Mar 4 18:22:53 2023 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Sat Mar 4 18:22:53 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a279942
dev-util/pkgcheck: fix for renamed python scm packages Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> .../pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch | 37 ++++++++++++++++++++++ ...k-0.10.21.ebuild => pkgcheck-0.10.21-r1.ebuild} | 4 +++ ...k-0.10.22.ebuild => pkgcheck-0.10.22-r1.ebuild} | 4 +++ 3 files changed, 45 insertions(+) diff --git a/dev-util/pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch b/dev-util/pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch new file mode 100644 index 000000000000..387da2374107 --- /dev/null +++ b/dev-util/pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch @@ -0,0 +1,37 @@ +diff --git a/src/pkgcheck/checks/python.py b/src/pkgcheck/checks/python.py +index 291a56b4..19b87ef5 100644 +--- a/src/pkgcheck/checks/python.py ++++ b/src/pkgcheck/checks/python.py +@@ -234,16 +234,16 @@ class PythonAnyMismatchedDepHasVersionCheck(results.VersionResult, results.Warni + + + class PythonMissingSCMDependency(results.VersionResult, results.Warning): +- """Package is missing BDEPEND on setuptools_scm or alike. ++ """Package is missing BDEPEND on setuptools-scm or alike. + + Packages which define ``SETUPTOOLS_SCM_PRETEND_VERSION`` should BDEPEND +- on ``dev-python/setuptools_scm`` or a similar package [#]_. ++ on ``dev-python/setuptools-scm`` or a similar package [#]_. + + .. [#] https://projects.gentoo.org/python/guide/distutils.html#setuptools-scm-flit-scm-hatch-vcs-and-snapshots + """ + + desc = ( +- "defines SETUPTOOLS_SCM_PRETEND_VERSION but is missing BDEPEND on setuptools_scm or alike" ++ "defines SETUPTOOLS_SCM_PRETEND_VERSION but is missing BDEPEND on setuptools-scm or alike" + ) + + +@@ -291,8 +291,10 @@ class PythonCheck(Check): + + setuptools_scm = frozenset( + { +- "dev-python/setuptools_scm", +- "dev-python/flit_scm", ++ "dev-python/setuptools-scm", ++ "dev-python/setuptools_scm", # legacy old name ++ "dev-python/flit-scm", ++ "dev-python/flit_scm", # legacy old name + "dev-python/hatch-vcs", + } + ) diff --git a/dev-util/pkgcheck/pkgcheck-0.10.21.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.21-r1.ebuild similarity index 97% rename from dev-util/pkgcheck/pkgcheck-0.10.21.ebuild rename to dev-util/pkgcheck/pkgcheck-0.10.21-r1.ebuild index 66e807c20cc1..6c5f4ff38cef 100644 --- a/dev-util/pkgcheck/pkgcheck-0.10.21.ebuild +++ b/dev-util/pkgcheck/pkgcheck-0.10.21-r1.ebuild @@ -55,6 +55,10 @@ BDEPEND="${RDEPEND} ) " +PATCHES=( + "${FILESDIR}/${PN}-0.10.21-fix-scm.patch" +) + SITEFILE="50${PN}-gentoo.el" distutils_enable_tests pytest diff --git a/dev-util/pkgcheck/pkgcheck-0.10.22.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.22-r1.ebuild similarity index 97% rename from dev-util/pkgcheck/pkgcheck-0.10.22.ebuild rename to dev-util/pkgcheck/pkgcheck-0.10.22-r1.ebuild index 582d6f268d39..00ae8b9e321b 100644 --- a/dev-util/pkgcheck/pkgcheck-0.10.22.ebuild +++ b/dev-util/pkgcheck/pkgcheck-0.10.22-r1.ebuild @@ -55,6 +55,10 @@ BDEPEND="${RDEPEND} ) " +PATCHES=( + "${FILESDIR}/${PN}-0.10.21-fix-scm.patch" +) + SITEFILE="50${PN}-gentoo.el" distutils_enable_tests pytest
