Version bump. Removed old. Added possible java fix (bug #387039)

(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

4 files changed, 20 insertions, 10 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 4756fdc8780a..56903b18b3a4 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.94 2011/12/07 17:28:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.95 2011/12/20 13:14:14 polynomial-c Exp $
+
+*virtualbox-4.1.8 (20 Dec 2011)
+
+  20 Dec 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-4.0.12.ebuild, virtualbox-4.1.4.ebuild,
+  virtualbox-4.1.6-r1.ebuild, +virtualbox-4.1.8.ebuild:
+  Version bump. Removed old. Added possible java fix (bug #387039).
 
   07 Dec 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> virtualbox-4.1.4.ebuild:
   x86 stable wrt bug #386317
diff --git a/app-emulation/virtualbox/virtualbox-4.1.4.ebuild b/app-emulation/virtualbox/virtualbox-4.1.4.ebuild
index 3d54ba12e50d..6dda17c583bb 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.4.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.4.ebuild,v 1.4 2011/12/07 17:28:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.4.ebuild,v 1.5 2011/12/20 13:14:14 polynomial-c Exp $
 
 EAPI=4
 
@@ -180,8 +180,8 @@ src_prepare() {
 	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
 	fi
-	java-pkg-opt-2_src_prepare
 }
 
 src_configure() {
diff --git a/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild b/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild
index e3673d025f86..87d1699ba8f5 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild,v 1.2 2011/11/25 10:25:23 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild,v 1.3 2011/12/20 13:14:14 polynomial-c Exp $
 
 EAPI=4
 
@@ -183,8 +183,8 @@ src_prepare() {
 	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
 	fi
-	java-pkg-opt-2_src_prepare
 }
 
 src_configure() {
diff --git a/app-emulation/virtualbox/virtualbox-4.0.12.ebuild b/app-emulation/virtualbox/virtualbox-4.1.8.ebuild
index 9d505ea7b781..ee49cd325487 100644
--- a/app-emulation/virtualbox/virtualbox-4.0.12.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.0.12.ebuild,v 1.6 2011/10/24 21:57:11 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.8.ebuild,v 1.1 2011/12/20 13:14:14 polynomial-c Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.virtualbox.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
 
 RDEPEND="!app-emulation/virtualbox-bin
@@ -50,7 +50,7 @@ RDEPEND="!app-emulation/virtualbox-bin
 	vnc? ( >=net-libs/libvncserver-0.9.7 )
 	java? ( >=virtual/jre-1.5 )"
 DEPEND="${RDEPEND}
-	=dev-util/kbuild-0.1.5*
+	>=dev-util/kbuild-0.1.999
 	>=dev-lang/yasm-0.6.2
 	sys-devel/bin86
 	sys-devel/dev86
@@ -156,7 +156,7 @@ src_prepare() {
 		"${FILESDIR}/${PN}-4-mkisofs-check.patch"
 
 	# fix build with --as-needed (bug #249295 and bug #350907)
-	epatch "${FILESDIR}/${PN}-4-asneeded.patch"
+	epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch"
 
 	# Respect LDFLAGS
 	sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
@@ -165,6 +165,9 @@ src_prepare() {
 	# We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
 	epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch"
 
+	# Don't build vboxpci.ko module (D'oh!)
+	epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch
+
 	# Use PAM only when pam USE flag is enbaled (bug #376531)
 	if ! use pam ; then
 		elog "Disabling PAM removes the possibility to use the VRDP features."
@@ -177,8 +180,8 @@ src_prepare() {
 	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
 	fi
-	java-pkg-opt-2_src_prepare
 }
 
 src_configure() {