summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2023-03-16 18:17:11 +0100
committerArthur Zamarin <arthurzam@gentoo.org>2023-03-16 19:37:28 +0200
commit0c5f3a6659b3e963351be5c08f2b73f18eb0b487 (patch)
tree43858a5891d67944ea2f437282de4c42d210fc15 /sys-apps/pkgcore
parentapp-crypt/certbot-nginx: stabilize 2.3.0 for amd64, x86 (diff)
downloadgentoo-0c5f3a6659b3e963351be5c08f2b73f18eb0b487.tar.gz
gentoo-0c5f3a6659b3e963351be5c08f2b73f18eb0b487.tar.bz2
gentoo-0c5f3a6659b3e963351be5c08f2b73f18eb0b487.zip
sys-apps/pkgcore: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/30158 Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
Diffstat (limited to 'sys-apps/pkgcore')
-rw-r--r--sys-apps/pkgcore/files/pkgcore-0.12.17-fix-extra-files.patch29
-rw-r--r--sys-apps/pkgcore/files/pkgcore-0.12.17-fix-prefix.patch18
2 files changed, 0 insertions, 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')