Modify blockers for renaming

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo i686

7 files changed, 25 insertions, 482 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/Manifest b/app-emulation/virtualbox-bin/Manifest
index 1b2cb2974b7b..0173eac25f39 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -7,27 +7,18 @@ AUX virtualbox-bin-config 28 RMD160 c03986f0a6ecc77c2d15382d965952bb209ae534 SHA
 AUX virtualbox-bin-interfaces 218 RMD160 4639b9848cf44ac59cd12585a3c56ef53d72a6d9 SHA1 3268e5759286bdff1c5242598266e6c2a5b17e5d SHA256 50ddbfedce3afd41aad45163eb799fce0956d815948ad9da842f09163aaafd52
 AUX virtualbox-bin-wrapper 3807 RMD160 8b6b6cdaaef0a49460af30103c9bdb0f59b0288d SHA1 4531eb5a0ead8c8f645870bdab6c738919463b2b SHA256 18a028fd02a971d7273020c2f5a75db441f93798a84a264d5b8a9c21996643c2
 AUX virtualbox-bin.desktop 198 RMD160 0e99c539851ee91ba909f1a2ba9259eac032fb07 SHA1 39cabeecd1e635f7a8f47f35303ddf3a45f66b9d SHA256 fdfbaf10c0ff7a9a3811ec2b1fb8fbc8bfe9b6706a3eb55b31ccc3943672a033
-DIST VirtualBox-1.6.2-Linux_amd64.run 22004296 RMD160 7b54bacbab46fc4ef9e944f22ad92ab8aeb1a6d6 SHA1 260decf3db9b2cb565588530b19854f39981d30d SHA256 6648c448939a908c219855888c35133088d08e1219d2f7b4c31bf5757f00533a
-DIST VirtualBox-1.6.2-Linux_x86.run 21451307 RMD160 4d9daa3236f776e8c7409aaccd5d8aed3c4a498c SHA1 191b7bb89165dd882295630582a04bc6860352cc SHA256 9db07a43b9c2235b2abf3bb6ede56feda9d9d282d7a6724d38eef1989ede335c
 DIST VirtualBox-1.6.4-Linux_amd64.run 22096469 RMD160 7c0a7df62ec0ce7d90684ec930f2c32f10d4eb51 SHA1 92fba77dab56ed5613893a6d8a74f9a48d73ea56 SHA256 a01ca85bee3273cf083dd63834881dbfb958c0962f5fab3e9ebfdb314f61dcb4
 DIST VirtualBox-1.6.4-Linux_x86.run 21533241 RMD160 fc6fc97f9b97e3a76a720430c87cab05721d79b1 SHA1 4fd99774f54d9a101366f610cee8bbbb2c8eb3ad SHA256 a063b3f237ea4f88d46c3144991b027531f5ba48592ac279ac7d3ec6bd1f5378
-DIST VirtualBox_1.5.2_Linux_amd64.run 16563190 RMD160 0e97a0f3175b57140743fb961215ccec651edc33 SHA1 1f3aadadbc47b427fce447f32b71cdc3cdbdf9ab SHA256 b7290b1df17d9011901b64ed3bf697bc8bdc71a762bdd0c12ef18dd7685ec5b8
-DIST VirtualBox_1.5.2_Linux_x86.run 15946150 RMD160 c8373044892a1b4b036ae3bb0460c03d0c5c9078 SHA1 4b79800d41da5c6bac109a617ce0da1a89c9cb22 SHA256 f1e0b3de29e39f0bdfd8697ee3409b5274fe8afd61b3c93c668c835409aaa6a7
-DIST VirtualBox_1.5.4_Linux_amd64.run 17118151 RMD160 49e688315ab7f4964eb22720f21fed7f72f68a59 SHA1 d42e591feb19685b3e84fb19b842c10a91c48bd2 SHA256 db3b64235dd90a7853ad73be788e418a91c353b247ba3608807d4a281cae0361
-DIST VirtualBox_1.5.4_Linux_x86.run 16018644 RMD160 701a5e5e4fb910c51dae81cd9071a1189d261213 SHA1 7b96967c3cd21962d40b54df2e1ffdafa51c024c SHA256 9f8fae10b60aec8812fceb27bed5e550b24abd4a42b787a1e2ce397a402fbf08
 DIST VirtualBox_1.5.6-1_Linux_amd64.run 17162248 RMD160 2478e2fad0fe6529d1eff5ac1d6698ec8f477f94 SHA1 128136e651fc104682185366d142cfc71f8dd4ff SHA256 d82a4d7986d77376c4a95adb5ce500e17214e89592e4cf92a5870104835f2f69
 DIST VirtualBox_1.5.6-1_Linux_x86.run 16469455 RMD160 a81057243c1f480f39b8778261028fd5b55cd3f0 SHA1 a43c52a95854804029683a2897b318c6ec686f63 SHA256 90b04d49eadbeb8a42c739491df6ea5280a88139fe2155f2b4ef61395bd405cc
-EBUILD virtualbox-bin-1.5.2-r1.ebuild 4046 RMD160 efe7d1e7112ce858e152618eb8035fc3747da716 SHA1 180db48d9b53a24dcb4bd0251e71a31262411dff SHA256 5aae38a016f998bd70fa1c88431686dea9d42622d411de630e0820898b1f1562
-EBUILD virtualbox-bin-1.5.4.ebuild 3841 RMD160 881481e2ddbb4241b13faaada3adbbdbcbdad227 SHA1 3fee520e111b9064874c10222106393fe60b57f1 SHA256 dc5ca0331b67c975719b2cfb7d7899a7a54296ccb9c2de9b6f24dca9706c5d8f
-EBUILD virtualbox-bin-1.5.6.ebuild 3850 RMD160 7e21772cccf32fcba4c077e86fc6ede93c4e6e10 SHA1 2338e43f618e41a3102ac3a8619d3ad8355f5afb SHA256 8e63e5129f9693f4bf22904a85d52085e9bfe6605bdb2ad41dceefbe017d7660
-EBUILD virtualbox-bin-1.6.2.ebuild 4927 RMD160 913add73c9d73cba146792cfa2aff03998b25419 SHA1 ef575d1b396c839d4d589ac6c3698dfdd6058a9c SHA256 eddf9b797e7dd9ca1f5e14170965bd8e9551a0a809a9115e4fe41adc807b107c
-EBUILD virtualbox-bin-1.6.4.ebuild 5228 RMD160 e472ff9e87a3a6f7ce29e3cc349b7ecbd0fe575f SHA1 fb8dec73c8c011e2f73970768932eb17cd16ccd0 SHA256 d26ab842eee0d16803d1983d0e515a3fb560df0e5fe04656ebf8b49143556dd4
-MISC ChangeLog 5760 RMD160 3025d1807d30e4257d44bd10f7634ead5f62fe87 SHA1 505960aa9fd2679126a00ace7c5f36f9733717fa SHA256 1626d2b1963bdfaac73e91685dbb5d98ff19c5d05c3c51ac29067c86e75a68bc
+EBUILD virtualbox-bin-1.5.6.ebuild 3894 RMD160 cace6021a74383f56cdfac5771adca419564b40e SHA1 227a0385c91f8d0a50ebb9c7fd7755e04e210dcd SHA256 300b5e21ab206f688a0e47533afa3d9000f2b89964bb9388bdb8e6c01d79efbb
+EBUILD virtualbox-bin-1.6.4.ebuild 5236 RMD160 299443c49c91b2bd497d39cfe5adca1e176f8f15 SHA1 cfe0aeb30297b7d6ea116e026fba0d000eaf7e10 SHA256 6cd304e0e1085bbee4a1ad80e1e5c49f1aded788d88e4b2408e6a1d4b707c1ac
+MISC ChangeLog 5998 RMD160 ed4530e0bdc4cbecd0130caabfa481941656a24c SHA1 300d5c82a61a0a22f2a91ac4bd42187d216919fc SHA256 cb6e3131f2088fbece7dda234de86b4b2a2393b1a150f7dac004a158f14e77d4
 MISC metadata.xml 674 RMD160 227ce8924ca2756736cafabca6db6d392045c046 SHA1 39897f3c50ad79428f105790727cdd1c8b9a2d33 SHA256 4a6a5fb269164b795ab5927c44408e3f7a18822df080ee989071d834f5bfd54b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkie/XwACgkQz974XjDVpbnNhACguM1OFNqpecbxYhGvl34XZU7s
-B0MAoKKOSN364i9JrcIN7+19sBWZJFcZ
-=U2j7
+iEYEARECAAYFAki1R74ACgkQz974XjDVpblJ5QCgxGf31LHi5cSOUlPaLDU2nWol
+kb0AoKRyUg59jEuLZJVPCUlJhI9QUSXj
+=p5K9
 -----END PGP SIGNATURE-----
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"