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

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

[Michał Górny]

commit:     90e81b38960fb11bcd5154daa658c13fa27d27a2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  6 10:40:27 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov  6 11:32:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90e81b38

sys-apps/pkgcore: Backport metadata.xsd update

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../files/pkgcore-0.10.13-metadata-xsd.patch       | 24 ++++++++++++++++++++++
 ...re-0.10.13.ebuild => pkgcore-0.10.13-r1.ebuild} |  4 ++++
 2 files changed, 28 insertions(+)

diff --git a/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd.patch b/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd.patch
new file mode 100644
index 00000000000..f2e4ab15a83
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd.patch
@@ -0,0 +1,24 @@
+From 780bf8e6a2b83a244461304017ab036bcf8c6eb9 Mon Sep 17 00:00:00 2001
+From: Tim Harder <radhermit@gmail.com>
+Date: Thu, 5 Nov 2020 07:20:18 -0700
+Subject: [PATCH] data/xml-schema: update metadata.xsd
+
+---
+ data/xml-schema/metadata.xsd | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/xml-schema/metadata.xsd b/data/xml-schema/metadata.xsd
+index 8b8ac0b5..db243abb 100644
+--- a/data/xml-schema/metadata.xsd
++++ b/data/xml-schema/metadata.xsd
+@@ -272,6 +272,7 @@
+ 			<xs:enumeration value='gitlab'/>
+ 			<xs:enumeration value='gitorious'/>
+ 			<xs:enumeration value='google-code'/>
++			<xs:enumeration value='heptapod'/>
+ 			<xs:enumeration value='launchpad'/>
+ 			<xs:enumeration value='pear'/>
+ 			<xs:enumeration value='pecl'/>
+-- 
+2.29.2
+

diff --git a/sys-apps/pkgcore/pkgcore-0.10.13.ebuild b/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild
similarity index 95%
rename from sys-apps/pkgcore/pkgcore-0.10.13.ebuild
rename to sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild
index 185be89d3ad..a83f747b80a 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.13.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild
@@ -36,6 +36,10 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-metadata-xsd.patch"
+)
+
 python_test() {
 	esetup.py test
 }

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

[Michał Górny]

commit:     57b678c1afd96922ad2db5d1ffb63d1a65386584
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 29 06:52:27 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Mar 29 07:28:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57b678c1

sys-apps/pkgcore: Backport signal handler pytest problem fix

Closes: https://bugs.gentoo.org/779013
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../pkgcore/files/pkgcore-0.10.18-sighdlr.patch    | 47 ++++++++++++++++++++++
 ...e-0.11.4-r2.ebuild => pkgcore-0.11.4-r3.ebuild} |  1 +
 ...e-0.11.5-r2.ebuild => pkgcore-0.11.5-r3.ebuild} |  1 +
 ...core-0.11.6.ebuild => pkgcore-0.11.6-r1.ebuild} |  4 ++
 ...core-0.11.8.ebuild => pkgcore-0.11.8-r1.ebuild} |  4 ++
 5 files changed, 57 insertions(+)

diff --git a/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr.patch b/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr.patch
new file mode 100644
index 00000000000..30cec9114f5
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr.patch
@@ -0,0 +1,47 @@
+From 533f1edd70054a5479ee85719d3cbef0d15627fd Mon Sep 17 00:00:00 2001
+From: Tim Harder <radhermit@gmail.com>
+Date: Sun, 28 Mar 2021 17:18:16 -0600
+Subject: [PATCH] ebuild.processor: register SIGINT and SIGTERM signal handlers
+ on ebd init
+
+Rather than at a global, module level to avoid issues with inadvertent
+issues during 3rd party imports, e.g. the pkgcore pytest plugin getting
+autoloaded by some other project's testsuite.
+---
+ src/pkgcore/ebuild/processor.py | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/src/pkgcore/ebuild/processor.py b/src/pkgcore/ebuild/processor.py
+index e8c3c2cd4..65437efcf 100644
+--- a/src/pkgcore/ebuild/processor.py
++++ b/src/pkgcore/ebuild/processor.py
+@@ -275,9 +275,6 @@ def chuck_KeyboardInterrupt(*args):
+     raise KeyboardInterrupt("ctrl+c encountered")
+ 
+ 
+-signal.signal(signal.SIGINT, chuck_KeyboardInterrupt)
+-
+-
+ def chuck_TermInterrupt(ebp, *args):
+     """Event handler for SIGTERM."""
+     if ebp is None:
+@@ -292,9 +289,6 @@ def chuck_TermInterrupt(ebp, *args):
+         ebp.shutdown_processor()
+ 
+ 
+-signal.signal(signal.SIGTERM, partial(chuck_TermInterrupt, None))
+-
+-
+ def chuck_UnhandledCommand(ebp, line):
+     """Event handler for unhandled commands."""
+     raise UnhandledCommand(line)
+@@ -332,6 +326,9 @@ def __init__(self, userpriv, sandbox, fd_pipes=None):
+         self._outstanding_expects = []
+         self._metadata_paths = None
+ 
++        signal.signal(signal.SIGTERM, partial(chuck_TermInterrupt, None))
++        signal.signal(signal.SIGINT, chuck_KeyboardInterrupt)
++
+         if userpriv:
+             self.__userpriv = True
+             spawn_opts.update({

diff --git a/sys-apps/pkgcore/pkgcore-0.11.4-r2.ebuild b/sys-apps/pkgcore/pkgcore-0.11.4-r3.ebuild
similarity index 96%
rename from sys-apps/pkgcore/pkgcore-0.11.4-r2.ebuild
rename to sys-apps/pkgcore/pkgcore-0.11.4-r3.ebuild
index 2b806114e42..7aca2d4c654 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.4-r2.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.4-r3.ebuild
@@ -37,6 +37,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+	"${FILESDIR}/pkgcore-0.10.18-sighdlr.patch"
 )
 
 distutils_enable_tests setup.py

diff --git a/sys-apps/pkgcore/pkgcore-0.11.5-r2.ebuild b/sys-apps/pkgcore/pkgcore-0.11.5-r3.ebuild
similarity index 96%
rename from sys-apps/pkgcore/pkgcore-0.11.5-r2.ebuild
rename to sys-apps/pkgcore/pkgcore-0.11.5-r3.ebuild
index 2b806114e42..7aca2d4c654 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.5-r2.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.5-r3.ebuild
@@ -37,6 +37,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
+	"${FILESDIR}/pkgcore-0.10.18-sighdlr.patch"
 )
 
 distutils_enable_tests setup.py

diff --git a/sys-apps/pkgcore/pkgcore-0.11.6.ebuild b/sys-apps/pkgcore/pkgcore-0.11.6-r1.ebuild
similarity index 94%
rename from sys-apps/pkgcore/pkgcore-0.11.6.ebuild
rename to sys-apps/pkgcore/pkgcore-0.11.6-r1.ebuild
index d98868c1bf8..274ef900e79 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.6.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.6-r1.ebuild
@@ -33,6 +33,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/pkgcore-0.10.18-sighdlr.patch"
+)
+
 distutils_enable_tests setup.py
 
 src_test() {

diff --git a/sys-apps/pkgcore/pkgcore-0.11.8.ebuild b/sys-apps/pkgcore/pkgcore-0.11.8-r1.ebuild
similarity index 94%
rename from sys-apps/pkgcore/pkgcore-0.11.8.ebuild
rename to sys-apps/pkgcore/pkgcore-0.11.8-r1.ebuild
index 9500e0ab3d3..ccaf1c6d439 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.8.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.8-r1.ebuild
@@ -33,6 +33,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/pkgcore-0.10.18-sighdlr.patch"
+)
+
 distutils_enable_tests setup.py
 
 src_test() {

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

[Michał Górny]

commit:     e12b52fb227d2386dcab13224dd93fb5946b4284
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 29 07:52:18 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Mar 29 07:52:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e12b52fb

sys-apps/pkgcore: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-apps/pkgcore/Manifest                          |  1 -
 .../files/pkgcore-0.10.13-metadata-xsd.patch       | 24 ----------
 sys-apps/pkgcore/pkgcore-0.11.4-r3.ebuild          | 54 ----------------------
 3 files changed, 79 deletions(-)

diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index bb62ba20421..1377a234f2f 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,4 +1,3 @@
-DIST pkgcore-0.11.4.tar.gz 643951 BLAKE2B 79567cdf5719b090ec358b51a7482f01a77658728efe267ca5bb217512004f920864f101cc59bdc2ce6f7260a3abc896b2cf4ef168f77500d541c92bfa848f4e SHA512 f290efacc13b72f6bf2319e240b2fba30a1307e6673db2f653dcc6a21420e94928deb63aa0483d9ac632791e60246758fe1de0481316b222c0b60197047dfb10
 DIST pkgcore-0.11.5.tar.gz 637303 BLAKE2B bd7e609039253864bf02c9a6cb084b54971a37b7d18d8c8234dcea3a7f25f25ec6652f51fc451bd991727f147d1341ee8ab7ecbcb37b727966708c1248fef428 SHA512 59a31cc9166ae2b12ec2cb349a5e29ce06999c532f7007af2392773a1e6f91ae7d6fa91c123991368dfe5ebdd7edc4ccc2a23fbf008c22b7e251562c8deb8bf8
 DIST pkgcore-0.11.6.tar.gz 634191 BLAKE2B c06f24006be697771dd3d7569e3a27310dca56c05047ac991c2db359838dddd5eec78c8d424e826b39968cc496be6e7eb366668bfa45082aac438b663015cb8a SHA512 e556d20100c0234d319ed2e15686a3bb9f388f1cdefd7188958c3c0b32d741dd531cbbe8d377b0736662f66b3241e633491a72a1ce84dd86790e9f543b3d0800
 DIST pkgcore-0.11.8.tar.gz 631665 BLAKE2B 1e33ce394c1df9418d22fc8653fca4da1b4e27d53325167e3b7231fb8382f3c81daa7a93587ab2226116865546d4ca1ae1dd4265ccc2adc9cb9b27106d9c352b SHA512 42ed7c54db5fa48dffa5e3927afae32d1b4db92da41eff99c8eaa10232fdeae4e0f3f4d39b1e1b4e3881304523822a9a99575648809c554e3bdcf59d9eab485b

diff --git a/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd.patch b/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd.patch
deleted file mode 100644
index f2e4ab15a83..00000000000
--- a/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 780bf8e6a2b83a244461304017ab036bcf8c6eb9 Mon Sep 17 00:00:00 2001
-From: Tim Harder <radhermit@gmail.com>
-Date: Thu, 5 Nov 2020 07:20:18 -0700
-Subject: [PATCH] data/xml-schema: update metadata.xsd
-
----
- data/xml-schema/metadata.xsd | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/data/xml-schema/metadata.xsd b/data/xml-schema/metadata.xsd
-index 8b8ac0b5..db243abb 100644
---- a/data/xml-schema/metadata.xsd
-+++ b/data/xml-schema/metadata.xsd
-@@ -272,6 +272,7 @@
- 			<xs:enumeration value='gitlab'/>
- 			<xs:enumeration value='gitorious'/>
- 			<xs:enumeration value='google-code'/>
-+			<xs:enumeration value='heptapod'/>
- 			<xs:enumeration value='launchpad'/>
- 			<xs:enumeration value='pear'/>
- 			<xs:enumeration value='pecl'/>
--- 
-2.29.2
-

diff --git a/sys-apps/pkgcore/pkgcore-0.11.4-r3.ebuild b/sys-apps/pkgcore/pkgcore-0.11.4-r3.ebuild
deleted file mode 100644
index 7aca2d4c654..00000000000
--- a/sys-apps/pkgcore/pkgcore-0.11.4-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+="
-		<dev-python/snakeoil-0.9.5[${PYTHON_USEDEP}]
-		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/pkgcore-0.10.13-metadata-xsd-2.patch"
-	"${FILESDIR}/pkgcore-0.10.18-sighdlr.patch"
-)
-
-distutils_enable_tests setup.py
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}

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

[Arthur Zamarin]

commit:     82a820e1928aec58b1850addfb7767e5de14edf9
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 19:18:38 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 19:20:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82a820e1

sys-apps/pkgcore: fix sys.prefix testing

Closes: https://bugs.gentoo.org/880693
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 .../pkgcore/files/pkgcore-0.12.17-fix-prefix.patch     | 18 ++++++++++++++++++
 ...kgcore-0.12.17.ebuild => pkgcore-0.12.17-r1.ebuild} | 15 +++------------
 sys-apps/pkgcore/pkgcore-9999.ebuild                   | 15 +--------------
 3 files changed, 22 insertions(+), 26 deletions(-)

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
new file mode 100644
index 000000000000..917e6323f6f8
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.12.17-fix-prefix.patch
@@ -0,0 +1,18 @@
+--- 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')

diff --git a/sys-apps/pkgcore/pkgcore-0.12.17.ebuild b/sys-apps/pkgcore/pkgcore-0.12.17-r1.ebuild
similarity index 78%
rename from sys-apps/pkgcore/pkgcore-0.12.17.ebuild
rename to sys-apps/pkgcore/pkgcore-0.12.17-r1.ebuild
index 727dcbf220de..9f732afa4d66 100644
--- a/sys-apps/pkgcore/pkgcore-0.12.17.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.12.17-r1.ebuild
@@ -38,20 +38,11 @@ BDEPEND="
 	)
 "
 
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# fail because of forcing Gentoo's prefix
-	tests/ebuild/test_eapi.py::TestEAPI::test_register
-	tests/ebuild/test_eapi.py::TestEAPI::test_is_supported
+PATCHES=(
+	"${FILESDIR}/${PN}-0.12.17-fix-prefix.patch"
 )
 
-src_prepare() {
-	# force Gentoo's prefix
-	sed -e "/INSTALL_PREFIX =/s@= .*\$@= '${EPREFIX}/usr'@" -i py_build.py || die
-
-	distutils-r1_src_prepare
-}
+distutils_enable_tests pytest
 
 python_install_all() {
 	local DOCS=( NEWS.rst )

diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index ad37b266d812..a25e0809c909 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -40,21 +40,8 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-EPYTEST_DESELECT=(
-	# fail because of forcing Gentoo's prefix
-	tests/ebuild/test_eapi.py::TestEAPI::test_register
-	tests/ebuild/test_eapi.py::TestEAPI::test_is_supported
-)
-
-src_prepare() {
-	# force Gentoo's prefix
-	sed -e "/INSTALL_PREFIX =/s@= .*\$@= '${EPREFIX}/usr'@" -i py_build.py || die
-
-	distutils-r1_src_prepare
-}
-
 python_install_all() {
 	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
+	[[ ${PV} == *9999 ]] || doman build/sphinx/man/*
 	distutils-r1_python_install_all
 }

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

[Arthur Zamarin]

commit:     ad80bcbb0fb4b7ddca33a27f7f450fd6baa2cf54
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 17:33:06 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 17:33:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad80bcbb

sys-apps/pkgcore: fix test artifacts being installed

Closes: https://bugs.gentoo.org/880881
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 .../files/pkgcore-0.12.17-fix-extra-files.patch    | 29 ++++++++++++++++++++++
 ...0.12.17-r1.ebuild => pkgcore-0.12.17-r2.ebuild} |  1 +
 2 files changed, 30 insertions(+)

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
new file mode 100644
index 000000000000..bc6b16ffc69f
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.12.17-fix-extra-files.patch
@@ -0,0 +1,29 @@
+--- 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/pkgcore-0.12.17-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.12.17-r2.ebuild
similarity index 95%
rename from sys-apps/pkgcore/pkgcore-0.12.17-r1.ebuild
rename to sys-apps/pkgcore/pkgcore-0.12.17-r2.ebuild
index 9f732afa4d66..4c804c52bcce 100644
--- a/sys-apps/pkgcore/pkgcore-0.12.17-r1.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.12.17-r2.ebuild
@@ -40,6 +40,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.12.17-fix-prefix.patch"
+	"${FILESDIR}/${PN}-0.12.17-fix-extra-files.patch"
 )
 
 distutils_enable_tests pytest