Version bump. Removed old.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

25 files changed, 62 insertions, 2501 deletions

diff --git a/app-emulation/virtualbox-additions/ChangeLog b/app-emulation/virtualbox-additions/ChangeLog
index dbcf9128ffb2..4c0bc014faea 100644
--- a/app-emulation/virtualbox-additions/ChangeLog
+++ b/app-emulation/virtualbox-additions/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virtualbox-additions
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/ChangeLog,v 1.45 2012/04/24 17:07:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/ChangeLog,v 1.46 2012/04/26 18:19:44 polynomial-c Exp $
+
+*virtualbox-additions-4.1.14 (26 Apr 2012)
+
+  26 Apr 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-additions-4.1.4.ebuild, -virtualbox-additions-4.1.8.ebuild,
+  -virtualbox-additions-4.1.10.ebuild, +virtualbox-additions-4.1.14.ebuild:
+  Version bump. Removed old.
 
   24 Apr 2012; Agostino Sarubbo <ago@gentoo.org>
   virtualbox-additions-4.1.12.ebuild:
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.10.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.14.ebuild
index d8e045be945c..ae057f0488bc 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.10.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.10.ebuild,v 1.1 2012/03/15 09:54:55 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.14.ebuild,v 1.1 2012/04/26 18:19:44 polynomial-c Exp $
 
 EAPI=2
 
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.4.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.4.ebuild
deleted file mode 100644
index cd281da51daf..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.4.ebuild,v 1.3 2011/12/07 17:28:33 phajdan.jr Exp $
-
-EAPI=2
-
-inherit eutils
-
-MY_PN=VBoxGuestAdditions
-MY_P=${MY_PN}_${PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	!=app-emulation/virtualbox-9999"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.8.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.8.ebuild
deleted file mode 100644
index b2e61032e467..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.8.ebuild,v 1.3 2012/04/09 12:03:13 maekke Exp $
-
-EAPI=2
-
-inherit eutils
-
-MY_PN=VBoxGuestAdditions
-MY_P=${MY_PN}_${PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	!=app-emulation/virtualbox-9999"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index d32545e001e3..da11ef7fc839 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.131 2012/04/24 17:07:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.132 2012/04/26 18:19:19 polynomial-c Exp $
+
+*virtualbox-bin-4.1.14 (26 Apr 2012)
+
+  26 Apr 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-bin-4.1.4.ebuild, -virtualbox-bin-4.1.8.ebuild,
+  -virtualbox-bin-4.1.10.ebuild, +virtualbox-bin-4.1.14.ebuild:
+  Version bump. Removed old.
 
   24 Apr 2012; Agostino Sarubbo <ago@gentoo.org> virtualbox-bin-4.1.12.ebuild:
   Stable for amd64, wrt bug #412565
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.10.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.14.ebuild
index 7453b6914b0d..463cb5a23516 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.10.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.14.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.10.ebuild,v 1.2 2012/03/16 19:53:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.14.ebuild,v 1.1 2012/04/26 18:19:19 polynomial-c Exp $
 
 EAPI=2
 
 inherit eutils unpacker fdo-mime gnome2 pax-utils
 
-MY_PV=${PV}-76795
+MY_PV=${PV}-77440
 SDK_PV=${MY_PV}
 EXTP_PV=${SDK_PV}
 MY_P=VirtualBox-${MY_PV}-Linux
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild
deleted file mode 100644
index 2c554ff89a7c..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild
+++ /dev/null
@@ -1,330 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild,v 1.4 2012/02/05 05:25:37 vapier Exp $
-
-EAPI=2
-
-inherit eutils unpacker fdo-mime pax-utils
-
-MY_PV=${PV}-74291
-SDK_PV=${MY_PV}
-EXTP_PV=${MY_PV}
-MY_P=VirtualBox-${MY_PV}-Linux
-EXTP_PN=Oracle_VM_VirtualBox_Extension_Pack
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run )
-	x86? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run )
-	sdk? ( http://download.virtualbox.org/virtualbox/${PV}/VirtualBoxSDK-${SDK_PV}.zip )
-	http://download.virtualbox.org/virtualbox/${PV}/${EXTP_PN}-${EXTP_PV}.vbox-extpack -> ${EXTP_PN}-${EXTP_PV}.tar.gz"
-
-LICENSE="GPL-2 PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="!!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${PV}
-	!headless? (
-		x11-libs/libXcursor
-		media-libs/libsdl[X]
-		x11-libs/libXrender
-		x11-libs/libXfixes
-		media-libs/libpng
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXinerama
-		x11-libs/libXft
-		media-libs/freetype
-		media-libs/fontconfig
-		x11-libs/libXext
-		dev-libs/glib
-		chm? ( dev-libs/expat )
-	)
-	x11-libs/libXt
-	dev-libs/libxml2
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXdmcp
-	python? ( || (
-			dev-lang/python:2.7
-			dev-lang/python:2.6
-			dev-lang/python:2.5
-			dev-lang/python:2.4
-		) )"
-
-S=${WORKDIR}
-
-QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
-QA_TEXTRELS_x86="opt/VirtualBox/VBoxGuestPropSvc.so
-	opt/VirtualBox/VBoxSDL.so
-	opt/VirtualBox/VBoxDbg.so
-	opt/VirtualBox/VBoxSharedFolders.so
-	opt/VirtualBox/VBoxDD2.so
-	opt/VirtualBox/VBoxOGLrenderspu.so
-	opt/VirtualBox/VBoxPython.so
-	opt/VirtualBox/VBoxPython2_3.so
-	opt/VirtualBox/VBoxPython2_4.so
-	opt/VirtualBox/VBoxPython2_5.so
-	opt/VirtualBox/VBoxPython2_6.so
-	opt/VirtualBox/VBoxPython2_7.so
-	opt/VirtualBox/VBoxPython3_0.so
-	opt/VirtualBox/VBoxPython3_1.so
-	opt/VirtualBox/VBoxDD.so
-	opt/VirtualBox/VBoxVRDP.so
-	opt/VirtualBox/VBoxDDU.so
-	opt/VirtualBox/VBoxREM64.so
-	opt/VirtualBox/VBoxSharedClipboard.so
-	opt/VirtualBox/VBoxHeadless.so
-	opt/VirtualBox/VBoxRT.so
-	opt/VirtualBox/VRDPAuth.so
-	opt/VirtualBox/VBoxREM.so
-	opt/VirtualBox/VBoxSettings.so
-	opt/VirtualBox/VBoxKeyboard.so
-	opt/VirtualBox/VBoxSharedCrOpenGL.so
-	opt/VirtualBox/VBoxVMM.so
-	opt/VirtualBox/VirtualBox.so
-	opt/VirtualBox/VBoxOGLhosterrorspu.so
-	opt/VirtualBox/components/VBoxC.so
-	opt/VirtualBox/components/VBoxSVCM.so
-	opt/VirtualBox/VBoxREM32.so
-	opt/VirtualBox/VBoxPython2_5.so
-	opt/VirtualBox/VBoxXPCOMC.so
-	opt/VirtualBox/VBoxOGLhostcrutil.so
-	opt/VirtualBox/VBoxNetDHCP.so
-	opt/VirtualBox/VBoxGuestControlSvc.so"
-QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
-	opt/VirtualBox/VBoxDD2.so
-	opt/VirtualBox/VBoxDDU.so
-	opt/VirtualBox/VBoxDbg.so
-	opt/VirtualBox/VBoxGuestControlSvc.so
-	opt/VirtualBox/VBoxGuestPropSvc.so
-	opt/VirtualBox/VBoxHeadless
-	opt/VirtualBox/VBoxHeadless.so
-	opt/VirtualBox/VBoxKeyboard.so
-	opt/VirtualBox/VBoxManage
-	opt/VirtualBox/VBoxNetAdpCtl
-	opt/VirtualBox/VBoxNetDHCP
-	opt/VirtualBox/VBoxNetDHCP.so
-	opt/VirtualBox/VBoxOGLhostcrutil.so
-	opt/VirtualBox/VBoxOGLhosterrorspu.so
-	opt/VirtualBox/VBoxOGLrenderspu.so
-	opt/VirtualBox/VBoxPython.so
-	opt/VirtualBox/VBoxPython2_3.so
-	opt/VirtualBox/VBoxPython2_4.so
-	opt/VirtualBox/VBoxPython2_5.so
-	opt/VirtualBox/VBoxPython2_6.so
-	opt/VirtualBox/VBoxPython2_7.so
-	opt/VirtualBox/VBoxPython3_0.so
-	opt/VirtualBox/VBoxPython3_1.so
-	opt/VirtualBox/VBoxREM.so
-	opt/VirtualBox/VBoxREM32.so
-	opt/VirtualBox/VBoxREM64.so
-	opt/VirtualBox/VBoxRT.so
-	opt/VirtualBox/VBoxSDL
-	opt/VirtualBox/VBoxSDL.so
-	opt/VirtualBox/VBoxSVC
-	opt/VirtualBox/VBoxSettings.so
-	opt/VirtualBox/VBoxSharedClipboard.so
-	opt/VirtualBox/VBoxSharedCrOpenGL.so
-	opt/VirtualBox/VBoxSharedFolders.so
-	opt/VirtualBox/VBoxTestOGL
-	opt/VirtualBox/VBoxTunctl
-	opt/VirtualBox/VBoxVMM.so
-	opt/VirtualBox/VBoxVRDP.so
-	opt/VirtualBox/VBoxXPCOM.so
-	opt/VirtualBox/VBoxXPCOMC.so
-	opt/VirtualBox/VBoxXPCOMIPCD
-	opt/VirtualBox/VRDPAuth.so
-	opt/VirtualBox/VirtualBox
-	opt/VirtualBox/VirtualBox.so
-	opt/VirtualBox/accessible/libqtaccessiblewidgets.so
-	opt/VirtualBox/components/VBoxC.so
-	opt/VirtualBox/components/VBoxSVCM.so
-	opt/VirtualBox/components/VBoxXPCOMIPCC.so
-	opt/VirtualBox/kchmviewer
-	opt/VirtualBox/libQtCoreVBox.so.4
-	opt/VirtualBox/libQtGuiVBox.so.4
-	opt/VirtualBox/libQtNetworkVBox.so.4
-	opt/VirtualBox/libQtOpenGLVBox.so.4
-	opt/VirtualBox/vboxwebsrv"
-
-src_unpack() {
-	unpack_makeself ${MY_P}_${ARCH}.run
-	unpack ./VirtualBox.tar.bz2
-
-	mkdir "${S}"/${EXTP_PN} || die
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	unpack ${EXTP_PN}-${EXTP_PV}.tar.gz
-	popd &>/dev/null || die
-
-	if use sdk; then
-		unpack VirtualBoxSDK-${SDK_PV}.zip
-	fi
-}
-
-src_install() {
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
-
-	if ! use headless ; then
-		newicon VBox.png ${PN}.png
-		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
-	fi
-
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-	popd &>/dev/null || die
-	rm -rf "${S}"/${EXTP_PN}
-
-	insinto /opt/VirtualBox
-	dodir /opt/bin
-
-	doins UserManual.pdf
-
-	if use sdk ; then
-		doins -r sdk || die
-	fi
-
-	if use additions; then
-		doins -r additions || die
-	fi
-
-	if use vboxwebsrv; then
-		doins vboxwebsrv || die
-		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
-		fperms 0750 /opt/VirtualBox/vboxwebsrv
-		dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use rdesktop-vrdp; then
-		doins rdesktop-vrdp || die
-		doins -r rdesktop-vrdp-keymaps || die
-		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
-		dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
-	fi
-
-	if ! use headless && use chm; then
-		doins kchmviewer VirtualBox.chm || die
-		fowners root:vboxusers /opt/VirtualBox/kchmviewer
-		fperms 0750 /opt/VirtualBox/kchmviewer
-	fi
-
-	if use python; then
-		local pyver
-		for pyver in 2.4 2.5 2.6 2.7 3.0 3.1 ; do
-			if has_version "=dev-lang/python-${pyver}*" && [ -f "${S}/VBoxPython${pyver/./_}.so" ] ; then
-				doins VBoxPython${pyver/./_}.so || die
-			fi
-		done
-	fi
-
-	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
-		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
-		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
-		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
-		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
-		VBoxPython?_*.so
-
-	if use headless ; then
-		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
-	fi
-
-	doins -r * || die
-
-	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
-	dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-	dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-	dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-	dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-	dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
-	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,TestOGL,ExtPackHelperApp}; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/opt/VirtualBox/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
-	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
-
-	if ! use headless ; then
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		for each in VBox{SDL,Headless} VirtualBox; do
-			fowners root:vboxusers /opt/VirtualBox/${each}
-			fperms 4510 /opt/VirtualBox/${each}
-			pax-mark -m "${D}"/opt/VirtualBox/${each}
-		done
-
-		dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
-		dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
-	else
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
-		fperms 4510 /opt/VirtualBox/VBoxHeadless
-		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
-	fi
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh" || die
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-
-	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
-	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-	dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-	# move udev scripts into /lib/udev (bug #372491)
-	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev
-	fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	elog ""
-	if ! use headless ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\""
-		elog ""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
-	elog "an overview about the different features of ${PN}"
-	elog "and virtualbox-ose"
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.8.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.8.ebuild
deleted file mode 100644
index 758e61fd63b2..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.8.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.8.ebuild,v 1.5 2012/04/09 12:06:47 maekke Exp $
-
-EAPI=2
-
-inherit eutils unpacker fdo-mime gnome2 pax-utils
-
-MY_PV=${PV}-75467
-SDK_PV=${MY_PV}
-EXTP_PV=${SDK_PV}
-MY_P=VirtualBox-${MY_PV}-Linux
-EXTP_PN=Oracle_VM_VirtualBox_Extension_Pack
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run )
-	x86? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run )
-	sdk? ( http://download.virtualbox.org/virtualbox/${PV}/VirtualBoxSDK-${SDK_PV}.zip )
-	http://download.virtualbox.org/virtualbox/${PV}/${EXTP_PN}-${EXTP_PV}.vbox-extpack -> ${EXTP_PN}-${EXTP_PV}.tar.gz"
-
-LICENSE="GPL-2 PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="!!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${PV}
-	!headless? (
-		x11-libs/libXcursor
-		media-libs/libsdl[X]
-		x11-libs/libXrender
-		x11-libs/libXfixes
-		media-libs/libpng
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXinerama
-		x11-libs/libXft
-		media-libs/freetype
-		media-libs/fontconfig
-		x11-libs/libXext
-		dev-libs/glib
-		chm? ( dev-libs/expat )
-	)
-	x11-libs/libXt
-	dev-libs/libxml2
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXdmcp
-	python? ( || (
-			dev-lang/python:2.7
-			dev-lang/python:2.6
-			dev-lang/python:2.5
-			dev-lang/python:2.4
-		) )"
-
-S=${WORKDIR}
-
-QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
-QA_TEXTRELS_x86="opt/VirtualBox/VBoxGuestPropSvc.so
-	opt/VirtualBox/VBoxSDL.so
-	opt/VirtualBox/VBoxDbg.so
-	opt/VirtualBox/VBoxSharedFolders.so
-	opt/VirtualBox/VBoxDD2.so
-	opt/VirtualBox/VBoxOGLrenderspu.so
-	opt/VirtualBox/VBoxPython.so
-	opt/VirtualBox/VBoxPython2_3.so
-	opt/VirtualBox/VBoxPython2_4.so
-	opt/VirtualBox/VBoxPython2_5.so
-	opt/VirtualBox/VBoxPython2_6.so
-	opt/VirtualBox/VBoxPython2_7.so
-	opt/VirtualBox/VBoxPython3_0.so
-	opt/VirtualBox/VBoxPython3_1.so
-	opt/VirtualBox/VBoxDD.so
-	opt/VirtualBox/VBoxVRDP.so
-	opt/VirtualBox/VBoxDDU.so
-	opt/VirtualBox/VBoxREM64.so
-	opt/VirtualBox/VBoxSharedClipboard.so
-	opt/VirtualBox/VBoxHeadless.so
-	opt/VirtualBox/VBoxRT.so
-	opt/VirtualBox/VRDPAuth.so
-	opt/VirtualBox/VBoxREM.so
-	opt/VirtualBox/VBoxSettings.so
-	opt/VirtualBox/VBoxKeyboard.so
-	opt/VirtualBox/VBoxSharedCrOpenGL.so
-	opt/VirtualBox/VBoxVMM.so
-	opt/VirtualBox/VirtualBox.so
-	opt/VirtualBox/VBoxOGLhosterrorspu.so
-	opt/VirtualBox/components/VBoxC.so
-	opt/VirtualBox/components/VBoxSVCM.so
-	opt/VirtualBox/VBoxREM32.so
-	opt/VirtualBox/VBoxPython2_5.so
-	opt/VirtualBox/VBoxXPCOMC.so
-	opt/VirtualBox/VBoxOGLhostcrutil.so
-	opt/VirtualBox/VBoxNetDHCP.so
-	opt/VirtualBox/VBoxGuestControlSvc.so"
-QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
-	opt/VirtualBox/VBoxDD2.so
-	opt/VirtualBox/VBoxDDU.so
-	opt/VirtualBox/VBoxDbg.so
-	opt/VirtualBox/VBoxGuestControlSvc.so
-	opt/VirtualBox/VBoxGuestPropSvc.so
-	opt/VirtualBox/VBoxHeadless
-	opt/VirtualBox/VBoxHeadless.so
-	opt/VirtualBox/VBoxKeyboard.so
-	opt/VirtualBox/VBoxManage
-	opt/VirtualBox/VBoxNetAdpCtl
-	opt/VirtualBox/VBoxNetDHCP
-	opt/VirtualBox/VBoxNetDHCP.so
-	opt/VirtualBox/VBoxOGLhostcrutil.so
-	opt/VirtualBox/VBoxOGLhosterrorspu.so
-	opt/VirtualBox/VBoxOGLrenderspu.so
-	opt/VirtualBox/VBoxPython.so
-	opt/VirtualBox/VBoxPython2_3.so
-	opt/VirtualBox/VBoxPython2_4.so
-	opt/VirtualBox/VBoxPython2_5.so
-	opt/VirtualBox/VBoxPython2_6.so
-	opt/VirtualBox/VBoxPython2_7.so
-	opt/VirtualBox/VBoxPython3_0.so
-	opt/VirtualBox/VBoxPython3_1.so
-	opt/VirtualBox/VBoxREM.so
-	opt/VirtualBox/VBoxREM32.so
-	opt/VirtualBox/VBoxREM64.so
-	opt/VirtualBox/VBoxRT.so
-	opt/VirtualBox/VBoxSDL
-	opt/VirtualBox/VBoxSDL.so
-	opt/VirtualBox/VBoxSVC
-	opt/VirtualBox/VBoxSettings.so
-	opt/VirtualBox/VBoxSharedClipboard.so
-	opt/VirtualBox/VBoxSharedCrOpenGL.so
-	opt/VirtualBox/VBoxSharedFolders.so
-	opt/VirtualBox/VBoxTestOGL
-	opt/VirtualBox/VBoxTunctl
-	opt/VirtualBox/VBoxVMM.so
-	opt/VirtualBox/VBoxVRDP.so
-	opt/VirtualBox/VBoxXPCOM.so
-	opt/VirtualBox/VBoxXPCOMC.so
-	opt/VirtualBox/VBoxXPCOMIPCD
-	opt/VirtualBox/VRDPAuth.so
-	opt/VirtualBox/VirtualBox
-	opt/VirtualBox/VirtualBox.so
-	opt/VirtualBox/accessible/libqtaccessiblewidgets.so
-	opt/VirtualBox/components/VBoxC.so
-	opt/VirtualBox/components/VBoxSVCM.so
-	opt/VirtualBox/components/VBoxXPCOMIPCC.so
-	opt/VirtualBox/kchmviewer
-	opt/VirtualBox/libQtCoreVBox.so.4
-	opt/VirtualBox/libQtGuiVBox.so.4
-	opt/VirtualBox/libQtNetworkVBox.so.4
-	opt/VirtualBox/libQtOpenGLVBox.so.4
-	opt/VirtualBox/vboxwebsrv"
-
-src_unpack() {
-	unpack_makeself ${MY_P}_${ARCH}.run
-	unpack ./VirtualBox.tar.bz2
-
-	mkdir "${S}"/${EXTP_PN} || die
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	unpack ${EXTP_PN}-${EXTP_PV}.tar.gz
-	popd &>/dev/null || die
-
-	if use sdk; then
-		unpack VirtualBoxSDK-${SDK_PV}.zip
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
-
-	if ! use headless ; then
-		pushd "${S}"/icons &>/dev/null || die
-		for size in * ; do
-			if [ -f "${size}/virtualbox.png" ] ; then
-				insinto "/usr/share/icons/hicolor/${size}/apps"
-				newins "${size}/virtualbox.png" ${PN}.png
-			fi
-		done
-		dodir /usr/share/pixmaps
-		cp "48x48/virtualbox.png" "${D}/usr/share/pixmaps/${PN}.png" \
-			|| die
-		popd &>/dev/null || die
-
-		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
-	fi
-
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-	popd &>/dev/null || die
-	rm -rf "${S}"/${EXTP_PN}
-
-	insinto /opt/VirtualBox
-	dodir /opt/bin
-
-	doins UserManual.pdf
-
-	if use sdk ; then
-		doins -r sdk || die
-	fi
-
-	if use additions; then
-		doins -r additions || die
-	fi
-
-	if use vboxwebsrv; then
-		doins vboxwebsrv || die
-		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
-		fperms 0750 /opt/VirtualBox/vboxwebsrv
-		dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use rdesktop-vrdp; then
-		doins rdesktop-vrdp || die
-		doins -r rdesktop-vrdp-keymaps || die
-		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
-		dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
-	fi
-
-	if ! use headless && use chm; then
-		doins kchmviewer VirtualBox.chm || die
-		fowners root:vboxusers /opt/VirtualBox/kchmviewer
-		fperms 0750 /opt/VirtualBox/kchmviewer
-	fi
-
-	if use python; then
-		local pyver
-		for pyver in 2.4 2.5 2.6 2.7 3.0 3.1 ; do
-			if has_version "=dev-lang/python-${pyver}*" && [ -f "${S}/VBoxPython${pyver/./_}.so" ] ; then
-				doins VBoxPython${pyver/./_}.so || die
-			fi
-		done
-	fi
-
-	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
-		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
-		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
-		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
-		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
-		VBoxPython?_*.so
-
-	if use headless ; then
-		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
-	fi
-
-	doins -r * || die
-
-	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
-	dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-	dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-	dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-	dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-	dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
-	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,TestOGL,ExtPackHelperApp}; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/opt/VirtualBox/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
-	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
-
-	if ! use headless ; then
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		for each in VBox{SDL,Headless} VirtualBox; do
-			fowners root:vboxusers /opt/VirtualBox/${each}
-			fperms 4510 /opt/VirtualBox/${each}
-			pax-mark -m "${D}"/opt/VirtualBox/${each}
-		done
-
-		dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
-		dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
-	else
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
-		fperms 4510 /opt/VirtualBox/VBoxHeadless
-		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
-	fi
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh" || die
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-
-	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
-	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-	dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-	# move udev scripts into /lib/udev (bug #372491)
-	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev
-	fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	gnome2_icon_cache_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	elog ""
-	if ! use headless ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\""
-		elog ""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
-	elog "an overview about the different features of ${PN}"
-	elog "and virtualbox-ose"
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/ChangeLog b/app-emulation/virtualbox-extpack-oracle/ChangeLog
index 289e617f45d0..d9329060643c 100644
--- a/app-emulation/virtualbox-extpack-oracle/ChangeLog
+++ b/app-emulation/virtualbox-extpack-oracle/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/virtualbox-extpack-oracle
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/ChangeLog,v 1.23 2012/04/24 17:08:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/ChangeLog,v 1.24 2012/04/26 18:20:52 polynomial-c Exp $
+
+*virtualbox-extpack-oracle-4.1.14 (26 Apr 2012)
+
+  26 Apr 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-extpack-oracle-4.1.4.ebuild,
+  -virtualbox-extpack-oracle-4.1.8.ebuild,
+  -virtualbox-extpack-oracle-4.1.10.ebuild,
+  +virtualbox-extpack-oracle-4.1.14.ebuild:
+  Version bump. Removed old.
 
   24 Apr 2012; Agostino Sarubbo <ago@gentoo.org>
   virtualbox-extpack-oracle-4.1.12.ebuild:
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.10.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.14.ebuild
index d12680817cb2..bcbc39436ee1 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.10.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.14.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.10.ebuild,v 1.1 2012/03/15 09:55:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.14.ebuild,v 1.1 2012/04/26 18:20:52 polynomial-c Exp $
 
 EAPI=2
 
 inherit eutils
 
-MY_BUILD="76795"
+MY_BUILD="77440"
 MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
 MY_P="${MY_PN}-${PV}-${MY_BUILD}"
 
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.4.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.4.ebuild
deleted file mode 100644
index 78a23a600d58..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.4.ebuild,v 1.3 2011/12/07 17:28:48 phajdan.jr Exp $
-
-EAPI=2
-
-inherit eutils
-
-MY_BUILD="74291"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${PV}-${MY_BUILD}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="~app-emulation/virtualbox-${PV}"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.8.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.8.ebuild
deleted file mode 100644
index d1ac69c35542..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.8.ebuild,v 1.3 2012/04/09 12:08:03 maekke Exp $
-
-EAPI=2
-
-inherit eutils
-
-MY_BUILD="75467"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${PV}-${MY_BUILD}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="~app-emulation/virtualbox-${PV}"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index 7407c7cc83b7..fb59b1d87705 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/virtualbox-guest-additions
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.95 2012/04/24 17:08:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.96 2012/04/26 18:22:41 polynomial-c Exp $
+
+*virtualbox-guest-additions-4.1.14 (26 Apr 2012)
+
+  26 Apr 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-guest-additions-4.1.4-r1.ebuild,
+  -virtualbox-guest-additions-4.1.8.ebuild,
+  -virtualbox-guest-additions-4.1.10.ebuild,
+  +virtualbox-guest-additions-4.1.14.ebuild:
+  Version bump. Removed old.
 
   24 Apr 2012; Agostino Sarubbo <ago@gentoo.org>
   virtualbox-guest-additions-4.1.12.ebuild:
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.10.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.14.ebuild
index e240a06f6155..18c1448bca00 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.10.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.10.ebuild,v 1.2 2012/03/15 16:52:24 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.14.ebuild,v 1.1 2012/04/26 18:22:41 polynomial-c Exp $
 
 EAPI=2
 
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4-r1.ebuild
deleted file mode 100644
index 9889bb15d4d1..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4-r1.ebuild,v 1.3 2011/12/07 17:29:29 phajdan.jr Exp $
-
-EAPI=2
-
-inherit eutils linux-mod
-
-MY_P=VirtualBox-${PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
-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="X"
-
-RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
-			 x11-apps/xrandr
-			 x11-apps/xrefresh
-			 x11-libs/libXmu
-			 x11-libs/libX11
-			 x11-libs/libXt
-			 x11-libs/libXext
-			 x11-libs/libXau
-			 x11-libs/libXdmcp
-			 x11-libs/libSM
-			 x11-libs/libICE )
-	!!x11-drivers/xf86-input-virtualbox"
-DEPEND="${RDEPEND}
-		>=dev-util/kbuild-0.1.999
-		>=dev-lang/yasm-0.6.2
-		sys-devel/bin86
-		sys-devel/dev86
-		sys-libs/pam
-		sys-power/iasl
-		X? ( x11-proto/renderproto )
-		!X? ( x11-proto/xproto )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-			vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
-
-S="${WORKDIR}/${MY_P}_OSE"
-
-pkg_setup() {
-		linux-mod_pkg_setup
-		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-		enewgroup vboxguest
-		enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Create and unpack a tarball with the sources of the Linux guest
-	# kernel modules, to include all the needed files
-	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
-	unpack ./vbox-kmod.tar.gz
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	cd "${S}"
-	rm -rf kBuild/bin tools
-}
-
-src_prepare() {
-	# PaX fixes (see bug #298988)
-	pushd "${WORKDIR}" &>/dev/null || die
-	epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
-
-	# stupid new header references...
-	for vboxheader in {product,revision}-generated.h ; do
-		for mdir in vbox{guest,sf} ; do
-			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-				"${WORKDIR}/${mdir}/${vboxheader}"
-		done
-	done
-}
-
-src_configure() {
-		# build the user-space tools, warnings are harmless
-		./configure --nofatal \
-		--disable-xpcom \
-		--disable-sdl-ttf \
-		--disable-pulse \
-		--disable-alsa \
-		--build-headless || die "configure failed"
-}
-
-src_compile() {
-		source ./env.sh
-
-		for each in /src/VBox/{Runtime,Additions/common} \
-		/src/VBox/Additions/linux/{sharedfolders,daemon} ; do
-				cd "${S}"${each}
-				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxControl failed"
-		done
-
-		if use X; then
-				cd "${S}"/src/VBox/Additions/x11/VBoxClient
-				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxClient failed"
-		fi
-
-		# Now creating the kernel modules. We must do this _after_
-		# we compiled the user-space tools as we need two of the
-		# automatically generated header files. (>=3.2.0)
-		linux-mod_src_compile
-}
-
-src_install() {
-		linux-mod_src_install
-
-		cd "${S}"/out/linux.${ARCH}/release/bin/additions
-
-		insinto /sbin
-		newins mount.vboxsf mount.vboxsf
-		fperms 4755 /sbin/mount.vboxsf
-
-		newinitd "${FILESDIR}"/${PN}-7.initd ${PN}
-
-		insinto /usr/sbin/
-		newins VBoxService vboxguest-service
-		fperms 0755 /usr/sbin/vboxguest-service
-
-		insinto /usr/bin
-		doins VBoxControl
-		fperms 0755 /usr/bin/VBoxControl
-
-		# VBoxClient user service and xrandr wrapper
-		if use X; then
-			doins VBoxClient
-			fperms 0755 /usr/bin/VBoxClient
-
-			cd "${S}"/src/VBox/Additions/x11/Installer
-			newins 98vboxadd-xclient VBoxClient-all
-			fperms 0755 /usr/bin/VBoxClient-all
-		fi
-
-		# udev rule for vboxdrv
-		dodir /lib/udev/rules.d
-		echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
-			|| die
-		echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
-			|| die
-
-		# VBoxClient autostart file
-		insinto /etc/xdg/autostart
-		doins "${FILESDIR}"/vboxclient.desktop
-
-		# sample xorg.conf
-		insinto /usr/share/doc/${PF}
-		doins "${FILESDIR}"/xorg.conf.vbox
-}
-
-pkg_postinst() {
-		linux-mod_pkg_postinst
-		if ! use X ; then
-			elog "use flag X is off, enable it to install the"
-			elog "X Window System input and video drivers"
-		fi
-		elog ""
-		elog "Please add users to the \"vboxguest\" group so they can"
-		elog "benefit from seamless mode, auto-resize and clipboard."
-		elog ""
-		elog "Please add:"
-		elog "/etc/init.d/${PN}"
-		elog "to the default runlevel in order to start"
-		elog "needed services."
-		elog "To use the VirtualBox X drivers, use the following"
-		elog "file as your /etc/X11/xorg.conf:"
-		elog "    /usr/share/doc/${PF}/xorg.conf.xorg"
-		elog ""
-		elog "Also make sure you use the Mesa library for OpenGL:"
-		elog "    eselect opengl set xorg-x11"
-		elog ""
-		elog "An autostart .desktop file has been installed to start"
-		elog "VBoxClient in desktop sessions."
-		elog ""
-		elog "You can mount shared folders with:"
-		elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-		elog ""
-		elog "Warning:"
-		elog "this ebuild is only needed if you are running gentoo"
-		elog "inside a VirtualBox Virtual Machine, you don't need"
-		elog "it to run VirtualBox itself."
-		elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.8.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.8.ebuild
deleted file mode 100644
index 6cec4e059743..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.8.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.8.ebuild,v 1.3 2012/04/09 12:06:08 maekke Exp $
-
-EAPI=2
-
-inherit eutils linux-mod
-
-MY_P=VirtualBox-${PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
-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="X"
-
-RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
-			 x11-apps/xrandr
-			 x11-apps/xrefresh
-			 x11-libs/libXmu
-			 x11-libs/libX11
-			 x11-libs/libXt
-			 x11-libs/libXext
-			 x11-libs/libXau
-			 x11-libs/libXdmcp
-			 x11-libs/libSM
-			 x11-libs/libICE )
-	!!x11-drivers/xf86-input-virtualbox"
-DEPEND="${RDEPEND}
-		>=dev-util/kbuild-0.1.999
-		>=dev-lang/yasm-0.6.2
-		sys-devel/bin86
-		sys-devel/dev86
-		sys-libs/pam
-		sys-power/iasl
-		X? ( x11-proto/renderproto )
-		!X? ( x11-proto/xproto )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-			vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
-
-S="${WORKDIR}/${MY_P}_OSE"
-
-pkg_setup() {
-		linux-mod_pkg_setup
-		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-		enewgroup vboxguest
-		enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Create and unpack a tarball with the sources of the Linux guest
-	# kernel modules, to include all the needed files
-	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
-	unpack ./vbox-kmod.tar.gz
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	cd "${S}"
-	rm -rf kBuild/bin tools
-}
-
-src_prepare() {
-	# PaX fixes (see bug #298988)
-	pushd "${WORKDIR}" &>/dev/null || die
-	epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
-
-	# stupid new header references...
-	for vboxheader in {product,revision}-generated.h ; do
-		for mdir in vbox{guest,sf} ; do
-			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-				"${WORKDIR}/${mdir}/${vboxheader}"
-		done
-	done
-}
-
-src_configure() {
-		# build the user-space tools, warnings are harmless
-		./configure --nofatal \
-		--disable-xpcom \
-		--disable-sdl-ttf \
-		--disable-pulse \
-		--disable-alsa \
-		--build-headless || die "configure failed"
-}
-
-src_compile() {
-		source ./env.sh
-
-		for each in /src/VBox/{Runtime,Additions/common} \
-		/src/VBox/Additions/linux/{sharedfolders,daemon} ; do
-				cd "${S}"${each}
-				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxControl failed"
-		done
-
-		if use X; then
-				cd "${S}"/src/VBox/Additions/x11/VBoxClient
-				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxClient failed"
-		fi
-
-		# Now creating the kernel modules. We must do this _after_
-		# we compiled the user-space tools as we need two of the
-		# automatically generated header files. (>=3.2.0)
-		linux-mod_src_compile
-}
-
-src_install() {
-		linux-mod_src_install
-
-		cd "${S}"/out/linux.${ARCH}/release/bin/additions
-
-		insinto /sbin
-		newins mount.vboxsf mount.vboxsf
-		fperms 4755 /sbin/mount.vboxsf
-
-		newinitd "${FILESDIR}"/${PN}-7.initd ${PN}
-
-		insinto /usr/sbin/
-		newins VBoxService vboxguest-service
-		fperms 0755 /usr/sbin/vboxguest-service
-
-		insinto /usr/bin
-		doins VBoxControl
-		fperms 0755 /usr/bin/VBoxControl
-
-		# VBoxClient user service and xrandr wrapper
-		if use X; then
-			doins VBoxClient
-			fperms 0755 /usr/bin/VBoxClient
-
-			cd "${S}"/src/VBox/Additions/x11/Installer
-			newins 98vboxadd-xclient VBoxClient-all
-			fperms 0755 /usr/bin/VBoxClient-all
-		fi
-
-		# udev rule for vboxdrv
-		dodir /lib/udev/rules.d
-		echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
-			|| die
-		echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
-			|| die
-
-		# VBoxClient autostart file
-		insinto /etc/xdg/autostart
-		doins "${FILESDIR}"/vboxclient.desktop
-
-		# sample xorg.conf
-		insinto /usr/share/doc/${PF}
-		doins "${FILESDIR}"/xorg.conf.vbox
-}
-
-pkg_postinst() {
-		linux-mod_pkg_postinst
-		if ! use X ; then
-			elog "use flag X is off, enable it to install the"
-			elog "X Window System input and video drivers"
-		fi
-		elog ""
-		elog "Please add users to the \"vboxguest\" group so they can"
-		elog "benefit from seamless mode, auto-resize and clipboard."
-		elog ""
-		elog "Please add:"
-		elog "/etc/init.d/${PN}"
-		elog "to the default runlevel in order to start"
-		elog "needed services."
-		elog "To use the VirtualBox X drivers, use the following"
-		elog "file as your /etc/X11/xorg.conf:"
-		elog "    /usr/share/doc/${PF}/xorg.conf.xorg"
-		elog ""
-		elog "Also make sure you use the Mesa library for OpenGL:"
-		elog "    eselect opengl set xorg-x11"
-		elog ""
-		elog "An autostart .desktop file has been installed to start"
-		elog "VBoxClient in desktop sessions."
-		elog ""
-		elog "You can mount shared folders with:"
-		elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-		elog ""
-		elog "Warning:"
-		elog "this ebuild is only needed if you are running gentoo"
-		elog "inside a VirtualBox Virtual Machine, you don't need"
-		elog "it to run VirtualBox itself."
-		elog ""
-}
diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog
index 7edd461ced6d..aa32860e0756 100644
--- a/app-emulation/virtualbox-modules/ChangeLog
+++ b/app-emulation/virtualbox-modules/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virtualbox-modules
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.103 2012/04/24 17:08:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.104 2012/04/26 18:18:43 polynomial-c Exp $
+
+*virtualbox-modules-4.1.14 (26 Apr 2012)
+
+  26 Apr 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-modules-4.1.4.ebuild, -virtualbox-modules-4.1.8.ebuild,
+  -virtualbox-modules-4.1.10.ebuild, +virtualbox-modules-4.1.14.ebuild:
+  Version bump. Removed old.
 
   24 Apr 2012; Agostino Sarubbo <ago@gentoo.org>
   virtualbox-modules-4.1.12.ebuild:
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.10.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.14.ebuild
index ad55197755d6..f60c28dffe56 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.10.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.10.ebuild,v 1.1 2012/03/15 09:52:06 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.14.ebuild,v 1.1 2012/04/26 18:18:43 polynomial-c Exp $
 
 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild
deleted file mode 100644
index e9f0fedbed48..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild,v 1.5 2011/12/07 17:26:06 phajdan.jr Exp $
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=2
-
-inherit eutils linux-mod
-
-MY_P=vbox-kernel-module-src-${PV}
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-	enewgroup vboxusers
-}
-
-src_prepare() {
-	if kernel_is -ge 2 6 33 ; then
-		# evil patch for new kernels - header moved
-		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
-	fi
-
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog "Starting with the 3.x release new kernel modules were added,"
-	elog "be sure to load all the needed modules."
-	elog ""
-	elog "Please add \"vboxdrv\", \"vboxnetflt\" and \"vboxnetadp\" to:"
-	elog "/etc/conf.d/modules"
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.8.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.8.ebuild
deleted file mode 100644
index e5102f7cbd3b..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.8.ebuild,v 1.3 2012/04/09 12:04:48 maekke Exp $
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=4
-
-inherit eutils linux-mod
-
-MY_P=vbox-kernel-module-src-${PV}
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-	enewgroup vboxusers
-}
-
-src_prepare() {
-	if kernel_is -ge 2 6 33 ; then
-		# evil patch for new kernels - header moved
-		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
-	fi
-
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog "Starting with the 3.x release new kernel modules were added,"
-	elog "be sure to load all the needed modules."
-	elog ""
-	elog "Please add \"vboxdrv\", \"vboxnetflt\" and \"vboxnetadp\" to:"
-	elog "/etc/conf.d/modules"
-}
diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index bb3d6702f591..a88dc480cb09 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.107 2012/04/24 17:06:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.108 2012/04/26 18:20:25 polynomial-c Exp $
+
+*virtualbox-4.1.14 (26 Apr 2012)
+
+  26 Apr 2012; Lars Wendler <polynomial-c@gentoo.org> -virtualbox-4.1.4.ebuild,
+  -virtualbox-4.1.8.ebuild, -virtualbox-4.1.8-r1.ebuild,
+  -virtualbox-4.1.10.ebuild, +virtualbox-4.1.14.ebuild:
+  Version bump. Removed old.
 
   24 Apr 2012; Agostino Sarubbo <ago@gentoo.org> virtualbox-4.1.12.ebuild:
   Stable for amd64, wrt bug #412565
diff --git a/app-emulation/virtualbox/virtualbox-4.1.10.ebuild b/app-emulation/virtualbox/virtualbox-4.1.10.ebuild
deleted file mode 100644
index d7e6c1f4b6b2..000000000000
--- a/app-emulation/virtualbox/virtualbox-4.1.10.ebuild
+++ /dev/null
@@ -1,391 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.10.ebuild,v 1.3 2012/04/05 07:44:41 polynomial-c Exp $
-
-EAPI=4
-
-inherit eutils fdo-mime flag-o-matic linux-info pax-utils python qt4-r2 toolchain-funcs java-pkg-opt-2
-
-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}
-	SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/openssl
-	dev-libs/libxml2
-	sys-libs/zlib
-	!headless? (
-		qt4? (
-			x11-libs/qt-gui:4
-			x11-libs/qt-core:4
-			opengl? ( x11-libs/qt-opengl:4 )
-			x11-libs/libXinerama
-		)
-		opengl? ( virtual/opengl media-libs/freeglut )
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		media-libs/libsdl[X,video]
-	)
-	vnc? ( >=net-libs/libvncserver-0.9.7 )
-	java? ( virtual/jre:1.6 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.999
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-devel/dev86
-	sys-power/iasl
-	media-libs/libpng
-	pam? ( sys-libs/pam )
-	sys-libs/libcap
-	doc? (
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( virtual/jdk:1.6 )
-	dev-util/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? ( x11-libs/libXinerama )
-	pulseaudio? ( media-sound/pulseaudio )
-	vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
-PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
-	extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_4.so
-	usr/lib/virtualbox/VBoxPython2_5.so
-	usr/lib/virtualbox/VBoxPython2_6.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-"
-
-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
-	java-pkg-opt-2_pkg_setup
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-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}-4-localconfig > LocalConfig.kmk || die
-
-	# unset useless/problematic checks in configure
-	epatch "${FILESDIR}/${PN}-ose-3.2.8-mesa-check.patch" \
-		"${FILESDIR}/${PN}-4-makeself-check.patch" \
-		"${FILESDIR}/${PN}-4-mkisofs-check.patch"
-
-	# fix build with --as-needed (bug #249295 and bug #350907)
-	epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch"
-
-	# Respect LDFLAGS
-	sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
-	epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch"
-
-	# Don't build vboxpci.ko module (D'oh!)
-	epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's/^.*VBOX_WITH_PAM/#VBOX_WITH_PAM/' Config.kmk || die
-		sed -i 's;\(.*/auth/Makefile.kmk.*\);#\1;' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# Fix compile error on hardened bug 339914 (disable PIE)
-	if gcc-specs-pie ; then
-		epatch "${FILESDIR}"/virtualbox_nopie.patch
-	fi
-
-	# Link to correct gsoap library. Bug #408569
-	# This has been fixed upstream and should be removed when virtualbox is
-	# bumped
-	epatch "${FILESDIR}"/${P}-libgsoapssl.patch
-}
-
-src_configure() {
-	local myconf
-	use alsa       || myconf+=" --disable-alsa"
-	use opengl     || myconf+=" --disable-opengl"
-	use pulseaudio || myconf+=" --disable-pulse"
-	use python     || myconf+=" --disable-python"
-	use java       || myconf+=" --disable-java"
-	use vboxwebsrv && myconf+=" --enable-webservice"
-	use vnc        && myconf+=" --enable-vnc"
-	use doc        || myconf+=" --disable-docs"
-	if ! use headless ; then
-		use qt4 || myconf+=" --disable-qt4"
-	else
-		myconf+=" --build-headless --disable-opengl"
-	fi
-	# not an autoconf script
-	./configure \
-		--with-gcc="$(tc-getCC)" \
-		--with-g++="$(tc-getCXX)" \
-		--disable-kmods \
-		--disable-dbus \
-		${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 \
-		VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'_Gentoo_ \
-		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}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
-		all || die "kmk failed"
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/release/bin || die
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-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}-ose-3-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,NetAdpCtl,NetDHCP,ExtPackHelperApp} *so *r0 *gc ; do
-		doins $each || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
-	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP
-
-	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
-
-		if use opengl && use qt4 ; then
-			doins VBoxTestOGL || die
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
-		fi
-
-		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
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
-		for size in 16 20 32 40 48 64 128 ; do
-			insinto /usr/share/icons/hicolor/${size}x${size}/apps
-			newins ${PN}-${size}px.png ${PN}.png
-		done
-		insinto /usr/share/pixmaps
-		newins ${PN}-48px.png ${PN}.png
-		popd &>/dev/null || die
-	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/$(get_libdir)/${PN}
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		doins ${fwfile} || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile} || die
-	done
-	popd &>/dev/null || die
-
-	# New way of handling USB device nodes for VBox (bug #356215)
-	insinto /lib/udev
-	doins VBoxCreateUSBNode.sh
-	fowners root:vboxusers /lib/udev/VBoxCreateUSBNode.sh
-	fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-
-	insinto /usr/share/${PN}
-	if ! use headless && use qt4 ; then
-		doins -r nls
-	fi
-
-	# VRDPAuth only works with this (bug #351949)
-	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if use java ; then
-		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	if ! use headless && use qt4 ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest 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"
-	elog ""
-	elog "IMPORTANT!"
-	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
-	elog "\"env-update\" as root and logout and relogin as the user you wish"
-	elog "to run ${PN} as."
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-4.1.8-r1.ebuild b/app-emulation/virtualbox/virtualbox-4.1.14.ebuild
index c5750c476124..d55ebfb03cc3 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.8-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.8-r1.ebuild,v 1.2 2012/02/25 13:13:32 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.14.ebuild,v 1.1 2012/04/26 18:20:25 polynomial-c Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=VirtualBox-${PV}
 	SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}_OSE"
+	S="${WORKDIR}/${MY_P}"
 fi
 
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
@@ -213,7 +213,7 @@ src_compile() {
 	# strip-flags
 
 	MAKE="kmk" emake \
-		VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'-Gentoo_ \
+		VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'_Gentoo_ \
 		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)" \
diff --git a/app-emulation/virtualbox/virtualbox-4.1.4.ebuild b/app-emulation/virtualbox/virtualbox-4.1.4.ebuild
deleted file mode 100644
index 857a10b1aefb..000000000000
--- a/app-emulation/virtualbox/virtualbox-4.1.4.ebuild
+++ /dev/null
@@ -1,385 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.4.ebuild,v 1.6 2011/12/27 21:53:21 polynomial-c Exp $
-
-EAPI=4
-
-inherit eutils fdo-mime flag-o-matic linux-info pax-utils python qt4-r2 toolchain-funcs java-pkg-opt-2
-
-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}
-	SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}_OSE"
-fi
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/openssl
-	dev-libs/libxml2
-	sys-libs/zlib
-	!headless? (
-		qt4? (
-			x11-libs/qt-gui:4
-			x11-libs/qt-core:4
-			opengl? ( x11-libs/qt-opengl:4 )
-			x11-libs/libXinerama
-		)
-		opengl? ( virtual/opengl media-libs/freeglut )
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		media-libs/libsdl[X,video]
-	)
-	vnc? ( >=net-libs/libvncserver-0.9.7 )
-	java? ( >=virtual/jre-1.5 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.999
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-devel/dev86
-	sys-power/iasl
-	media-libs/libpng
-	pam? ( sys-libs/pam )
-	sys-libs/libcap
-	doc? (
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( >=virtual/jdk-1.5 )
-	dev-util/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? ( x11-libs/libXinerama )
-	pulseaudio? ( media-sound/pulseaudio )
-	vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
-PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
-	extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_4.so
-	usr/lib/virtualbox/VBoxPython2_5.so
-	usr/lib/virtualbox/VBoxPython2_6.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-"
-
-pkg_setup() {
-	if built_with_use sys-devel/gcc hardened && gcc-config -c | grep -qv -E "hardenednopie|vanilla"; then
-		eerror "The PIE feature provided by the \"hardened\" compiler is incompatible with ${PF}."
-		eerror "You must use gcc-config to select a profile without this feature.  You may"
-		eerror "choose either \"hardenednopie\", \"hardenednopiessp\" or \"vanilla\" profile;"
-		eerror "however, \"hardenednopie\" is preferred because it gives the most hardening."
-		eerror "Remember to run \"source /etc/profile\" before continuing.  See bug #339914."
-		die
-	fi
-
-	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
-	java-pkg-opt-2_pkg_setup
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-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}-4-localconfig > LocalConfig.kmk || die
-
-	# unset useless/problematic checks in configure
-	epatch "${FILESDIR}/${PN}-ose-3.2.8-mesa-check.patch" \
-		"${FILESDIR}/${PN}-4-makeself-check.patch" \
-		"${FILESDIR}/${PN}-4-mkisofs-check.patch"
-
-	# fix build with --as-needed (bug #249295 and bug #350907)
-	epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch"
-
-	# Respect LDFLAGS
-	sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
-	epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch"
-
-	# Don't build vboxpci.ko module (D'oh!)
-	epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch
-
-	# Fixed compilation with yasm-1.2.0 (bug #391189)
-	epatch "${FILESDIR}"/${PN}-4.1.6-yasm120-fix.patch
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's/^.*VBOX_WITH_PAM/#VBOX_WITH_PAM/' Config.kmk || die
-		sed -i 's;\(.*/auth/Makefile.kmk.*\);#\1;' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-}
-
-src_configure() {
-	local myconf
-	use alsa       || myconf+=" --disable-alsa"
-	use opengl     || myconf+=" --disable-opengl"
-	use pulseaudio || myconf+=" --disable-pulse"
-	use python     || myconf+=" --disable-python"
-	use java       || myconf+=" --disable-java"
-	use vboxwebsrv && myconf+=" --enable-webservice"
-	use vnc        && myconf+=" --enable-vnc"
-	use doc        || myconf+=" --disable-docs"
-	if ! use headless ; then
-		use qt4 || myconf+=" --disable-qt4"
-	else
-		myconf+=" --build-headless --disable-opengl"
-	fi
-	# not an autoconf script
-	./configure \
-		--with-gcc="$(tc-getCC)" \
-		--with-g++="$(tc-getCXX)" \
-		--disable-kmods \
-		--disable-dbus \
-		${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 \
-		VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'-Gentoo_ \
-		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}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
-		all || die "kmk failed"
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/release/bin || die
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-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}-ose-3-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,NetAdpCtl,NetDHCP,ExtPackHelperApp} *so *r0 *gc ; do
-		doins $each || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
-	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP
-
-	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
-
-		if use opengl && use qt4 ; then
-			doins VBoxTestOGL || die
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
-		fi
-
-		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
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		newicon	"${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png ${PN}.png
-	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
-
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		doins ${fwfile} || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile} || die
-	done
-	popd &>/dev/null || die
-
-	# New way of handling USB device nodes for VBox (bug #356215)
-	insinto /lib/udev
-	doins VBoxCreateUSBNode.sh
-	fowners root:vboxusers /lib/udev/VBoxCreateUSBNode.sh
-	fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-
-	insinto /usr/share/${PN}
-	if ! use headless && use qt4 ; then
-		doins -r nls
-	fi
-
-	# VRDPAuth only works with this (bug #351949)
-	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if use java ; then
-		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	if ! use headless && use qt4 ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest 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"
-	elog ""
-	elog "IMPORTANT!"
-	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
-	elog "\"env-update\" as root and logout and relogin as the user you wish"
-	elog "to run ${PN} as."
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-4.1.8.ebuild b/app-emulation/virtualbox/virtualbox-4.1.8.ebuild
deleted file mode 100644
index 95ff8614a362..000000000000
--- a/app-emulation/virtualbox/virtualbox-4.1.8.ebuild
+++ /dev/null
@@ -1,390 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.8.ebuild,v 1.5 2012/04/09 12:07:27 maekke Exp $
-
-EAPI=4
-
-inherit eutils fdo-mime flag-o-matic linux-info pax-utils python qt4-r2 toolchain-funcs java-pkg-opt-2
-
-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}
-	SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}_OSE"
-fi
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/openssl
-	dev-libs/libxml2
-	sys-libs/zlib
-	!headless? (
-		qt4? (
-			x11-libs/qt-gui:4
-			x11-libs/qt-core:4
-			opengl? ( x11-libs/qt-opengl:4 )
-			x11-libs/libXinerama
-		)
-		opengl? ( virtual/opengl media-libs/freeglut )
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		media-libs/libsdl[X,video]
-	)
-	vnc? ( >=net-libs/libvncserver-0.9.7 )
-	java? ( virtual/jre:1.6 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.999
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-devel/dev86
-	sys-power/iasl
-	media-libs/libpng
-	pam? ( sys-libs/pam )
-	sys-libs/libcap
-	doc? (
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( virtual/jdk:1.6 )
-	dev-util/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? ( x11-libs/libXinerama )
-	pulseaudio? ( media-sound/pulseaudio )
-	vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
-PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
-	extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_4.so
-	usr/lib/virtualbox/VBoxPython2_5.so
-	usr/lib/virtualbox/VBoxPython2_6.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-"
-
-pkg_setup() {
-	if built_with_use sys-devel/gcc hardened && gcc-config -c | grep -qv -E "hardenednopie|vanilla"; then
-		eerror "The PIE feature provided by the \"hardened\" compiler is incompatible with ${PF}."
-		eerror "You must use gcc-config to select a profile without this feature.  You may"
-		eerror "choose either \"hardenednopie\", \"hardenednopiessp\" or \"vanilla\" profile;"
-		eerror "however, \"hardenednopie\" is preferred because it gives the most hardening."
-		eerror "Remember to run \"source /etc/profile\" before continuing.  See bug #339914."
-		die
-	fi
-
-	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
-	java-pkg-opt-2_pkg_setup
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-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}-4-localconfig > LocalConfig.kmk || die
-
-	# unset useless/problematic checks in configure
-	epatch "${FILESDIR}/${PN}-ose-3.2.8-mesa-check.patch" \
-		"${FILESDIR}/${PN}-4-makeself-check.patch" \
-		"${FILESDIR}/${PN}-4-mkisofs-check.patch"
-
-	# fix build with --as-needed (bug #249295 and bug #350907)
-	epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch"
-
-	# Respect LDFLAGS
-	sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
-	epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch"
-
-	# Don't build vboxpci.ko module (D'oh!)
-	epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's/^.*VBOX_WITH_PAM/#VBOX_WITH_PAM/' Config.kmk || die
-		sed -i 's;\(.*/auth/Makefile.kmk.*\);#\1;' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-}
-
-src_configure() {
-	local myconf
-	use alsa       || myconf+=" --disable-alsa"
-	use opengl     || myconf+=" --disable-opengl"
-	use pulseaudio || myconf+=" --disable-pulse"
-	use python     || myconf+=" --disable-python"
-	use java       || myconf+=" --disable-java"
-	use vboxwebsrv && myconf+=" --enable-webservice"
-	use vnc        && myconf+=" --enable-vnc"
-	use doc        || myconf+=" --disable-docs"
-	if ! use headless ; then
-		use qt4 || myconf+=" --disable-qt4"
-	else
-		myconf+=" --build-headless --disable-opengl"
-	fi
-	# not an autoconf script
-	./configure \
-		--with-gcc="$(tc-getCC)" \
-		--with-g++="$(tc-getCXX)" \
-		--disable-kmods \
-		--disable-dbus \
-		${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 \
-		VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'-Gentoo_ \
-		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}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
-		all || die "kmk failed"
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/release/bin || die
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-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}-ose-3-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,NetAdpCtl,NetDHCP,ExtPackHelperApp} *so *r0 *gc ; do
-		doins $each || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
-	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP
-
-	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
-
-		if use opengl && use qt4 ; then
-			doins VBoxTestOGL || die
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
-		fi
-
-		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
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
-		for size in 16 20 32 40 48 64 128 ; do
-			insinto /usr/share/icons/hicolor/${size}x${size}/apps
-			newins ${PN}-${size}px.png ${PN}.png
-		done
-		insinto /usr/share/pixmaps
-		newins ${PN}-48px.png ${PN}.png
-		popd &>/dev/null || die
-	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/$(get_libdir)/${PN}
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		doins ${fwfile} || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile} || die
-	done
-	popd &>/dev/null || die
-
-	# New way of handling USB device nodes for VBox (bug #356215)
-	insinto /lib/udev
-	doins VBoxCreateUSBNode.sh
-	fowners root:vboxusers /lib/udev/VBoxCreateUSBNode.sh
-	fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-
-	insinto /usr/share/${PN}
-	if ! use headless && use qt4 ; then
-		doins -r nls
-	fi
-
-	# VRDPAuth only works with this (bug #351949)
-	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if use java ; then
-		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	if ! use headless && use qt4 ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest 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"
-	elog ""
-	elog "IMPORTANT!"
-	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
-	elog "\"env-update\" as root and logout and relogin as the user you wish"
-	elog "to run ${PN} as."
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}