Version bump (bug #410811). Removed old

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

13 files changed, 106 insertions, 55 deletions

diff --git a/app-emulation/virtualbox-additions/ChangeLog b/app-emulation/virtualbox-additions/ChangeLog
index 084d9922f02b..49192dbb5c85 100644
--- a/app-emulation/virtualbox-additions/ChangeLog
+++ b/app-emulation/virtualbox-additions/ChangeLog
@@ -1,6 +1,12 @@
 # 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.41 2012/03/15 09:54:55 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/ChangeLog,v 1.42 2012/04/05 07:42:50 polynomial-c Exp $
+
+*virtualbox-additions-4.1.12 (05 Apr 2012)
+
+  05 Apr 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-additions-4.1.6.ebuild, +virtualbox-additions-4.1.12.ebuild:
+  Version bump (bug #410811). Removed old.
 
 *virtualbox-additions-4.1.10 (15 Mar 2012)
 
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.6.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.12.ebuild
index 332094742a4f..c3d679acb80a 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.6.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.6.ebuild,v 1.1 2011/11/04 23:06:13 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.12.ebuild,v 1.1 2012/04/05 07:42:50 polynomial-c Exp $
 
 EAPI=2
 
diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 88ac3beb28a3..37a33426fdc9 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.127 2012/03/16 19:53:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.128 2012/04/05 07:42:20 polynomial-c Exp $
+
+*virtualbox-bin-4.1.12 (05 Apr 2012)
+
+  05 Apr 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-bin-4.1.6-r1.ebuild, +virtualbox-bin-4.1.12.ebuild:
+  Version bump (bug #410811). Removed old.
 
   16 Mar 2012; Mike Gilbert <floppym@gentoo.org> virtualbox-bin-4.1.10.ebuild:
   Set PYTHON_UPDATER_IGNORE and remove some obsolete entries in QA and RDEPEND
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.6-r1.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.12.ebuild
index bae0e209a78d..fc7f726dae1c 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.6-r1.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.12.ebuild
@@ -1,13 +1,13 @@
 # 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.6-r1.ebuild,v 1.2 2012/02/05 05:25:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.12.ebuild,v 1.1 2012/04/05 07:42:20 polynomial-c Exp $
 
 EAPI=2
 
-inherit eutils unpacker fdo-mime pax-utils
+inherit eutils unpacker fdo-mime gnome2 pax-utils
 
-MY_PV=${PV}-74727
-SDK_PV=${PV}-74713
+MY_PV=${PV}-77245
+SDK_PV=${MY_PV}
 EXTP_PV=${SDK_PV}
 MY_P=VirtualBox-${MY_PV}-Linux
 EXTP_PN=Oracle_VM_VirtualBox_Extension_Pack
@@ -58,7 +58,6 @@ RDEPEND="!!app-emulation/virtualbox
 			dev-lang/python:2.7
 			dev-lang/python:2.6
 			dev-lang/python:2.5
-			dev-lang/python:2.4
 		) )"
 
 S=${WORKDIR}
@@ -71,13 +70,9 @@ QA_TEXTRELS_x86="opt/VirtualBox/VBoxGuestPropSvc.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
@@ -118,13 +113,9 @@ QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.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
@@ -157,6 +148,8 @@ QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
 	opt/VirtualBox/libQtOpenGLVBox.so.4
 	opt/VirtualBox/vboxwebsrv"
 
+PYTHON_UPDATER_IGNORE="1"
+
 src_unpack() {
 	unpack_makeself ${MY_P}_${ARCH}.run
 	unpack ./VirtualBox.tar.bz2
@@ -171,13 +164,32 @@ src_unpack() {
 	fi
 }
 
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
 src_install() {
 	# create virtualbox configurations files
 	insinto /etc/vbox
 	newins "${FILESDIR}/${PN}-config" vbox.cfg
 
 	if ! use headless ; then
-		newicon VBox.png ${PN}.png
+		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
 
@@ -225,7 +237,7 @@ src_install() {
 
 	if use python; then
 		local pyver
-		for pyver in 2.4 2.5 2.6 2.7 3.0 3.1 ; do
+		for pyver in 2.5 2.6 2.7; do
 			if has_version "=dev-lang/python-${pyver}*" && [ -f "${S}/VBoxPython${pyver/./_}.so" ] ; then
 				doins VBoxPython${pyver/./_}.so || die
 			fi
@@ -303,6 +315,8 @@ src_install() {
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 
+	gnome2_icon_cache_update
+
 	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
 
 	elog ""
diff --git a/app-emulation/virtualbox-extpack-oracle/ChangeLog b/app-emulation/virtualbox-extpack-oracle/ChangeLog
index 845f3b0354e2..4d0bab2cedb6 100644
--- a/app-emulation/virtualbox-extpack-oracle/ChangeLog
+++ b/app-emulation/virtualbox-extpack-oracle/ChangeLog
@@ -1,6 +1,13 @@
 # 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.19 2012/03/15 09:55:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/ChangeLog,v 1.20 2012/04/05 07:45:10 polynomial-c Exp $
+
+*virtualbox-extpack-oracle-4.1.12 (05 Apr 2012)
+
+  05 Apr 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-extpack-oracle-4.1.6.ebuild,
+  +virtualbox-extpack-oracle-4.1.12.ebuild:
+  Version bump (bug #410811). Removed old.
 
 *virtualbox-extpack-oracle-4.1.10 (15 Mar 2012)
 
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.6.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.12.ebuild
index 77696f93ef76..c506eb9f1946 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.6.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.12.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.6.ebuild,v 1.1 2011/11/04 23:08:17 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.12.ebuild,v 1.1 2012/04/05 07:45:10 polynomial-c Exp $
 
 EAPI=2
 
 inherit eutils
 
+MY_BUILD="77245"
 MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${PV}"
+MY_P="${MY_PN}-${PV}-${MY_BUILD}"
 
 DESCRIPTION="PUEL extensions for VirtualBox"
 HOMEPAGE="http://www.virtualbox.org/"
diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index 2efb207387d6..77a8d7d15e89 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,13 @@
 # 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.91 2012/03/15 16:52:24 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.92 2012/04/05 07:46:12 polynomial-c Exp $
+
+*virtualbox-guest-additions-4.1.12 (05 Apr 2012)
+
+  05 Apr 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-guest-additions-4.1.6-r1.ebuild,
+  +virtualbox-guest-additions-4.1.12.ebuild:
+  Version bump (bug #410811). Removed old.
 
   15 Mar 2012; Lars Wendler <polynomial-c@gentoo.org>
   virtualbox-guest-additions-4.1.10.ebuild:
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.6-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.12.ebuild
index 56881ef5d141..1d09815a021f 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.6-r1.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.6-r1.ebuild,v 1.1 2011/11/06 23:40:53 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.12.ebuild,v 1.1 2012/04/05 07:46:12 polynomial-c Exp $
 
 EAPI=2
 
@@ -43,7 +43,7 @@ BUILD_TARGET_ARCH="${ARCH}"
 MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
 			vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
 
-S="${WORKDIR}/${MY_P}_OSE"
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 		linux-mod_pkg_setup
diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog
index e66132e1200a..7d69a19f44cd 100644
--- a/app-emulation/virtualbox-modules/ChangeLog
+++ b/app-emulation/virtualbox-modules/ChangeLog
@@ -1,6 +1,12 @@
 # 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.99 2012/03/15 09:52:06 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.100 2012/04/05 07:41:26 polynomial-c Exp $
+
+*virtualbox-modules-4.1.12 (05 Apr 2012)
+
+  05 Apr 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-modules-4.1.6.ebuild, +virtualbox-modules-4.1.12.ebuild:
+  Version bump (bug #410811). Removed old.
 
 *virtualbox-modules-4.1.10 (15 Mar 2012)
 
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.12.ebuild
index 72a076337c0f..3d269c348d2a 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.6.ebuild,v 1.3 2011/12/03 17:36:18 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.12.ebuild,v 1.1 2012/04/05 07:41:26 polynomial-c Exp $
 
 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
@@ -35,9 +35,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# bug #389953
-	epatch "${FILESDIR}"/${PN}-4.1.6-kernel-3.2-vboxpci.patch
-
 	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>:'
diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index f91d5bf87f60..ddd666db3f48 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,12 @@
 # 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.103 2012/03/23 20:18:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.104 2012/04/05 07:44:41 polynomial-c Exp $
+
+*virtualbox-4.1.12 (05 Apr 2012)
+
+  05 Apr 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-4.1.6-r1.ebuild, +virtualbox-4.1.12.ebuild:
+  Version bump (bug #410811). Removed old.
 
   23 Mar 2012; Markos Chandras <hwoarang@gentoo.org>
   +files/virtualbox-4.1.10-libgsoapssl.patch, virtualbox-4.1.10.ebuild:
diff --git a/app-emulation/virtualbox/virtualbox-4.1.10.ebuild b/app-emulation/virtualbox/virtualbox-4.1.10.ebuild
index 5982efe53898..d7e6c1f4b6b2 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.10.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.10.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.10.ebuild,v 1.2 2012/03/23 20:18:07 hwoarang Exp $
+# $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
 
@@ -182,7 +182,7 @@ src_prepare() {
 	# 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
+	epatch "${FILESDIR}"/${P}-libgsoapssl.patch
 }
 
 src_configure() {
diff --git a/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild b/app-emulation/virtualbox/virtualbox-4.1.12.ebuild
index 87d1699ba8f5..d627acb8c3f6 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.6-r1.ebuild,v 1.3 2011/12/20 13:14:14 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.12.ebuild,v 1.1 2012/04/05 07:44:41 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"
@@ -48,7 +48,7 @@ RDEPEND="!app-emulation/virtualbox-bin
 		media-libs/libsdl[X,video]
 	)
 	vnc? ( >=net-libs/libvncserver-0.9.7 )
-	java? ( >=virtual/jre-1.5 )"
+	java? ( virtual/jre:1.6 )"
 DEPEND="${RDEPEND}
 	>=dev-util/kbuild-0.1.999
 	>=dev-lang/yasm-0.6.2
@@ -66,7 +66,7 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-fontsextra
 	)
-	java? ( >=virtual/jdk-1.5 )
+	java? ( virtual/jdk:1.6 )
 	dev-util/pkgconfig
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	!headless? ( x11-libs/libXinerama )
@@ -116,15 +116,6 @@ REQUIRED_USE="
 "
 
 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."
@@ -168,9 +159,6 @@ src_prepare() {
 	# 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}"/${P}-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."
@@ -185,6 +173,11 @@ src_prepare() {
 			-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
 }
 
 src_configure() {
@@ -220,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)" \
@@ -306,7 +299,14 @@ src_install() {
 			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
 		fi
 
-		newicon	"${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png ${PN}.png
+		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
@@ -314,6 +314,7 @@ src_install() {
 		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