summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-emulation/virtualbox/ChangeLog6
-rw-r--r--app-emulation/virtualbox/Manifest14
-rw-r--r--app-emulation/virtualbox/virtualbox-4.0.4-r1.ebuild13
3 files changed, 23 insertions, 10 deletions
diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 5fe05e6b44ae..db6387af9cf7 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,10 @@
# 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.63 2011/03/19 16:35:02 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.64 2011/03/20 13:53:29 serkan Exp $
+
+ 20 Mar 2011; Serkan Kaba <serkan@gentoo.org> virtualbox-4.0.4-r1.ebuild:
+ Enable sdk by default to fix bug #359607. Migrate to EAPI4 and use
+ REQUIRED_USE.
*virtualbox-4.0.4-r1 (19 Mar 2011)
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index c236c25da349..9dc2db152062 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX vboxwebsrv-confd 623 RMD160 ad4a86aa317d466e556d613e57a7fa6a195db986 SHA1 f6f0f568a10093f082b3f8e09c9dfa515a560adc SHA256 8a6773013072e3049fa3ede7b5117e59dde9b35bc3402fc31e9985361b5f9147
AUX vboxwebsrv-initd 749 RMD160 3cfe8484be4fe67d7be25044a4ab79c44ad42492 SHA1 5dddd297edd74a2e12a731e19f663128d6289b4b SHA256 279addc442d19f982c6b209c8900fe9bd65d73e2dcf98b96cd08b168eb8bf54d
AUX virtualbox-4-asneeded.patch 1076 RMD160 94e7a836f4f0b2c5de7ed327b4732adde4c4abca SHA1 9e55fea49a185579049e3cc7b185726904aee7f7 SHA256 f081d030eceeccdb164e726c12d46847c4c0c76d71f934f43b3cf82893439339
@@ -19,8 +22,15 @@ DIST VirtualBox-4.0.2.tar.bz2 69867297 RMD160 50677557729595d77f152157bbb65018be
DIST VirtualBox-4.0.4.tar.bz2 70190670 RMD160 5445bd0ff31adee6de872ae02058fa104c986b82 SHA1 4ca74dd7ac4314058df811d6e69f60d412456328 SHA256 f049fe428e2f54c6a4593283ad44680051bd582253f2863b71ed3379a77b0ac7
EBUILD virtualbox-3.2.12-r4.ebuild 9658 RMD160 49e35b5aea7ba596b7bda564a5226fd33a8d9db4 SHA1 9d4ab5a271b018d9fd99741afe0949444142fe63 SHA256 cb820c7f10f8be365acab120ee3ca464f212ae691a9cfb793e996c1ca280420f
EBUILD virtualbox-4.0.2.ebuild 10308 RMD160 9e07e096bd0336cf0e65f703a78dc2aa12a549cc SHA1 f359a4ac10c6bab2834fc2cca72e639858374b1a SHA256 aa43aa4218f9b6f9610042c3afbcd4d5ce635fb0bcba3a7f2e16ae875572b182
-EBUILD virtualbox-4.0.4-r1.ebuild 10905 RMD160 044088b6e734527b5a370a79ed0cdac1f9d975ed SHA1 01a47fcde42ec12d62573cd942f16a95cd9ffb35 SHA256 46fc9932eecd158b0d7944f2fad431a145113859bc1f114e6efa400d3b8f965e
+EBUILD virtualbox-4.0.4-r1.ebuild 10813 RMD160 fdbb4e5e07eadad82c0f68ca1fb6881e5419a015 SHA1 0a01624f4f9ca3c3fb4f3e92de8838faee8a4529 SHA256 222b3b29c83e295977fb7736e5a27a28db916f3e61605000af93f2ef9ae49363
EBUILD virtualbox-4.0.4.ebuild 10501 RMD160 a6acc8a9fab30fde89df4d771a9630c4f80a717a SHA1 952651260f93eaf94171ad4ecc034d981e4f81ec SHA256 e203c3e58da7a2b02c8a7f407d1598249ef175ffc72d15ca1e064377c172efb7
EBUILD virtualbox-9999.ebuild 5623 RMD160 3e3eeabc7dfcddc0583974335494f51b23c8327b SHA1 fcc07a44770a14802e337c9ff2a87f19b2d149f3 SHA256 301e900d619a1fd9c9e38793671fb0ab843c2d973bda2612e64e34c1fdbf3c8d
-MISC ChangeLog 4584 RMD160 d7047805cd28277d12520fc25f091c8431227561 SHA1 122569ae6d70d3f980074d2542949882bea80758 SHA256 3f9b244f5f9d00f9f7094bb8c5de56ce8176071dc5aea301016db758293199f1
+MISC ChangeLog 4745 RMD160 54cf1381b1dbbea8241ea603b90de4701e02d867 SHA1 2c21b1602ecca8cc922798aa8ff94f2e620e1e53 SHA256 4fbf893c30f4519038169ebe0b62ad3af9dc84f9c855bd11c818779696e45471
MISC metadata.xml 787 RMD160 ba43b02e20c2649a3bfb0dbf1b7d8ce30d5c0beb SHA1 6efd8b7802c97c203b8be8154bb2913cd3e24266 SHA256 9250eb6045eadd27afda974481dbea721de9f5d5157dddc3f0786ba2fcc98d21
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2GBuUACgkQRh6X64ivZaLtEgCdGZPeSMJqeNwzZdfIY67/Ls28
+h5QAn0u25Ax/YDB9Mb9msD1Abs6O5TEL
+=24gM
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox/virtualbox-4.0.4-r1.ebuild b/app-emulation/virtualbox/virtualbox-4.0.4-r1.ebuild
index be37925c9023..92f862495cda 100644
--- a/app-emulation/virtualbox/virtualbox-4.0.4-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.0.4-r1.ebuild
@@ -1,8 +1,8 @@
# 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.4-r1.ebuild,v 1.2 2011/03/19 20:22:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.0.4-r1.ebuild,v 1.3 2011/03/20 13:53:29 serkan Exp $
-EAPI=2
+EAPI=4
inherit eutils fdo-mime flag-o-matic linux-info pax-utils qt4-r2 toolchain-funcs java-pkg-opt-2
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.virtualbox.org/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+additions alsa doc extensions headless java pulseaudio +opengl python +qt4 sdk vboxwebsrv vnc"
+IUSE="+additions alsa doc extensions headless java pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
RDEPEND="!app-emulation/virtualbox-bin
~app-emulation/virtualbox-modules-${PV}
@@ -110,6 +110,8 @@ QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
usr/lib/virtualbox/VBoxOGLhostcrutil.so
usr/lib/virtualbox/VBoxNetDHCP.so"
+REQUIRED_USE="java? ( sdk ) python? ( sdk )"
+
pkg_setup() {
if ! use headless && ! use qt4 ; then
einfo "No USE=\"qt4\" selected, this build will not include"
@@ -123,9 +125,6 @@ pkg_setup() {
einfo "No USE=\"opengl\" selected, this build will lack"
einfo "the OpenGL feature."
fi
- if ( use java || use python ) && ! use sdk; then
- die "Python and Java bindings depend on \"sdk\" USE flag to be enabled."
- fi
java-pkg-opt-2_pkg_setup
}
@@ -312,7 +311,7 @@ src_install() {
if use java ; then
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
+ fi
}