Version bump. Removed old versions.
authorLars Wendler <polynomial-c@gentoo.org>
Thu, 20 May 2010 13:18:57 +0000 (13:18 +0000)
committerLars Wendler <polynomial-c@gentoo.org>
Thu, 20 May 2010 13:18:57 +0000 (13:18 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

app-emulation/virtualbox-guest-additions/ChangeLog
app-emulation/virtualbox-guest-additions/Manifest
app-emulation/virtualbox-guest-additions/files/vboxclient.desktop [new file with mode: 0644]
app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-2-localconfig [deleted file]
app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.initd [new file with mode: 0644]
app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions.initd [deleted file]
app-emulation/virtualbox-guest-additions/files/xorg.conf.vbox [new file with mode: 0644]
app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.0.ebuild [deleted file]
app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.2.ebuild [deleted file]
app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.0.ebuild [moved from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.4.ebuild with 70% similarity]

index ff525585eae8879a1aac27a1eddbee4aaee65911..1e19792bc265ef379abbdc5d25a21569e11150d7 100644 (file)
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/virtualbox-guest-additions
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.38 2010/05/11 18:52:37 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.39 2010/05/20 13:18:57 polynomial-c Exp $
+
+*virtualbox-guest-additions-3.2.0 (20 May 2010)
+
+  20 May 2010; Lars Wendler <polynomial-c@gentoo.org>
+  +virtualbox-guest-additions-3.2.0.ebuild,
+  +files/virtualbox-guest-additions-7.initd, +files/vboxclient.desktop,
+  +files/xorg.conf.vbox:
+  Version bump. Removed old versions. First attempt to fix bug #297633.
 
 *virtualbox-guest-additions-3.1.8-r1 (11 May 2010)
 
index 5edd8a685934ba6613052ecf7a9412723312d6b4..c8e16028eeb2f1632b4409259c2339b1be5cab03 100644 (file)
@@ -1,20 +1,17 @@
-AUX virtualbox-guest-additions-2-localconfig 877 RMD160 7a09c0e50c1294c289cfd0665dc29986e55f2f7c SHA1 186a04d197c4f1a22376f767b4804cb05a8c811a SHA256 0115ff252376fa9c1244f79f183041a8e1b078f64d8bea2126d344e8b21a7b84
+AUX vboxclient.desktop 145 RMD160 2a337f588cd85da4edb74c2e2333d1be1018ca9d SHA1 8e634ef77d287cdbc116f14fa6e147d83559f263 SHA256 0e310fbb8defee6842f5fc9d2cf124a4ca7a0d1121074cf1aa2e1bea5900f905
 AUX virtualbox-guest-additions-3-localconfig 877 RMD160 7a09c0e50c1294c289cfd0665dc29986e55f2f7c SHA1 186a04d197c4f1a22376f767b4804cb05a8c811a SHA256 0115ff252376fa9c1244f79f183041a8e1b078f64d8bea2126d344e8b21a7b84
 AUX virtualbox-guest-additions-3.initd 1454 RMD160 617d486535efccfd2cf013ffeb7c2ae9c211a533 SHA1 942b81b99d33e85d7dc6564f0449608620cd5d50 SHA256 d87d8386fbed5c17c4919368d59540ce527bcca7d539fb88927e3b4a849ad9ae
 AUX virtualbox-guest-additions-5.initd 1484 RMD160 aeca98255287c1e4000887d288fef9fa1f9ff2e9 SHA1 2ea17f3442c2a6049fbbe50a93af6ae436114ed7 SHA256 1e6df134835645478f8f46bb3cde5543ba8570d46bb6e2355f799bd6cc45b2ac
 AUX virtualbox-guest-additions-6.initd 1482 RMD160 822843f6258a3fec4e8cb8dc7873d1cbb3172757 SHA1 d53a9a59d95cee81d696e6ce5826086742ed2e29 SHA256 9386ff9452a09d1d085ae2d9eaf79af2e8e9b1d12da530140fb87a28f0e6b116
-AUX virtualbox-guest-additions.initd 1463 RMD160 4daceefa3e10659381f4b714512548944c7f54fd SHA1 f5290150bbf99feac5c6d81c4f82f9191e5f1786 SHA256 933dbdc5e5363dfbdc2d51deed0726ab91f1ea89e330298266b9ffb03c38989a
+AUX virtualbox-guest-additions-7.initd 980 RMD160 326e8a115b6ab8c72dad391f65980bc3207b2274 SHA1 31f343280ef2da8e269e25936d99b92d487a3f56 SHA256 af61d1fe7c4e7c7d49e235406f9b69661eb229a96f3156443872884860becd69
+AUX xorg.conf.vbox 407 RMD160 53dcfdd2b0ff8930d23f30b7f5cf4d525806eef6 SHA1 73024a87ead01a21abdb05c94144af9eec0e3448 SHA256 34bb64aa6702811acf82304c35ff92b029067115563d3d6c78e65a846f2dd686
 DIST VirtualBox-3.0.12-OSE.tar.bz2 52075946 RMD160 4c19f2b945f7288235c8becfc0d1931ddf1bc94e SHA1 7ac46be39db4e51ea38cb6a857d2da544b7a820f SHA256 3c88b6ad1fa5739440485ad8cfd9754dbd17dc23df09a7dcc47b2e91635182b2
-DIST VirtualBox-3.1.0-OSE.tar.bz2 55491869 RMD160 7e3600ca1320af601d01d24f0a4e78ef04c89aac SHA1 fb7c97d692fc8e9973578ef44a848a5988694606 SHA256 da8affc44342d3988c96ad2d98c248b99f481ecd001af1557aeb31cd15e10639
-DIST VirtualBox-3.1.2-OSE.tar.bz2 55553394 RMD160 be66ad7198f04c71471eeffd5b95ff9d5078eab7 SHA1 ac85e5d098684080ce0571406d741f3db03064b8 SHA256 293f582e37eda29efdb53c6468481b446e1964592f5728656b74664f4d32f2b1
-DIST VirtualBox-3.1.4-OSE.tar.bz2 55850055 RMD160 b1f38821a6ea8d501402f853e5c9987042a09036 SHA1 a9afca1e9a3415b1c499958a6b1309062fb4e62c SHA256 6ea10abae86b8777366f66ec4a1d68e033fe5d97f4bb0f551f83737ba58cdb70
 DIST VirtualBox-3.1.6-OSE.tar.bz2 55871561 RMD160 83ec81a0444c0dfa4415a888e42dc530b31e39dc SHA1 521dd1ecbbede996681a62ac767da2a60e851a95 SHA256 840148f879c8ef1e6d2a54586fdddf3df389e9de91ada4c6d10ebc0da37ea016
 DIST VirtualBox-3.1.8-OSE.tar.bz2 56291753 RMD160 45aa637d1e008248bd9061e9824b9c2631e8b570 SHA1 e29f3070d337d9c475241a68948dba43c363b079 SHA256 b77c8ae7b43401c908a231f8e3b7355f96b351237fd86f1f7416ed99a6081e85
+DIST VirtualBox-3.2.0-OSE.tar.bz2 57837589 RMD160 aca3a820c952c4f90f08350a4438e502d12c3f42 SHA1 d0e9f1dc56dad61d4d6a519c764ce73e242807cd SHA256 1818320efcbc2e7d223536b3f0e719dc37ed9da3058440de23759789edc63d34
 EBUILD virtualbox-guest-additions-3.0.12.ebuild 4203 RMD160 220f120b9491918acc465e6949af44281df8eeeb SHA1 f457f354fd4fe30a6238c01a59c42127f1fbde4a SHA256 1d59c89a053ba58b8193c2bfeafacabe6ff99e2f9017bd55f0c39fdddf55c5e6
-EBUILD virtualbox-guest-additions-3.1.0.ebuild 4269 RMD160 507f8f7a3eaea71c56f0402e71e5ac03ecc92dff SHA1 de27de651887f87f9340e43b6a9dfe72d7a2d232 SHA256 e633a13909871292a65c87ee0b8a7d1740489db3b95f675f0db3df5f60619c71
-EBUILD virtualbox-guest-additions-3.1.2.ebuild 4268 RMD160 c5b284478a9f3f0b929cd944193490899ef5c7d5 SHA1 79517951b8793d982bc602bf6332fe453b467e3f SHA256 14f33922fa1939da44023646cebbabdb3eae39a1ee5fa0600e04a3ed0763ebf1
-EBUILD virtualbox-guest-additions-3.1.4.ebuild 4267 RMD160 a5a58dc6dd77283dc52c4ecc8172c5319e9be26d SHA1 51c906831f95df5036c74fae02f22712fdf49b7d SHA256 61df982fac8a6a8b4a280e8e537125ec6714477bcca0dff4f2f1e7168a90a5d8
 EBUILD virtualbox-guest-additions-3.1.6.ebuild 4267 RMD160 d29b4ff2f525a1eea138200ffbbc1bc475a90579 SHA1 3d24ab232a5611912dcf5c20225348ddb984c300 SHA256 096ca5370faac47319b2d324961edf9ab41747e092210a95f6f13e07bd0c80c1
 EBUILD virtualbox-guest-additions-3.1.8-r1.ebuild 4199 RMD160 e0c91f5a49fe22c7a62b241ebf2019f655e36acb SHA1 8baf426ed8f18831847b58c59abe9f97c080dd1c SHA256 aea9cead0a0072aa91e4d786b3ed8d38d1104b6e055a3b2755c978d0d89f5800
-MISC ChangeLog 13728 RMD160 00b0e595c8c3451bb552c2bbe4c163f53985cdce SHA1 68b81d127f58730fbcba0746e11f58d6d08ee022 SHA256 66e98e37ce2c5c782d006dd063d464fc97c475498eff1f17886fb528600cfc32
+EBUILD virtualbox-guest-additions-3.2.0.ebuild 5256 RMD160 bb9f0f9450400216892f27134c8a19eeda48aee5 SHA1 b3b9f8d7e8e034cc9afb4382e52c1ae617187e29 SHA256 d2641e6d420c70b81b9e53be750d062c6f1fc3532f1df9aa617561076f45fd3f
+MISC ChangeLog 14053 RMD160 5ba66f9e31b9c6a4288efa9226216c798fbceb0c SHA1 0b58ee60402b91ffa4aa2cc85d236ecd3595488b SHA256 a3d568c614b3b94e8222d427533c7350795932a6eb2308bea734960236f74d6f
 MISC metadata.xml 353 RMD160 0fd52505150025043cf0f6d53b54736082f266bb SHA1 60aa8776951b13cd71fde130db73849977b4c48f SHA256 c8c97cdc3c8878c361444f278d234b1ad6fe9db06d8c4d4d9bcee711a2f6369d
diff --git a/app-emulation/virtualbox-guest-additions/files/vboxclient.desktop b/app-emulation/virtualbox-guest-additions/files/vboxclient.desktop
new file mode 100644 (file)
index 0000000..316eb9f
--- /dev/null
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=VirtualBox Client Service
+Exec=VBoxClient-all
+Terminal=false
+X-KDE-StartupNotify=false
+StartupNotify=false
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-2-localconfig b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-2-localconfig
deleted file mode 100644 (file)
index 5e6371e..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- Makefile -*-
-#
-# Overwrite some default kBuild settings
-#
-
-#
-# Copyright (C) 2006-2008 Sun Microsystems, Inc.
-#
-# This file is part of VirtualBox Open Source Edition (OSE), as
-# available from http://www.virtualbox.org. This file is free software;
-# you can redistribute it and/or modify it under the terms of the GNU
-# General Public License as published by the Free Software Foundation,
-# in version 2 as it comes in the "COPYING" file of the VirtualBox OSE
-# distribution. VirtualBox OSE is distributed in the hope that it will
-# be useful, but WITHOUT ANY WARRANTY of any kind.
-#
-
-# don't build testcases to save time, they are not needed for the package
-VBOX_WITH_TESTCASES     :=
-VBOX_WITH_TESTSUITE     :=
-
-KBUILD_MSG_STYLE        := brief
-
-## paths, origin, hardening
-VBOX_WITH_HARDENING        := 2
-VBOX_WITH_ORIGIN           :=
-VBOX_ONLY_ADDITIONS        := 1
-
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.initd
new file mode 100644 (file)
index 0000000..67097da
--- /dev/null
@@ -0,0 +1,40 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:
+
+depend() {
+        need localmount
+       before xdm
+}
+
+start() {
+       ebegin "Starting VirtualBox guest additions"
+
+       einfo " Loading kernel modules"
+       /sbin/modprobe vboxguest &> /dev/null
+       /sbin/modprobe vboxsf &> /dev/null
+
+        start-stop-daemon --start --make-pidfile \
+               --exec /usr/sbin/vboxguest-service --pidfile /var/run/vboxguest-service.pid \
+               --name vboxguest-service \
+               --background -- \
+               --foreground
+
+        eend $? "Failed to start vboxguest-service"
+}
+
+stop() {
+       local retval=1
+        ebegin "Stopping VirtualBox guest additions"
+
+       start-stop-daemon --stop --quiet \
+               --pidfile /var/run/vboxguest-service.pid --name vboxguest-service \
+                       && retval=0
+
+       einfo "Removing kernel modules"
+       /sbin/modprobe -r vboxsf &> /dev/null
+       /sbin/modprobe -r vboxguest &> /dev/null
+
+        eend ${retval} "Failed to stop vboxguest-service"
+}
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions.initd
deleted file mode 100644 (file)
index 69b0a46..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:
-
-depend() {
-        need localmount
-       before xdm
-}
-
-createvboxdevice() {
-               local maj min
-
-               maj=`sed -n 's;\([0-9]\+\) vboxadd;\1;p' /proc/devices`
-
-               if ! [[ -z $maj ]] ; then
-                       min=0
-               else
-                       min=`sed -n 's;\([0-9]\+\) vboxadd;\1;p' /proc/misc`
-                       if ! [[ -z $min ]] ; then
-                               maj=10
-                       fi
-               fi
-
-               mknod /dev/vboxadd c $maj $min -m 0664 &> /dev/null
-}
-
-start() {
-       ebegin "Starting VirtualBox guest additions"
-
-       if [[ -e /dev/vboxadd ]] ; then
-               rm -f /dev/vboxadd &> /dev/null
-       fi
-
-       einfo " Loading kernel modules and creating devices"
-       /sbin/modprobe vboxadd &> /dev/null
-       createvboxdevice
-       /sbin/modprobe vboxvfs &> /dev/null
-
-       einfo " Starting the time syncronization system service"
-        start-stop-daemon --start --make-pidfile \
-               --exec /usr/sbin/vboxadd-timesync --pidfile /var/run/vboxadd-timesync.pid \
-               --name vboxadd-timesync \
-               --background
-
-        eend $? "Failed to start VirtualBox guest additions"
-}
-
-stop() {
-        ebegin "Stopping VirtualBox guest additions"
-
-       einfo " Stopping the time syncronization system service"
-       start-stop-daemon --stop --quiet \
-               --pidfile /var/run/vboxadd-timesync.pid --name vboxadd-timesync
-
-       einfo " Unloading kernel modules and removing devices"
-       /sbin/rmmod vboxvfs &> /dev/null
-       /sbin/rmmod vboxadd &> /dev/null
-       rm -f /dev/vboxadd &> /dev/null
-        eend $?
-}
diff --git a/app-emulation/virtualbox-guest-additions/files/xorg.conf.vbox b/app-emulation/virtualbox-guest-additions/files/xorg.conf.vbox
new file mode 100644 (file)
index 0000000..faa471b
--- /dev/null
@@ -0,0 +1,19 @@
+Section "Device"
+       Identifier  "Device-vboxvideo"
+       Driver      "vboxvideo"
+EndSection
+Section "Screen"
+       Identifier  "Screen-vboxvideo"
+       Device      "Device-vboxvideo"
+EndSection
+
+Section "InputDevice"
+       Identifier  "InputDevice-vboxmouse"
+       Driver      "vboxmouse"
+EndSection
+
+Section "ServerLayout"
+       Identifier  "Default Layout"
+       Screen      "Screen-vboxvideo"
+       InputDevice "InputDevice-vboxmouse"
+EndSection
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.0.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.0.ebuild
deleted file mode 100644 (file)
index 35984f7..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.0.ebuild,v 1.2 2010/05/01 14:04:21 lxnay Exp $
-
-inherit eutils linux-mod
-
-MY_P=VirtualBox-${PV}-OSE
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
-                        ~x11-drivers/xf86-input-virtualbox-${PV}
-                        x11-apps/xrandr
-                        x11-apps/xrefresh
-                        x11-libs/libXmu
-                        x11-libs/libX11
-                        x11-libs/libXt
-                        x11-libs/libXext
-                        x11-libs/libXau
-                        x11-libs/libXdmcp
-                        x11-libs/libSM
-                        x11-libs/libICE
-                        amd64? ( app-emulation/emul-linux-x86-xlibs ) )"
-DEPEND="${RDEPEND}
-               >=dev-util/kbuild-0.1.5-r1
-               >=dev-lang/yasm-0.6.2
-               sys-devel/bin86
-               sys-devel/dev86
-               sys-power/iasl
-               X? ( x11-proto/renderproto )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-                       vboxvfs(misc:${WORKDIR}/vboxvfs:${WORKDIR}/vboxvfs)"
-
-S=${WORKDIR}/${MY_P/-OSE/_OSE}
-
-pkg_setup() {
-               linux-mod_pkg_setup
-               BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-               enewgroup vboxguest
-               enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
-}
-
-src_unpack() {
-               unpack ${A}
-
-               # Create and unpack a tarball with the sources of the Linux guest
-               # kernel modules, to include all the needed files
-               "${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
-               unpack ./vbox-kmod.tar.gz
-
-               # Remove shipped binaries (kBuild,yasm), see bug #232775
-               cd "${S}"
-               rm -rf kBuild/bin tools
-
-               # Disable things unused or splitted into separate ebuilds
-               cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
-}
-
-src_compile() {
-               linux-mod_src_compile
-
-               # build the user-space tools, warnings are harmless
-               ./configure --nofatal \
-               --disable-xpcom \
-               --disable-sdl-ttf \
-               --disable-pulse \
-               --disable-alsa \
-               --build-headless || die "configure failed"
-               source ./env.sh
-
-               for each in     /src/VBox/{Runtime,Additions/common} \
-               /src/VBox/Additions/linux/{sharedfolders,daemon} ; do
-                               cd "${S}"${each}
-                               MAKE="kmk" emake TOOL_YASM_AS=yasm \
-                               KBUILD_PATH="${S}/kBuild" \
-                               || die "kmk VBoxControl failed"
-               done
-
-               if use X; then
-                               cd "${S}"/src/VBox/Additions/x11/VBoxClient
-                               MAKE="kmk" emake TOOL_YASM_AS=yasm \
-                               KBUILD_PATH="${S}/kBuild" \
-                               || die "kmk VBoxClient failed"
-               fi
-}
-
-src_install() {
-               linux-mod_src_install
-
-               cd "${S}"/out/linux.${ARCH}/release/bin/additions
-
-               insinto /sbin
-               newins mountvboxsf mount.vboxsf
-               fperms 4755 /sbin/mount.vboxsf
-
-               newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
-
-               insinto /usr/sbin/
-               newins VBoxService vboxguest-service
-               fperms 0755 /usr/sbin/vboxguest-service
-
-               insinto /usr/bin
-               doins VBoxControl
-               fperms 0755 /usr/bin/VBoxControl
-
-               # VBoxClient user service and xrandr wrapper
-               if use X; then
-                       doins VBoxClient
-                       fperms 0755 /usr/bin/VBoxClient
-
-                       cd "${S}"/src/VBox/Additions/x11/Installer
-                       newins VBoxRandR.sh VBoxRandR
-                       fperms 0755 /usr/bin/VBoxRandR
-
-                       newins 98vboxguest-xclient VBoxClient-all
-                       fperms 0755 /usr/bin/VBoxClient-all
-               fi
-
-               # udev rule for vboxdrv
-               dodir /etc/udev/rules.d
-               echo 'KERNEL=="vboxguest", NAME="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-               >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
-               echo 'KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-               >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
-}
-
-pkg_postinst() {
-               linux-mod_pkg_postinst
-               if ! useq X ; then
-                       elog "use flag X is off, enable it to install the"
-                       elog "X Window System input and video drivers"
-               fi
-               elog "Please add:"
-               elog "/etc/init.d/${PN}"
-               elog "to the default runlevel in order to load all"
-               elog "needed modules and services."
-               elog ""
-               elog "Warning:"
-               elog "this ebuild is only needed if you are running gentoo"
-               elog "inside a VirtualBox Virtual Machine, you don't need"
-               elog "it to run VirtualBox itself."
-               elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.2.ebuild
deleted file mode 100644 (file)
index 0dff9ef..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.2.ebuild,v 1.2 2010/05/01 14:04:21 lxnay Exp $
-
-inherit eutils linux-mod
-
-MY_P=VirtualBox-${PV}-OSE
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
-                        ~x11-drivers/xf86-input-virtualbox-${PV}
-                        x11-apps/xrandr
-                        x11-apps/xrefresh
-                        x11-libs/libXmu
-                        x11-libs/libX11
-                        x11-libs/libXt
-                        x11-libs/libXext
-                        x11-libs/libXau
-                        x11-libs/libXdmcp
-                        x11-libs/libSM
-                        x11-libs/libICE
-                        amd64? ( app-emulation/emul-linux-x86-xlibs ) )"
-DEPEND="${RDEPEND}
-               >=dev-util/kbuild-0.1.5-r1
-               >=dev-lang/yasm-0.6.2
-               sys-devel/bin86
-               sys-devel/dev86
-               sys-power/iasl
-               X? ( x11-proto/renderproto )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-                       vboxvfs(misc:${WORKDIR}/vboxvfs:${WORKDIR}/vboxvfs)"
-
-S=${WORKDIR}/${MY_P/-OSE/_OSE}
-
-pkg_setup() {
-               linux-mod_pkg_setup
-               BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-               enewgroup vboxguest
-               enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
-}
-
-src_unpack() {
-               unpack ${A}
-
-               # Create and unpack a tarball with the sources of the Linux guest
-               # kernel modules, to include all the needed files
-               "${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
-               unpack ./vbox-kmod.tar.gz
-
-               # Remove shipped binaries (kBuild,yasm), see bug #232775
-               cd "${S}"
-               rm -rf kBuild/bin tools
-
-               # Disable things unused or splitted into separate ebuilds
-               cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
-}
-
-src_compile() {
-               linux-mod_src_compile
-
-               # build the user-space tools, warnings are harmless
-               ./configure --nofatal \
-               --disable-xpcom \
-               --disable-sdl-ttf \
-               --disable-pulse \
-               --disable-alsa \
-               --build-headless || die "configure failed"
-               source ./env.sh
-
-               for each in     /src/VBox/{Runtime,Additions/common} \
-               /src/VBox/Additions/linux/{sharedfolders,daemon} ; do
-                               cd "${S}"${each}
-                               MAKE="kmk" emake TOOL_YASM_AS=yasm \
-                               KBUILD_PATH="${S}/kBuild" \
-                               || die "kmk VBoxControl failed"
-               done
-
-               if use X; then
-                               cd "${S}"/src/VBox/Additions/x11/VBoxClient
-                               MAKE="kmk" emake TOOL_YASM_AS=yasm \
-                               KBUILD_PATH="${S}/kBuild" \
-                               || die "kmk VBoxClient failed"
-               fi
-}
-
-src_install() {
-               linux-mod_src_install
-
-               cd "${S}"/out/linux.${ARCH}/release/bin/additions
-
-               insinto /sbin
-               newins mount.vboxsf mount.vboxsf
-               fperms 4755 /sbin/mount.vboxsf
-
-               newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
-
-               insinto /usr/sbin/
-               newins VBoxService vboxguest-service
-               fperms 0755 /usr/sbin/vboxguest-service
-
-               insinto /usr/bin
-               doins VBoxControl
-               fperms 0755 /usr/bin/VBoxControl
-
-               # VBoxClient user service and xrandr wrapper
-               if use X; then
-                       doins VBoxClient
-                       fperms 0755 /usr/bin/VBoxClient
-
-                       cd "${S}"/src/VBox/Additions/x11/Installer
-                       newins VBoxRandR.sh VBoxRandR
-                       fperms 0755 /usr/bin/VBoxRandR
-
-                       newins 98vboxadd-xclient VBoxClient-all
-                       fperms 0755 /usr/bin/VBoxClient-all
-               fi
-
-               # udev rule for vboxdrv
-               dodir /etc/udev/rules.d
-               echo 'KERNEL=="vboxguest", NAME="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-               >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
-               echo 'KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-               >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
-}
-
-pkg_postinst() {
-               linux-mod_pkg_postinst
-               if ! useq X ; then
-                       elog "use flag X is off, enable it to install the"
-                       elog "X Window System input and video drivers"
-               fi
-               elog "Please add:"
-               elog "/etc/init.d/${PN}"
-               elog "to the default runlevel in order to load all"
-               elog "needed modules and services."
-               elog ""
-               elog "Warning:"
-               elog "this ebuild is only needed if you are running gentoo"
-               elog "inside a VirtualBox Virtual Machine, you don't need"
-               elog "it to run VirtualBox itself."
-               elog ""
-}
similarity index 70%
rename from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.4.ebuild
rename to app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.0.ebuild
index 652f7bf52bab45490e567d91ca5deb8d5d17483e..91c7e618248dab9e00a7d7505372215c57a3bcd3 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.4.ebuild,v 1.3 2010/05/11 18:52:37 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.0.ebuild,v 1.1 2010/05/20 13:18:57 polynomial-c Exp $
 
 inherit eutils linux-mod
 
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
 BUILD_TARGETS="all"
 BUILD_TARGET_ARCH="${ARCH}"
 MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-                       vboxvfs(misc:${WORKDIR}/vboxvfs:${WORKDIR}/vboxvfs)"
+                       vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
 
 S=${WORKDIR}/${MY_P/-OSE/_OSE}
 
@@ -63,11 +63,17 @@ src_unpack() {
 
                # Disable things unused or splitted into separate ebuilds
                cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
+
+               # stupid new header references...
+               for vboxheader in {product,revision}-generated.h ; do
+                       for mdir in vbox{guest,sf} ; do
+                               ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+                                       "${WORKDIR}/${mdir}/${vboxheader}"
+                       done
+               done
 }
 
 src_compile() {
-               linux-mod_src_compile
-
                # build the user-space tools, warnings are harmless
                ./configure --nofatal \
                --disable-xpcom \
@@ -91,6 +97,11 @@ src_compile() {
                                KBUILD_PATH="${S}/kBuild" \
                                || die "kmk VBoxClient failed"
                fi
+
+               # Now creating the kernel modules. We must do this _after_
+               # we compiled the user-space tools as we need two of the
+               # automatically generated header files. (>=3.2.0)
+               linux-mod_src_compile
 }
 
 src_install() {
@@ -102,7 +113,7 @@ src_install() {
                newins mount.vboxsf mount.vboxsf
                fperms 4755 /sbin/mount.vboxsf
 
-               newinitd "${FILESDIR}"/${PN}-5.initd ${PN}
+               newinitd "${FILESDIR}"/${PN}-7.initd ${PN}
 
                insinto /usr/sbin/
                newins VBoxService vboxguest-service
@@ -118,19 +129,24 @@ src_install() {
                        fperms 0755 /usr/bin/VBoxClient
 
                        cd "${S}"/src/VBox/Additions/x11/Installer
-                       newins VBoxRandR.sh VBoxRandR
-                       fperms 0755 /usr/bin/VBoxRandR
-
                        newins 98vboxadd-xclient VBoxClient-all
                        fperms 0755 /usr/bin/VBoxClient-all
                fi
 
                # udev rule for vboxdrv
                dodir /etc/udev/rules.d
-               echo 'KERNEL=="vboxguest", NAME="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+               echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
                >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
-               echo 'KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+               echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
                >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
+
+               # VBoxClient autostart file
+               insinto /etc/xdg/autostart
+               doins "${FILESDIR}"/vboxclient.desktop
+
+               # sample xorg.conf
+               insinto /usr/share/doc/${PF}
+               doins "${FILESDIR}"/xorg.conf.vbox
 }
 
 pkg_postinst() {
@@ -141,8 +157,20 @@ pkg_postinst() {
                fi
                elog "Please add:"
                elog "/etc/init.d/${PN}"
-               elog "to the default runlevel in order to load all"
-               elog "needed modules and services."
+               elog "to the default runlevel in order to start"
+               elog "needed services."
+               elog "To use the VirtualBox X drivers, use the following"
+               elog "file as your /etc/X11/xorg.conf:"
+               elog "    /usr/share/doc/${PF}/xorg.conf.xorg"
+               elog ""
+               elog "Also make sure you use the Mesa library for OpenGL:"
+               elog "    eselect opengl set xorg-x11"
+               elog ""
+               elog "An autostart .desktop file has been installed to start"
+               elog "VBoxClient in desktop sessions."
+               elog ""
+               elog "You can mount shared folders with:"
+               elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
                elog ""
                elog "Warning:"
                elog "this ebuild is only needed if you are running gentoo"