Allow python modules to be built for multiple versions of python, thanks to Michal Gorny.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x8568F528

4 files changed, 72 insertions, 31 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index 5178c716d2e0..f98416d5d7cf 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/kmod
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.145 2014/04/12 18:52:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.146 2014/04/23 18:38:11 williamh Exp $
+
+  23 Apr 2014; William Hubbs <williamh@gentoo.org> kmod-17.ebuild,
+  kmod-9999.ebuild:
+  Allow python modules to be built for multiple versions of python, thanks to
+  Michal Gorny.
 
   12 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> kmod-17.ebuild,
   kmod-9999.ebuild:
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index ccdf4759e8ee..b36a5b79cba1 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -6,18 +6,14 @@ AUX kmod-static-nodes 584 SHA256 078b07581e63b5113cef9e85da7d5b53e1fbad91d793f7f
 DIST kmod-16.tar.xz 1440880 SHA256 63412efab37c70459ccef167556965c93fd4f56af5986cd3750542a684c613c5 SHA512 326921bb184d53840837cc600f6301b948031ef7c2048e46ef16bc26ef7b967fa3c20cb133b1ebbddcf8a8537e9af8166fbca6a28d94f694f12ce1d89361a1bc WHIRLPOOL 625c277d7733a344040eaaeca26ce103d79c96ca1ba7759302e5fd573bba86285420c6f599a70411e7732e22145108afadbc29606d9f8fc62fe94479480f3a3f
 DIST kmod-17.tar.xz 1484336 SHA256 3ba7470041de04ca88308f501901b574169cb517d3192397074611b3921a2dfa SHA512 2b237a96b8bcfe03bde30d4f8b6886f8ec33817cc6f0fe810f6f382310bd71814236b299b9051304ca5a9b29c205d8e1ba5a15bf6ee98648644ac268dc368294 WHIRLPOOL 421f95e48da7baf40617c9222d4cc26868d26dbf51f77aa2613cfe5cf7a84b5489eca4611fe86108135c164890eeab32916836776561ab8f2541aa10456d1095
 EBUILD kmod-16.ebuild 3791 SHA256 be36a499e17190ab608b19706978477063d3c6295700838d613504000014bf20 SHA512 a2a237b0f0c95852c64030bae807c9501da448f9c7a2858b1bbbbda5a347b2dbeb473d941f91a28ee7eb2083814f17fa6aefb9081038c771ff658c97d4195852 WHIRLPOOL d7dafcabc14d2195f61dced5724c1de14eaa57770af51c40e1daf1224c6e32dee995a2ba9f0be5185c1de91acf6e3eab83c2a82dc39e2216cd41e6d041623432
-EBUILD kmod-17.ebuild 4608 SHA256 5a256f23a07d6e4d4ac0340358e79e38e1c3482e8fcbe3342edb8e1c441569dc SHA512 ee7b7c0c1ddb48cb09a68a5ee916ad20d6fc3f72dfef6b27bc56055dd9552515dd168593f56e5b0796255100aec058458cdef468d74e1deb3c58f84bd9cb519a WHIRLPOOL fc3387fd78ef988817a6fac34cd3cb0bf3c835a663641a59c15fc3a3d6aaeea3b51dae37868bf697cbd430d404c99ef7252c3418955a731f38de4ae17987fcef
-EBUILD kmod-9999.ebuild 4611 SHA256 f8588e62d60c95f8b095a2725100dbf3423680e217e0c9d7ce5c36d328df7b24 SHA512 4d6931e43569ab4a17c8ef1f94b895b283c67eb9ef9244e7424cdc510f0841c8a9facdee01f44dd8f55fef539beebf86067f7d95abe78f829dbff03c9ac9d46e WHIRLPOOL df0eae90178ed682162c9fc1810e8db42787d20eb87c0a04a01fdbe9937f2ef108a002efd676ac3633a22248b7b415a2c22a4f4aafca4b6f0d328cbee5b01aad
-MISC ChangeLog 20666 SHA256 1d08f38d73a993faa8a8f3cc829dec16e5e07047f2a11145a369a8c67defed3d SHA512 0971e8ce38f4d76f0de5a45952d2462d3ed9bb9efa290966abc8e7b7ff99c3ccb71690b17103a86aa50d8a939f1dafe774d4448ffa181db8ed26708371fe3d4c WHIRLPOOL 6fee1f2c26a03a60372cc950919b8c4f599dcb75a64f18b9b2569e526dde4e3301a653d63b4faa720e2cc172c7043cc91ec0e51ee0b7e40d226aea390da2f833
+EBUILD kmod-17.ebuild 5123 SHA256 c5e8f16e25b32f8625ee789c4d099c331efa12fae76cf5e6b73c4e229ad4bad2 SHA512 6b4101f8edbd95768ebe7fb30de1f5b080b143db6f0fcfb98d0ffbb7218fcaedd7f39af5a116aa2086df67091e9c255381699ea326a5f1d4cb7427de30a61a3f WHIRLPOOL 9173b8e2f37e4f8aae68535255c984f7bcde4bb80a92647d116ede8b5b6e3a53542d129f332ea6dc5d86ad6fb4ae8e924d57efa0a73386d0ab8b531d7b0ec0b7
+EBUILD kmod-9999.ebuild 5126 SHA256 7f0ae738e895d6debe50bf05a0afad472b917ddc1dd059c3214f2e84eb3f504e SHA512 e2c0cf7937368dc126648fada9b13c1b419097577cf7cb92c49432f748e73f0ec81d20c179b933a4cf8d877b019a0da8684e92effb983ce28d8375a2e48b79d1 WHIRLPOOL dc46b45224d5b9798dcffe98b29fef613ee3e5c75c94aee470c9264ebefb0f99d5fe182d3702670051c56182cc685709edf319bbf92fb435e9817989b68dc83b
+MISC ChangeLog 20847 SHA256 f81acb9894941d04ebaccfa5ca577175fdf7e9c60440d1b6d5ddd21e74b49bfe SHA512 902a46029b98f58e29289c38dc9d93d4325fc00d5ed9e1c2e4b091dc6fbb9be86936a3b302cd3a6b5908ff9e5abe2242bbd5870048a1ecdf1e54a9e33283be90 WHIRLPOOL 12628eece605bd2dd6c99203e664f04716a3ff85f3c3d5803f1c524edd5a44314a171f7bbb82bf438eb9bccfdb3f00b7da866d21a2b6ec71fb971baeda4154a7
 MISC metadata.xml 376 SHA256 5eb64ba82d456033efa6947dff12b009f73f4e5b4e883841c7fb4c8a368b3e0c SHA512 7dd59b5c777f37c5aa734a81562491ab90e0ed2854340f4d89fd9198d17c8e8d880e8d47ae99dba23b1fb16bc0b711788b7159f77ff53b08a2b2a3af01894f43 WHIRLPOOL d659931a7f525e0453e86a96f2dd6ca889bcf428496f1510bb612251961dac7afa5c36b87f90947371f4903c84b5cabf42d7647cfbbbf7af3e24396107a7197f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTSYtQAAoJEEdUh39IaPFNre8H/jg/2errS2SRHvvq5Z2vc99G
-mXdPwW/C3bFK1s7UOfQXoSAXGpcasZKH1qz/PfGZc9NSvLw2a6YeObpNgbDxCO+d
-GVDUV8XSehCCAsb0O4P7MucpGCUo+++1o4WKF03tTdrLDBDnrR2UAOtoO+hFrlBI
-Lkx6ASo54nIXGQM1aSRf9rPKy5qYLcE1e5nF96WNNIRPhuW8rXfa1wNBbGN0/FaG
-OB21tgnDv3qN9t3/xrKNn0VBiQnbJufNJbiigi8SrMw0Ho7ba8rQ/plShIxmUK1a
-5xPuJdvZe2trxD3+MWOosJr5SOPh/19ykOliDyPAIEd5kuK1UTughQCve1P8D8Q=
-=uEAl
+iEYEAREIAAYFAlNYCKcACgkQblQW9DDEZTg6+gCdElAKyWQGZqPmy2CFyZXB4PBq
+D6AAn2Gg9nhzrsv50HfVN8ATSlXuqUE2
+=aWrC
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-17.ebuild b/sys-apps/kmod/kmod-17.ebuild
index c16c379fd2fb..f228fc0d1680 100644
--- a/sys-apps/kmod/kmod-17.ebuild
+++ b/sys-apps/kmod/kmod-17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-17.ebuild,v 1.2 2014/04/12 18:52:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-17.ebuild,v 1.3 2014/04/23 18:38:11 williamh Exp $
 
 EAPI=5
 
@@ -91,11 +91,11 @@ src_configure() {
 		run_in_build_dir econf "${myeconfargs[@]}" "$@"
 	}
 
+	BUILD_DIR="${WORKDIR}/build"
+	kmod_configure --disable-python
+
 	if use python; then
 		python_parallel_foreach_impl kmod_configure --enable-python
-	else
-		BUILD_DIR="${WORKDIR}/build"
-		kmod_configure --disable-python
 	fi
 }
 
@@ -105,18 +105,38 @@ src_compile() {
 		# wrt #494806
 		local MAKEOPTS="${MAKEOPTS} -j1"
 	fi
+
+	emake -C "${BUILD_DIR}"
+
 	if use python; then
-		python_foreach_impl run_in_build_dir emake
-	else
-		run_in_build_dir emake
+		local native_builddir=${BUILD_DIR}
+
+		python_compile() {
+			echo 'python: $(pkgpyexec_LTLIBRARIES)' |
+			emake -C "${BUILD_DIR}" -f Makefile -f - python \
+				VPATH="${native_builddir}:${S}" \
+				native_builddir="${native_builddir}" \
+				libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la'
+		}
+
+		python_foreach_impl python_compile
 	fi
 }
 
 src_install() {
+	emake -C "${BUILD_DIR}" DESTDIR="${D}" install
+
 	if use python; then
-		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	else
-		run_in_build_dir emake DESTDIR="${D}" install
+		local native_builddir=${BUILD_DIR}
+
+		python_install() {
+			emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+				VPATH="${native_builddir}:${S}" \
+				install-pkgpyexecLTLIBRARIES \
+				install-dist_pkgpyexecPYTHON
+		}
+
+		python_foreach_impl python_install
 	fi
 
 	prune_libtool_files
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 89b6d55e6567..06c14a04f9cd 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.73 2014/04/12 18:52:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.74 2014/04/23 18:38:11 williamh Exp $
 
 EAPI=5
 
@@ -91,11 +91,11 @@ src_configure() {
 		run_in_build_dir econf "${myeconfargs[@]}" "$@"
 	}
 
+	BUILD_DIR="${WORKDIR}/build"
+	kmod_configure --disable-python
+
 	if use python; then
 		python_parallel_foreach_impl kmod_configure --enable-python
-	else
-		BUILD_DIR="${WORKDIR}/build"
-		kmod_configure --disable-python
 	fi
 }
 
@@ -105,18 +105,38 @@ src_compile() {
 		# wrt #494806
 		local MAKEOPTS="${MAKEOPTS} -j1"
 	fi
+
+	emake -C "${BUILD_DIR}"
+
 	if use python; then
-		python_foreach_impl run_in_build_dir emake
-	else
-		run_in_build_dir emake
+		local native_builddir=${BUILD_DIR}
+
+		python_compile() {
+			echo 'python: $(pkgpyexec_LTLIBRARIES)' |
+			emake -C "${BUILD_DIR}" -f Makefile -f - python \
+				VPATH="${native_builddir}:${S}" \
+				native_builddir="${native_builddir}" \
+				libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la'
+		}
+
+		python_foreach_impl python_compile
 	fi
 }
 
 src_install() {
+	emake -C "${BUILD_DIR}" DESTDIR="${D}" install
+
 	if use python; then
-		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	else
-		run_in_build_dir emake DESTDIR="${D}" install
+		local native_builddir=${BUILD_DIR}
+
+		python_install() {
+			emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+				VPATH="${native_builddir}:${S}" \
+				install-pkgpyexecLTLIBRARIES \
+				install-dist_pkgpyexecPYTHON
+		}
+
+		python_foreach_impl python_install
 	fi
 
 	prune_libtool_files