Fix ROOT

Package-Manager: portage-2.1.2-r8

7 files changed, 27 insertions, 77 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index af8be0f968eb..80720f9a0daa 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.1 2007/02/15 20:40:27 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.2 2007/02/16 20:35:43 jokey Exp $
+
+  16 Feb 2007; Markus Ullmann <jokey@gentoo.org>
+  virtualbox-bin-1.3.4.ebuild:
+  Fix ROOT
 
 *virtualbox-bin-1.3.4 (15 Feb 2007)
 
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.3.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.3.4.ebuild
index 151e873045d4..d6553100ccba 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-1.3.4.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-1.3.4.ebuild
@@ -83,11 +83,11 @@ src_install() {
 		fperms 0755 /opt/VirtualBox/${each}
 	done
 
-	make_wrapper vboxsvc "./VBoxSVC" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	make_wrapper virtualbox "./VirtualBox" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	make_wrapper vboxmanage "./VBoxManage" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	make_wrapper vboxsdl "./VBoxSDL" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	make_wrapper vboxvrdp "./VBoxVRDP" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper vboxsvc "./VBoxSVC" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper virtualbox "./VirtualBox" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper vboxmanage "./VBoxManage" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper vboxsdl "./VBoxSDL" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper vboxvrdp "./VBoxVRDP" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
 
 	# udev rule for vboxdrv
 	dodir /etc/udev/rules.d
diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index a9c7a90598b8..e275eb53a7f0 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.7 2007/02/16 20:06:34 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.8 2007/02/16 20:33:50 jokey Exp $
+
+  16 Feb 2007; Markus Ullmann <jokey@gentoo.org> -virtualbox-1.3.4.ebuild,
+  virtualbox-1.3.4-r1.ebuild, virtualbox-9999.ebuild:
+  Fix ROOT
 
   16 Feb 2007; Simon Stelling <blubb@gentoo.org> virtualbox-1.3.4.ebuild,
   virtualbox-1.3.4-r1.ebuild, virtualbox-9999.ebuild:
diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.3.4 b/app-emulation/virtualbox/files/digest-virtualbox-1.3.4
deleted file mode 100644
index d3662f648fa4..000000000000
--- a/app-emulation/virtualbox/files/digest-virtualbox-1.3.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 67853add4afc2eace5d8f45cfe9a32c5 VirtualBox-OSE-1.3.4.tar.bz2 17491150
-RMD160 32bd5f5e9bbf19bf59ffa93ccf6013496b40e318 VirtualBox-OSE-1.3.4.tar.bz2 17491150
-SHA256 c7d756645c96d202b8e88924f2b4da414c6d02775d3224739b21cdda064bbeee VirtualBox-OSE-1.3.4.tar.bz2 17491150
diff --git a/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild b/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild
index c326b48abb31..c92c35ab642a 100644
--- a/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild
@@ -52,7 +52,7 @@ src_install() {
 	insinto /opt/VirtualBox
 	if use sdk; then
 	    doins -r sdk
-	    make_wrapper xpidl "sdk/bin/xpidl" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	    make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
 	    fperms 0755 /opt/VirtualBox/sdk/bin/xpidl
 	fi
 
@@ -62,11 +62,11 @@ src_install() {
 	for each in VBox{BFE,Manage,SDL,SVC,XPCOMIPCD} VirtualBox vditool xpidl ; do
 		fperms 0755 /opt/VirtualBox/${each}
 	done
-	make_wrapper vboxsvc "./VBoxSVC" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	make_wrapper virtualbox "./VirtualBox" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	make_wrapper vboxmanage "./VBoxManage" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	make_wrapper vboxsdl "./VBoxSDL" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	make_wrapper vboxvrdp "./VBoxVRDP" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper vboxsvc "./VBoxSVC" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper virtualbox "./VirtualBox" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper vboxmanage "./VBoxManage" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper vboxsdl "./VBoxSDL" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper vboxvrdp "./VBoxVRDP" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
 
 	# udev rule for vboxdrv
 	dodir /etc/udev/rules.d
diff --git a/app-emulation/virtualbox/virtualbox-1.3.4.ebuild b/app-emulation/virtualbox/virtualbox-1.3.4.ebuild
deleted file mode 100644
index 1093b7b38bab..000000000000
--- a/app-emulation/virtualbox/virtualbox-1.3.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-1.3.4.ebuild,v 1.4 2007/02/16 20:06:34 blubb Exp $
-
-inherit eutils linux-mod qt3
-
-MY_P=VirtualBox-OSE-${PV}
-DESCRIPTION="Softwarefamily of powerful x86 virtualization"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://virtualbox.org/download/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	dev-libs/xalan-c
-	dev-libs/xerces-c
-	media-libs/libsdl
-	x11-libs/libXcursor
-	$(qt_min_version 3.3.5)"
-DEPEND="${RDEPEND}
-	sys-devel/bin86
-	sys-devel/dev86
-	sys-power/iasl"
-
-S=${WORKDIR}/${MY_P}
-
-BUILD_TARGETS="all"
-BUILD_PARAMS="KERN_DIR=${KERNEL_DIR}"
-MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)"
-
-src_compile() {
-	cd "${S}"
-	./configure || die "configure failed"
-	source ./env.sh
-	kmk all
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-	cd "${S}"/out/linux.${ARCH}/release/bin
-	rm -rf sdk src tst* testcase additions/src
-	rm vboxdrv.ko SUPInstall SUPUninstall
-	insinto /opt/VirtualBox
-	doins -r *
-	for each in VBox{BFE,Manage,SDL,SVC,XPCOMIPCD} VirtualBox vditool xpidl additions/vboxadd-timesync ; do
-		fperms 0755 /opt/VirtualBox/${each}
-	done
-	make_wrapper vboxsvc "./VBoxSVC" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	make_wrapper virtualbox "./VirtualBox" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-}
diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild
index 83685c39b9e7..6a4fd69b935e 100644
--- a/app-emulation/virtualbox/virtualbox-9999.ebuild
+++ b/app-emulation/virtualbox/virtualbox-9999.ebuild
@@ -49,7 +49,7 @@ src_install() {
 	insinto /opt/VirtualBox
 	if use sdk; then
 	    doins -r sdk
-	    make_wrapper xpidl "sdk/bin/xpidl" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	    make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
 	    fperms 0755 /opt/VirtualBox/sdk/bin/xpidl
 	fi
 
@@ -59,11 +59,11 @@ src_install() {
 	for each in VBox{BFE,Manage,SDL,SVC,XPCOMIPCD} VirtualBox vditool xpidl ; do
 		fperms 0755 /opt/VirtualBox/${each}
 	done
-	make_wrapper vboxsvc "./VBoxSVC" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	make_wrapper virtualbox "./VirtualBox" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	make_wrapper vboxmanage "./VBoxManage" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	make_wrapper vboxsdl "./VBoxSDL" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	make_wrapper vboxvrdp "./VBoxVRDP" "${ROOT}opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper vboxsvc "./VBoxSVC" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper virtualbox "./VirtualBox" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper vboxmanage "./VBoxManage" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper vboxsdl "./VBoxSDL" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	make_wrapper vboxvrdp "./VBoxVRDP" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
 
 	# udev rule for vboxdrv
 	dodir /etc/udev/rules.d