gentoo resync : 31.05.2021

7 files changed, 76 insertions, 123 deletions

diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest
index 5303f1ccde35..2a0ade17f1e4 100644
--- a/sys-libs/libseccomp/Manifest
+++ b/sys-libs/libseccomp/Manifest
@@ -1,10 +1,6 @@
-DIST libseccomp-2.4.3.tar.gz 598147 BLAKE2B 272c9f1ca7e4059790f633a79cae8612831aa483d28630fb85b31dc2be0192907a8897819d835b61324e0b3fb0d77b8781e2a85e9750ef8d7974d8680b8cdea3 SHA512 7b7af2e98493243ffe1934fefff5723b24ae9b9bdc4bf039343ee8456c15acb0ea34e81ec292a41143848272aeca794ef92ad38fc3f42c77465170cb540479ef
-DIST libseccomp-2.4.4.tar.gz 604420 BLAKE2B 04a2e22996d94f2525c1f4a890f325e7c75abb7ac84928a1ffde5e4cc569ef6355fcda8415e0c9937139e187f458602714cfd042008de74637c7bf30e9bd58e2 SHA512 53e5aa338a1c30ce826551e33be6ef877af43b1d8cfd2e1b6ffb70789eb2070d2610fb7cb5cec4a3a4c4a1221767f867f3d2bc07b6b1d9742719b1e053630b24
-DIST libseccomp-2.5.0.tar.gz 638793 BLAKE2B c1f30624e210d632175b734c49411ee3f95e8f0ee68819ad83a342434231baef10c292f23fca0127394365a37efb043f9f24ade9534deecd61f50e7111a6fbc8 SHA512 00ef5aeb4db8dafb546ae680b2d6d9b6aeed008df805d0f28f9dd15c074ff6ea7a5e5131ab503825b8011c59aa23046baedd5849ca040aa73352f43ab2d602ae
+AUX libseccomp-python-shared.patch 759 BLAKE2B e2c42e18ca93fe5fddbc3a5b47ac0e6a29e566292fd62b87e6b45f6cb230570a2d1907a8b192e80b32c1900d069a4f10a866fa50bd9b88f5b78abff4206bd4cb SHA512 74548c7969869ff8f937a75eac720f1c654fad87dc17aed1c041bcb765586b4ee978a3ff7c6281be03277f6c74f2ec32624f91beb55afec3066a06a9e51483e2
 DIST libseccomp-2.5.1.tar.gz 638811 BLAKE2B 683ae7536c0cba36f4d30640b42361171fc34b7cb04985ea56e64369df29c440361a0205385b14580cc0e481e0f9ffd0b0e8ebd4ac98817ed59298db6b274c35 SHA512 2be80a6323f9282dbeae8791724e5778b32e2382b2a3d1b0f77366371ec4072ea28128204f675cce101c091c0420d12c497e1a9ccbb7dc5bcbf61bfd777160af
-EBUILD libseccomp-2.4.3.ebuild 1033 BLAKE2B b8f0ab2c71319953287e4ad85c0ce0955bb5f4cb775e3a76c29522a3223296e20a820a8015c3f1a4f1ba871fbbf3c4400f65aaadc63ec4ab72aabb7cb3427b6c SHA512 25eab36a52b84f109abec338d4f0c315c7714abdfa07bfdbdff8f9e65e2c65ff9e857fca89ba6e110835cb91416df4b67c65ca5612f7d004c2a0da5f1f911c02
-EBUILD libseccomp-2.4.4.ebuild 1033 BLAKE2B b8f0ab2c71319953287e4ad85c0ce0955bb5f4cb775e3a76c29522a3223296e20a820a8015c3f1a4f1ba871fbbf3c4400f65aaadc63ec4ab72aabb7cb3427b6c SHA512 25eab36a52b84f109abec338d4f0c315c7714abdfa07bfdbdff8f9e65e2c65ff9e857fca89ba6e110835cb91416df4b67c65ca5612f7d004c2a0da5f1f911c02
-EBUILD libseccomp-2.5.0.ebuild 1949 BLAKE2B bcecd01bcbfa1e7d3efa6ea6808d5e9e3d1a029596d486a3a716b7fd613a163dafd6e036233ae1014190eacdfaab6e01f2a09f2bb754c052dc59c8a592836103 SHA512 b09eb1a9895bb0ce45eb41f623419a6976feaaff5ef10d4726fa94a362f325f424b40ec813cffef93adf652a1a3ef48eaee7dc6500e20b009508ac7d4f20abfe
-EBUILD libseccomp-2.5.1.ebuild 1987 BLAKE2B 12d3454c73d6df8cd486a0cbf3074bfd22bd84c83a6bd3c122f9b10c9c6ba50673cd40a2d2701e0eaf2e8fe7c12fe6ce7d55c022f1b41dc04e81b4eb15810733 SHA512 c37c4f2cd29baa6d63b9f6a47843d55a7e25000d86885a50592a160711e285d685abaada0b28f7975034365b322661df02d32fd5f74f625ebc03f2efd53c0cdd
-EBUILD libseccomp-9999.ebuild 1994 BLAKE2B fc3087eab99a3760febb6996beef0018c25b071d4143a06ec94f4898c846cbb1399009d42af45aed4e09e691aec3e5e3ef00488136479fc2ef7975dc3b735c19 SHA512 f834293582bc68e2e381e81b3ab0db49ff8748df113b39cec396be1069e3ffd6f7d1436040344edbeebc1c1ff581dec73d68eb4a06151644e7e03266b03e2261
+EBUILD libseccomp-2.5.1-r1.ebuild 2336 BLAKE2B 29fac73807ed8d1da2f8e233eca53e0892fd4eb973f80404622d524b90d11acab8d428c87699b6c8085c591fb65b0a355ab335f2ea6b7335ed45c9f267ac04f8 SHA512 e917b8877228a235b2c4fc5665736b2f224d078503de6132e07d9f8d7079875b12c1729177fa6dc69bf604f740266941872735d09b84d1075180d07c29fd2cca
+EBUILD libseccomp-2.5.1.ebuild 2015 BLAKE2B 42a902f6c0abe87bead4723428f287bdf730d0718265a2cd98aa0b9af3f8cf9094831a9743f9e8b43de811eb5a7cca89657cd529c90abaae018cb0017c51777a SHA512 9f46b611420ae1adbe84a0aa2b1e8b1aff83d8d93a34172b6909bee845089a5eb8d0a871cdc576839fcd02837e701a8b30fa8273df1592945b7efa963dad9c26
+EBUILD libseccomp-9999.ebuild 2336 BLAKE2B 29fac73807ed8d1da2f8e233eca53e0892fd4eb973f80404622d524b90d11acab8d428c87699b6c8085c591fb65b0a355ab335f2ea6b7335ed45c9f267ac04f8 SHA512 e917b8877228a235b2c4fc5665736b2f224d078503de6132e07d9f8d7079875b12c1729177fa6dc69bf604f740266941872735d09b84d1075180d07c29fd2cca
 MISC metadata.xml 468 BLAKE2B f09a751736d4f5f5b5d1cacfbbce2280f2c07f2a435882e833ecd0db3f363ae9e4e7aafaea23d21946279fef27a55d93af9549d75a5f929d6a965dc82f53cfb6 SHA512 3fb402831ab2522948f9514cf0dfad2ed1b035c773eeadb78d958766b92b480b1fb55a274e0990f1913b5be5e4c7de734f8f691f4b3c111949f68f604fb3edc9
diff --git a/sys-libs/libseccomp/files/libseccomp-python-shared.patch b/sys-libs/libseccomp/files/libseccomp-python-shared.patch
new file mode 100644
index 000000000000..93e1ec8a9156
--- /dev/null
+++ b/sys-libs/libseccomp/files/libseccomp-python-shared.patch
@@ -0,0 +1,25 @@
+From 763b863c3028f604f16cc6d2de7452dc16458596 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 23 May 2021 16:17:32 -0400
+Subject: [PATCH] Link python module against shared library
+
+---
+ src/python/setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/python/setup.py b/src/python/setup.py
+index 0419111..fb650d0 100755
+--- a/src/python/setup.py
++++ b/src/python/setup.py
+@@ -41,7 +41,7 @@ setup(
+ 	ext_modules = [
+ 		Extension("seccomp", ["seccomp.pyx"],
+ 			# unable to handle libtool libraries directly
+-			extra_objects=["../.libs/libseccomp.a"],
++			extra_objects=["../.libs/libseccomp.so"],
+ 			# fix build warnings, see PEP 3123
+ 			extra_compile_args=["-fno-strict-aliasing"])
+ 	]
+-- 
+2.32.0.rc1
+
diff --git a/sys-libs/libseccomp/libseccomp-2.4.3.ebuild b/sys-libs/libseccomp/libseccomp-2.4.3.ebuild
deleted file mode 100644
index f6e555a5b8d7..000000000000
--- a/sys-libs/libseccomp/libseccomp-2.4.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="high level interface to Linux seccomp filter"
-HOMEPAGE="https://github.com/seccomp/libseccomp"
-SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-# We need newer kernel headers; we don't keep strict control of the exact
-# version here, just be safe and pull in the latest stable ones. #551248
-DEPEND=">=sys-kernel/linux-headers-4.3"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/_LDFLAGS/s:-static::' \
-		tools/Makefile.in || die
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		--disable-python
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name "${PN}.la" -delete || die
-	einstalldocs
-}
diff --git a/sys-libs/libseccomp/libseccomp-2.4.4.ebuild b/sys-libs/libseccomp/libseccomp-2.4.4.ebuild
deleted file mode 100644
index f6e555a5b8d7..000000000000
--- a/sys-libs/libseccomp/libseccomp-2.4.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="high level interface to Linux seccomp filter"
-HOMEPAGE="https://github.com/seccomp/libseccomp"
-SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-# We need newer kernel headers; we don't keep strict control of the exact
-# version here, just be safe and pull in the latest stable ones. #551248
-DEPEND=">=sys-kernel/linux-headers-4.3"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/_LDFLAGS/s:-static::' \
-		tools/Makefile.in || die
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		--disable-python
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name "${PN}.la" -delete || die
-	einstalldocs
-}
diff --git a/sys-libs/libseccomp/libseccomp-2.5.0.ebuild b/sys-libs/libseccomp/libseccomp-2.5.1-r1.ebuild
index d03ab2456c99..c445290913e2 100644
--- a/sys-libs/libseccomp/libseccomp-2.5.0.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.5.1-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 multilib-minimal
 
@@ -17,31 +18,29 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa -mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="python static-libs"
 
-REQUIRED_USE="
-	python? (
-		static-libs
-		${PYTHON_REQUIRED_USE}
-	)"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-BDEPEND="
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}
 	dev-util/gperf
-	python? ( ${PYTHON_DEPS} )
+	python? ( dev-python/cython[${PYTHON_USEDEP}] )
 "
-DEPEND="${BDEPEND}"
-RDEPEND="${DEPEND}"
-
 # We need newer kernel headers; we don't keep strict control of the exact
 # version here, just be safe and pull in the latest stable ones. #551248
 DEPEND="${DEPEND} >=sys-kernel/linux-headers-4.3"
 
 src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/libseccomp-python-shared.patch"
+	)
 	default
 	if [[ "${PV}" == *9999 ]] ; then
 		sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac
@@ -57,16 +56,24 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
+do_python() {
+	# setup.py reads VERSION_RELEASE from the environment
+	local -x VERSION_RELEASE=${PRERELEASE-${PV}}
+	pushd "${BUILD_DIR}/src/python" >/dev/null || die
+	"$@"
+	popd >/dev/null || die
+}
+
 multilib_src_compile() {
 	emake
 
 	if multilib_is_native_abi && use python ; then
-		cd "${S}/src/python" || die
-		sed -i -e "s/=.*VERSION_RELEASE.*,/=\"${PRERELEASE}\",/" \
-			-e "/extra_objects/s,\.\.,${OLDPWD}/src," \
-			setup.py || die
-		local -x CPPFLAGS="-I${OLDPWD}/include -I../../include"
-		distutils-r1_src_compile
+		# setup.py expects libseccomp.so to live in "../.libs"
+		# Copy the python files to the right place for this.
+		rm -r "${BUILD_DIR}/src/python" || die
+		cp -r "${S}/src/python" "${BUILD_DIR}/src/python" || die
+		local -x CPPFLAGS="-I\"${BUILD_DIR}/include\" -I\"${S}/include\" ${CPPFLAGS}"
+		do_python distutils-r1_src_compile
 	fi
 }
 
@@ -74,8 +81,7 @@ multilib_src_install() {
 	emake DESTDIR="${D}" install
 
 	if multilib_is_native_abi && use python ; then
-		cd "${S}/src/python" || die
-		distutils-r1_src_install
+		do_python distutils-r1_src_install
 	fi
 }
 
diff --git a/sys-libs/libseccomp/libseccomp-2.5.1.ebuild b/sys-libs/libseccomp/libseccomp-2.5.1.ebuild
index b68cd3835b8d..169a677b6cf6 100644
--- a/sys-libs/libseccomp/libseccomp-2.5.1.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.5.1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 multilib-minimal
 
diff --git a/sys-libs/libseccomp/libseccomp-9999.ebuild b/sys-libs/libseccomp/libseccomp-9999.ebuild
index 9df6cc592e47..c445290913e2 100644
--- a/sys-libs/libseccomp/libseccomp-9999.ebuild
+++ b/sys-libs/libseccomp/libseccomp-9999.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 multilib-minimal
 
@@ -24,11 +25,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="python static-libs"
 
-REQUIRED_USE="
-	python? (
-		static-libs
-		${PYTHON_REQUIRED_USE}
-	)"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="python? ( ${PYTHON_DEPS} )"
 RDEPEND="${DEPEND}"
@@ -41,6 +38,9 @@ BDEPEND="${DEPEND}
 DEPEND="${DEPEND} >=sys-kernel/linux-headers-4.3"
 
 src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/libseccomp-python-shared.patch"
+	)
 	default
 	if [[ "${PV}" == *9999 ]] ; then
 		sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac
@@ -56,16 +56,24 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
+do_python() {
+	# setup.py reads VERSION_RELEASE from the environment
+	local -x VERSION_RELEASE=${PRERELEASE-${PV}}
+	pushd "${BUILD_DIR}/src/python" >/dev/null || die
+	"$@"
+	popd >/dev/null || die
+}
+
 multilib_src_compile() {
 	emake
 
 	if multilib_is_native_abi && use python ; then
-		cd "${S}/src/python" || die
-		sed -i -e "s/=.*VERSION_RELEASE.*,/=\"${PRERELEASE}\",/" \
-			-e "/extra_objects/s,\.\.,${OLDPWD}/src," \
-			setup.py || die
-		local -x CPPFLAGS="-I${OLDPWD}/include -I../../include"
-		distutils-r1_src_compile
+		# setup.py expects libseccomp.so to live in "../.libs"
+		# Copy the python files to the right place for this.
+		rm -r "${BUILD_DIR}/src/python" || die
+		cp -r "${S}/src/python" "${BUILD_DIR}/src/python" || die
+		local -x CPPFLAGS="-I\"${BUILD_DIR}/include\" -I\"${S}/include\" ${CPPFLAGS}"
+		do_python distutils-r1_src_compile
 	fi
 }
 
@@ -73,8 +81,7 @@ multilib_src_install() {
 	emake DESTDIR="${D}" install
 
 	if multilib_is_native_abi && use python ; then
-		cd "${S}/src/python" || die
-		distutils-r1_src_install
+		do_python distutils-r1_src_install
 	fi
 }