gentoo auto-resync : 10:11:2022 - 21:28:32

4 files changed, 25 insertions, 28 deletions

diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 404cc51c025c..efe4b0de49f9 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,6 +1,7 @@
+AUX pkgcore-0.12.17-fix-prefix.patch 731 BLAKE2B 4487c145393747415717f5bf4845a49741641eb509175d4bcf766ae56625513243f7f0a951ad749a1e5efcf5327e16b8b9d684a5e235a23b18a0af5256e4506c SHA512 edcaa570a6c7606437b3b35f684f9fcd9c1fc2bf493c5199ad209007dec0ae546b31fff3b6adcc9477cda3a7ad35764357107519d8429a254af52d56b3f0c3ee
 DIST pkgcore-0.12.16.tar.gz 623795 BLAKE2B b591aeaa5d780f0b273d446d1bdbdf33a44d085aa4975d3c5f394820a6f479c15da7850a699c92a56cb280ee028d922551c7226801dea6f4c34620bde3859c31 SHA512 acd7c478b342349e66dfda5ed1284663037b221e39b557215d1441e8a908c845fe26e274bcfd97b1879f5792fc017437cd0fbde1cdffc5ebc595a34fa56d2589
 DIST pkgcore-0.12.17.tar.gz 615375 BLAKE2B 9aabdeead2997e53ee3c966c908a231ff5e3b85422844538f47ff7bed03611459224ad7e931a9e94f0e376f221bd5c54f0f77f7883543cbd5b03c4dba6ba591b SHA512 9bad9b6e6177873b9187cff66b6b51c644a59a2d9f01b8ca110bc49006d6f0221c2c3b145d7cf5cec6f3c7526b6751100d56df13350b674a68ab5bbf19f10131
 EBUILD pkgcore-0.12.16-r1.ebuild 1449 BLAKE2B a4620deadd0c3e5c59a72b0eea28d15dab8d73449051d59f347a4d37b4a83c69ff8c84cae743b7d8f3344dbac5055c08e6a85282d3680900b9e873131ba9f842 SHA512 cd9676de9f17249a2c0aeb1b266b357c6a700f829a6fe8ba0b9cab5423312ef8874e2f407c29156f894a2c9b64e3a7e98d733f6abff082ec2a199870e629c1e2
-EBUILD pkgcore-0.12.17.ebuild 1462 BLAKE2B 8d0ae8be85072236fb8a624179f78d0f21ce26c1bf2d661a7538e652e646ee5416a5fad966b0ec29fafea357333d7a71f97d7cedf55501391e3bd3cbc4531fcf SHA512 8ea694a7561725786af3e520a653e8c7d2d28a2ef55412bb60d184edef04315cfbf0589d9dc45b086af150a99f30fffc066f9a6de4e95b73771c79015e8d4b45
-EBUILD pkgcore-9999.ebuild 1449 BLAKE2B 24ba7a7835e8d2268c3dd1c05d73700e55de940ecabe1cface8878a1ef9b78c824da197787b065ccbef1d28f91a82418f9ee0d78efe2c09831c749bcbf66454a SHA512 777b0ef3b758ea7da829e0288e16164643d37268f973628c1415a71cf9e9fdf7f569606a16bb130544671277fc33726267e072bee62655021917fa7c05a175fa
+EBUILD pkgcore-0.12.17-r1.ebuild 1198 BLAKE2B e1d14fa3a8558a511dcb94715444b873fb4765ce79c55e61c0e322737fd5ce75bfd93e1be2b96f72352b7bac034f3f9d546b5cf8e7cc805467589132d7f9653b SHA512 70141dae9a3dc50d1f9dedfc6cf8e40e5b40f696f3956af97dda2bf078ca4b6b76455f2051e81e80d15fe94cfcc60ad3f7eaf198ccad62889bb7baf8b9f5e77a
+EBUILD pkgcore-9999.ebuild 1139 BLAKE2B 1030392abec3f120c6e588b7750cdf03b01cce418ed79c85d4b2de5d62e5474d2e0c690294c80f4f0e66d8b38208de409a41e7f0e4bc805424399935670c828c SHA512 cac9cdada2dc91a8e720d40af32dd61d0f4884766d581cf793c39757a43457c0e680abac4b44fe71975cc017e047b8bc79b1bd5586d45f203679814eb427af32
 MISC metadata.xml 392 BLAKE2B 98797b18321d3133dceaf79389bd35b26344a342c55c477b178359d731c46fa209adbdcf1d14eb009d57c8c20db8b898651dd45d5bcfc6bb3009ceffa1436650 SHA512 097710cc6c1df7455328a1d3feb223e324162ff20ef03964de4682eec7acf4e2d08fa64d3ac4946783f4c2587455d90ee5aa628f637f3a48386d9c9e6b7362e1
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
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
 }