Fixed install paths

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

6 files changed, 16 insertions, 304 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 491de8f91324..5f455d516427 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.52 2011/01/08 10:22:12 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.53 2011/01/08 12:40:22 polynomial-c Exp $
+
+  08 Jan 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-3.2.12-r3.ebuild, virtualbox-3.2.12-r4.ebuild,
+  files/virtualbox-ose-3-config, files/virtualbox-ose-3-localconfig:
+  Fixed install path in vbox.cfg. Thanks to Robert Cernansky for reporting this
+  issue in bug #351109.
 
 *virtualbox-4.0.0-r1 (08 Jan 2011)
 
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 44fce5cac195..652927db4b68 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -7,8 +7,8 @@ AUX virtualbox-4-makeself-check.patch 289 RMD160 ff0385e86ad83501d58ff051b6c80c5
 AUX virtualbox-4-mkisofs-check.patch 356 RMD160 2562cee4530976224ae128a732ae99d79eece99d SHA1 050479d15ee5fed1504646c0687fd6e2c8a22dc1 SHA256 0e72a5ef8d915c550fd92865b40c265153dc2d4621714a599d3a7172726b6fff
 AUX virtualbox-4-restore_old_machines_dir.patch 506 RMD160 663e6dd09c77c4e578d09f0acc1fe2e015f1874d SHA1 2ae740adc15fbd2523ae17c78669b6a0000ed503 SHA256 0bf28d75a01d041145b12730917c880a382e42b3d5ad3b2fa85c9d9f233b6d99
 AUX virtualbox-4-vnc.patch 2471 RMD160 3e86ed80f592ee0258fdc295245ddf228ce3e41c SHA1 14bf8b20ec60024336d50c06d15cba37b29265af SHA256 5d7219d05928021af0e333a9459dc3c3bcc98c8babfe75f221f1a7f3bc2d6d37
-AUX virtualbox-ose-3-config 42 RMD160 7102b584e67b964dfd3c06e06b29eb91d33d7604 SHA1 1fe2ac29550c4b3ab4a82399ece3d08c8851c207 SHA256 fb619bc28ba651135730601240e192f9d02b9bef9954eb8026a716865db01b4d
-AUX virtualbox-ose-3-localconfig 1442 RMD160 a40962b6ce3b5b4dd4cec47f32d3a2e935bd8aa5 SHA1 317eaee6d3b22cb561180a84f179dfdfcef2acc7 SHA256 27e169d386b1ca865f47fe64c43eb8ce157c9fa028d6d2d026e5f1cc4e61fac1
+AUX virtualbox-ose-3-config 38 RMD160 44974362ca28f2762c0501b4d4c18de2634aa063 SHA1 d475cbdbf469dd3a178fa9a4a8580859aacd7c37 SHA256 cc3cd896be49a421b06665683a22edb0fe17d6588fc259140b139c3d8a8581b5
+AUX virtualbox-ose-3-localconfig 1434 RMD160 773b58324831c919afaf6a85ddbbccd03c49dead SHA1 6ab0f7e45f5778c1d392025dcec07c332678546a SHA256 e7d23a6c15b5982f7132c38ee5d660bae111a46c6a5603c2212488637cdcfe20
 AUX virtualbox-ose-3-wrapper 2931 RMD160 c73f7fca4531dc8023484b860c81c0a5805f022c SHA1 1d51680f1dc67394b0bf2c0533305e54c68ef177 SHA256 7ed4834ece201cb6a9da57e36a1a9b47bd054057d2ac4a46343a9966ff460644
 AUX virtualbox-ose-3.0.0-mesa-check.patch 692 RMD160 c1b62d987fa941f5455a8fb0c0d6b07377756d0f SHA1 18c987a024fc45778cc2dc55515100150996408d SHA256 88e981ed765b26c11ea9c606a009a9a1b03c67a1de5cb42b18e0088e027fe0c8
 AUX virtualbox-ose-3.1.8-iasl-length-calculation-fix.patch 1190 RMD160 4c1950bf59457edb4e18c6670b49e2096c153bda SHA1 aa93ed7c058c78a1479e2e2c965c64e74031d699 SHA256 6ab56908bdc65f0c81a4f8f8150a83724abe6b31358a6a3550959ff42e9879dc
@@ -20,9 +20,8 @@ DIST VirtualBox-3.1.8-OSE.tar.bz2 56291753 RMD160 45aa637d1e008248bd9061e9824b9c
 DIST VirtualBox-3.2.12-OSE.tar.bz2 58239733 RMD160 9bcb80327655d77cede13b1f76b1fa6c763b1a25 SHA1 73ddd9365588ea56a54ff81117719ac818e842f9 SHA256 064eb382e5b752a3f9189c930734393765125e70b5f99679a63ff4eb6186e261
 DIST VirtualBox-4.0.0.tar.bz2 70279717 RMD160 8cfce949fc8fc3fccdcb46781fd1d861f385b83c SHA1 2d0a763d148622569f2a23254b35bce5e112f7e8 SHA256 c60b42385b4956780babd133d2b694dade4838e18ef723a78f899fc3bd8543a0
 EBUILD virtualbox-3.1.8.ebuild 8384 RMD160 9ad6a4cc9673d2da3ed6a63018dcab0fb6a42cf7 SHA1 e40823ab16a6d3f1df4e1e69d732947b7d59b782 SHA256 10c25aa08345cbb205048385ee012264f0424f2ccb6ccc170d4b3d39bf7619ef
-EBUILD virtualbox-3.2.12-r3.ebuild 9407 RMD160 3584b759ec434d196040c82d1c2b72fd79088ea9 SHA1 7143669f9152db1696ff76cf5a40374813ee61e4 SHA256 d2dfc980457dea4627d98eaac670eb0c2e0a8a0ed02dcbe3ef2cc21ea55a4668
-EBUILD virtualbox-3.2.12-r4.ebuild 9666 RMD160 bc93534a444722721e98e9167bae7e49818d8906 SHA1 f15380cc7c20b91006f391558135e798887af278 SHA256 d3adf4458c9fb2cec6d6166378c8d516ae80075104b5237867ba9a1dc75ba8bb
+EBUILD virtualbox-3.2.12-r4.ebuild 9665 RMD160 4b0fac370f6b49954ba020308d937227cc195782 SHA1 b45b87e71b6a23255b166296850f3b890b9b8fad SHA256 4e540c9568eb9373d5563ab46b8baf23f1acfbe8dda2704d96834059a8b74b42
 EBUILD virtualbox-4.0.0-r1.ebuild 10379 RMD160 5d01697947025cb2a5ca313fe1072946223b6a66 SHA1 180ff6cddd0f4b2408eea8e740022a00e42d1302 SHA256 5e0d1b7285c753706894f5567bdecd962122cc3e119e880ac41f7ba545c18ebd
 EBUILD virtualbox-9999.ebuild 5623 RMD160 3e3eeabc7dfcddc0583974335494f51b23c8327b SHA1 fcc07a44770a14802e337c9ff2a87f19b2d149f3 SHA256 301e900d619a1fd9c9e38793671fb0ab843c2d973bda2612e64e34c1fdbf3c8d
-MISC ChangeLog 2428 RMD160 edbe7ddedd447f0488bac1c2ffded2100e20da0b SHA1 f108df863fd2f1b5b21ce7f03c2b0d9e65f839da SHA256 95ff9db4ea41a6a9cb91f5e3cb0bf6cc2ef04d48610f82d5f428d92dd657eba3
+MISC ChangeLog 2717 RMD160 b500cdb82670cabd7029274929a547c783eb7a3e SHA1 2ce4ebbe978b1a17a3918d14f540a44684c5dbd4 SHA256 db17b13dcd7ad6d1e7ec2042225f64922159cd59e93c118bbbd56f014275e330
 MISC metadata.xml 787 RMD160 ba43b02e20c2649a3bfb0dbf1b7d8ce30d5c0beb SHA1 6efd8b7802c97c203b8be8154bb2913cd3e24266 SHA256 9250eb6045eadd27afda974481dbea721de9f5d5157dddc3f0786ba2fcc98d21
diff --git a/app-emulation/virtualbox/files/virtualbox-ose-3-config b/app-emulation/virtualbox/files/virtualbox-ose-3-config
index d1e35d2c40d2..af7822146560 100644
--- a/app-emulation/virtualbox/files/virtualbox-ose-3-config
+++ b/app-emulation/virtualbox/files/virtualbox-ose-3-config
@@ -1 +1 @@
-INSTALL_DIR=/usr/MY_LIBDIR/virtualbox-ose
+INSTALL_DIR=/usr/MY_LIBDIR/virtualbox
diff --git a/app-emulation/virtualbox/files/virtualbox-ose-3-localconfig b/app-emulation/virtualbox/files/virtualbox-ose-3-localconfig
index fb3440daba6b..5138d9252698 100644
--- a/app-emulation/virtualbox/files/virtualbox-ose-3-localconfig
+++ b/app-emulation/virtualbox/files/virtualbox-ose-3-localconfig
@@ -28,10 +28,10 @@ KBUILD_MSG_STYLE        := brief
 ## paths, origin, hardening
 VBOX_WITH_HARDENING        := 1
 VBOX_WITH_ORIGIN           :=
-VBOX_PATH_APP_PRIVATE_ARCH := /usr/MY_LIBDIR/virtualbox-ose
+VBOX_PATH_APP_PRIVATE_ARCH := /usr/MY_LIBDIR/virtualbox
 VBOX_PATH_SHARED_LIBS      := $(VBOX_PATH_APP_PRIVATE_ARCH)
 VBOX_WITH_RUNPATH          := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_PATH_APP_PRIVATE      := /usr/share/virtualbox-ose
+VBOX_PATH_APP_PRIVATE      := /usr/share/virtualbox
 VBOX_PATH_APP_DOCS          = $(VBOX_PATH_PACKAGE_DOCS)
 
 ## don't build unwanted/splitted stuff
diff --git a/app-emulation/virtualbox/virtualbox-3.2.12-r3.ebuild b/app-emulation/virtualbox/virtualbox-3.2.12-r3.ebuild
deleted file mode 100644
index e834413373a5..000000000000
--- a/app-emulation/virtualbox/virtualbox-3.2.12-r3.ebuild
+++ /dev/null
@@ -1,293 +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-3.2.12-r3.ebuild,v 1.2 2011/01/07 18:16:30 polynomial-c Exp $
-
-EAPI=2
-
-inherit eutils fdo-mime flag-o-matic linux-info pax-utils qt4-r2 toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	# XXX: should finish merging the -9999 ebuild into this one ...
-	ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
-	inherit linux-mod subversion
-else
-	MY_P=VirtualBox-${PV}-OSE
-	SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-	S=${WORKDIR}/${MY_P/-OSE/_OSE}
-fi
-
-DESCRIPTION="Software family of powerful x86 virtualization"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+additions alsa headless 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
-	!headless? (
-		qt4? (
-			x11-libs/qt-gui:4
-			x11-libs/qt-core:4
-			opengl?	( x11-libs/qt-opengl:4 )
-		)
-		opengl? ( virtual/opengl media-libs/freeglut )
-		x11-libs/libXcursor
-		media-libs/libsdl[X,video]
-		x11-libs/libXt
-	)
-	headless? ( x11-libs/libX11 )
-	vnc? ( >=net-libs/libvncserver-0.9.7 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.5-r1
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-devel/dev86
-	sys-power/iasl
-	media-libs/libpng
-	sys-libs/libcap
-	dev-util/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? ( x11-libs/libXinerama )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( >=dev-lang/python-2.3[threads] )
-	vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
-PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox-ose/VBoxSDL.so
-	usr/lib/virtualbox-ose/VBoxSharedFolders.so
-	usr/lib/virtualbox-ose/VBoxDD2.so
-	usr/lib/virtualbox-ose/VBoxOGLrenderspu.so
-	usr/lib/virtualbox-ose/VBoxPython.so
-	usr/lib/virtualbox-ose/VBoxDD.so
-	usr/lib/virtualbox-ose/VBoxDDU.so
-	usr/lib/virtualbox-ose/VBoxREM64.so
-	usr/lib/virtualbox-ose/VBoxSharedClipboard.so
-	usr/lib/virtualbox-ose/VBoxHeadless.so
-	usr/lib/virtualbox-ose/VBoxRT.so
-	usr/lib/virtualbox-ose/VBoxREM.so
-	usr/lib/virtualbox-ose/VBoxSettings.so
-	usr/lib/virtualbox-ose/VBoxKeyboard.so
-	usr/lib/virtualbox-ose/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox-ose/VBoxVMM.so
-	usr/lib/virtualbox-ose/VirtualBox.so
-	usr/lib/virtualbox-ose/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox-ose/components/VBoxC.so
-	usr/lib/virtualbox-ose/components/VBoxSVCM.so
-	usr/lib/virtualbox-ose/components/VBoxDDU.so
-	usr/lib/virtualbox-ose/components/VBoxRT.so
-	usr/lib/virtualbox-ose/components/VBoxREM.so
-	usr/lib/virtualbox-ose/components/VBoxVMM.so
-	usr/lib/virtualbox-ose/VBoxREM32.so
-	usr/lib/virtualbox-ose/VBoxPython2_4.so
-	usr/lib/virtualbox-ose/VBoxPython2_5.so
-	usr/lib/virtualbox-ose/VBoxPython2_6.so
-	usr/lib/virtualbox-ose/VBoxPython2_7.so
-	usr/lib/virtualbox-ose/VBoxXPCOMC.so
-	usr/lib/virtualbox-ose/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox-ose/VBoxNetDHCP.so"
-
-pkg_setup() {
-	if ! use headless && ! use qt4 ; then
-		einfo "No USE=\"qt4\" selected, this build will not include"
-		einfo "any Qt frontend."
-	elif use headless && use qt4 ; then
-		einfo "You selected USE=\"headless qt4\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s/MY_LIBDIR/$(get_libdir)/" \
-		"${FILESDIR}"/${PN}-ose-3-localconfig > LocalConfig.kmk || die
-
-	# unset useless/problematic mesa checks in configure
-	epatch "${FILESDIR}/${PN}-ose-3.2.8-mesa-check.patch"
-
-	# fix build with --as-needed (bug #249295)
-	epatch "${FILESDIR}/${PN}-ose-asneeded.patch"
-
-	# add the --enable-vnc option to configure script (bug #348204)
-	epatch "${FILESDIR}/${PN}-ose-vnc.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 vboxwebsrv && myconf+=" --enable-webservice"
-	use vnc        && myconf+=" --enable-vnc"
-	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 \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
-		all || die "kmk failed"
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/release/bin || die
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-ose-3-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} *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
-		fi
-
-		newicon	"${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png ${PN}.png
-		newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-	else
-		doins VBoxHeadless || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
-		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
-		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
-	fi
-
-	# 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
-
-	insinto /usr/share/${PN}
-	if ! use headless && use qt4 ; then
-		doins -r nls
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	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 "Please visit http://www.virtualbox.org/wiki/Editions for"
-	elog "an overview about the different features of ${PN}"
-	elog "and virtualbox-bin"
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-3.2.12-r4.ebuild b/app-emulation/virtualbox/virtualbox-3.2.12-r4.ebuild
index 582bb6f2b861..a45be226894d 100644
--- a/app-emulation/virtualbox/virtualbox-3.2.12-r4.ebuild
+++ b/app-emulation/virtualbox/virtualbox-3.2.12-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-3.2.12-r4.ebuild,v 1.2 2011/01/07 18:16:30 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-3.2.12-r4.ebuild,v 1.3 2011/01/08 12:40:22 polynomial-c Exp $
 
 EAPI=2
 
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.virtualbox.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+additions alsa headless pulseaudio +opengl python +qt4 sdk vboxwebsrv vnc"
 
 RDEPEND="!app-emulation/virtualbox-bin