rename virtualbox-guest-tools to virtualbox-guest-additions

svn path=/trunk/; revision=333

7 files changed, 39 insertions, 37 deletions

diff --git a/app-emulation/virtualbox-guest-tools/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index 66ddd46..962ac96 100644
--- a/app-emulation/virtualbox-guest-tools/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Jan 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com> ChangeLog:
+  rename virtualbox-guest-tools to virtualbox-guest-additions
+
   18 Jan 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
   virtualbox-guest-tools-1.5.4.ebuild:
   add app-emulation/emul-linux-x86-xlibs in RDEPEND, 32 bit libXt is needed
diff --git a/app-emulation/virtualbox-guest-tools/files/virtualbox-guest-tools-1.5.4-remove-alsa.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.5.4-remove-alsa.patch
index 2796892..2796892 100644
--- a/app-emulation/virtualbox-guest-tools/files/virtualbox-guest-tools-1.5.4-remove-alsa.patch
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.5.4-remove-alsa.patch
diff --git a/app-emulation/virtualbox-guest-tools/files/virtualbox-guest-tools-1.5.4.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.5.4.initd
index eba9456..70b07b3 100755
--- a/app-emulation/virtualbox-guest-tools/files/virtualbox-guest-tools-1.5.4.initd
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.5.4.initd
@@ -4,14 +4,14 @@
 # $Header:
 
 depend() {
-        need net
+        need localmount
 }
 
 start() {
-	ebegin "VirtualBox Timesync Service"
+	ebegin "Starting VirtualBox guest additions"
 
 	# Check if vboxadd module is already loaded
-	if [[ -e /proc/modules && ! grep -q vboxadd /proc/modules ]] ; then
+	if [[ -e /proc/modules && -e /dev/vboxadd ]] ; then
                 einfo "Loading vboxadd module"
                 /sbin/modprobe vboxadd &> /dev/null
         fi
@@ -21,17 +21,31 @@ start() {
                 einfo "Loading vboxvfs module"
                 /sbin/modprobe vboxvfs &> /dev/null
         fi
-	
+
+	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 Timesync Service"
+		--background
+
+	einfo "Starting the shared clipboard system service"
+	start-stop-daemon --start \
+	 	--exec /usr/bin/vboxadd-xclient \
+		--name vboxadd-xclient \
+		--background
+
+        eend $? "Failed to start VirtualBox guest additions"
 }
 
 stop() {
-        ebegin "Stopping VirtualBox Timesync Service"
+        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 "Stopping the shared clipboard system service"
+	start-stop-daemon --stop --quiet \
+		--name vboxadd-xclient
         eend $?
 }
diff --git a/app-emulation/virtualbox-guest-tools/metadata.xml b/app-emulation/virtualbox-guest-additions/metadata.xml
index 76eddd3..76eddd3 100644
--- a/app-emulation/virtualbox-guest-tools/metadata.xml
+++ b/app-emulation/virtualbox-guest-additions/metadata.xml
diff --git a/app-emulation/virtualbox-guest-tools/virtualbox-guest-tools-1.5.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.5.4.ebuild
index ff19e34..fb305e1 100644
--- a/app-emulation/virtualbox-guest-tools/virtualbox-guest-tools-1.5.4.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.5.4.ebuild
@@ -67,15 +67,27 @@ src_install() {
 		linux-mod_src_install
 
 		cd "${S}"/out/linux.${ARCH}/release/bin/additions
-		dosbin mount.vboxvsf vboxadd-timesync vboxadd-xclient
-		dobin mountvboxsf
+
+		# shared folders
+		dosbin mount.vboxvsf
+		fperms 4755 /sbin/mount.vboxsf
+
+		# time synchronisation system service
+		insinto /usr/sbin
+		doins vboxadd-timesync
+		fperms 0755 /usr/sbin/vboxadd-timesync
+
+		# shared clipboard user service
+		insinto /usr/bin
+		doins vboxadd-xclient
+		fperms 4755 /usr/bin/vboxadd-xclient
 
 		newinitd "${FILESDIR}"/${P}.initd ${PN}
 
 		# udev rule for vboxdrv
 		dodir /etc/udev/rules.d
 		echo 'KERNEL=="vboxadd", NAME="vboxadd", OWNER="root", MODE="0660"' \
-		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-tools.rules"
+		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
 }
 
 pkg_postinst() {
diff --git a/app-emulation/virtualbox-guest-tools/Manifest b/app-emulation/virtualbox-guest-tools/Manifest
deleted file mode 100644
index 59dde1f..0000000
--- a/app-emulation/virtualbox-guest-tools/Manifest
+++ /dev/null
@@ -1,24 +0,0 @@
-AUX virtualbox-guest-tools-1.5.4-remove-alsa.patch 761 RMD160 e1390d18f9734e1da4151300f3eb780d4473d343 SHA1 be68f3c5fccbfa747011686d7afd65fd026fae7c SHA256 93bef36933cc567a0278229c98d0db34e06fb93d836584235b094f489c4ab83d
-MD5 cb75a5c8da2c3d8c5d7770d863d5b0af files/virtualbox-guest-tools-1.5.4-remove-alsa.patch 761
-RMD160 e1390d18f9734e1da4151300f3eb780d4473d343 files/virtualbox-guest-tools-1.5.4-remove-alsa.patch 761
-SHA256 93bef36933cc567a0278229c98d0db34e06fb93d836584235b094f489c4ab83d files/virtualbox-guest-tools-1.5.4-remove-alsa.patch 761
-AUX virtualbox-guest-tools-1.5.4.initd 1096 RMD160 c132c213e41ce937df0409f4e8672183a33dc279 SHA1 c5eb43d9696a72b9a16d723949ac4562f1e495fd SHA256 4c96122a39e1db33538ec6e9238df52e7d3500b8111be7046d316d0db822aa2c
-MD5 6da0c7903badf309852ff080ca47ee25 files/virtualbox-guest-tools-1.5.4.initd 1096
-RMD160 c132c213e41ce937df0409f4e8672183a33dc279 files/virtualbox-guest-tools-1.5.4.initd 1096
-SHA256 4c96122a39e1db33538ec6e9238df52e7d3500b8111be7046d316d0db822aa2c files/virtualbox-guest-tools-1.5.4.initd 1096
-DIST VirtualBox-1.5.4_OSE.tar.bz2 26646142 RMD160 2e3fcce0e961783f50b14cac3ca061e0a8b6f0bb SHA1 a918c064804d1dfde77b17747fe1886deff21f82 SHA256 64ae19c50a6a8c4e39a8c0cf3896dac1d7409fe7c29e51f1aabec7de75232a02
-EBUILD virtualbox-guest-tools-1.5.4.ebuild 2273 RMD160 338ff031adbc29533601c9a01f598f392ca616b8 SHA1 dff80e817cb0e39f85a4b34c89a1454298ce86d5 SHA256 71d338e92078e4d6fdb42038ab401c028f51f8102ca260608335bc3f32d64d59
-MD5 7b44f04f0c07ea39bdb4d4c575701267 virtualbox-guest-tools-1.5.4.ebuild 2273
-RMD160 338ff031adbc29533601c9a01f598f392ca616b8 virtualbox-guest-tools-1.5.4.ebuild 2273
-SHA256 71d338e92078e4d6fdb42038ab401c028f51f8102ca260608335bc3f32d64d59 virtualbox-guest-tools-1.5.4.ebuild 2273
-MISC ChangeLog 610 RMD160 42e487609f6b6cc870276e0f07a1b52b9add035c SHA1 ec43992f0c0c51e6c5bc1952d04be6495c34ae5e SHA256 d77394adc2bb5dc9ee906bf95951073c296b370b194861a48d181fd8e10c4a21
-MD5 7ec4412dd22d066accd2f41e2310aa3f ChangeLog 610
-RMD160 42e487609f6b6cc870276e0f07a1b52b9add035c ChangeLog 610
-SHA256 d77394adc2bb5dc9ee906bf95951073c296b370b194861a48d181fd8e10c4a21 ChangeLog 610
-MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
-MD5 688de6c9943189afc4fa3ab510813dbd metadata.xml 344
-RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e metadata.xml 344
-SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9 metadata.xml 344
-MD5 ff5e119bc2e6108e02c8defcdb0372a8 files/digest-virtualbox-guest-tools-1.5.4 271
-RMD160 f04c3dab19b504d7fbd10d8a7c1157e61f085af2 files/digest-virtualbox-guest-tools-1.5.4 271
-SHA256 f21164c30eb23fa850d64ca3db71a1f22e735be538a0f3ce00eb63ba27373cdb files/digest-virtualbox-guest-tools-1.5.4 271
diff --git a/app-emulation/virtualbox-guest-tools/files/digest-virtualbox-guest-tools-1.5.4 b/app-emulation/virtualbox-guest-tools/files/digest-virtualbox-guest-tools-1.5.4
deleted file mode 100644
index 694dfa6..0000000
--- a/app-emulation/virtualbox-guest-tools/files/digest-virtualbox-guest-tools-1.5.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fbebb3f04911c4c39aac27b1d3532acc VirtualBox-1.5.4_OSE.tar.bz2 26646142
-RMD160 2e3fcce0e961783f50b14cac3ca061e0a8b6f0bb VirtualBox-1.5.4_OSE.tar.bz2 26646142
-SHA256 64ae19c50a6a8c4e39a8c0cf3896dac1d7409fe7c29e51f1aabec7de75232a02 VirtualBox-1.5.4_OSE.tar.bz2 26646142