Simplified installation of VBoxPython.so files.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 38 insertions, 28 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index c77e4234076d..8f130b3c7475 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.87 2010/06/30 07:13:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.88 2010/07/06 13:47:09 polynomial-c Exp $
+
+  06 Jul 2010; Lars Wendler <polynomial-c@gentoo.org>
+  virtualbox-bin-3.2.4-r1.ebuild, virtualbox-bin-3.2.6.ebuild:
+  Simplified installation of VBoxPython.so files.
 
   30 Jun 2010; Lars Wendler <polynomial-c@gentoo.org>
   virtualbox-bin-3.1.8.ebuild, virtualbox-bin-3.2.4-r1.ebuild,
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 9b0084d4ce62..6bbd6e47d2ad 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -19,7 +19,7 @@ DIST VirtualBoxSDK-3.2.4-62467.zip 9099789 RMD160 d56ce11b3a2e67fb13b9a969a841aa
 DIST VirtualBoxSDK-3.2.6-63112.zip 9098597 RMD160 791160764dcd7abad79b111e9cb88b0d5a428342 SHA1 c2d0b64e5adf6c8711569e8bcc578f087921bef1 SHA256 0384e98ce71f28cff9bfa73064a276f9e4c24e7f230e3065aa7570b53b10f9ed
 EBUILD virtualbox-bin-3.0.12.ebuild 8176 RMD160 11707c382071d0ad9af451746c429ab33bef538a SHA1 8d2b7f519d2200ac888cbc2880d5dd85bad39f49 SHA256 62b9533faa1e14026fa6622900067720802e33ff4c2c7ead295183b75fa31a65
 EBUILD virtualbox-bin-3.1.8.ebuild 8489 RMD160 5444bb55b08b40021081d38d21d1f5f7353aa1b8 SHA1 3f8e19ce95c1b681dd13aeb673153ba28444b30e SHA256 651df890c6be9883e0be950273bc0ce39617aaa73e2e51736c1724c85186199f
-EBUILD virtualbox-bin-3.2.4-r1.ebuild 8571 RMD160 410b7006f2716e5944a533de6e427dcf6d696db6 SHA1 06fec2b2353467362a376303a92590de1fa89c40 SHA256 bea5810fecd41d3a46c5ead31ce09d798675f5d1f6ecb959636ad25588b491bc
-EBUILD virtualbox-bin-3.2.6.ebuild 8515 RMD160 8145522ec5b5929d7ed8da1455853b54ed621dd9 SHA1 942f77f71c695e96aa9939ccbe31507642443373 SHA256 2f14d87d7fb3ad40176b61acd7144c67eb2df974a3f357974c5f18023b706270
-MISC ChangeLog 17711 RMD160 5c85b77ed94cf80f6f14993f85ebc3f5fc96e374 SHA1 ca00066223184a14092e0878d873d9b72fd7658e SHA256 0d78d9d71951b20a12f888fc702273f6223d5414f3d334264d58e742199675d0
+EBUILD virtualbox-bin-3.2.4-r1.ebuild 8758 RMD160 f4bddcb10967b6992d795e25db650dedebae9b38 SHA1 8e31e79084b7b06c136132d2498ba48910b4fb23 SHA256 805648d969712d735a3b7a1d22581b5922ca062245e893b3a6019db1e3256cab
+EBUILD virtualbox-bin-3.2.6.ebuild 8772 RMD160 8b60e805c929550b4291d91c9c760ab664bac9a5 SHA1 33cec865463d877caf115b2737ab849820f205c2 SHA256 6503ad61f03b2febb8e0b3c01cb390294f98d533ab6fefce393f3af7177151c9
+MISC ChangeLog 17879 RMD160 3915141fa3a371b8e585107e9a7fd5bf19be8ee6 SHA1 919b17aa8c0eccafbe5831fef32e5a7d2ae69158 SHA256 fa191fb758d64fe021cf5d6e5d2fd9a58581e19860249baaa1cb8488764a2b88
 MISC metadata.xml 776 RMD160 53115ae984c83c47fc86bc833eb7c9f7d8427cc3 SHA1 75fa6689975d96f294bc52f989e4838704c8c651 SHA256 fecaf0e98bd60995cb85c59300255fbe7732a4c7c6e5315ae554204d3c324d82
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-3.2.4-r1.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-3.2.4-r1.ebuild
index 1ed1ced57e34..028bae2e58a6 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-3.2.4-r1.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-3.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-3.2.4-r1.ebuild,v 1.3 2010/06/30 07:21:24 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-3.2.4-r1.ebuild,v 1.4 2010/07/06 13:47:09 polynomial-c Exp $
 
 EAPI=2
 
@@ -57,14 +57,18 @@ S=${WORKDIR}
 QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
 QA_TEXTRELS_x86="opt/VirtualBox/VBoxGuestPropSvc.so
 	opt/VirtualBox/VBoxSDL.so
-	opt/VirtualBox/VBoxPython2_4.so
-	opt/VirtualBox/VBoxPython2_6.so
 	opt/VirtualBox/VBoxDbg.so
 	opt/VirtualBox/VBoxSharedFolders.so
 	opt/VirtualBox/VBoxDD2.so
 	opt/VirtualBox/VBoxOGLrenderspu.so
 	opt/VirtualBox/VBoxPython.so
 	opt/VirtualBox/VBoxPython2_3.so
+	opt/VirtualBox/VBoxPython2_4.so
+	opt/VirtualBox/VBoxPython2_5.so
+	opt/VirtualBox/VBoxPython2_6.so
+	opt/VirtualBox/VBoxPython2_7.so
+	opt/VirtualBox/VBoxPython3_0.so
+	opt/VirtualBox/VBoxPython3_1.so
 	opt/VirtualBox/VBoxDD.so
 	opt/VirtualBox/VBoxVRDP.so
 	opt/VirtualBox/VBoxDDU.so
@@ -109,6 +113,9 @@ QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
 	opt/VirtualBox/VBoxPython2_4.so
 	opt/VirtualBox/VBoxPython2_5.so
 	opt/VirtualBox/VBoxPython2_6.so
+	opt/VirtualBox/VBoxPython2_7.so
+	opt/VirtualBox/VBoxPython3_0.so
+	opt/VirtualBox/VBoxPython3_1.so
 	opt/VirtualBox/VBoxREM.so
 	opt/VirtualBox/VBoxREM32.so
 	opt/VirtualBox/VBoxREM64.so
@@ -195,17 +202,11 @@ src_install() {
 	fi
 
 	if use python; then
-		if has_version "=dev-lang/python-2.4*"; then
-			doins VBoxPython2_4.so || die
-		fi
-
-		if has_version "=dev-lang/python-2.5*"; then
-			doins VBoxPython2_5.so || die
-		fi
-
-		if has_version "=dev-lang/python-2.6*"; then
-			doins VBoxPython2_6.so || die
-		fi
+		for vboxpyver in 2.4 2.5 2.6 2.7 3.0 3.1 ; do
+			if has_version "=dev-lang/python-${vboxpyver}*" && [[ -f ${S}/VBoxPython${vboxpyver/./_}.so ]] ; then
+				doins VBoxPython${vboxpyver/./_}.so || die
+			fi
+		done
 	fi
 
 	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-3.2.6.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-3.2.6.ebuild
index 09f3cf067ea5..30d6f80a8014 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-3.2.6.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-3.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-3.2.6.ebuild,v 1.5 2010/06/30 07:21:24 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-3.2.6.ebuild,v 1.6 2010/07/06 13:47:09 polynomial-c Exp $
 
 EAPI=2
 
@@ -57,14 +57,18 @@ S=${WORKDIR}
 QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
 QA_TEXTRELS_x86="opt/VirtualBox/VBoxGuestPropSvc.so
 	opt/VirtualBox/VBoxSDL.so
-	opt/VirtualBox/VBoxPython2_4.so
-	opt/VirtualBox/VBoxPython2_6.so
 	opt/VirtualBox/VBoxDbg.so
 	opt/VirtualBox/VBoxSharedFolders.so
 	opt/VirtualBox/VBoxDD2.so
 	opt/VirtualBox/VBoxOGLrenderspu.so
 	opt/VirtualBox/VBoxPython.so
 	opt/VirtualBox/VBoxPython2_3.so
+	opt/VirtualBox/VBoxPython2_4.so
+	opt/VirtualBox/VBoxPython2_5.so
+	opt/VirtualBox/VBoxPython2_6.so
+	opt/VirtualBox/VBoxPython2_7.so
+	opt/VirtualBox/VBoxPython3_0.so
+	opt/VirtualBox/VBoxPython3_1.so
 	opt/VirtualBox/VBoxDD.so
 	opt/VirtualBox/VBoxVRDP.so
 	opt/VirtualBox/VBoxDDU.so
@@ -109,6 +113,9 @@ QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
 	opt/VirtualBox/VBoxPython2_4.so
 	opt/VirtualBox/VBoxPython2_5.so
 	opt/VirtualBox/VBoxPython2_6.so
+	opt/VirtualBox/VBoxPython2_7.so
+	opt/VirtualBox/VBoxPython3_0.so
+	opt/VirtualBox/VBoxPython3_1.so
 	opt/VirtualBox/VBoxREM.so
 	opt/VirtualBox/VBoxREM32.so
 	opt/VirtualBox/VBoxREM64.so
@@ -195,13 +202,11 @@ src_install() {
 	fi
 
 	if use python; then
-		if has_version "=dev-lang/python-2.4*"; then
-			doins VBoxPython2_4.so || die
-		fi
-
-		if has_version "=dev-lang/python-2.6*"; then
-			doins VBoxPython2_6.so || die
-		fi
+		for pyver in 2.4 2.5 2.6 2.7 3.0 3.1 ; do
+			if has_version "=dev-lang/python-${pyver}*" && [ -f "${S}/VBoxPython${pyver/./_}.so" ] ; then
+				doins VBoxPython${pyver/./_}.so || die
+			fi
+		done
 	fi
 
 	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \