Modify blockers for renaming

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

6 files changed, 19 insertions, 467 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 713efadc2492..42ff86196965 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.30 2008/08/10 14:38:45 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.31 2008/08/27 12:25:33 jokey Exp $
+
+  27 Aug 2008; Markus Ullmann <jokey@gentoo.org>
+  -virtualbox-bin-1.5.2-r1.ebuild, -virtualbox-bin-1.5.4.ebuild,
+  virtualbox-bin-1.5.6.ebuild, -virtualbox-bin-1.6.2.ebuild,
+  virtualbox-bin-1.6.4.ebuild:
+  Modify blockers for renaming
 
 *virtualbox-bin-1.6.4 (10 Aug 2008)
 
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.5.2-r1.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.5.2-r1.ebuild
deleted file mode 100644
index 642cac20d49a..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.5.2-r1.ebuild,v 1.2 2008/07/27 19:38:56 carlo Exp $
-
-EAPI=1
-
-inherit eutils qt3 pax-utils
-
-MY_P=VirtualBox_${PV}_Linux_${ARCH}.run
-
-DESCRIPTION="Softwarefamily of powerful x86 virtualization"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}_Linux_amd64.run )
-	x86? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}_Linux_x86.run )"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="additions sdk"
-
-RDEPEND="!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${PV}
-	virtual/xft
-	x11-libs/libXi
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXtst
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXrender
-	x11-libs/libXrandr
-	x11-libs/libXau
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXfixes
-	dev-libs/libxml2
-	media-libs/libsdl
-	media-libs/libmng
-	media-libs/jpeg
-	media-libs/libpng
-	media-libs/freetype
-	media-libs/fontconfig
-	x11-libs/qt:3
-	sys-apps/usermode-utilities
-	net-misc/bridge-utils
-	x86? ( =virtual/libstdc++-3.3 )
-	sdk? ( dev-libs/libIDL )"
-
-S=${WORKDIR}
-
-RESTRICT="primaryuri"
-
-pkg_setup() {
-	# The VBoxSDL frontend needs media-libs/libsdl compiled
-	# with USE flag X enabled (bug #177335)
-	if ! built_with_use media-libs/libsdl X; then
-		eerror "media-libs/libsdl was compiled without the \"X\" USE flag enabled."
-		eerror "Please re-emerge media-libs/libsdl with USE=\"X\"."
-		die "media-libs/libsdl should be compiled with the \"X\" USE flag."
-	fi
-
-	check_license
-}
-
-src_unpack() {
-	unpack_makeself ${MY_P}
-	unpack ./VirtualBox.tar.bz2
-}
-
-src_install() {
-	cd "${S}"
-
-	# desktop entry
-	insinto /usr/share/pixmaps
-	newins VBox.png virtualbox.png
-	insinto /usr/share/applications
-	newins VirtualBox.desktop virtualbox.desktop
-	dosed -e "10d" /usr/share/applications/virtualbox.desktop
-	dosed -e "5d" /usr/share/applications/virtualbox.desktop
-	dosed -e "s/VBox.png/virtualbox.png/" /usr/share/applications/virtualbox.desktop
-	dosed -e "s/innotek virtualbox/Innotek VirtualBox/" /usr/share/applications/virtualbox.desktop
-	dosed -e "s/X-MandrivaLinux-System;//" /usr/share/applications/virtualbox.desktop
-
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
-	newins "${FILESDIR}/${PN}-interfaces" interfaces
-
-	insinto /opt/VirtualBox
-	doins UserManual.pdf
-
-	if use additions; then
-		doins -r additions
-	fi
-	if use sdk; then
-		doins -r sdk
-		fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl
-		fperms 0750 /opt/VirtualBox/sdk/bin/xpidl
-		pax-mark -m "${D}"/opt/VirtualBox/sdk/bin/xpidl
-	fi
-
-	rm -rf src sdk tst* rdesktop-vrdp.tar.gz deffiles install.sh routines.sh \
-	runlevel.sh vboxdrv.sh VBox.sh VBox.png kchmviewer additions VirtualBox.desktop \
-	VirtualBox.chm VirtualBox.tar.bz2 vboxnet.sh LICENSE VirtualBoxAPI.chm
-
-	doins -r *
-	for each in VBox{Manage,SDL,SVC,XPCOMIPCD,VRDP,Tunctl} VirtualBox ; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/opt/VirtualBox/${each}
-	done
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-wrapper" "VBox.sh" || die
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-	fowners root:vboxusers /opt/VirtualBox/VBoxAddIF.sh
-	fperms 0750 /opt/VirtualBox/VBoxAddIF.sh
-
-	dosym /opt/VirtualBox/VBox.sh /usr/bin/VirtualBox
-	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxManage
-	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxSDL
-	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxVRDP
-	dosym /opt/VirtualBox/VBoxTunctl /usr/bin/VBoxTunctl
-	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxAddIF
-	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxDeleteIF
-}
-
-pkg_postinst() {
-	elog ""
-	elog "To launch VirtualBox just type: \"VirtualBox\""
-	elog "You must be in the vboxusers group to use VirtualBox"
-	elog ""
-}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.5.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.5.4.ebuild
deleted file mode 100644
index c161d87936ef..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-1.5.4.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.5.4.ebuild,v 1.5 2008/07/27 19:38:56 carlo Exp $
-
-EAPI=1
-
-inherit eutils fdo-mime qt3 pax-utils
-
-MY_P=VirtualBox_${PV}_Linux_${ARCH}.run
-
-DESCRIPTION="Softwarefamily of powerful x86 virtualization"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}_Linux_amd64.run )
-	x86? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}_Linux_x86.run )"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="additions chm sdk"
-
-RDEPEND="!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${PV}
-	virtual/xft
-	x11-libs/libXi
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXtst
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXrender
-	x11-libs/libXrandr
-	x11-libs/libXau
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXfixes
-	dev-libs/libxml2
-	media-libs/libsdl
-	media-libs/libmng
-	media-libs/jpeg
-	media-libs/libpng
-	media-libs/freetype
-	media-libs/fontconfig
-	x11-libs/qt:3
-	sys-apps/usermode-utilities
-	net-misc/bridge-utils
-	x86? ( =virtual/libstdc++-3.3 )
-	sdk? ( dev-libs/libIDL )
-	chm? ( app-text/kchmviewer )"
-
-S=${WORKDIR}
-
-RESTRICT="primaryuri"
-
-pkg_setup() {
-	# The VBoxSDL frontend needs media-libs/libsdl compiled
-	# with USE flag X enabled (bug #177335)
-	if ! built_with_use media-libs/libsdl X; then
-		eerror "media-libs/libsdl was compiled without the \"X\" USE flag enabled."
-		eerror "Please re-emerge media-libs/libsdl with USE=\"X\"."
-		die "media-libs/libsdl should be compiled with the \"X\" USE flag."
-	fi
-
-	check_license
-}
-
-src_unpack() {
-	unpack_makeself ${MY_P}
-	unpack ./VirtualBox.tar.bz2
-}
-
-src_install() {
-
-	# desktop entry
-	newicon VBox.png virtualbox.png
-	newmenu "${FILESDIR}"/${PN}.desktop virtualbox.desktop
-
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
-	newins "${FILESDIR}/${PN}-interfaces" interfaces
-
-	insinto /opt/VirtualBox
-	doins UserManual.pdf
-
-	if use additions; then
-		doins -r additions
-	fi
-	if use sdk; then
-		doins -r sdk
-		fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl
-		fperms 0750 /opt/VirtualBox/sdk/bin/xpidl
-		pax-mark -m "${D}"/opt/VirtualBox/sdk/bin/xpidl
-	fi
-	if use chm; then
-		doins *.chm
-		dosym /usr/bin/kchmviewer /opt/VirtualBox/kchmviewer
-	fi
-
-	rm -rf src sdk tst* rdesktop-vrdp.tar.gz deffiles install.sh routines.sh \
-	runlevel.sh vboxdrv.sh VBox.sh VBox.png kchmviewer additions VirtualBox.desktop \
-	VirtualBox.tar.bz2 vboxnet.sh LICENSE VirtualBox.chm VirtualBoxAPI.chm \
-	VBoxSysInfo.sh
-
-	doins -r *
-	for each in VBox{Manage,SDL,SVC,XPCOMIPCD,VRDP,Tunctl} VirtualBox ; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/opt/VirtualBox/${each}
-	done
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-wrapper" "VBox.sh" || die
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-	fowners root:vboxusers /opt/VirtualBox/VBoxAddIF.sh
-	fperms 0750 /opt/VirtualBox/VBoxAddIF.sh
-
-	dosym /opt/VirtualBox/VBox.sh /usr/bin/VirtualBox
-	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxManage
-	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxSDL
-	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxVRDP
-	dosym /opt/VirtualBox/VBoxTunctl /usr/bin/VBoxTunctl
-	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxAddIF
-	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxDeleteIF
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	elog ""
-	elog "To launch VirtualBox just type: \"VirtualBox\""
-	elog "You must be in the vboxusers group to use VirtualBox"
-	elog ""
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.5.6.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.5.6.ebuild
index 9045bb984e39..f2b20c3075b6 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-1.5.6.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-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-bin/virtualbox-bin-1.5.6.ebuild,v 1.4 2008/07/27 19:38:56 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.5.6.ebuild,v 1.5 2008/08/27 12:25:33 jokey Exp $
 
 EAPI=1
 
@@ -8,7 +8,7 @@ inherit eutils fdo-mime qt3 pax-utils
 
 MY_P=VirtualBox_${PV}-1_Linux_${ARCH}.run
 
-DESCRIPTION="Softwarefamily of powerful x86 virtualization"
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
 HOMEPAGE="http://www.virtualbox.org/"
 SRC_URI="amd64? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}-1_Linux_amd64.run )
 	x86? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}-1_Linux_x86.run )"
@@ -18,9 +18,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="additions chm sdk"
 
-RDEPEND="!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	>=app-emulation/virtualbox-modules-${PV}
+RDEPEND="!app-emulation/virtualbox-ose
+	!app-emulation/virtualbox-ose-additions
+	=app-emulation/virtualbox-modules-1.5.7
 	virtual/xft
 	x11-libs/libXi
 	x11-libs/libX11
@@ -131,7 +131,7 @@ pkg_postinst() {
 	fdo-mime_desktop_database_update
 	elog ""
 	elog "To launch VirtualBox just type: \"VirtualBox\""
-	elog "You must be in the vboxusers group to use VirtualBox"
+	elog "You must be in the vboxusers group to use VirtualBox."
 	elog ""
 }
 
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.6.2.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.6.2.ebuild
deleted file mode 100644
index a6727bd323ee..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-1.6.2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.6.2.ebuild,v 1.5 2008/07/29 07:02:21 vapier Exp $
-
-EAPI=1
-
-inherit eutils fdo-mime qt3 pax-utils
-
-MY_P=VirtualBox-${PV}-Linux
-
-DESCRIPTION="Softwarefamily of powerful x86 virtualization"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( ${MY_P}_amd64.run )
-	x86? ( ${MY_P}_x86.run )"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="additions headless sdk vboxwebsrv"
-
-RDEPEND="!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	>=app-emulation/virtualbox-modules-${PV}
-	!headless? (
-		x11-libs/qt:3
-		x11-libs/libXcursor
-		media-libs/libsdl
-		x11-libs/libXrender
-		x11-libs/libXfixes
-		media-libs/libmng
-		media-libs/jpeg
-		media-libs/libpng
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXinerama
-		virtual/xft
-		x11-libs/libXft
-		media-libs/freetype
-		media-libs/fontconfig
-		x11-libs/libXext )
-	x11-libs/libXt
-	dev-libs/libxml2
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXdmcp
-	sys-apps/usermode-utilities
-	net-misc/bridge-utils
-	x86? ( =virtual/libstdc++-3.3 )
-	sdk? ( dev-libs/libIDL )"
-
-S=${WORKDIR}
-
-RESTRICT="fetch"
-
-pkg_nofetch() {
-	elog "Please from the site:"
-	elog "https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_SMI-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=innotek-1.6-G-F@CDS-CDS_SMI"
-	if use amd64 ; then
-		elog "select \"Linux (AMD64)\" and download \"${MY_P}_amd64.run\""
-	else
-		elog "select \"Linux i386\" and download \"${MY_P}_x86.run\""
-	fi
-	elog "then put this file in ${DISTDIR}"
-}
-
-pkg_setup() {
-	# The VBoxSDL frontend needs media-libs/libsdl compiled
-	# with USE flag X enabled (bug #177335)
-	if ! use headless ; then
-		if ! built_with_use media-libs/libsdl X ; then
-			eerror "media-libs/libsdl was compiled without the \"X\" USE flag enabled."
-			eerror "Please re-emerge media-libs/libsdl with USE=\"X\"."
-			die "media-libs/libsdl should be compiled with the \"X\" USE flag."
-		fi
-	fi
-
-	check_license
-}
-
-src_unpack() {
-	unpack_makeself
-	unpack ./VirtualBox.tar.bz2
-}
-
-src_install() {
-	if ! use headless ; then
-		newicon VBox.png virtualbox.png
-		newmenu "${FILESDIR}"/${PN}.desktop virtualbox.desktop
-	fi
-
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
-	newins "${FILESDIR}/${PN}-interfaces" interfaces
-
-	insinto /opt/VirtualBox
-	doins UserManual.pdf
-
-	if use additions; then
-		doins -r additions
-	fi
-	if use sdk; then
-		doins -r sdk
-		fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl
-		fperms 0750 /opt/VirtualBox/sdk/bin/xpidl
-		pax-mark -m "${D}"/opt/VirtualBox/sdk/bin/xpidl
-	fi
-	if use vboxwebsrv; then
-		doins vboxwebsrv
-		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
-		fperms 0750 /opt/VirtualBox/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	rm -rf src sdk tst* rdesktop-vrdp.tar.gz deffiles install* routines.sh \
-		runlevel.sh vboxdrv.sh VBox.sh VBox.png kchmviewer additions VirtualBox.desktop \
-		VirtualBox.tar.bz2 vboxnet.sh LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv webtest
-
-	if use headless ; then
-		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so VirtualBoxAPI.chm \
-			VirtualBox.chm
-	fi
-
-	doins -r * || die
-
-	if ! use headless ; then
-		for each in VBox{Manage,SDL,SVC,XPCOMIPCD,Tunctl,Headless} VirtualBox; do
-			fowners root:vboxusers /opt/VirtualBox/${each}
-			fperms 0750 /opt/VirtualBox/${each}
-			pax-mark -m "${D}"/opt/VirtualBox/${each}
-		done
-
-		dosym /opt/VirtualBox/VBox.sh /usr/bin/VirtualBox
-		dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxSDL
-	else
-		for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,Headless} ; do
-			fowners root:vboxusers /opt/VirtualBox/${each}
-			fperms 0750 /opt/VirtualBox/${each}
-			pax-mark -m "${D}"/opt/VirtualBox/${each}
-		done
-	fi
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-wrapper" "VBox.sh" || die
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-	fowners root:vboxusers /opt/VirtualBox/VBoxAddIF.sh
-	fperms 0750 /opt/VirtualBox/VBoxAddIF.sh
-
-	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxManage
-	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxHeadless
-	dosym /opt/VirtualBox/VBoxTunctl /usr/bin/VBoxTunctl
-	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxAddIF
-	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxDeleteIF
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	elog ""
-	if ! use headless ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\""
-		elog ""
-		elog "In order to use the online help, create a link"
-		elog "to your favourite chm viewer, for example:"
-		elog "ln -s /usr/bin/kchmviewer /opt/VirtualBox/kchmviewer"
-		elog ""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox"
-	elog ""
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild
index e50f2d27a999..435f611d3f5c 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.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-bin/virtualbox-bin-1.6.4.ebuild,v 1.1 2008/08/10 14:38:45 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild,v 1.2 2008/08/27 12:25:33 jokey Exp $
 
 EAPI=1
 
@@ -8,7 +8,7 @@ inherit eutils fdo-mime qt3 pax-utils
 
 MY_P=VirtualBox-${PV}-Linux
 
-DESCRIPTION="family of powerful x86 virtualization products for enterprise as well as home use"
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
 HOMEPAGE="http://www.virtualbox.org/"
 SRC_URI="amd64? ( ${MY_P}_amd64.run )
 	x86? ( ${MY_P}_x86.run )"
@@ -18,9 +18,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="additions headless sdk vboxwebsrv"
 
-RDEPEND="!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	>=app-emulation/virtualbox-modules-${PV}
+RDEPEND="!app-emulation/virtualbox-ose
+	!app-emulation/virtualbox-ose-additions
+	~app-emulation/virtualbox-modules-${PV}
 	!headless? (
 		x11-libs/qt:3
 		x11-libs/libXcursor
@@ -167,7 +167,7 @@ pkg_postinst() {
 		elog "ln -s /usr/bin/kchmviewer /opt/VirtualBox/kchmviewer"
 		elog ""
 	fi
-	elog "You must be in the vboxusers group to use VirtualBox"
+	elog "You must be in the vboxusers group to use VirtualBox."
 	elog ""
 	elog "Warning:"
 	elog "Due to a bug which can cause a large amount of logging"