Use doicon instead insinto + doins to install icon files

(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)

4 files changed, 17 insertions, 19 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 57cd2f38c40a..cc7a17452228 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,10 @@
 # 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.123 2012/08/22 21:15:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.124 2012/09/05 09:16:52 jlec Exp $
+
+  05 Sep 2012; Justin Lecher <jlec@gentoo.org> virtualbox-4.1.12.ebuild,
+  virtualbox-4.1.18.ebuild, virtualbox-4.1.20-r1.ebuild:
+  Use doicon instead insinto + doins to install icon files
 
   22 Aug 2012; Lars Wendler <polynomial-c@gentoo.org>
   +files/virtualbox-4.1.8-nopie.patch, virtualbox-4.1.12.ebuild,
diff --git a/app-emulation/virtualbox/virtualbox-4.1.12.ebuild b/app-emulation/virtualbox/virtualbox-4.1.12.ebuild
index c17b8f12debf..6ae939a2193d 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.12.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.12.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.12.ebuild,v 1.7 2012/08/22 21:15:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.12.ebuild,v 1.8 2012/09/05 09:16:52 jlec Exp $
 
 EAPI=4
 
@@ -300,12 +300,10 @@ src_install() {
 		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
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
 		done
-		insinto /usr/share/pixmaps
-		newins ${PN}-48px.png ${PN}.png
+		newicon ${PN}-48px.png ${PN}.png
 		popd &>/dev/null || die
 	else
 		doins VBoxHeadless || die
diff --git a/app-emulation/virtualbox/virtualbox-4.1.18.ebuild b/app-emulation/virtualbox/virtualbox-4.1.18.ebuild
index a999623ffee3..76ee2294398e 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.18.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.18.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.18.ebuild,v 1.4 2012/08/22 21:15:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.18.ebuild,v 1.5 2012/09/05 09:16:52 jlec Exp $
 
 EAPI=4
 
@@ -300,12 +300,10 @@ src_install() {
 		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
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
 		done
-		insinto /usr/share/pixmaps
-		newins ${PN}-48px.png ${PN}.png
+		newicon ${PN}-48px.png ${PN}.png
 		popd &>/dev/null || die
 	else
 		doins VBoxHeadless || die
diff --git a/app-emulation/virtualbox/virtualbox-4.1.20-r1.ebuild b/app-emulation/virtualbox/virtualbox-4.1.20-r1.ebuild
index 8acdd9e31516..34bd13abf65a 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.20-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.20-r1.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.20-r1.ebuild,v 1.2 2012/08/22 21:15:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.20-r1.ebuild,v 1.3 2012/09/05 09:16:52 jlec Exp $
 
 EAPI=4
 
@@ -303,12 +303,10 @@ src_install() {
 		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
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
 		done
-		insinto /usr/share/pixmaps
-		newins ${PN}-48px.png ${PN}.png
+		newicon ${PN}-48px.png ${PN}.png
 		popd &>/dev/null || die
 	else
 		doins VBoxHeadless || die