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

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 4756fdc8780ac99b6c751d8e4e831bae0b593a8c..56903b18b3a415a3f0b05d47f03dffb6ba15f5fa 100644 (file)
--- 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/Manifest b/app-emulation/virtualbox/Manifest
index 8778a4cf9d2fc1f388dc9eb0da096a42b6075322..635c23ac8be95f82994b79a0444ebe1536acebbd 100644 (file)
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -17,19 +17,29 @@ AUX virtualbox-ose-3-config 38 RMD160 44974362ca28f2762c0501b4d4c18de2634aa063 S
 AUX virtualbox-ose-3-wrapper 2931 RMD160 c73f7fca4531dc8023484b860c81c0a5805f022c SHA1 1d51680f1dc67394b0bf2c0533305e54c68ef177 SHA256 7ed4834ece201cb6a9da57e36a1a9b47bd054057d2ac4a46343a9966ff460644
 AUX virtualbox-ose-3.2.8-mesa-check.patch 701 RMD160 061b6eaf0b3cdbcaac7258d85909d1e9d89cdeb3 SHA1 7e5cf6d11421d392d4f2a7bf9846cc71d9688d03 SHA256 6b4ce64673cda33631e7a60ac94f23ab2d020d52b6160bb072ad8d6f9547c251
 AUX virtualbox-ose.desktop-2 201 RMD160 9cf3ef83d1fda93142d192b0bb4eae9d6dc62118 SHA1 58d6c89123034510476a65a8b4836fac5d0c57aa SHA256 fa7fc3dae940e768560559db944289c578acb691db2dcb51c8c85bfaf3298a25
-DIST VirtualBox-4.0.12.tar.bz2 69566771 RMD160 f25d361c19d25a883918b0e8f2ae9bc1c2dd83e8 SHA1 9e49c6a5a7b7b224a970655643cce52aac43eb0c SHA256 0175c4118af1f9633f33a055a0b0cc0b5a2d95a63b44269af2139eb2fd07e5a9
 DIST VirtualBox-4.1.4.tar.bz2 73837275 RMD160 475a68dc6beebdb588688743b3652bbb9ab3f507 SHA1 6ec0dd31844da91c9773611a6fb553eef575e899 SHA256 aa368de95f9dd2020394f9e8f145908c236c0899d24bb27436ed2f670725cefb
 DIST VirtualBox-4.1.6.tar.bz2 73793713 RMD160 1bf368464ac0d431ac799e4710835f3426a9a5f6 SHA1 19a801444102a10d2b62ab35daacb7ddc415bab0 SHA256 554137cb33a806bf0dd74dc0de0c3008dd9bb20d483cdcebaf8a929720c0ab7e
-EBUILD virtualbox-4.0.12.ebuild 12310 RMD160 b7a2a9407565d70832130db17b698a5c4c4a268d SHA1 67131c5476b8035e90ef72c389d5c73f3b38c404 SHA256 0ef0360d3252531e68a6c24c1369e9335f57c4dbeb8fa6ed8066ada4af9ae2c5
-EBUILD virtualbox-4.1.4.ebuild 12409 RMD160 44107a65c1876959da09371e96ef64ba2f006fd3 SHA1 b41ce8ae43d5c97f53a53c63283b717e46d71adc SHA256 9a9c3c6522b77910eec6a5afecfbe880fe53254aa01219d802612fa6da746040
-EBUILD virtualbox-4.1.6-r1.ebuild 12513 RMD160 3e4dca9509f95074300e669690a478eb71651f0a SHA1 9d64eec3f5409b73a62d64c86cf5ee2d4bd32424 SHA256 cf8bd15d7ab551478dbdbfe88a4ad1202fac57662d1c4ad9e4474b6050f980cb
+DIST VirtualBox-4.1.8.tar.bz2 73822230 RMD160 f8ae296406fe370eded166d0772be7e4558ecc3a SHA1 4683e30aa32d0d6ca764e5ce366d7216705cf0f2 SHA256 ef16d6729c9bcc298a33eff636549872dcfe291ac01bfa117cdf7aaf8a4004e0
+EBUILD virtualbox-4.1.4.ebuild 12412 RMD160 3c0fc7af1ab38f8010a7611fcb38aff526fedf12 SHA1 fac700e688bda8fd9b1ec520d6ee9e5841a1d2ff SHA256 1b89a4f8204e032c795062daffb74ce56b7fa291b2794e31bd707ed40df2618d
+EBUILD virtualbox-4.1.6-r1.ebuild 12514 RMD160 e4ba884a4021d7694b984295206c4354ffe0c7d1 SHA1 cddec774630ee455ed17ac3e01bcbce323a408af SHA256 9d39000b6c2c22b7cd8e0dcc21611e278628d1e984dcea8e8c356ed630610f04
+EBUILD virtualbox-4.1.8.ebuild 12414 RMD160 0cd4806080baa701710117e6b0304d1fb1ec20a6 SHA1 95ffb84e026ed51c272c25b0f82ab3297f227f42 SHA256 a1c59d0872c14e1a461ab20626c2b4f1ffc9b0c8d550ae822e7f00dd17031893
 EBUILD virtualbox-9999.ebuild 5702 RMD160 5910c24c277af2bac4f50c57ca97253994a16734 SHA1 782323a9c9a40ed52f350836f379a958b72a490b SHA256 1b2ab1d308157fa4adfb7827cdf8e4f6b643200876f02f96bd0b7bd9a6e45fb4
-MISC ChangeLog 10205 RMD160 21da2fac3d3aed795ffe9333ab69290cc78d72b2 SHA1 bd1b37bccb61e57ddf1290e42f7ac49e40f73a2e SHA256 f0a33653e30431c0a047a7f8ff1e0e06fa46f6afee2c8b67ac95676647f99995
+MISC ChangeLog 10473 RMD160 f03d1c7eb7c1d9d12e97e90ecb683aa9c84ff87d SHA1 ab85397e03cc1d42b59c674c48fdd9953f64ee49 SHA256 11d53f59b30ef9e415248ad5bd548108ad5ee90935c03c5101021cdbef8def4b
 MISC metadata.xml 766 RMD160 1c69e37183d073f82b9fd2c8761b758cc33ccce8 SHA1 31295f3715624ada590d13fdc80c076380415ba0 SHA256 54cc5df43fbe674f4f04674566dfec523c0c912f8c94db26f4215727ab6850e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk7fojgACgkQuUQtlDBCeQL/OwCdEOzqmeOd42in77SDkrcIdumy
-jyMAniHx6e8Gto9Y4QD4ExTlESL+5WyB
-=wdcf
+iQIcBAEBCgAGBQJO8IotAAoJEPiazRVxLXTFLHEQAK7l64qY+BwZQYZl9+v33+GV
+MD8brIoH1CGauek+BoypQD5uKkRUy/xY6jrUOtpAfT3wzPtb9zyk9qc9ZQgoUj/3
+s9mUB006j28Tdav4Xpd1YzrW4iYef+0vNyc4dfJMDUHGkeCE2OKgycS8HvRkf/l9
+xG4pPkkVRAgolNtBjTo4lpV/PujR6/NZR28Nro8d3DneOzLRdssjPOfYIA11PwC2
+9aPqFGvAxozxU7s9U/a8hEktZJGAdFe47fjm/xGZhBOF61UgCCi2W4FuRTe6PRoa
+XLwyohWTnqi4q9SRrC/0E8FiCVv68dekZrsGv2sr1oszTnDLvCmKB5Qk5ytBeMZ1
+EZItjR60tXUNXW6zS4pK5QJHjCuHFwcPbYXEy3uLvqxTjyeQk4aFi9c+sBhX2hcW
+CjfFKnahFdpWv6W6HwiRRWxb1lJuLg83N1cum9UUQQA/gx6usrAdGrIG9ibJeDHg
+8sZqvuFXSFbMTz739RR4VsP9oPYDF2uQN6YJXPnc8uMi6aRV6WJ+YwvYvFitHZnm
+kUOdA8N/ETUUo9IpqYwXXWlT72N+WoEzuaSBncjK4pOAhabtUsvslJgLdr+9mrJG
+NkZ/nPti2C95P8HnPL/pcS6VKmMZHQrueLQdFqstk2ZG2vdQB0A/XQYvdB+II2ID
+awDaDYIMZ3RYgxuUf/zG
+=NyHH
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/virtualbox/virtualbox-4.1.4.ebuild b/app-emulation/virtualbox/virtualbox-4.1.4.ebuild
index 3d54ba12e50d9696ef00141ecdabbdd644b0f37b..6dda17c583bb37d25bd9f18bca235d5470559e6f 100644 (file)
--- 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 e3673d025f86c647f71178bd693618d21913e51a..87d1699ba8f586ec5434f60a9b4fc610d269c1c4 100644 (file)
--- 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
similarity index 97%
rename from app-emulation/virtualbox/virtualbox-4.0.12.ebuild
rename to app-emulation/virtualbox/virtualbox-4.1.8.ebuild
index 9d505ea7b781cfd223b0c427a9962ca829db8ad7..ee49cd325487fc9833664569a3c45d8776126331 100644 (file)
--- 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() {