diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2012-04-26 18:24:57 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2012-04-26 18:24:57 +0000 |
| commit | 394dbb4f638318697b19346230689fa7a801556d (patch) | |
| tree | 6be84f53a2d5bb48d3866d3860e3ef5e74678022 /app-emulation/virtualbox | |
| parent | Version bump. Removed old. (diff) | |
| download | gentoo-2-394dbb4f638318697b19346230689fa7a801556d.tar.gz gentoo-2-394dbb4f638318697b19346230689fa7a801556d.tar.bz2 gentoo-2-394dbb4f638318697b19346230689fa7a801556d.zip | |
Allow compilation with java-1.7
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/virtualbox')
| -rw-r--r-- | app-emulation/virtualbox/ChangeLog | 5 | ||||
| -rw-r--r-- | app-emulation/virtualbox/virtualbox-4.1.14.ebuild | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog index a88dc480cb09..927b0eb24e71 100644 --- a/app-emulation/virtualbox/ChangeLog +++ b/app-emulation/virtualbox/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-emulation/virtualbox # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.108 2012/04/26 18:20:25 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.109 2012/04/26 18:24:57 polynomial-c Exp $ + + 26 Apr 2012; Lars Wendler <polynomial-c@gentoo.org> virtualbox-4.1.14.ebuild: + Allow compilation with java-1.7 *virtualbox-4.1.14 (26 Apr 2012) diff --git a/app-emulation/virtualbox/virtualbox-4.1.14.ebuild b/app-emulation/virtualbox/virtualbox-4.1.14.ebuild index d55ebfb03cc3..a64fa6f69436 100644 --- a/app-emulation/virtualbox/virtualbox-4.1.14.ebuild +++ b/app-emulation/virtualbox/virtualbox-4.1.14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.14.ebuild,v 1.1 2012/04/26 18:20:25 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.14.ebuild,v 1.2 2012/04/26 18:24:57 polynomial-c Exp $ EAPI=4 @@ -48,7 +48,7 @@ RDEPEND="!app-emulation/virtualbox-bin media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) - java? ( virtual/jre:1.6 )" + java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) )" DEPEND="${RDEPEND} >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 @@ -66,7 +66,7 @@ DEPEND="${RDEPEND} dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) - java? ( virtual/jdk:1.6 ) + java? ( || ( virtual/jdk:1.7 virtual/jdk:1.6 ) ) dev-util/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) |