[gentoo-commits] repo/gentoo:master commit in: sys-apps/pkgcore/files/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/pkgcore/files/

[Arthur Zamarin]

commit:     0c5f3a6659b3e963351be5c08f2b73f18eb0b487
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Mar 16 17:17:11 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 17:37:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c5f3a66

sys-apps/pkgcore: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30158
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 .../files/pkgcore-0.12.17-fix-extra-files.patch    | 29 ----------------------
 .../pkgcore/files/pkgcore-0.12.17-fix-prefix.patch | 18 --------------
 2 files changed, 47 deletions(-)

diff --git a/sys-apps/pkgcore/files/pkgcore-0.12.17-fix-extra-files.patch b/sys-apps/pkgcore/files/pkgcore-0.12.17-fix-extra-files.patch
deleted file mode 100644
index bc6b16ffc69f..000000000000
--- a/sys-apps/pkgcore/files/pkgcore-0.12.17-fix-extra-files.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/tests/ebuild/test_eapi.py
-+++ b/tests/ebuild/test_eapi.py
-@@ -1,6 +1,8 @@
-+import shutil
- from unittest import mock
- 
- import pytest
-+from pkgcore.const import EBD_PATH
- from pkgcore.ebuild import eapi
- from pkgcore.ebuild.eapi import EAPI, eapi6, get_eapi
- 
-@@ -19,13 +21,15 @@ def test_get_eapi():
- 
- class TestEAPI:
- 
--    def test_register(self):
-+    def test_register(self, tmp_path):
-         # re-register known EAPI
-         with pytest.raises(ValueError):
-             EAPI.register(magic="0")
- 
-+        mock_ebd_temp = str(shutil.copytree(EBD_PATH, tmp_path / 'ebd'))
-         with mock.patch('pkgcore.ebuild.eapi.bash_version') as bash_version, \
--                mock.patch.dict(eapi.EAPI.known_eapis):
-+                mock.patch.dict(eapi.EAPI.known_eapis), \
-+                mock.patch('pkgcore.ebuild.eapi.const.EBD_PATH', mock_ebd_temp):
-             # inadequate bash version
-             bash_version.return_value = '3.1'
-             with pytest.raises(SystemExit) as excinfo:

diff --git a/sys-apps/pkgcore/files/pkgcore-0.12.17-fix-prefix.patch b/sys-apps/pkgcore/files/pkgcore-0.12.17-fix-prefix.patch
deleted file mode 100644
index 917e6323f6f8..000000000000
--- a/sys-apps/pkgcore/files/pkgcore-0.12.17-fix-prefix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/py_build.py
-+++ b/py_build.py
-@@ -28,12 +28,12 @@ def write_pkgcore_lookup_configs(cleanup_files):
-     with open(path, "w") as f:
-         os.chmod(path, 0o644)
-         f.write(textwrap.dedent("""\
--            from os.path import join, abspath
-+            from os.path import abspath, exists, join
-             import sys
- 
--            from snakeoil import process
--
-             INSTALL_PREFIX = abspath(sys.prefix)
-+            if not exists(join(INSTALL_PREFIX, 'lib/pkgcore')):
-+                INSTALL_PREFIX = abspath(sys.base_prefix)
-             DATA_PATH = join(INSTALL_PREFIX, 'share/pkgcore')
-             CONFIG_PATH = join(DATA_PATH, 'config')
-             LIBDIR_PATH = join(INSTALL_PREFIX, 'lib/pkgcore')

[gentoo-commits] repo/gentoo:master commit in: sys-apps/pkgcore/files/

[Petr Vaněk]

commit:     2bfb39b9fbf6052b25725ee41c00a8951bde1ac0
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Mar  4 18:26:12 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Tue Mar  5 09:17:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bfb39b9

sys-apps/pkgcore: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 .../pkgcore/files/pkgcore-0.12.23-metadata-xsd.patch     | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/sys-apps/pkgcore/files/pkgcore-0.12.23-metadata-xsd.patch b/sys-apps/pkgcore/files/pkgcore-0.12.23-metadata-xsd.patch
deleted file mode 100644
index abffe300b669..000000000000
--- a/sys-apps/pkgcore/files/pkgcore-0.12.23-metadata-xsd.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-commit f244de224400d9634742c52c655ac705cce9658a
-Author: Thomas Bracht Laumann Jespersen <t@laumann.xyz>
-Date:   Thu Sep 14 12:32:44 2023 +0000
-
-    data/xml-schema/metadata.xsd: add codeberg remote-id
-
---- a/data/share/pkgcore/xml-schema/metadata.xsd
-+++ b/data/share/pkgcore/xml-schema/metadata.xsd
-@@ -271,6 +271,7 @@
- 	<xs:simpleType name='upstreamRemoteIdTypeAttrType'>
- 		<xs:restriction base='xs:token'>
- 			<xs:enumeration value='bitbucket'/>
-+			<xs:enumeration value='codeberg'/>
- 			<xs:enumeration value='cpan'/>
- 			<xs:enumeration value='cpan-module'/>
- 			<xs:enumeration value='cpe'/>