summaryrefslogtreecommitdiff
path: root/sys-apps/pkgcore/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-03-17 00:25:50 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-03-17 00:25:50 +0000
commit48dbe17904ac8ee6f006488d8f21734b0d253db4 (patch)
tree90c7f087cbefd4ac6b893072d309e75dbf019f76 /sys-apps/pkgcore/files
parent7972abc05090180dcc09d2b16af4020ce1cd1841 (diff)
gentoo auto-resync : 17:03:2023 - 00:25:50
Diffstat (limited to 'sys-apps/pkgcore/files')
-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')