gentoo resync : 02.02.2022

3 files changed, 54 insertions, 10 deletions

diff --git a/dev-python/pypax/Manifest b/dev-python/pypax/Manifest
index 651618cc3adf..729895128e07 100644
--- a/dev-python/pypax/Manifest
+++ b/dev-python/pypax/Manifest
@@ -1,4 +1,5 @@
 DIST elfix-0.9.5.tar.gz 401722 BLAKE2B 184f8944c62412675819ca86f13bcf23039ebcf069df528267f3e4272859e6cc442a1e05a7a121d88987c282d7e2f513d02f28ce41a8e3c0c226b456fa256aa6 SHA512 e15ab664357796f3a63ac54912eb43ae659947088a10ef16aafcbdd713cc3670fb0319cb2b95a2d29092866d322ef69df1d63847dfc0c4ab2cdd49e6eaa4635e
+EBUILD pypax-0.9.5-r1.ebuild 1086 BLAKE2B a9a1e4ce75584d8acd54f485e83d0ad2a653b48b255dbd506127787db8eba88eba981aa10d0f2e4bb4bf6adc9a2608f9895055ab03065b62f157a609991359ca SHA512 0357fd83dc59d43ced988ead7a73e5242fa601e550ae5e749e27b3f12229f6516bcd26f6a27a43403ba959bdde7b3dd2b96a67cdb08451a88d9b0d7bbc95cc83
 EBUILD pypax-0.9.5.ebuild 1117 BLAKE2B 8e9f6400a95a9929791d7ff04080e7c1123163b6b5298ab4b433315a3819c99718c48fe5edb8a35527fc15124aaf2160ed5b51e381d6e0effc889d61c12e46f6 SHA512 89d3dc40933b61da78dc324329e9e07b50dc1ba06a3727bdfc1b94a6f1a24ab00729480ce7aaa0a8e085c7bab46bdaaed6b846695dad91323d0afbeb316be4c7
-EBUILD pypax-9999.ebuild 1119 BLAKE2B a1675cff826da6eac6e12c250faa4594a155361097af4df070b6720d2fd0467cc879e5598eff060e52438ade73133e38ecb350cc323f077596170ee76325ecde SHA512 bf1df0fc3f43c0158e0dc5514abb866285d22f875f490b4bad8126e48fc6f882b9ef00d301767a0175dab5b84a6d565f95028026d420acad54080f927e40b770
+EBUILD pypax-9999.ebuild 1086 BLAKE2B a9a1e4ce75584d8acd54f485e83d0ad2a653b48b255dbd506127787db8eba88eba981aa10d0f2e4bb4bf6adc9a2608f9895055ab03065b62f157a609991359ca SHA512 0357fd83dc59d43ced988ead7a73e5242fa601e550ae5e749e27b3f12229f6516bcd26f6a27a43403ba959bdde7b3dd2b96a67cdb08451a88d9b0d7bbc95cc83
 MISC metadata.xml 598 BLAKE2B e82b37c38906a966561fd6982fa89c6beae4b7941c73d86845865e1a32be9dad4d7d66c903e7a816bec1197c119b75dc47bedbdb3423386d2c5139cce5ee2abd SHA512 bf986279d57efb1633c4d26fcd830ff9d3e207270498125c419959e71d1be90348bdf746c33d0bfd54519b156bb23274e0fb323738d022d4add169cf7929a4b7
diff --git a/dev-python/pypax/pypax-0.9.5-r1.ebuild b/dev-python/pypax/pypax-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..1da867b776a7
--- /dev/null
+++ b/dev-python/pypax/pypax-0.9.5-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	S="${WORKDIR}/elfix-${PV}"
+fi
+
+DESCRIPTION="Python module to get or set either PT_PAX and/or XATTR_PAX flags"
+HOMEPAGE="https://dev.gentoo.org/~blueness/elfix/
+	https://wiki.gentoo.org/wiki/Project:Hardened/PaX_Quickstart"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+ptpax +xtpax"
+REQUIRED_USE="|| ( ptpax xtpax )"
+
+RDEPEND="
+	ptpax? ( dev-libs/elfutils )
+	xtpax? ( sys-apps/attr )"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	cd scripts || die
+	unset PTPAX
+	unset XTPAX
+	use ptpax && export PTPAX="yes"
+	use xtpax && export XTPAX="yes"
+	distutils-r1_src_compile
+}
+
+src_install() {
+	cd scripts || die
+	distutils-r1_src_install
+}
diff --git a/dev-python/pypax/pypax-9999.ebuild b/dev-python/pypax/pypax-9999.ebuild
index 6e639fff609e..1da867b776a7 100644
--- a/dev-python/pypax/pypax-9999.ebuild
+++ b/dev-python/pypax/pypax-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	S="${WORKDIR}/elfix-${PV}"
 fi
 
@@ -24,15 +24,12 @@ HOMEPAGE="https://dev.gentoo.org/~blueness/elfix/
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="+ptpax +xtpax"
-
 REQUIRED_USE="|| ( ptpax xtpax )"
 
 RDEPEND="
 	ptpax? ( dev-libs/elfutils )
 	xtpax? ( sys-apps/attr )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${RDEPEND}"
+DEPEND="${RDEPEND}"
 
 src_compile() {
 	cd scripts || die