Simplified installation of VBoxPython.so files.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 35 insertions, 25 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/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 \