Version bump (bug #410811). Removed old

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

2 files changed, 36 insertions, 16 deletions

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 ""