7 files changed, 134 insertions, 202 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 38ecd576c846..38198b92b2c0 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libnvidia-container/Manifest b/sys-libs/libnvidia-container/Manifest
index 4de53a105cdb..edad3dfcc6d5 100644
--- a/sys-libs/libnvidia-container/Manifest
+++ b/sys-libs/libnvidia-container/Manifest
@@ -3,9 +3,11 @@ AUX libnvidia-container-1.17.4-go-1.24.patch 1681 BLAKE2B df0b26d5276fd78b912b24
 DIST libnvidia-container-1.17.2.tar.gz 1611920 BLAKE2B 571ddc5fda854999cd7d1b2bbc40d34728827bf2e9c26afe6784166db7202d2baa55b0ca0eba50be61b029645735aaf91655bfec55113996eaf8c5278b835cd8 SHA512 a791998012f681805b3cc0a3bd38abc958a523c3eaa13cab36be4e0242cfba095719d5f6fa59423453a81c3fc76c96a4bbfd2eea27d20e2ef2f9a03d3a447fd8
 DIST libnvidia-container-1.17.3.tar.gz 1612952 BLAKE2B dad0bdf68d6f9e7b7ed37792a7b5609ae632bc450fe69d5d31e035e2e404ec32e5fd8f1663c66c5613041c5d9f814af692a77b6e522c62e673e1df1cf19abc29 SHA512 24293e369fea42ebe64163464f600808c0d18e8b4efeea12095de22e16d43837cb6441f46baf52e8c966810c76b0f5045737a96d173e2ecf8cd15fff37cd4c4f
 DIST libnvidia-container-1.17.4.tar.gz 1612093 BLAKE2B 225b0ffb31fca19f8b2996fb64cc31de59f1b38ad2a7389f8098bccabe4244289b3d857b51c9614f61cf770ced7eb74b55776e5398b1b4463d3b7d693c74a28e SHA512 a5edb4eec8cc4a9bd221c3cbb14515656854700b1a6aef7b47147d96b67511d5cfcae38c740fd946452768da0f993edf6c656697cd01189de88b67a4ae00aae5
+DIST libnvidia-container-1.17.5.tar.gz 1612083 BLAKE2B eecefbd6dfdcee5053656cd5961dc9ce6ff6d292f9bd7a46366a65ec4877008094e9af862dbcfc35b99743fd4b66ec4c513e3023480dc7038fba2c47593b446a SHA512 79080dc1cce853c37ddd7d5e9e09a5670884f8cf9f0e070d3e7bb1c921a14ba1defb28ec0c14829d1f848ab0aa5b16ccb0d7d9a0ceda068c1bb0c0f2420c3c3f
 DIST libnvidia-container-nvidia-modprobe-550.54.14.tar.gz 47147 BLAKE2B 7b334877d98d0c75d5750192dea868436938852443ced14e74e59076ed4d8be9e361cdefbe48295d87bb91ac4565152ec3f3233479b3da19bb8baf8e7ef53cd6 SHA512 279228aa315ff5fd1a23df23527aff58b2319f11f9fc7d939fa285ea933b4cc6d223451e20ecf7f50baba9f6c9c100e57cb77675d0d17fa77f19d3fea2ccc193
 EBUILD libnvidia-container-1.17.2.ebuild 3260 BLAKE2B e52be0bc0d09afae9b4bae4cd01dab47a119fb8152bcdc706927e2a19ea0c783291d8b8399fd79c0440ecfd0b08119255ddb20c8c6941b711607f286bd69986f SHA512 d76505d08ae73e88f3e39c98c516503e52a9fe75cfd4f263cbf58823065b2605b0af59abd7416010a290e18c3e56d30838093f37b698d1713435a0d8a014bf72
 EBUILD libnvidia-container-1.17.3.ebuild 3345 BLAKE2B 0d1d649008de4805bdc36f5140f1517e2c11952a2431d9d97dc19bd36d41a0320677e9953249e6ce1fbeccd8b3f3f2621b1e0b18c5ac7af434e4dd036c1d748b SHA512 c2651e762003e161fb2155e8f3d696da59d44919c56987a91b14a357937f104f63e6e5954f6821b108070113c3fde977e161c592275e94075ebf3b863234fd46
 EBUILD libnvidia-container-1.17.4.ebuild 3387 BLAKE2B bc060f2184cbc976f89934bf4465e9977e45c89ed924307be34a1f5e45b6bdd1fbe2e080298e4ff15cb64bc6bec72e6949efb12a11be556c477b73b27c0cc672 SHA512 55e8942f39caf496fba61d82069f1f864cbf611750a63bba9bd064278f882cc84f8c5e5b6896cc1cbd64911570014fb2958993b1e3503c804317ac817ccada24
+EBUILD libnvidia-container-1.17.5.ebuild 3387 BLAKE2B bc060f2184cbc976f89934bf4465e9977e45c89ed924307be34a1f5e45b6bdd1fbe2e080298e4ff15cb64bc6bec72e6949efb12a11be556c477b73b27c0cc672 SHA512 55e8942f39caf496fba61d82069f1f864cbf611750a63bba9bd064278f882cc84f8c5e5b6896cc1cbd64911570014fb2958993b1e3503c804317ac817ccada24
 EBUILD libnvidia-container-9999.ebuild 3345 BLAKE2B 0d1d649008de4805bdc36f5140f1517e2c11952a2431d9d97dc19bd36d41a0320677e9953249e6ce1fbeccd8b3f3f2621b1e0b18c5ac7af434e4dd036c1d748b SHA512 c2651e762003e161fb2155e8f3d696da59d44919c56987a91b14a357937f104f63e6e5954f6821b108070113c3fde977e161c592275e94075ebf3b863234fd46
 MISC metadata.xml 1210 BLAKE2B 7a1af79b86dbe5a09eb4769a4a758db0f69cf93f8233dfe317822f1e9110bed783455abba7585bb2c67ef5386249dcf0c8ea07a42726674b87f86fd134a9fdb5 SHA512 48cd3f0a7170a0d6a5677da24e90bff0e9b6ed308a0cbec9e0e47e04d5a8f5d381eec7f992acdd3c8b1de4f144e2ba27c57b7d50d71ba3747ccb5f2bc44d860d
diff --git a/sys-libs/libnvidia-container/libnvidia-container-1.17.5.ebuild b/sys-libs/libnvidia-container/libnvidia-container-1.17.5.ebuild
new file mode 100644
index 000000000000..b1e9266e9b98
--- /dev/null
+++ b/sys-libs/libnvidia-container/libnvidia-container-1.17.5.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+# check the VERSION in libnvidia-container/mk/nvidia-modprobe.mk
+NVMODV="550.54.14"
+
+DESCRIPTION="NVIDIA container runtime library"
+HOMEPAGE="https://github.com/NVIDIA/libnvidia-container"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git"
+else
+	SRC_URI="
+		https://github.com/NVIDIA/${PN}/archive/v${PV/_rc/-rc.}.tar.gz -> ${P}.tar.gz
+	"
+	S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
+	KEYWORDS="~amd64"
+fi
+NVMODS="${WORKDIR}/nvidia-modprobe-${NVMODV}"
+SRC_URI+="
+	https://github.com/NVIDIA/nvidia-modprobe/archive/${NVMODV}.tar.gz -> ${PN}-nvidia-modprobe-${NVMODV}.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+IUSE="+seccomp static-libs"
+
+# libtirpc
+# NOTE It seams that library also has optional support for net-libs/libtirpc, but I didn't
+#      manage to build without it, probably the support for that build-roted away.
+DEPEND="
+	net-libs/libtirpc:=
+	sys-libs/libcap
+	virtual/libelf:=
+	seccomp? ( sys-libs/libseccomp )
+"
+
+RDEPEND="${DEPEND}
+	elibc_glibc? ( x11-drivers/nvidia-drivers )
+"
+
+BDEPEND="
+	dev-lang/go
+	net-libs/rpcsvc-proto
+	sys-apps/lsb-release
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.17.0-fix-makefile-r1.patch"
+	"${FILESDIR}/${PN}-1.17.4-go-1.24.patch"
+)
+
+DOCS=( NOTICE README.md )
+
+src_unpack() {
+	default_src_unpack
+	if [[ "${PV}" == "9999" ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	# nvidia-modprobe patching based on libnvidia-container/mk/nvidia-modprobe.mk
+	mkdir -p "${S}"/deps/src/nvidia-modprobe-"${NVMODV}" || die
+	cp -r "${NVMODS}"/modprobe-utils/ "${S}"/deps/src/nvidia-modprobe-"${NVMODV}"/ || die
+	touch "${S}/deps/src/nvidia-modprobe-${NVMODV}/.download_stamp" || die
+	pushd "${S}/deps/src/nvidia-modprobe-${NVMODV}" || die
+	eapply -p1 "${S}"/mk/nvidia-modprobe.patch
+	popd || die
+
+	if ! tc-is-gcc; then
+		ewarn "libnvidia-container must be built with gcc because of option \"-fplan9-extensions\"!"
+		ewarn "Ignoring CC=$(tc-getCC) and forcing ${CHOST}-gcc"
+		export CC=${CHOST}-gcc AR=${CHOST}-gcc-ar
+		tc-is-gcc || die "tc-is-gcc failed in spite of CC=${CC}"
+	fi
+
+	default
+}
+
+src_configure() {
+	export GOPATH="${S}"
+	export GOFLAGS="-mod=vendor"
+	export CFLAGS="${CFLAGS}"
+	export LDFLAGS="${LDFLAGS}"
+	export CGO_CFLAGS="${CGO_CFLAGS:-$CFLAGS}"
+	export CGO_LDFLAGS="${CGO_LDFLAGS:-$LDFLAGS}"
+
+	tc-export LD OBJCOPY PKG_CONFIG
+
+	# we could also set GO compiller, but it currently defaults to gccgo, but as for now I believe
+	# most users will prefer dev-lang/go and they usually don't define GO="go" their make.conf either.
+	# tc-export GO
+
+	my_makeopts=(
+		prefix="${EPREFIX}/usr"
+		libdir="${EPREFIX}/usr/$(get_libdir)"
+		GO_LDFLAGS="-compressdwarf=false -linkmode=external"
+		WITH_SECCOMP="$(usex seccomp)"
+	)
+	# WITH_TIRPC="$(usex libtirpc)"
+
+	if [[ "${PV}" != "9999" ]] ; then
+		IFS='_' read -r MY_LIB_VERSION MY_LIB_TAG <<< "${PV}"
+
+		my_makeopts=( "${my_makeopts[@]}"
+			REVISION="${PV}"
+			LIB_VERSION="${MY_LIB_VERSION}"
+			LIB_TAG="${MY_LIB_TAG}"
+		)
+	fi
+}
+
+src_compile() {
+	emake "${my_makeopts[@]}"
+}
+
+src_install() {
+	emake "${my_makeopts[@]}" DESTDIR="${D}" install
+	# Install docs
+	einstalldocs # Bug 831705
+	# Cleanup static libraries
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die # Bug 783984
+	fi
+}
diff --git a/sys-libs/pam_wrapper/Manifest b/sys-libs/pam_wrapper/Manifest
index 52151088fd56..68c3a1e2d1d0 100644
--- a/sys-libs/pam_wrapper/Manifest
+++ b/sys-libs/pam_wrapper/Manifest
@@ -1,10 +1,6 @@
-AUX pam_wrapper-1.1.4-tests-import.patch 767 BLAKE2B 65ce88028190bbbd3aacdf0a3af7591ebe90e4c24fb3502ef631ee8b126377cc6fe2a8a124658d5624e569235c9d48751e1f8142dbb87f5179d6017647991f3c SHA512 420704520ef5e4d6e1a5f4fca64619ab29765e9a5ddd347d1fc5427664e212695b6c19d7c15fe787f7375570378a261fab99c2b345ff7e96f3a7aaaf35e51939
 AUX pam_wrapper-1.1.5-env-var-typo.patch 957 BLAKE2B 8dbbe94484339ff2b1062c43133fc9d5986cdcbf70d26e2eee65a990a273cfcb7dda8fd9c8d240481528fb49ab2c32e1538a0e79d7cfd3c443fa3acb45852b04 SHA512 a220ea15815185c58184947123d7ba3fd2cc150f276f38bce222f3979c478459db344a87ea401bc239748855d81ec993e48b15c60be98006f0c99d61585c76ed
 AUX pam_wrapper-1.1.5-mkdir-race.patch 1476 BLAKE2B fcd85c50086dfe54b2473b885aba4a2891a55f18e9c61c98f345d1f86d2b3dd320eab7e491b01916760a82092d51f990cb742141e36c899c2e4756bfae426b57 SHA512 60d0f0d62fa73f0fc2aeeb1218197435e8266ed1e055d038dac58636d6bc2c0a99fbe24de688a0a5929a0b13fdec64d3334910b6ae18fec0971dfea26bdaa119
 AUX pam_wrapper-1.1.5-tests-import.patch 724 BLAKE2B a19af5ba7534ee0e106e464df2a0cb58af59cbdf90d0f4632d70ecb4ccf2558068919caf1e50874a30e771390193c18fa1ecc457129e400fdf50cfcca5c11344 SHA512 e2e9eeb26582feee621b8bfeb363052d23d898bdd44f5e7a399220cf4c4fd96e0e476a162f86b643a1557ceddd20a1cae11be3344fde3a1485f4c07b98bcf962
-DIST pam_wrapper-1.1.4.tar.gz 170882 BLAKE2B fa0a789f6fd6f809c7ef80e354e886b5f1f0b4212060dc0e388a44701e4a1f49635b8f47344156ad65cd273660e3b0a806480c37875a830e2f5d8e56c4ec0818 SHA512 3b68dc6d7815707d74d1340facd9c2de4dff3934402ac2c2632371b39c41a75744434744ed7308e157be03a03a941405638cadb6f34995de56fb1f5f45d37de2
 DIST pam_wrapper-1.1.5.tar.gz 95037 BLAKE2B 78adeaac3994349460c2c9966e1145c3c6b78189cf1e6092cf0272bc82498c2182b114d718ce47b3403e32255d8ae5e65dee22e7bc261442323a661a4dbd1b38 SHA512 eee2c0683bd87c5416b52115105a9a2397cbec261e358ff20d9b272509f64ee5ea50a4adcb04f7791d451ca904ffd31c3bc07dc53555c3808f50f71634ab6323
-EBUILD pam_wrapper-1.1.4-r2.ebuild 2005 BLAKE2B f53ee6bb5b95756410a683e314aa92a4f9856088cb9475d64dcaf659217ccc9a17de38ec663a1c82b706ec98d1d25e08b06b64c84c63d273266ca102493b1dc0 SHA512 cbb24c1c058dffc46a18baeb75c0f594d3af03114b3ec9d9e30deb1d22fff8d6d75aa9719f3b32ce6f000c243670af2259f22276567d9cae20e8a3e80a03bd36
-EBUILD pam_wrapper-1.1.4-r3.ebuild 2004 BLAKE2B a4db43aca28b694b6b611e3fb921982873ed94640720f585e71330d2bf9e8ba1c9a1ae5db9b98ab556eaaa9b197673bf25d3a4473d9a295d04a6afa17564ab64 SHA512 fea4c47102419b2eeff1fd4dc66f66e377198578ae527663b48a32e1742698cba4e432d17fdb2a8a9307f155cd5249778da9acb03583df91f8be028a7a487da0
 EBUILD pam_wrapper-1.1.5.ebuild 2080 BLAKE2B f6ae43e7f180239485fdb6e238bc54013bee4c5141bcf630b57c1f0b0a9c33e412aeb2f39e72d7c4741f567bfd3c134629df5356f8b91352782236da0a423641 SHA512 42da28976d1539d9c78f22821740e78613412d0efeb2a1e7be7d762cbcee03d0c55abe988b2adc549ecbb151e1bc1d74fca0101e67ef20e02936d9759f48b37a
 MISC metadata.xml 250 BLAKE2B e398673dd1a3522ccddb89a82a53fc2578d8e0777ec46f889d01d618609a22958d91699beef513c7912799e0e8ff985200f7c67bba941235da25c24cd4b48f09 SHA512 16834c3cbecd0dd5a9c8c311d2b8ebc63d8cd72c5891498f4f0048988993c104aadd4e24e632bf54071c11f810716432e89e4afab029555875f9f52794daa6e9
diff --git a/sys-libs/pam_wrapper/files/pam_wrapper-1.1.4-tests-import.patch b/sys-libs/pam_wrapper/files/pam_wrapper-1.1.4-tests-import.patch
deleted file mode 100644
index aba9c370a22c..000000000000
--- a/sys-libs/pam_wrapper/files/pam_wrapper-1.1.4-tests-import.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/tests/pypamtest_test.py
-+++ b/tests/pypamtest_test.py
-@@ -15,19 +15,6 @@ class PyPamTestCase(unittest.TestCase):
-         self.assertSequenceEqual(test_result.errors, info_list)
- 
- class PyPamTestImport(unittest.TestCase):
--    def setUp(self):
--        " Make sure we load the in-tree module "
--        if sys.hexversion >= 0x3000000:
--            self.modpath = os.path.join(os.getcwd(), "../src/python/python3")
--        else:
--            self.modpath = os.path.join(os.getcwd(), "../src/python/python2")
--        self.system_path = sys.path[:]
--        sys.path = [ self.modpath ]
--
--    def tearDown(self):
--        " Restore the system path "
--        sys.path = self.system_path
--
-     def testImport(self):
-         " Import the module "
-         try:
diff --git a/sys-libs/pam_wrapper/pam_wrapper-1.1.4-r2.ebuild b/sys-libs/pam_wrapper/pam_wrapper-1.1.4-r2.ebuild
deleted file mode 100644
index 600508cfadd3..000000000000
--- a/sys-libs/pam_wrapper/pam_wrapper-1.1.4-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit cmake-multilib python-r1
-
-DESCRIPTION="A tool to test PAM applications and PAM modules"
-HOMEPAGE="https://cwrap.org/pam_wrapper.html"
-SRC_URI="
-	https://www.samba.org/ftp/pub/cwrap/${P}.tar.gz
-	https://ftp.samba.org/pub/cwrap/${P}.tar.gz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Require newer PAM so we know where it's located, bug #825078
-RDEPEND="
-	${PYTHON_DEPS}
-	>=sys-libs/pam-1.5.2-r1:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/cmocka[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.4-tests-import.patch
-)
-
-multilib_src_configure() {
-	configure_for_python() {
-		local mycmakeargs=( -DUNIT_TESTING=OFF )
-		cmake_src_configure
-	}
-
-	if multilib_is_native_abi ; then
-		# Build the Pythons for each version (but only for the native ABI)
-		# bug #737468
-		python_foreach_impl configure_for_python
-	fi
-
-	# Do the regular build now
-	local mycmakeargs=(
-		-DUNIT_TESTING=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Python{Libs,Interp,SiteLibs}=ON
-	)
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		python_foreach_impl cmake_src_compile
-	fi
-
-	# Compile the "proper" version without Python last
-	cmake_src_compile
-}
-
-multilib_src_test() {
-	cmake_src_test
-
-	# Fails b/c of sandbox?
-	#python_test() {
-	#	local -x PYTHONPATH="${BUILD_DIR}/src/python/python3:${PYTHONPATH}"
-	#	elog "${PYTHONPATH}"
-	#	${EPYTHON} "${S}"/tests/pypamtest_test.py || die "Tests failed with ${EPYTHON}"
-	#}
-
-	#if multilib_is_native_abi ; then
-	#	python_foreach_impl python_test
-	#fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		python_foreach_impl cmake_src_install
-	fi
-
-	# Install the "proper" version without Python last
-	cmake_src_install
-}
diff --git a/sys-libs/pam_wrapper/pam_wrapper-1.1.4-r3.ebuild b/sys-libs/pam_wrapper/pam_wrapper-1.1.4-r3.ebuild
deleted file mode 100644
index f1992bad8d2d..000000000000
--- a/sys-libs/pam_wrapper/pam_wrapper-1.1.4-r3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit cmake-multilib python-r1
-
-DESCRIPTION="A tool to test PAM applications and PAM modules"
-HOMEPAGE="https://cwrap.org/pam_wrapper.html"
-SRC_URI="
-	https://www.samba.org/ftp/pub/cwrap/${P}.tar.gz
-	https://ftp.samba.org/pub/cwrap/${P}.tar.gz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Require newer PAM so we know where it's located, bug #825078
-RDEPEND="
-	${PYTHON_DEPS}
-	>=sys-libs/pam-1.5.3-r1:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/cmocka[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.4-tests-import.patch
-)
-
-multilib_src_configure() {
-	configure_for_python() {
-		local mycmakeargs=( -DUNIT_TESTING=OFF )
-		cmake_src_configure
-	}
-
-	if multilib_is_native_abi ; then
-		# Build the Pythons for each version (but only for the native ABI)
-		# bug #737468
-		python_foreach_impl configure_for_python
-	fi
-
-	# Do the regular build now
-	local mycmakeargs=(
-		-DUNIT_TESTING=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Python{Libs,Interp,SiteLibs}=ON
-	)
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		python_foreach_impl cmake_src_compile
-	fi
-
-	# Compile the "proper" version without Python last
-	cmake_src_compile
-}
-
-multilib_src_test() {
-	cmake_src_test
-
-	# Fails b/c of sandbox?
-	#python_test() {
-	#	local -x PYTHONPATH="${BUILD_DIR}/src/python/python3:${PYTHONPATH}"
-	#	elog "${PYTHONPATH}"
-	#	${EPYTHON} "${S}"/tests/pypamtest_test.py || die "Tests failed with ${EPYTHON}"
-	#}
-
-	#if multilib_is_native_abi ; then
-	#	python_foreach_impl python_test
-	#fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		python_foreach_impl cmake_src_install
-	fi
-
-	# Install the "proper" version without Python last
-	cmake_src_install
-}