9 files changed, 29 insertions, 32 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e45c16ea625e..c462f0da94c7 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index ea9797e12cd6..5e78bf76000a 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -2,5 +2,5 @@ AUX gptfdisk-1.0.9-libuuid.patch 899 BLAKE2B 534038452a7184945486b8435099adf7f19
 AUX gptfdisk-1.0.9-popt_segv.patch 671 BLAKE2B 1d46905caca1b7a403d1d200f5f0afa89953b86997f834df16002780d4371027bc34988c58b9a67e6b10a8978d4c99e93b2e711cbe00f5c49f3a868f708efc29 SHA512 b559c479dd2d62208b41a4ba3c6e68cf3e3b099d999bb8c2bbe251d77f217ccde28a44de0ca26c86004a6cecc17cf8360a120f3f1dd884ab4616c061110fde60
 DIST gptfdisk-1.0.9.tar.gz 215065 BLAKE2B 1939ffd75972a4d7f92af2bfab90c7b0223825b5478b6b808dd35af943c687d38ba81663cd7ba5e0f9400656db4dac019c13a9f75d90b7bd716568c676c24dd2 SHA512 c2489ac7e196cb53b9fdb18d0e421571eca43c366de8922c5c7f550aadf192558e7af69b181c30747d6cf607c1670126223465eaa5e231cc589402d94a4e97a2
 EBUILD gptfdisk-1.0.9-r1.ebuild 1287 BLAKE2B 9a46d6625eb48a72b7e4882d8ff08d5a8525f7cd9884e2b5ecaa43c13e4295a9570894d857b1b2dc5cdc3a8128de2d3439a216b0e35c1b8c08e02c297cb07713 SHA512 2083c0cf8325732699c6703545089768934f1221fc5ec93b4996e1c973a9fe6c113aef9665a2b7942d0ecefe4c907dfe3a40c04b6cec720a1ec41235c89df5d3
-EBUILD gptfdisk-1.0.9-r2.ebuild 1364 BLAKE2B 0ea266b003a89d033c6eec58246a8c328ebea8bbe503a8f17f40207daac9f8d84fd13a131afab079949c4e44d47272b22664ef81628e87599fdffee4d70e86a8 SHA512 188f2dd8c5e88725a43055e5a0e6b019010a858476ccccee0c06727aa9413d59a24f0ccd9444da61c5e2688f13c01dc9d2e782b02e86a8961e7b85a90d70aa61
+EBUILD gptfdisk-1.0.9-r2.ebuild 1361 BLAKE2B 8bcfa746b47003f40a4d703205315259853c0d99b2c023fc2f6338fd800157a4c6e3d97ab54fa552c5740e5f28f15714c59c328116a0415e21abe0bbc669c7ad SHA512 62310cd3978627983faebb42f544bb80e009342507920aecbbd22d3758675839d6c804c49e9fdf63dbde06c4dbeb9656af094f824df73601af7da7f2c99d8fa8
 MISC metadata.xml 324 BLAKE2B 71325b739cb7e216be64dfff099ebf3a3f24d8a714ce59838780b6944a65f7d9abdb9b0afb43c617364071778768a7d90da9ef8c7eb4c3bc0cd6b5dc9e04c773 SHA512 ad7457ef87228bef7db385c72bee2c9cf1f913cf261641582a57e4b72c05e7106ad39092c55e2aae1e4d92f86a0bf6f4537dd7de9fdd6e1dc64677b36df4a273
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild
index 5ccaa186a5da..6d028d9c8c59 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index 37286c93cccb..8b185536583e 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -10,6 +10,6 @@ AUX sensord.confd 695 BLAKE2B e435c63a48da41218b793f9beefd5f9d1702aa80a525ca378e
 AUX sensord.initd 574 BLAKE2B bbc4e39d6b906a0e7539c4521420b9da686722eb6d26d486c29554c2cdc1b8c45d770c5e587f707d4fad0e34e083b2388dda194908a78c89e3ad4606cd61e464 SHA512 69abc9a92bfffae59f17a93e4792fd1f6b64285271693a443e1007adb73f95cb62a8dbf318f407f60fb3e3573d0e7ea11357076f14dbb58a0964f7b0bfe30b4a
 AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc095446e64de85d829f3d34802d4f762967cc503d527b8f28deaeaf3e0a93b3a4384b9c9b62a8b71d4dfe SHA512 83132636209f3e3717edad28ed230f767ee8bf00eabf3036238f64c370d1e42db1c14d1ed965c650da8aa3a6deb3ce7a0794425491ff7f8ce67e2fde934fc4fb
 DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B d05efa2bf5f052158a9b3f8bbe925d45a8e00fd7fb07490ddf6c87db786c803fbe8a728693f36c301269b995c72d510657d02f2e94fbbe5a7e9f50a36214635b SHA512 4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf
-EBUILD lm-sensors-3.6.0-r1.ebuild 6638 BLAKE2B 5b013c228428208cfc65849990156b48e814de7c9a1977bbd4e24c063d4640a414c608f484feba3459d95d989b834790d160174f166ee5a24cec6b309058f864 SHA512 6adf11422cdc0cbb825153e81978cf5586db974a0078362aa254a042a53aadf31325fecc8dca2874eb71a40077680cc1c8b6e9059ed2fb76f580c65509b5fe0c
+EBUILD lm-sensors-3.6.0-r1.ebuild 6635 BLAKE2B c74d9baebae1989bb1f54b7242760c7b3f7a8d18c8b56d600631c537a42e96057f2c937c309a4e6892361c06fbc4fea089eb2e64ad886dbe2bd0ca1c3453d5e4 SHA512 a607ca4981063f41801a3731256c1357daa8beb1d1d5d75f9f41ea4dbd456f51e7496c992f376a84e18fc4fc686ad379e80fe8ae564081b3983ddf4a84f05866
 EBUILD lm-sensors-3.6.0.ebuild 6672 BLAKE2B efecba75234ac2175f71f070cd16b3bed7dbae5e74c91ce78c3999de502155286669651dd8ff3149d83d51190bf672e90a477aba5d528b540e1fe6ef2b2aa3f2 SHA512 2f120c58c561c148ab755b85dc3d1e65c731e1fad666cc39ade50e98fff6de3c0c0ab59cdd57bbd262a47a15ef2095f7d4139c996446288d3ddc6e9d61f7cf7d
 MISC metadata.xml 826 BLAKE2B f4bbd7a126d042dc595f2f5f980445ee576f61c589ecd61359b0f68935b92a2483890add6f4b3fbe73d7e43a5e60462cde524c25561df0036d43c95dd36bdc2f SHA512 83e3b7b23643aff17671420de8bb32095e2170d4b80abd4bf5cee4f08a7168475f8779a40a6d35d587f8820a7f6d32eb8c9a83015860bc521064ca157e23782a
diff --git a/sys-apps/lm-sensors/lm-sensors-3.6.0-r1.ebuild b/sys-apps/lm-sensors/lm-sensors-3.6.0-r1.ebuild
index 1374e7998896..8612e3a12419 100644
--- a/sys-apps/lm-sensors/lm-sensors-3.6.0-r1.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.6.0-r1.ebuild
@@ -22,7 +22,7 @@ LICENSE="GPL-2+ LGPL-2.1"
 # SUBSLOT based on SONAME of libsensors.so
 SLOT="0/5.0.0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="contrib sensord static-libs"
 
 COMMON_DEPS="
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
 }