Version bump; prune old ebuilds in overlay

svn path=/trunk/; revision=711

6 files changed, 36 insertions, 634 deletions

diff --git a/app-emulation/virtualbox-ose/ChangeLog b/app-emulation/virtualbox-ose/ChangeLog
index 4011a80..07f60c8 100644
--- a/app-emulation/virtualbox-ose/ChangeLog
+++ b/app-emulation/virtualbox-ose/ChangeLog
@@ -1,25 +1,37 @@
 # ChangeLog for app-emulation/virtualbox-ose
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.17 2009/04/30 16:34:14 patrick Exp $
-
-  21 Jul 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  -virtualbox-ose-3.0.2.ebuild, +virtualbox-ose-3.0.2-r1.ebuild:
-  fix installation of VBoxTestOGL even if opengl USE flag is disabled
-  wrt #278125
-
-  10 Jul 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  -virtualbox-ose-3.0.0.ebuild, +virtualbox-ose-3.0.2.ebuild:
-  Version bump; drop release 3.0.0
-
-  01 Jul 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  +virtualbox-ose-3.0.0.ebuild,
-  +files/virtualbox-ose-3.0.0-mesa-check.patch:
-  Version bump; add a patch to fix mesa checks in configure
-  thanks to Grzegorz Chwesewicz and David Gence Fixes #265558 and #268885
-
-  30 May 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
-  -virtualbox-ose-2.2.2.ebuild, +virtualbox-ose-2.2.4.ebuild:
-  Version bump
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.21 2009/07/25 15:34:38 patrick Exp $
+
+  05 Aug 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  -virtualbox-ose-1.6.6-r1.ebuild, -virtualbox-ose-2.2.4.ebuild,
+  -virtualbox-ose-3.0.2-r1.ebuild, +virtualbox-ose-3.0.4.ebuild,
+  -virtualbox-ose-9999.ebuild:
+  Version bump; prune old ebuilds in overlay
+
+*virtualbox-ose-3.0.2-r1 (25 Jul 2009)
+
+  25 Jul 2009; Patrick Lauer <patrick@gentoo.org>
+  +virtualbox-ose-3.0.2-r1.ebuild:
+  Fixing #278125, thanks to Piotr Radkowski and Alessio Cassibba for the
+  patch
+
+*virtualbox-ose-3.0.2 (16 Jul 2009)
+
+  16 Jul 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/virtualbox-ose-3.0.0-mesa-check.patch,
+  +virtualbox-ose-3.0.2.ebuild:
+  Bump to 3.0.2. Fixes #275963. Thanks to Alessio Cassiba and all the
+  testers
+
+  09 Jun 2009; Patrick Lauer <patrick@gentoo.org> +files/vboxwebsrv-confd,
+  +files/vboxwebsrv-initd:
+  Adding missing init scripts for vboxwebsrv
+
+*virtualbox-ose-2.2.4 (01 Jun 2009)
+
+  01 Jun 2009; Patrick Lauer <patrick@gentoo.org>
+  +virtualbox-ose-2.2.4.ebuild:
+  Bump to 2.2.4, thanks to Alessio Cassibba. Fixes #271983 #271341 #269335
 
   30 Apr 2009; Patrick Lauer <patrick@gentoo.org>
   -virtualbox-ose-2.0.2.ebuild, -virtualbox-ose-2.0.4.ebuild,
diff --git a/app-emulation/virtualbox-ose/Manifest b/app-emulation/virtualbox-ose/Manifest
index a57d6ce..a8ae1b3 100644
--- a/app-emulation/virtualbox-ose/Manifest
+++ b/app-emulation/virtualbox-ose/Manifest
@@ -11,12 +11,7 @@ AUX virtualbox-ose-fix-insecure-lockfiles.patch 2579 RMD160 4b460669369a4da395a3
 AUX virtualbox-ose-fix-nodbus-build.patch 461 RMD160 f9e731a1d68947823d23bdfd4bc85ae182e6302c SHA1 f39bcd3bf704d64d45a97b1e1b77b6c47e9a61fc SHA256 cecc8685203f715f446fad31a597a2bf7397967200b1ab90b0c02785b151445b
 AUX virtualbox-ose-interfaces 218 RMD160 4639b9848cf44ac59cd12585a3c56ef53d72a6d9 SHA1 3268e5759286bdff1c5242598266e6c2a5b17e5d SHA256 50ddbfedce3afd41aad45163eb799fce0956d815948ad9da842f09163aaafd52
 AUX virtualbox-ose.desktop 202 RMD160 8b4b5c05743978d71edd4eaba71ae25f1d9d0d82 SHA1 3c10d2f12ea58ef35e785b8727a51fd3a0d66472 SHA256 9bbd26661317b106593d74b84cec3781b24c41bc40a2f98776e23d6b422ee4bb
-DIST VirtualBox-1.6.6-OSE.tar.bz2 35483853 RMD160 4b17428371089806cf6f5e52d1905936f7beb01d SHA1 7c323b35d77277c650cbce2821ab6778d1e3270e SHA256 acb3c20ef751ed408489d7b5c2d5d441226055a6e83bfeb9258ce2d55baba4da
-DIST VirtualBox-2.2.4-OSE.tar.bz2 50948689 RMD160 12577f01568e362d6285aa19eeb8eeb9ca6eadb7 SHA1 ebc5566c4b8115c649a82bde743e94ea62ed1a26 SHA256 b5d52a67b94510275eb3dc8649eb7d3063446da4f3ac038f821d598c62b5d6c5
-DIST VirtualBox-3.0.2-OSE.tar.bz2 51322139 RMD160 9d33f82cf0ef2ca001fd61b9b26583ca2ad32a5a SHA1 442206e7dfcf6719b7ee452f9f042563acd6f0eb SHA256 41ee0fc47103aeeae8301f7b75d358662ff0f05e5874b9775641d6a9b9e39fe8
-EBUILD virtualbox-ose-1.6.6-r1.ebuild 5993 RMD160 8c6d79e27f62919d45d2e2723e67eb450686969a SHA1 0cf299bee2c373762effd91457533737610b8b3a SHA256 7a30240d9a13b0b82c5c5fa531924c3118a7c4b871d7bf4c5f6b003562342492
-EBUILD virtualbox-ose-2.2.4.ebuild 6396 RMD160 751f97606805d668dd6148d78cfa520f3a6a702b SHA1 9790057088f7c5dbe8a9ad8f4ec3a6b0971a32d1 SHA256 506494238a978c846590400a988ae6cb33280547d79400f1d67a33cdb89de4d9
-EBUILD virtualbox-ose-3.0.2-r1.ebuild 6816 RMD160 1e5d2c075fec4159169e7dbe87f92e6b13101ac1 SHA1 e40707fb643f0ce02cbb9e8d48455a24574be398 SHA256 cb0d9c2e250e773d4074a4235aef659adaf6ce25089d4eb0cfb67549cdff2bc0
-EBUILD virtualbox-ose-9999.ebuild 5536 RMD160 07a3448d464a43d9193b1e0f6e1ec7323055496c SHA1 2dd4e3d6933066d605b23e240fb8e4b3395ee345 SHA256 364be7798dd6589711e6b2d47d7e03ffeb8bb29472ced56f7971cb6c0dee2c43
-MISC ChangeLog 18232 RMD160 ddfd5f9b28ec783d5c8986d90424d1c034b58cbb SHA1 d564fc736c32899adddb2d6ffc9b2d82446b04d5 SHA256 ef77f125ac7d3492357a2601810875e2c138590eca5a0fdab86f543cbd224a4c
+DIST VirtualBox-3.0.4-OSE.tar.bz2 51381059 RMD160 7addc9d840ef751d95356a342c6a51f2c87a855b SHA1 454f4fbd46a3c7bfa0f6e48eaa37bb578446aca5 SHA256 006a25df51a209262ee93b8cf3f155e1883fa872b4b8c5d77f042675a0f302e1
+EBUILD virtualbox-ose-3.0.4.ebuild 6819 RMD160 66000eefb928b5c1a2435956a8e49577ea8cf145 SHA1 fed7b737677234f68d798bc7ec21f7102a8b67fa SHA256 70309a7c2a79e591cfa59ca38e6ff9b7a6a6b76eb2f6b2257248b9e057161c50
+MISC ChangeLog 18516 RMD160 a6acbb69aa8534042446ea717b02be3d070ed3f4 SHA1 c40fce0877e5f3335d909b44a643799738011cc2 SHA256 a3692ee17f3e752f94354529d3c4db34d0b2d0da18618fa3c218fdfb7dc4c5e6
 MISC metadata.xml 608 RMD160 05b2e56d330d28aed13d4a7035369e04dc1e989e SHA1 ea332f57fa454cc6f8489f6debcd991003886fc0 SHA256 ab349ab6727625054f24bbf733a3f6fabb34ba1e1f0fd845c51c70595b05b6aa
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-1.6.6-r1.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-1.6.6-r1.ebuild
deleted file mode 100644
index 9dbb8ce..0000000
--- a/app-emulation/virtualbox-ose/virtualbox-ose-1.6.6-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-1.6.6-r1.ebuild,v 1.1 2008/12/18 12:47:58 flameeyes Exp $
-
-EAPI=1
-
-inherit eutils fdo-mime flag-o-matic qt3 toolchain-funcs
-
-MY_P=VirtualBox-${PV}-OSE
-DESCRIPTION="Softwarefamily of powerful x86 virtualization"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="additions alsa headless pulseaudio +qt3 sdk"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	!headless? (
-		qt3? ( x11-libs/qt:3 )
-		x11-libs/libXcursor
-		media-libs/libsdl
-		x11-libs/libXt )"
-DEPEND="${RDEPEND}
-	dev-util/kbuild
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-devel/dev86
-	sys-power/iasl
-	media-libs/libpng
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	pulseaudio? ( media-sound/pulseaudio )"
-# sys-apps/hal is required at runtime (bug #197541)
-RDEPEND="${RDEPEND}
-	additions? ( ~app-emulation/virtualbox-ose-additions-${PV} )
-	sys-apps/usermode-utilities
-	net-misc/bridge-utils
-	sys-apps/hal"
-
-S=${WORKDIR}/${MY_P/-OSE/}
-
-pkg_setup() {
-	# known problems with gcc 4.3 and the recompiler
-	# http://www.virtualbox.org/ticket/936
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "43" ]]; then
-			eerror "there are known problems with gcc 4.3 and the virtualbox"
-			eerror "recompiler stuff. Please use at least a version of gcc < 4.3"
-			die "gcc 4.3 cannot build the virtualbox recompiler"
-	fi
-
-	if ! use headless; then
-			# 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
-			if ! use qt3; then
-					einfo ""
-					einfo "No USE=\"qt3\" selected, this build will not include"
-					einfo "any Qt frontend."
-					einfo ""
-			fi
-	else
-			if use qt3; then
-					einfo ""
-					einfo "You selected USE=\"qt3 headless\", defaulting to"
-					einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-					einfo ""
-			fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
-
-	# Don't build things unused or splitted into separate ebuilds (eg: additions)
-	epatch "${FILESDIR}/${P}-remove-unused.patch"
-
-	# Fix Insecure temp file usage, see bug #245958
-	epatch "${FILESDIR}/${PN}-fix-insecure-lockfiles.patch"
-}
-
-src_compile() {
-
-	local myconf
-	# Don't build vboxdrv kernel module
-	myconf="--disable-kmods --disable-qt4"
-
-	if ! use pulseaudio; then
-			myconf="${myconf} --disable-pulse"
-	fi
-	if ! use alsa; then
-			myconf="${myconf} --disable-alsa"
-	fi
-	if ! use headless; then
-			if ! use qt3; then
-					myconf="${myconf} --disable-qt"
-			fi
-	else
-			myconf="${myconf} --build-headless"
-	fi
-
-	./configure --with-gcc="$(tc-getCC)" --with-g++="$(tc-getCXX)" \
-	${myconf} || die "configure failed"
-	source ./env.sh
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	# and strip all flags
-	strip-flags
-
-	MAKE="kmk" emake TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm \
-		all || die "kmk failed"
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/release/bin
-
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-1-config" vbox.cfg
-	newins "${FILESDIR}/${PN}-interfaces" interfaces
-
-	insinto /opt/VirtualBox
-	if use sdk; then
-		doins -r sdk
-		fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl
-		fperms 0750 /opt/VirtualBox/sdk/bin/xpidl
-	fi
-
-	rm -rf sdk src tst* testcase xpidl SUPInstall SUPUninstall VBox.png \
-	VBoxBFE vditool VBoxSysInfo.sh vboxkeyboard.tar.gz
-
-	doins -r *
-
-	if ! use headless; then
-			for each in VBox{Manage,SDL,SVC,XPCOMIPCD,Tunctl,Headless} ; do
-				fowners root:vboxusers /opt/VirtualBox/${each}
-				fperms 0750 /opt/VirtualBox/${each}
-			done
-
-			if use qt3; then
-				fowners root:vboxusers /opt/VirtualBox/VirtualBox
-				fperms 0750 /opt/VirtualBox/VirtualBox
-
-				dosym /opt/VirtualBox/VBox.sh /usr/bin/VirtualBox
-			fi
-
-			dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxSDL
-
-			newicon	"${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png ${PN}.png
-			domenu "${FILESDIR}"/${PN}.desktop
-	else
-			for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,Headless} ; do
-				fowners root:vboxusers /opt/VirtualBox/${each}
-				fperms 0750 /opt/VirtualBox/${each}
-			done
-	fi
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-1-wrapper" "VBox.sh" || die
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-	newexe "${S}"/src/VBox/Installer/linux/VBoxAddIF.sh "VBoxAddIF.sh" || die
-	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/VBoxVRDP
-	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\""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The last user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-2.2.4.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-2.2.4.ebuild
deleted file mode 100644
index bf1c383..0000000
--- a/app-emulation/virtualbox-ose/virtualbox-ose-2.2.4.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-2.1.4-r2.ebuild,v 1.2 2009/03/22 13:36:43 patrick Exp $
-
-EAPI=2
-
-inherit eutils fdo-mime flag-o-matic linux-info pax-utils qt4 toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	# XXX: should finish merging the -9999 ebuild into this one ...
-	ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
-	inherit linux-mod subversion
-else
-	MY_P=VirtualBox-${PV}-OSE
-	SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-	S=${WORKDIR}/${MY_P/-OSE/_OSE}
-fi
-
-DESCRIPTION="Software family of powerful x86 virtualization"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+additions alsa +hal headless pulseaudio +opengl python +qt4 sdk vboxwebsrv"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	!headless? (
-		qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
-		opengl? ( virtual/opengl virtual/glut )
-		x11-libs/libXcursor
-		media-libs/libsdl[X,video]
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.5-r1
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-devel/dev86
-	sys-power/iasl
-	media-libs/libpng
-	sys-libs/libcap
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	hal? ( sys-apps/hal )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( >=dev-lang/python-2.3 )
-	vboxwebsrv? ( >=net-libs/gsoap-2.7.9f )"
-RDEPEND="${RDEPEND}
-	additions? ( ~app-emulation/virtualbox-ose-additions-${PV} )"
-
-pkg_setup() {
-	if ! use headless && ! use qt4 ; then
-		einfo "No USE=\"qt4\" selected, this build will not include"
-		einfo "any Qt frontend."
-	elif use headless && use qt4 ; then
-		einfo "You selected USE=\"headless qt4\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s/MY_LIBDIR/$(get_libdir)/" \
-		"${FILESDIR}"/${PN}-2-localconfig > LocalConfig.kmk || die
-}
-
-src_configure() {
-	local myconf
-	use alsa       || myconf="${myconf} --disable-alsa"
-	use opengl     || myconf="${myconf} --disable-opengl"
-	use pulseaudio || myconf="${myconf} --disable-pulse"
-	use python     || myconf="${myconf} --disable-python"
-	use hal        || myconf="${myconf} --disable-dbus"
-	use vboxwebsrv && myconf="${myconf} --enable-webservice"
-	if ! use headless ; then
-		use qt4 || myconf="${myconf} --disable-qt4"
-	else
-		myconf="${myconf} --build-headless --disable-opengl"
-	fi
-	# not an autoconf script
-	./configure \
-		--with-gcc="$(tc-getCC)" \
-		--with-g++="$(tc-getCXX)" \
-		--disable-kmods \
-		${myconf} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	# and strip all flags
-	strip-flags
-
-	MAKE="kmk" emake \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
-		all || die "kmk failed"
-}
-
-src_install() {
-	cd "${S}"/out/linux.*/release/bin || die
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-2-config" vbox.cfg
-
-	# Set the right libdir
-	sed -i \
-		-e "s/MY_LIBDIR/$(get_libdir)/" \
-		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Symlink binaries to the shipped wrapper
-	exeinto /usr/$(get_libdir)/${PN}
-	newexe "${FILESDIR}/${PN}-2-wrapper" "VBox" || die
-	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
-	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
-
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
-	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	# Install binaries and libraries
-	insinto /usr/$(get_libdir)/${PN}
-	doins -r components || die
-
-	if use sdk ; then
-		doins -r sdk || die
-	fi
-
-	if use vboxwebsrv ; then
-		doins vboxwebsrv || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
-		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl} *so *r0 *gc ; do
-		doins $each || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
-	done
-
-	if ! use headless ; then
-		for each in VBox{SDL,Headless} ; do
-			doins $each || die
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-			fperms 4750 /usr/$(get_libdir)/${PN}/${each}
-			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
-		done
-
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
-
-		if use qt4 ; then
-			doins VirtualBox || die
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
-			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
-			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
-
-			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
-		fi
-
-		newicon	"${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png ${PN}.png
-		domenu "${FILESDIR}"/${PN}.desktop
-	else
-		doins VBoxHeadless || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
-		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
-		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
-	fi
-
-	insinto /usr/share/${PN}
-	doins -r nls
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	if ! use headless ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The lastest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-3.0.2-r1.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-3.0.4.ebuild
index e606749..4ff0223 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-3.0.2-r1.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-3.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.0.2.ebuild,v 1.1 2009/07/16 21:43:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.0.2-r1.ebuild,v 1.1 2009/07/25 15:34:38 patrick Exp $
 
 EAPI=2
 
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild
deleted file mode 100644
index 05cd0a2..0000000
--- a/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild,v 1.5 2008/12/18 12:47:58 flameeyes Exp $
-
-EAPI=2
-
-inherit eutils fdo-mime flag-o-matic linux-mod pax-utils qt4 subversion toolchain-funcs
-
-DESCRIPTION="Softwarefamily of powerful x86 virtualization"
-HOMEPAGE="http://www.virtualbox.org/"
-ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="alsa +hal headless +opengl pulseaudio python +qt4 sdk"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	!app-emulation/virtualbox-ose-additions
-	!app-emulation/virtualbox-modules
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	!headless? (
-		qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
-		opengl? ( virtual/opengl virtual/glut )
-		x11-libs/libXcursor
-		media-libs/libsdl[X]
-		x11-libs/libXt )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.5-r1
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-devel/dev86
-	sys-power/iasl
-	media-libs/libpng
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	hal? ( sys-apps/hal )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( >=dev-lang/python-2.3 )"
-RDEPEND="${RDEPEND}
-	sys-apps/usermode-utilities
-	net-misc/bridge-utils"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)
-			vboxnetflt(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)"
-MY_LIBDIR="$(get_libdir)"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-
-	# Add the vboxusers group before src_install, see (bug #184504)
-	enewgroup vboxusers
-}
-
-src_configure() {
-	local myconf
-	# Don't build vboxdrv kernel module
-	myconf="--disable-kmods"
-
-	use alsa       || myconf="${myconf} --disable-alsa"
-	use opengl     || myconf="${myconf} --disable-opengl"
-	use pulseaudio || myconf="${myconf} --disable-pulse"
-	use python     || myconf="${myconf} --disable-python"
-	use hal        || myconf="${myconf} --disable-dbus"
-	use vboxwebsrv && myconf="${myconf} --enable-webservice"
-	if ! use headless ; then
-		use qt4 || myconf="${myconf} --disable-qt4"
-	else
-		myconf="${myconf} --build-headless --disable-opengl"
-	fi
-
-	# not an autoconf script
-	./configure \
-	--with-gcc="$(tc-getCC)" \
-	--with-g++="$(tc-getCXX)" \
-	--disable-kmods \
-	${myconf} \
-	|| die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	# and strip all flags
-	strip-flags
-
-	MAKE="kmk" emake TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
-		all || die "kmk failed"
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin || die
-
-	# create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-2-config" vbox.cfg
-
-	# Set the right libdir
-	sed -i \
-			-e "s/MY_LIBDIR/${MY_LIBDIR}/" \
-			"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# symlink binaries to the shipped wrapper
-	exeinto /usr/${MY_LIBDIR}/${PN}
-	newexe "${FILESDIR}/${PN}-2-wrapper" "VBox" || die
-	fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBox
-	fperms 0750 /usr/${MY_LIBDIR}/${PN}/VBox
-
-	dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxManage
-	dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxVRDP
-	dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxHeadless
-	dosym /usr/${MY_LIBDIR}/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	# install binaries and libraries
-	insinto /usr/${MY_LIBDIR}/${PN}
-	doins -r components
-
-	if use sdk; then
-		doins -r sdk
-	fi
-
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl} *so *r0 *gc ; do
-		doins $each
-		fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/${each}
-		fperms 0750 /usr/${MY_LIBDIR}/${PN}/${each}
-	done
-
-	if use amd64; then
-		doins VBoxREM2.rel
-		fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBoxREM2.rel
-		fperms 0750 /usr/${MY_LIBDIR}/${PN}/VBoxREM2.rel
-	fi
-
-	if ! use headless; then
-			for each in VBox{SDL,Headless} ; do
-				doins $each
-				fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/${each}
-				fperms 4750 /usr/${MY_LIBDIR}/${PN}/${each}
-				pax-mark -m "${D}"/usr/${MY_LIBDIR}/${PN}/${each}
-			done
-
-			dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxSDL
-
-			if use qt4; then
-				doins VirtualBox
-				fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VirtualBox
-				fperms 4750 /usr/${MY_LIBDIR}/${PN}/VirtualBox
-				pax-mark -m "${D}"/usr/${MY_LIBDIR}/${PN}/VirtualBox
-
-				dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VirtualBox
-			fi
-
-			newicon "${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png ${PN}.png
-			domenu "${FILESDIR}"/${PN}.desktop
-	else
-			doins VBoxHeadless
-			fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBoxHeadless
-			fperms 4750 /usr/${MY_LIBDIR}/${PN}/VBoxHeadless
-			pax-mark -m "${D}"/usr/${MY_LIBDIR}/${PN}/VBoxHeadless
-	fi
-
-	insinto /usr/share/${PN}
-	doins -r nls
-
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	fdo-mime_desktop_database_update
-	elog "To launch VirtualBox just type: \"VirtualBox\""
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "Due to the nature of the build process, there are not"
-	elog "additions available for the live ebuild"
-	elog ""
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}