summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorx-drum <x-drum@localhost>2009-04-29 16:24:20 +0000
committerx-drum <x-drum@localhost>2009-04-29 16:24:20 +0000
commitb3dcf3e96df6d92449060b5094efadd187a4cb38 (patch)
tree3112b7a14e72be593b512cbc0769c997981f9f7a /app-emulation/virtualbox-ose
parentfix postinst message for OpenRC users, thanks to Michael Sawczuk bug #265281 (diff)
downloadjokey-b3dcf3e96df6d92449060b5094efadd187a4cb38.tar.gz
jokey-b3dcf3e96df6d92449060b5094efadd187a4cb38.tar.bz2
jokey-b3dcf3e96df6d92449060b5094efadd187a4cb38.zip
add opengl USE flag, fix minor issues in the live ebuild
svn path=/trunk/; revision=664
Diffstat (limited to 'app-emulation/virtualbox-ose')
-rw-r--r--app-emulation/virtualbox-ose/ChangeLog12
-rw-r--r--app-emulation/virtualbox-ose/Manifest6
-rw-r--r--app-emulation/virtualbox-ose/virtualbox-ose-2.2.2.ebuild11
-rw-r--r--app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild44
4 files changed, 39 insertions, 34 deletions
diff --git a/app-emulation/virtualbox-ose/ChangeLog b/app-emulation/virtualbox-ose/ChangeLog
index d8df1ed..418fa78 100644
--- a/app-emulation/virtualbox-ose/ChangeLog
+++ b/app-emulation/virtualbox-ose/ChangeLog
@@ -4,7 +4,7 @@
28 Apr 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-virtualbox-ose-2.2.0.ebuild, +virtualbox-ose-2.2.2.ebuild:
- Version bump
+ Version bump; add opengl USE flag
08 Apr 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+virtualbox-ose-2.2.0.ebuild:
@@ -42,7 +42,7 @@
*virtualbox-ose-2.0.4-r1 (18 Dec 2008)
*virtualbox-ose-1.6.6-r1 (18 Dec 2008)
- 18 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+ 18 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+files/virtualbox-ose-fix-insecure-lockfiles.patch,
+virtualbox-ose-1.6.6-r1.ebuild, +virtualbox-ose-2.0.4-r1.ebuild,
+virtualbox-ose-2.0.6.ebuild, virtualbox-ose-9999.ebuild:
@@ -213,13 +213,13 @@
04 Mar 2008; Markus Ullmann <jokey@gentoo.org> virtualbox-1.5.4-r1.ebuild:
Stable on x86 wrt bug #208905
- 26 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
+ 26 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
virtualbox-1.5.6.ebuild:
Fix patch naming.
*virtualbox-1.5.6 (25 Feb 2008)
- 25 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
+ 25 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
+virtualbox-1.5.6.ebuild:
Version bump, as requested by the proxy-maintainer Alessio Cassibba.
@@ -268,7 +268,7 @@
Fix desktop entry for bug #196832, typo in wrapper and HAL warning. Thanks
to Alessio for providing needed modifications
- 29 Oct 2007; Dawid Węgliński <cla@gentoo.org> virtualbox-1.5.2.ebuild:
+ 29 Oct 2007; Dawid Węgliński <cla@gentoo.org> virtualbox-1.5.2.ebuild:
Stable on x86
*virtualbox-1.5.2 (22 Oct 2007)
@@ -345,7 +345,7 @@
virtualbox-1.3.8.ebuild, virtualbox-9999.ebuild:
Fix for sdl useflag bug #177335
- 21 Apr 2007; Raúl Porcel <armin76@gentoo.org> virtualbox-1.3.8.ebuild:
+ 21 Apr 2007; Raúl Porcel <armin76@gentoo.org> virtualbox-1.3.8.ebuild:
x86 stable
*virtualbox-1.3.8 (16 Mar 2007)
diff --git a/app-emulation/virtualbox-ose/Manifest b/app-emulation/virtualbox-ose/Manifest
index 89fd60c..36644c4 100644
--- a/app-emulation/virtualbox-ose/Manifest
+++ b/app-emulation/virtualbox-ose/Manifest
@@ -13,7 +13,7 @@ AUX virtualbox-ose.desktop 202 RMD160 8b4b5c05743978d71edd4eaba71ae25f1d9d0d82 S
DIST VirtualBox-1.6.6-OSE.tar.bz2 35483853 RMD160 4b17428371089806cf6f5e52d1905936f7beb01d SHA1 7c323b35d77277c650cbce2821ab6778d1e3270e SHA256 acb3c20ef751ed408489d7b5c2d5d441226055a6e83bfeb9258ce2d55baba4da
DIST VirtualBox-2.2.2-OSE.tar.bz2 50937824 RMD160 b29f67dff7c9432d373bf62447e708bbdff92693 SHA1 31d928b786d9c1ca4cc30fd8c6d9089aceb05cad SHA256 868ccdfaa9f2d364ba1cf407234d59713a464837e4012104e5a2a5b2ad4c2d5d
EBUILD virtualbox-ose-1.6.6-r1.ebuild 5993 RMD160 8c6d79e27f62919d45d2e2723e67eb450686969a SHA1 0cf299bee2c373762effd91457533737610b8b3a SHA256 7a30240d9a13b0b82c5c5fa531924c3118a7c4b871d7bf4c5f6b003562342492
-EBUILD virtualbox-ose-2.2.2.ebuild 6079 RMD160 cea20e8a988bd235c40734f211408c92fe6e3254 SHA1 d18eaec47d6f538908d3ea0aeefcd5f2a8c5e006 SHA256 3d070f8a17832989c8929bd5059f028952f691b563f71cfe7354af53a2a485ce
-EBUILD virtualbox-ose-9999.ebuild 5379 RMD160 e2f934a615723c668303dad1ed0e517e4513e599 SHA1 377f457cbaf0e414ebdd424abf02d7e665f7aa90 SHA256 677d809c891a2bfe51c66bf7e989e8501ebb1112d0989b6eba0f48a583b91532
-MISC ChangeLog 17144 RMD160 266a4e9821c46423ac5d597155a91d42361c9a5c SHA1 3411b3b9e5ae6632c6e8924bbf12fa067373e356 SHA256 0aaa9ffbdb0bc5e551e6cb7abdb1605c29fa7d6217a2ae399773208f0b4ee777
+EBUILD virtualbox-ose-2.2.2.ebuild 6319 RMD160 fcfbd06a1e15aa7421f776e0689a327f322fac0e SHA1 9e0eeb7fbff92ef46645d946c03f15ef313e7c2a SHA256 2e28d3d565d7128390049cdec6c8fe4fa77b06a7829d56809c082b860f4913ff
+EBUILD virtualbox-ose-9999.ebuild 5536 RMD160 07a3448d464a43d9193b1e0f6e1ec7323055496c SHA1 2dd4e3d6933066d605b23e240fb8e4b3395ee345 SHA256 364be7798dd6589711e6b2d47d7e03ffeb8bb29472ced56f7971cb6c0dee2c43
+MISC ChangeLog 17177 RMD160 d3d5a5b82f6c4c6044bf114d20853232bf03cc5f SHA1 28e674fd5b4356832790452a0638aa896e478f43 SHA256 9e5d4d14a84ff7c27ff578c4242ca1164e588defd831b11b4f86cae92547cf16
MISC metadata.xml 608 RMD160 05b2e56d330d28aed13d4a7035369e04dc1e989e SHA1 ea332f57fa454cc6f8489f6debcd991003886fc0 SHA256 ab349ab6727625054f24bbf733a3f6fabb34ba1e1f0fd845c51c70595b05b6aa
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-2.2.2.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-2.2.2.ebuild
index 0c94dcd..dfb4a9f 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-2.2.2.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-2.2.2.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.virtualbox.org/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+additions alsa +hal headless pulseaudio python +qt4 sdk vboxwebsrv"
+IUSE="+additions alsa +hal headless pulseaudio +opengl python +qt4 sdk vboxwebsrv"
RDEPEND="!app-emulation/virtualbox-bin
~app-emulation/virtualbox-modules-${PV}
@@ -30,6 +30,7 @@ RDEPEND="!app-emulation/virtualbox-bin
>=dev-libs/libxslt-1.1.19
!headless? (
qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
+ opengl? ( virtual/opengl virtual/glut )
x11-libs/libXcursor
media-libs/libsdl[X,video]
x11-libs/libXt
@@ -60,6 +61,11 @@ pkg_setup() {
einfo "You selected USE=\"headless qt4\", defaulting to"
einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
fi
+
+ if ! use opengl ; then
+ einfo "No USE=\"opengl\" selected, this build will lack"
+ einfo "the OpenGL feature."
+ fi
}
src_prepare() {
@@ -74,6 +80,7 @@ src_prepare() {
src_configure() {
local myconf
use alsa || myconf="${myconf} --disable-alsa"
+ use opengl || myconf="${myconf} --disable-opengl"
use pulseaudio || myconf="${myconf} --disable-pulse"
use python || myconf="${myconf} --disable-python"
use hal || myconf="${myconf} --disable-dbus"
@@ -81,7 +88,7 @@ src_configure() {
if ! use headless ; then
use qt4 || myconf="${myconf} --disable-qt4"
else
- myconf="${myconf} --build-headless"
+ myconf="${myconf} --build-headless --disable-opengl"
fi
# not an autoconf script
./configure \
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild
index c0dcf09..05cd0a2 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild
@@ -13,7 +13,7 @@ ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="alsa +hal headless pulseaudio python +qt4 sdk"
+IUSE="alsa +hal headless +opengl pulseaudio python +qt4 sdk"
RDEPEND="!app-emulation/virtualbox-bin
!app-emulation/virtualbox-ose-additions
@@ -22,11 +22,12 @@ RDEPEND="!app-emulation/virtualbox-bin
>=dev-libs/libxslt-1.1.19
!headless? (
qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
+ opengl? ( virtual/opengl virtual/glut )
x11-libs/libXcursor
media-libs/libsdl[X]
x11-libs/libXt )"
DEPEND="${RDEPEND}
- dev-util/kbuild
+ >=dev-util/kbuild-0.1.5-r1
>=dev-lang/yasm-0.6.2
sys-devel/bin86
sys-devel/dev86
@@ -55,31 +56,28 @@ pkg_setup() {
src_configure() {
local myconf
- # Don't build vboxdrv kernel module, disable deprecated qt3 support
+ # Don't build vboxdrv kernel module
myconf="--disable-kmods"
- if ! use alsa; then
- myconf="${myconf} --disable-alsa"
- fi
- if ! use pulseaudio; then
- myconf="${myconf} --disable-pulse"
- fi
- if ! use python; then
- myconf="${myconf} --disable-python"
- fi
- if ! use hal; then
- myconf="${myconf} --disable-dbus"
- fi
- if ! use headless; then
- if ! use qt4; then
- myconf="${myconf} --disable-qt4"
- fi
+ use alsa || myconf="${myconf} --disable-alsa"
+ use opengl || myconf="${myconf} --disable-opengl"
+ use pulseaudio || myconf="${myconf} --disable-pulse"
+ use python || myconf="${myconf} --disable-python"
+ use hal || myconf="${myconf} --disable-dbus"
+ use vboxwebsrv && myconf="${myconf} --enable-webservice"
+ if ! use headless ; then
+ use qt4 || myconf="${myconf} --disable-qt4"
else
- myconf="${myconf} --build-headless"
+ myconf="${myconf} --build-headless --disable-opengl"
fi
- ./configure --with-gcc="$(tc-getCC)" --with-g++="$(tc-getCXX)" \
- ${myconf} || die "configure failed"
+ # not an autoconf script
+ ./configure \
+ --with-gcc="$(tc-getCC)" \
+ --with-g++="$(tc-getCXX)" \
+ --disable-kmods \
+ ${myconf} \
+ || die "configure failed"
}
src_compile() {
@@ -102,7 +100,7 @@ src_compile() {
src_install() {
linux-mod_src_install
- cd "${S}"/out/linux.${ARCH}/release/bin
+ cd "${S}"/out/linux.${ARCH}/release/bin || die
# create configuration files
insinto /etc/vbox