[patch] ebuild patch

vbox_java.patch (text/plain), 4.10 KB, created by Ian Delaney (RETIRED) on 2011-12-13 10:45:59 UTC

diff -ur virtualbox.orig//virtualbox-4.1.4.ebuild virtualbox/virtualbox-4.1.4.ebuild
--- virtualbox.orig//virtualbox-4.1.4.ebuild	2011-12-08 01:31:04.000000000 +0800
+++ virtualbox/virtualbox-4.1.4.ebuild	2011-12-13 18:28:18.772000048 +0800
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit eutils fdo-mime flag-o-matic linux-info pax-utils python qt4-r2 toolchain-funcs java-pkg-opt-2
+inherit eutils fdo-mime flag-o-matic linux-info pax-utils distutils qt4-r2 toolchain-funcs java-pkg-opt-2
 
 if [[ ${PV} == "9999" ]] ; then
 	# XXX: should finish merging the -9999 ebuild into this one ...
@@ -23,6 +23,7 @@
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
+PYTHON_MODNAME="xpcom"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
@@ -144,7 +145,7 @@
 
 src_prepare() {
 	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
+	rm -rf kBuild/bin/ tools/
 
 	# Disable things unused or split into separate ebuilds
 	sed -e "s/MY_LIBDIR/$(get_libdir)/" \
@@ -180,8 +181,8 @@
 	if use java ; then
 		sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
 			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare || die
 	fi
-	java-pkg-opt-2_src_prepare
 }
 
 src_configure() {
@@ -207,11 +208,18 @@
 		--disable-dbus \
 		${myconf} \
 		|| die "configure failed"
+
 }
 
 src_compile() {
 	source ./env.sh
 
+        if use python; then
+                cd src/libs/libxml2-2.6.30/python
+                distutils_src_compile
+                cd ${S}
+        fi
+
 	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
 	# and strip all flags
 	# strip-flags
@@ -343,6 +351,13 @@
 		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
 		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
 	fi
+
+        if use python; then
+                cd ${S}/src/libs/libxml2-2.6.30/python
+                distutils_src_install
+                cp -r ${S}/src/VBox/Frontends/VBoxShell/vboxshell.py ${ED}/usr/bin/ || die
+                cd ${S}
+        fi
 }
 
 pkg_postinst() {
diff -ur virtualbox.orig//virtualbox-4.1.6-r1.ebuild virtualbox/virtualbox-4.1.6-r1.ebuild
--- virtualbox.orig//virtualbox-4.1.6-r1.ebuild	2011-12-13 02:25:46.940000009 +0800
+++ virtualbox/virtualbox-4.1.6-r1.ebuild	2011-12-13 18:32:05.876000041 +0800
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit eutils fdo-mime flag-o-matic linux-info pax-utils python qt4-r2 toolchain-funcs java-pkg-opt-2
+inherit eutils fdo-mime flag-o-matic linux-info pax-utils distutils qt4-r2 toolchain-funcs java-pkg-opt-2
 
 if [[ ${PV} == "9999" ]] ; then
 	# XXX: should finish merging the -9999 ebuild into this one ...
@@ -23,6 +23,7 @@
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
+PYTHON_MODNAME="xpcom"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
@@ -144,7 +145,7 @@
 
 src_prepare() {
 	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
+	rm -rf kBuild/bin/ tools/
 
 	# Disable things unused or split into separate ebuilds
 	sed -e "s/MY_LIBDIR/$(get_libdir)/" \
@@ -183,8 +184,8 @@
 	if use java ; then
 		sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
 			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare || die         
 	fi
-	java-pkg-opt-2_src_prepare
 }
 
 src_configure() {
@@ -215,6 +216,12 @@
 src_compile() {
 	source ./env.sh
 
+        if use python; then
+		cd src/libs/libxml2-2.6.30/python
+                distutils_src_compile
+		cd ${S}
+        fi
+
 	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
 	# and strip all flags
 	# strip-flags
@@ -346,6 +353,13 @@
 		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
 		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
 	fi
+
+	if use python; then
+		cd ${S}/src/libs/libxml2-2.6.30/python
+		distutils_src_install
+		cp -r ${S}/src/VBox/Frontends/VBoxShell/vboxshell.py ${ED}/usr/bin/ || die
+		cd ${S}
+	fi
 }
 
 pkg_postinst() {