gentoo resync : 12.05.2022

4 files changed, 14 insertions, 56 deletions

diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 502226209104..6277d0c10e05 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,6 +1,4 @@
 DIST pkgcore-0.12.10.tar.gz 625285 BLAKE2B e6d8aeec37e9f5379cc12ca9ff502bbfd8ab355087be63160b9a03feddb5c792cc0ef01d338926e3217ee01859fca5a84aa710db8e224dde8e2befc59e3fafad SHA512 8b5159a06e8291be1663de077ac089b0cfc0da1334111ee66cb6c3b627bb29ecbc7fa6b4727fef1d4c9ac93889a7de787114d07071157a1fc1ed0b5143ebe12f
-DIST pkgcore-0.12.9.tar.gz 624918 BLAKE2B 190ccae01862b7e498dabcab5e8716ab0f3ed732eeb0469a0ca39f5e201c75ea19575f49be29a6d36b3acad8d5252528dc5e76444cd21fec25681a9350b93875 SHA512 2e391f9ae2baacaaec025c4b6cd7fd7c7757d7815d8bc62aec0f09e4fdbf7fc99ce832bc2c3ce15013fda860465ca19f27377935dc535a286446e548e08be6cd
-EBUILD pkgcore-0.12.10.ebuild 1120 BLAKE2B b1d653ef353ba355345c6033ab1b2a70ec651d4e6867060259318c7b684302731456ece67ba42367426090fd2e4e8a5c96674c9e198571cea9f83d6eed7e30af SHA512 71c929d71a042a5c574f176c93b892fcdbcfc23a547e3ffca6a7507ce5b859c34e0eb3d51615c1e1373efc890db116a1c48df784f243856af3c97581a2156663
-EBUILD pkgcore-0.12.9.ebuild 1119 BLAKE2B a5b776d54396ecd6491bf3db798c1131caa37402331c3968096673d0efabc172469734a04312fc0f8ead1b2a37018d8b03bc69ec05fd9ec792c73dba0db5c9ee SHA512 97aa6863c986cfdbf0a04af429ca774c6e4230c1010aebbc487156d92db4e23e082f5939e05dec83de2eefe83fab4192a7c5293779bcad260e878ba4f038a36d
-EBUILD pkgcore-9999.ebuild 1128 BLAKE2B 8a1e4b3be381366d63c74e02d3f4daa2a4c9613b07b7837579da10763aff9029e41e390c4b8e2f9754b0d6e621feb559328128e681da9ea00f6a49e5638cb698 SHA512 44ceade535f78821029b3a4d26e0b3b1c1510530499daf2989c66b9e5f99d72eeb873c09351bc3e8648d7a6521638a80bb48c1f6e7ee742a8a88ba56591bc819
+EBUILD pkgcore-0.12.10.ebuild 1301 BLAKE2B 57d05e60b30be4a51fba84d10fa8fc4914d7e879f098b5a265c6f973d8180ccbcae86ba834fc0243aab4451b63f34d2d9dec264d45251a34abc376d27bffa894 SHA512 3c8a8001b429b97d057ee9212ba748b2e43c8323b7e0430fbed17bbd7200f9d4fe0af5bd36aa20de3112443c2bad824c0113a98afdd41441a1a72ca736ef27cb
+EBUILD pkgcore-9999.ebuild 1309 BLAKE2B b92c0f41da48bbbd8e2ee2abf63da449e098ed5ee95a305b9ff101320bdd06d9fd54034384601c0be378baa5ce505e381a3834449bd6846cc83fd7aa46e02c2a SHA512 15ec096ac7978faff4191192030dda97ffa9dee7ad75ee6b57e2a44ce671753a6cbf6d6b855ab82c2295cdab6d5633ddcce6d0115a079fb3635bae9e86fc4b8f
 MISC metadata.xml 338 BLAKE2B 8e1efa689e0129b002ca035af4d3da753e9ef4d80029e01d2baceaca5a45a4c1c325ed25d58f38094a73564a033611e92a3b60d836967e9c664021d643bd0813 SHA512 019b2e934eb8f3a04148d4426466fc397983487122e10e9a2dc2f42e747bc7675947edf549e5ab5efb284d753de0af994a0a7a4f014ee22183a156afa4a462da
diff --git a/sys-apps/pkgcore/pkgcore-0.12.10.ebuild b/sys-apps/pkgcore/pkgcore-0.12.10.ebuild
index 9f81bcac50ec..e0fb6d80f2d5 100644
--- a/sys-apps/pkgcore/pkgcore-0.12.10.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.12.10.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
@@ -39,6 +39,11 @@ BDEPEND="
 distutils_enable_tests setup.py
 
 src_test() {
+	# With PYTHONDONTWRITEBYTECODE=, python will try rebuild all sorts of modules.
+	# https://bugs.gentoo.org/840266
+	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict /
+
 	local -x PYTHONDONTWRITEBYTECODE=
 	distutils-r1_src_test
 }
diff --git a/sys-apps/pkgcore/pkgcore-0.12.9.ebuild b/sys-apps/pkgcore/pkgcore-0.12.9.ebuild
deleted file mode 100644
index c9746dc7c745..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.12.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 ~m68k ~mips ppc ppc64 ~riscv ~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="
-	>=app-shells/bash-5.0
-	dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	test? (
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-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
-}
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index f6d5f97f6274..8ee26f5ac2e5 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
@@ -39,6 +39,11 @@ BDEPEND="
 distutils_enable_tests setup.py
 
 src_test() {
+	# With PYTHONDONTWRITEBYTECODE=, python will try rebuild all sorts of modules.
+	# https://bugs.gentoo.org/840266
+	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict /
+
 	local -x PYTHONDONTWRITEBYTECODE=
 	distutils-r1_src_test
 }