Version bump

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 417 insertions, 15 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 7236d08fc4f3..385b2b6046fc 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.164 2013/11/02 15:15:59 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.165 2013/11/29 08:15:34 polynomial-c Exp $
+
+*virtualbox-4.2.20 (29 Nov 2013)
+
+  29 Nov 2013; Lars Wendler <polynomial-c@gentoo.org>
+  +virtualbox-4.2.20.ebuild:
+  Version bump.
 
 *virtualbox-4.3.2 (02 Nov 2013)
 
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 08651ab6137f..525344261e67 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -11,31 +11,33 @@ AUX virtualbox-ose-3-wrapper 2931 SHA256 7ed4834ece201cb6a9da57e36a1a9b47bd05405
 AUX virtualbox-ose.desktop-2 201 SHA256 fa7fc3dae940e768560559db944289c578acb691db2dcb51c8c85bfaf3298a25 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c WHIRLPOOL 080fc09f951f621976499e7721e1edaa6e89d6a3632c63d14806a23d1369ce1a7d3408a6375f8658f00603fccf69cef3b2f587e1861b02a09646262f365aee2c
 DIST VirtualBox-4.1.26.tar.bz2 74552384 SHA256 229773b45bb18374aa091d4ef585f3893307fb4ccb6f489055b048c0f93c36ab SHA512 da3dc07a390f423446190ba68221a9389423381def888a6eb754dc02fed75f0b99e41263ffc6d36f955b6018b8f7e928da55397bb544eae16cd5b0cbcc66ed89 WHIRLPOOL 9f5d74e44950d41887955250307bc1af99ca0007e3d4b0f6549b35ff3fb9a48d546f9b7dab6d346ac5a0e88bbb1af092665024d1e792aa9befdc04b6017c62bf
 DIST VirtualBox-4.2.18.tar.bz2 76893031 SHA256 9dbddf393b029c549249f627d12040c1d257972bc09292969b8819a31ab78d74 SHA512 c267cef156476992773135b5a154164f30841c4f2d4afa5e6c7c74a320384f621d141bff5f7164968767c3d86035befcb59e34b7a912a8a5ae3bede2d24e9c60 WHIRLPOOL 665e4895db5c0fd623fd08c6b9f4df69e5e5d27ebd3063a4216721460782691d2936567be68a4af7bed57b88fd5b2a41805df76551b1aac200ccff0101055a56
+DIST VirtualBox-4.2.20.tar.bz2 77050211 SHA256 193aa3ce7c0e700fe6a12b64bf462ce633a856f1e831ee4a337cc3439b21df61 SHA512 53cd847490e74ed7255a63a0e15b5de424d10c32934212b9aa50ef5beae69194895195991f4c58a5baf4ad9645bf90473e0474c287c395c3c064fc217ea7957e WHIRLPOOL 0177201a63978fdd75ebe65a8567d561bcb12609d936c8e9f98fef61ecafd2630235d988e17a38c82d39de9a729a32d5b0c493833cf88a35f88b3f8b7e558498
 DIST VirtualBox-4.3.0.tar.bz2 89452701 SHA256 8ea8988a041163c34bff1da6b278d7729cecd4596f5eb778575c5ac9ac95bc12 SHA512 455907296efa9fed98efd435554a00c168f5b3b1c2b237dfb41281a2cfa6da76e4f6d8cd763db15dbe8be20b145ba30690f61e4f4dd4efafd31b3014752da3f1 WHIRLPOOL 728613d31bf0dadcb45d4a55886afb617648e76ed41e3094a6fd750e5a98ce70b21df3188174fefb4b8db5f3c688697ee07830c0a0a0c0c4307163ac457726e1
 DIST VirtualBox-4.3.2.tar.bz2 89709005 SHA256 137ee464dcf3ec81fd74793022ecb53d7f4399682759e00cafd322b0dc92967e SHA512 5a622636ab5f25ebd18a51c07ce16a98aac5a020d356060321a7433682e110983442ed3c17c4d70e40dca343caeedb5f15bc34a924c95c29239c2e5b1ba6bd6e WHIRLPOOL 34b34f5cc9b495d8a67c0a41db205aeed1b9bd514586261ec6acaff652192832c04993df8867ec8f886ff4d56e0500225800449d3b1684c90fc93ec5dc5ac4a7
 DIST virtualbox-4.1.22-patches-01.tar.xz 3752 SHA256 2ff58f8d2bdfdcbf1ae4bbe9f68ad1256f1ae37091fd4b392582a062d206962f SHA512 9bba2a4352d52cddd27f55b4ad0e9de250c1d29359a8859f61fc413e53ac62206321c5e347391ca478b942967bd7974a3a469eb3bb133c79d7033692afe559dd WHIRLPOOL 1aa98913e7d4e1ddf5f775db200cddc18a7ed4d7dd915dda0dab6bffbf33bfd63a785cc7381bca74e4780e7dce21f18314dc093b9c6ba02addfd1330f3b61aa9
 DIST virtualbox-4.2.18-patches-01.tar.xz 3788 SHA256 9a147e3a3da7e1e07b70aed67042c822897c7874ccaa3690c9497862373d8222 SHA512 021f8a566ede223ead5a2605bff3917195165c543f760ee7af004ab97d5dcf0771e6ccb62148d7986a34872ea8c35db952286fb8534b1f69804e192701bd8108 WHIRLPOOL 9818df1703636fecfbda1bbeb4d167d845701fe9de2827a97573a26ffb3cb9feaa22ee2849c45d3ea700a9c305185eb404b15572b0f4e666f8a8e6158a48b9eb
 EBUILD virtualbox-4.1.26.ebuild 12296 SHA256 01cc60107f53c6259671c87c9ecf7b2f06e39d40a70661961adf43910e6cc282 SHA512 80c6f3b2b07eb0758de11386e24b0b6f6ee00ee9591f50312629c48f268362319a8fb14e7f39411e82673e9bc5b81a33f470b28a91bf875897ab02f078cbddff WHIRLPOOL 20bfcd1ebf56ad8b0c9fd21bc575b99cc87d596988c6e9ac381af02584ebdf1e6de94760326e7ac29b973ad14631648cf0a3a10b52abbb5bd362a5eee336b0b8
 EBUILD virtualbox-4.2.18.ebuild 12220 SHA256 b1c0119b37dade28b3828f561e27a454e81bf2c7a8d549a273e9dc10191c99a4 SHA512 a63c8d9d03c28587711039a49cfd0506319166552d7726412ce07d830b02a8e253b29d88bd60512616760e257155bd5426dc6f8a8a86ff22fa07f3c9080753bf WHIRLPOOL ffcb7eda57d180b1f568f51cb23eae64f692104c552f1f7cb43d0cdf7ba02db86ce80f4c415952dc6103dab2ab29e7818956a88809f3f8bb421aad41754db7da
+EBUILD virtualbox-4.2.20.ebuild 12225 SHA256 021bfa90a124b0dc30cc0595e2bbae3ba83403cc28a60a510aeb136aabb230a3 SHA512 8d88e03d064b0d82c531dd5b4bec092603663f18ceddbe1aa1af95279c5590f2bd30116ddb38405b54270d5f47deefb1e50606b7724748195f14bd1b6c752f9c WHIRLPOOL 980f38cd115ce06c005d364eba4bba4b4242dafab3550ccaacb45e8024a88771f4144b082b20f8f13908826b9c0b2c07a6eaeb09e7ed3ce6549bebbbad2417a2
 EBUILD virtualbox-4.3.0-r2.ebuild 12500 SHA256 7212b77ae012a40c3b6c597a980a134ef2ef2b89fdc9cf5d096a936b66bf2bf6 SHA512 4567cadb6b7ddc292a2660137e10b21c30dc7cf36db5ac967fe68178f5b0df258cb546bb574bd3794e3dfbc4c8ee4e7c1c81e7381b6753b95393369e975ca1f5 WHIRLPOOL 10a6a9f8291ee3e2614762b6dfb40795b2e2dad0e514dc664a76dfdb92f7b6c268c3af1027c8c0f455bb442f8e9f1a204a78e5bf9a91832c03f09644d3143df1
 EBUILD virtualbox-4.3.2.ebuild 12500 SHA256 cc6f02a04b58e420fe01a7ad5ae53612b37c8b3ebe9f83e91ebce201b4e9dae5 SHA512 86444248556634276fdbb6828391bcef8665e550f6a48416c20b76a85e60ac544b3a8909ef6ffe8242f8af3e3eb8cb11034b642caaf8bfec49d6cdcfbd92eb2d WHIRLPOOL 5eab5486a6b4f5965e07eecfe8de788d1d323028fbcf037e05524ea0f9182a577ce029408b4274c5d2a190e88f8cd3ab1eac57b399130da791d3ef6bcbc852d3
 EBUILD virtualbox-9999.ebuild 5123 SHA256 8cd24ad4cc1fab5562d58ebcf531b3131796eb24c40489d98bfb2078cd0b3803 SHA512 3c4658a749419a64f7ed8636e62f385db059639d58a2152ac1b136f54f8577407ba0553f612511ea7819eb4e26727ab516f62b11faac5d2e4b6de73892206430 WHIRLPOOL 317967e118951cda333e6db60a6e8f37df7a53599d752271d8f29873caa1e9bb22774963e8972989516031516b293c5b8dd9f7f5e680ac785d7f16437bf8c2ca
-MISC ChangeLog 23966 SHA256 7fa1b9bd65b8a200da88b7822f7eec5548d492ca0d803c920cc6779a2be365bc SHA512 e65fe7bc402cc8a0ced23a12ce92f3805bd6bba255ff162c9e50a1502e0bea3b0425b680fb22ab84437e69e32df34ef3e5d17d10ee3fa491245208bc462498ac WHIRLPOOL 6c0c330060db608e2530134e7bbee47d3801fba8b68c13fc6907b7ed3f38bf59c75ed6127abcebe6e94f27915c017467bdd7467a0ff9828fa5dbe4ee662c6817
+MISC ChangeLog 24100 SHA256 05682ad0bf867b9093d769dcea9641dea39e8a33be4ec02352fa74625195850f SHA512 8ffbc4833d33b173cb95be501f02b5e57abfb5c1d299edc4610bdb0ff977a38324684d4ac030420713899e6bd321baf913f7109a58118ad8d9d808179142eafd WHIRLPOOL 849ee813d6a441d212b4b56a805d806417c4b19ad90d4c02bf2fa1ff14e6ec62bbcb80bf41b3c2f8b6356068760899cf881580d5c840d52da2c0d63564bc3f85
 MISC metadata.xml 673 SHA256 5cf3053a2f23eff40c24dfdb7af90d4bf905df95a7406f6298ae9e5e547cbe79 SHA512 79b4b7477041212815e0b509016b692ac719625534ba93540ac5afe655e47ed2ed27d7ba51b494a49a6ac603733ba0b66a2a517f27e4d0e6b7563eb7d4e640ec WHIRLPOOL 6bcb7711e01036fa3ff064ffdc5021da6fca464d4da77d8e93d033304c7c1d3ed105723d5d5e7fa3328daec929c7c7a90c9c82572bb082765f286b53c3feb688
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSdRcxAAoJEPiazRVxLXTFrm4P/R6AZzm7O0q+MfXzl1oAAdmQ
-OOWZF39wvW8niPSX8L6i/jdvniNA6z4A7la6Nk2gIW9aG4ZLhzzApNi8LwoP+1WF
-L7XUB3IOnmD/nU09/4GCcrK+Fy5lYIdPZt/fusNBULK88wBN9tkZaT4UgqzSLZbt
-jaVkMgqd1k3dp7+ge+1NKhi8vv3pGOEdPSCjm8eltnqT+shV+NgXnAvgAHmYqcbd
-aPaPD11eltr8oQaa9aJExMqDzpamywrt/DtIurtQrK3TRBU0PJXuh+RTqEt/0Z0Z
-BDQj3fWPF7xi3cQh0YxVit04iV1Er/LxuyYibUa42nObTQ8hfpXrj+oxJeOEpnc/
-8vFeLZJNjrgZUsEeSUikxgnYGill7XPyKIwncJ2POIx6nc+m/mKz/cok+yVN9hTN
-7P3LSpTQ6tcIgzH3o1PFsq48FsVQriRU4DcNAlbAujzNu+icwue8PzG4Z2klvEHK
-rgnvIfK7jHXcJK4OM6zM8rgAok2dHg546/gsbUntXIVS+bogSq7r2h7mw1qyuA61
-N+At+9cO/D/mTgnQN6rmyDOBvdWFx3MqCHtjdlpNth1twKvhrJAk8T1Hn+kRKjZ7
-2beAKx2oxZDikgIx2c5aqFTA8rg+42eiktfwf7Btdj2jpXHsUR9UXBiq5Lbbhy5A
-5sLy/Fa74LdXHP5Qi7NA
-=bVmN
+iQIcBAEBCAAGBQJSmE0nAAoJEPiazRVxLXTFF90QAL9EupuBD1w/xw9WODk9YNLw
+msDThcY+eGJWN5bgUnKIde6+XQgJMTdrhP0UIHhxuEW4CbLknf3UZDcz/v45FYQi
+CxrpoXuSBMU2kWLnmMxGRYP3yZWY5g/eQCzWLWeAyFP/Fiwir5PwmqFJ3CON9bzn
+3p/RuwQZ5ccCuT3UzCC0Nv7UySGbjOdpfDVLtD3e3y1nBBk8TWftnCl09/uT4ASB
+yEcPqsIfOorDV2uj4w6Zu/Z87qcsVZ3DfkjdDcoYWyQNWy3Ab1ZaGAuXwPwITd1j
+mR/BE/YyDKyXY0dCiK5nCUcWhA107Qt5kmMNM9cg6i+E0T8YpagQIo7FRYxH+UGr
++gOVczdxXz9/7P7tEF7DvKlvrMqJ/VA8Cb8QgPeL74MrAx3OSa8VkIG2PQdlkTM8
+zpzwQVqFt8wJMi3ZT5PClTHlwlcZpwBSU/cyC/AELgrSoMt2RHAVLfjE71sJN+Ub
+EXFYLQCS8/nQFg2Nodfn497v7ZHwMy/smxJuXE09c8DEMtcFa6MSuQtUThkKT5on
+7UscWorC4IZ3vBXbmsxRsBvz8CLxtY8JH9PIZYNbHxdJy/hP7HAL9Obt35kZlGVH
+RRNxCki+JPsbHAwHh+62MPeXFvDWCi+6M/dDhQvITPugGbB8vIdJn0AD9NDk+6aK
+AN4djnDniAS7iEg3meNp
+=S4de
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox/virtualbox-4.2.20.ebuild b/app-emulation/virtualbox/virtualbox-4.2.20.ebuild
new file mode 100644
index 000000000000..9259546b581b
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-4.2.20.ebuild
@@ -0,0 +1,394 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.20.ebuild,v 1.1 2013/11/29 08:15:34 polynomial-c Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime flag-o-matic linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs java-pkg-opt-2 udev
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-4.2.18-patches-01.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+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
+	media-libs/libpng
+	sys-libs/zlib
+	>=virtual/udev-171
+	!headless? (
+		qt4? (
+			dev-qt/qtgui:4
+			dev-qt/qtcore:4
+			opengl? ( dev-qt/qtopengl: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:0[X,video]
+	)
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+	java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20120806
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-power/iasl
+	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.7 virtual/jdk:1.6 ) )
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? ( x11-libs/libXinerama )
+	pulseaudio? ( media-sound/pulseaudio )
+	vboxwebsrv? ( <net-libs/gsoap-2.8.13 )
+	${PYTHON_DEPS}"
+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 )
+	${PYTHON_REQUIRED_USE}
+"
+
+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
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_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
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# 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
+
+	if ! gcc-specs-pie ; then
+		EPATCH_EXCLUDE="050_${PN}-4.2.0-nopie.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/patches"
+
+	# fix location of ifconfig binary (bug #455902)
+	local ifcfg="$(type -p ifconfig)"
+	if [ "${ifcfg}" != "/sbin/ifconfig" ] ; then
+		sed "/VBOXADPCTL_IFCONFIG_PATH/s@/sbin/ifconfig@${ifcfg}@" \
+			-i "${S}"/src/apps/adpctl/VBoxNetAdpCtl.cpp \
+			|| die
+	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 \
+		--disable-devmapper \
+		${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_BUILD_PUBLISHER=_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" \
+		KBUILD_VERBOSE=2 \
+		all
+}
+
+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"
+	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
+
+	if use sdk ; then
+		doins -r sdk
+	fi
+
+	if use vboxwebsrv ; then
+		doins vboxwebsrv
+		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
+		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
+
+	# VBoxSVC needs to be pax-marked (bug #403453)
+	pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSVC || die
+
+	if ! use headless ; then
+		for each in VBox{SDL,Headless} ; do
+			doins $each
+			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
+			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
+			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 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		popd &>/dev/null || die
+	else
+		doins VBoxHeadless
+		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}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile}
+	done
+	popd &>/dev/null || die
+
+	# New way of handling USB device nodes for VBox (bug #356215)
+	local udevdir="$(udev_get_udevdir)"
+	insinto ${udevdir}
+	doins VBoxCreateUSBNode.sh
+	fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+	insinto ${udevdir}/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+
+	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
+}