Use doicon instead insinto + doins to install icon files

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

7 files changed, 24 insertions, 31 deletions

diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog
index f9510394fbe5..2d90fa2f4876 100644
--- a/app-backup/bacula/ChangeLog
+++ b/app-backup/bacula/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-backup/bacula
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.132 2012/09/05 07:07:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.133 2012/09/05 08:28:17 jlec Exp $
+
+  05 Sep 2012; Justin Lecher <jlec@gentoo.org> bacula-5.0.3-r1.ebuild,
+  bacula-5.0.3-r2.ebuild, bacula-5.0.3-r3.ebuild, bacula-5.2.10.ebuild,
+  bacula-5.2.5.ebuild, bacula-5.2.9.ebuild:
+  Use doicon instead insinto + doins to install icon files
 
   05 Sep 2012; Justin Lecher <jlec@gentoo.org> bacula-5.0.3-r1.ebuild,
   bacula-5.0.3-r2.ebuild, bacula-5.0.3-r3.ebuild, bacula-5.2.10.ebuild,
diff --git a/app-backup/bacula/bacula-5.0.3-r1.ebuild b/app-backup/bacula/bacula-5.0.3-r1.ebuild
index 8236b2fa03e8..ad8fef6593f9 100644
--- a/app-backup/bacula/bacula-5.0.3-r1.ebuild
+++ b/app-backup/bacula/bacula-5.0.3-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-backup/bacula/bacula-5.0.3-r1.ebuild,v 1.12 2012/09/05 07:07:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r1.ebuild,v 1.13 2012/09/05 08:28:17 jlec Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2"
@@ -222,14 +222,12 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/share/pixmaps
-	doins scripts/bacula.png || die
+	doicon scripts/bacula.png || die
 
 	# install bat when enabled (for some reason ./configure doesn't pick this up)
 	if use qt4; then
 		dosbin "${S}"/src/qt-console/.libs/bat || die
-		insinto /usr/share/pixmaps
-		doins src/qt-console/images/bat_icon.png || die
+		doicon src/qt-console/images/bat_icon.png || die
 		domenu scripts/bat.desktop || die
 	fi
 
diff --git a/app-backup/bacula/bacula-5.0.3-r2.ebuild b/app-backup/bacula/bacula-5.0.3-r2.ebuild
index 628ee05a10a6..5f565f2bd1e4 100644
--- a/app-backup/bacula/bacula-5.0.3-r2.ebuild
+++ b/app-backup/bacula/bacula-5.0.3-r2.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-backup/bacula/bacula-5.0.3-r2.ebuild,v 1.9 2012/09/05 07:07:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r2.ebuild,v 1.10 2012/09/05 08:28:17 jlec Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2"
@@ -236,14 +236,12 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/share/pixmaps
-	doins scripts/bacula.png || die
+	doicon scripts/bacula.png || die
 
 	# install bat when enabled (for some reason ./configure doesn't pick this up)
 	if use qt4 && ! use static ; then
 		dosbin "${S}"/src/qt-console/.libs/bat || die
-		insinto /usr/share/pixmaps
-		doins src/qt-console/images/bat_icon.png || die
+		doicon src/qt-console/images/bat_icon.png || die
 		domenu scripts/bat.desktop || die
 	fi
 
diff --git a/app-backup/bacula/bacula-5.0.3-r3.ebuild b/app-backup/bacula/bacula-5.0.3-r3.ebuild
index f9c57863a79a..1ec90a982026 100644
--- a/app-backup/bacula/bacula-5.0.3-r3.ebuild
+++ b/app-backup/bacula/bacula-5.0.3-r3.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-backup/bacula/bacula-5.0.3-r3.ebuild,v 1.6 2012/09/05 07:07:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r3.ebuild,v 1.7 2012/09/05 08:28:17 jlec Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2"
@@ -238,14 +238,12 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/share/pixmaps
-	doins scripts/bacula.png || die
+	doicon scripts/bacula.png || die
 
 	# install bat when enabled (for some reason ./configure doesn't pick this up)
 	if use qt4 && ! use static ; then
 		dosbin "${S}"/src/qt-console/.libs/bat || die
-		insinto /usr/share/pixmaps
-		doins src/qt-console/images/bat_icon.png || die
+		doicon src/qt-console/images/bat_icon.png || die
 		domenu scripts/bat.desktop || die
 	fi
 
diff --git a/app-backup/bacula/bacula-5.2.10.ebuild b/app-backup/bacula/bacula-5.2.10.ebuild
index bc151b5c3f35..f73109d7a45b 100644
--- a/app-backup/bacula/bacula-5.2.10.ebuild
+++ b/app-backup/bacula/bacula-5.2.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-backup/bacula/bacula-5.2.10.ebuild,v 1.3 2012/09/05 07:07:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.10.ebuild,v 1.4 2012/09/05 08:28:17 jlec Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -195,14 +195,12 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	insinto /usr/share/pixmaps
-	doins scripts/bacula.png
+	doicon scripts/bacula.png
 
 	# install bat icon and desktop file when enabled
 	# (for some reason ./configure doesn't pick this up)
 	if use qt4 && ! use static ; then
-		insinto /usr/share/pixmaps
-		doins src/qt-console/images/bat_icon.png
+		doicon src/qt-console/images/bat_icon.png
 		domenu scripts/bat.desktop
 	fi
 
diff --git a/app-backup/bacula/bacula-5.2.5.ebuild b/app-backup/bacula/bacula-5.2.5.ebuild
index d409a694e94d..aa927cd1640b 100644
--- a/app-backup/bacula/bacula-5.2.5.ebuild
+++ b/app-backup/bacula/bacula-5.2.5.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-backup/bacula/bacula-5.2.5.ebuild,v 1.10 2012/09/05 07:07:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.5.ebuild,v 1.11 2012/09/05 08:28:17 jlec Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -195,14 +195,12 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	insinto /usr/share/pixmaps
-	doins scripts/bacula.png
+	doicon scripts/bacula.png
 
 	# install bat icon and desktop file when enabled
 	# (for some reason ./configure doesn't pick this up)
 	if use qt4 && ! use static ; then
-		insinto /usr/share/pixmaps
-		doins src/qt-console/images/bat_icon.png
+		doicon src/qt-console/images/bat_icon.png
 		domenu scripts/bat.desktop
 	fi
 
diff --git a/app-backup/bacula/bacula-5.2.9.ebuild b/app-backup/bacula/bacula-5.2.9.ebuild
index ec8f5b80a726..b2c50bf2e425 100644
--- a/app-backup/bacula/bacula-5.2.9.ebuild
+++ b/app-backup/bacula/bacula-5.2.9.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-backup/bacula/bacula-5.2.9.ebuild,v 1.4 2012/09/05 07:07:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.9.ebuild,v 1.5 2012/09/05 08:28:17 jlec Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -194,14 +194,12 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	insinto /usr/share/pixmaps
-	doins scripts/bacula.png
+	doicon scripts/bacula.png
 
 	# install bat icon and desktop file when enabled
 	# (for some reason ./configure doesn't pick this up)
 	if use qt4 && ! use static ; then
-		insinto /usr/share/pixmaps
-		doins src/qt-console/images/bat_icon.png
+		doicon src/qt-console/images/bat_icon.png
 		domenu scripts/bat.desktop
 	fi