Fix up script naming and correct dependencies

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo i686)

4 files changed, 28 insertions, 13 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index d2b7c222f8a8..ab0cd3fb35ed 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/virtualbox-guest-additions
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.2 2008/08/16 17:21:18 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.3 2008/08/27 12:30:59 jokey Exp $
+
+*virtualbox-guest-additions-1.6.4-r1 (27 Aug 2008)
+
+  27 Aug 2008; Markus Ullmann <jokey@gentoo.org>
+  files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,
+  virtualbox-guest-additions-1.5.6.ebuild,
+  -virtualbox-guest-additions-1.6.4.ebuild,
+  +virtualbox-guest-additions-1.6.4-r1.ebuild:
+  Fix up script naming and correct dependencies
 
 *virtualbox-guest-additions-1.6.4 (10 Aug 2008)
 
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch
index e8c3bfe0f92f..44668d838849 100644
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch
@@ -1,7 +1,7 @@
 --- src/apps/Makefile.kmk	1970-01-01 01:00:00.000000000 +0100
 +++ src/apps/Makefile.kmk	2008-08-02 16:06:11.358197514 +0200
 @@ -0,0 +1,28 @@
-+# $Id: virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,v 1.1 2008/08/10 14:49:33 jokey Exp $
++# $Id: virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,v 1.2 2008/08/27 12:31:00 jokey Exp $
 +## @file
 +# Sub-Makefile for the external apps.
 +#
@@ -32,7 +32,7 @@
 --- src/apps/tunctl/Makefile.kmk	1970-01-01 01:00:00.000000000 +0100
 +++ src/apps/tunctl/Makefile.kmk	2008-08-02 16:06:37.447936207 +0200
 @@ -0,0 +1,32 @@
-+# $Id: virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,v 1.1 2008/08/10 14:49:33 jokey Exp $
++# $Id: virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,v 1.2 2008/08/27 12:31:00 jokey Exp $
 +## @file
 +# Sub-Makefile for VBoxTunctl
 +#
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.5.6.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.5.6.ebuild
index 0c580d61bf5c..92d32b431be7 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.5.6.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-1.5.6.ebuild,v 1.1 2008/08/10 14:49:33 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.5.6.ebuild,v 1.2 2008/08/27 12:30:59 jokey Exp $
 
 inherit eutils linux-mod
 
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r1.ebuild
index b3b3e4aea669..2e9b6653cb08 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-1.6.4.ebuild,v 1.1 2008/08/10 14:49:33 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r1.ebuild,v 1.1 2008/08/27 12:30:59 jokey Exp $
 
 inherit eutils linux-mod
 
@@ -17,7 +17,9 @@ IUSE="X"
 RDEPEND="x11-libs/libXt
 		amd64? ( app-emulation/emul-linux-x86-xlibs )
 		X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
-			 ~x11-drivers/xf86-input-virtualbox-${PV} )"
+			 ~x11-drivers/xf86-input-virtualbox-${PV}
+			 x11-apps/xrandr
+			 x11-apps/xrefresh )"
 DEPEND="${RDEPEND}
 		sys-devel/bin86
 		sys-devel/dev86
@@ -62,7 +64,7 @@ src_compile() {
 		source ./env.sh
 
 		for each in	src/VBox/{Runtime,Additions/common} \
-		src/VBox/Additions/linux{sharefolders,daemon,xclient} ; do
+		src/VBox/Additions/linux{sharefolders,daemon} ; do
 				MAKE="kmk" emake || die "kmk failed"
 		done
 }
@@ -84,16 +86,20 @@ src_install() {
 
 		newinitd "${FILESDIR}"/${P}.initd ${PN}
 
-		# shared clipboard user service and xinit script
+		# VBoxClient user service and xrandr wrapper
 		if use X; then
 			insinto /usr/bin
-			doins vboxadd-xclient
-			fperms 4755 /usr/bin/vboxadd-xclient
+			doins VBoxClient
+			fperms 4755 /usr/bin/VBoxClient
 
 			dodir /etc/X11/xinit/xinitrc.d/
-			echo -e "#/bin/sh\n/usr/bin/vboxadd-xclient" \
-			>> "${D}/etc/X11/xinit/xinitrc.d/98vboxadd-xclient"
-			fperms 0755 /etc/X11/xinit/xinitrc.d/98vboxadd-xclient
+			echo -e "#/bin/sh\n/usr/bin/VBoxClient" \
+			>> "${D}/etc/X11/xinit/xinitrc.d/98VBoxClient"
+			fperms 0755 /etc/X11/xinit/xinitrc.d/98VBoxClient
+
+			cd "${S}"/src/VBox/Additions/x11/installer
+			newins VBoxRandR.sh VBoxRandR
+			fperms 0755 /usr/bin/VBoxRandR
 		fi
 
 		# udev rule for vboxdrv