gentoo auto-resync : 17:03:2023 - 00:25:50

3 files changed, 0 insertions, 49 deletions

diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 102cea93ec34..827a1db6b8a0 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,5 +1,3 @@
-AUX pkgcore-0.12.17-fix-extra-files.patch 1006 BLAKE2B 72de925e135d33f3cdf52382c4a9cf172f195301de467e01d4218f88b4037d6e7fc824f06401e1838c4a22d25e3132f0b0aace9047bc6b557e413ed65e6e6053 SHA512 1f09f215b544cdbc07935af405f94a5c69f4840a1c1570e9cea23a2a48cf8a4e71a9ac74f8b65cf7f3d391060fc2f8012761f4187e9a4446e4e9de42d6c316c9
-AUX pkgcore-0.12.17-fix-prefix.patch 731 BLAKE2B 4487c145393747415717f5bf4845a49741641eb509175d4bcf766ae56625513243f7f0a951ad749a1e5efcf5327e16b8b9d684a5e235a23b18a0af5256e4506c SHA512 edcaa570a6c7606437b3b35f684f9fcd9c1fc2bf493c5199ad209007dec0ae546b31fff3b6adcc9477cda3a7ad35764357107519d8429a254af52d56b3f0c3ee
 DIST pkgcore-0.12.19.tar.gz 631185 BLAKE2B e088e187bb261c2db29d3d2b830a71552dc8982f30ca6e82baff325fae2c00168f10228145588a05ce0c0fa9aa773206acfecf1c831482917b4e3ca386dfb097 SHA512 9fd6c86370dea4c67a31551216b6d372ae0793c5122472a56a103c42029268dc2c0a23b5071d3fefb6bbea73f5e590a1f03b81d2c63e51a0275c18c3082e92dd
 DIST pkgcore-0.12.20.tar.gz 629420 BLAKE2B d98f992fd37bb6487aaaab39dd15101bddabb24597c2ea05cdf29f3024f0362609701315e3683ac67ce0e5bb64ebc4e348a65f4e74925456bff8c197149c179f SHA512 9ceb254998a522b4a1d519798e6ebb0ea728a20c6d9e5a9e9da7dde0916cf5746b9d22093b5b14b21ccdd177f5e4d23e6c8d069230685bc4476d5a07478aae4d
 EBUILD pkgcore-0.12.19.ebuild 1092 BLAKE2B c9cead3dd36473e51ba111e271d3954d2a566d0f310f52837adb9266718312b571e343efd2e62aea02e19c8b60b4e69acbd3b8eb85eb62e4adcf9ec3a48d2bba SHA512 bb632942eb8d9237e37593f8560fb461918ea0159fad653d76c66a4c7d1aff146e48334bdf1b85a010ca7e3768a9d14f5c4d928d32d21bc6f1712cede82a92b4
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')