simplify LINGUAS stuff, relocate icon dest, update icon cache

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

5 files changed, 66 insertions, 54 deletions

diff --git a/media-sound/gmusicbrowser/ChangeLog b/media-sound/gmusicbrowser/ChangeLog
index fafd9c54f603..186be0ab2b4c 100644
--- a/media-sound/gmusicbrowser/ChangeLog
+++ b/media-sound/gmusicbrowser/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/gmusicbrowser
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/ChangeLog,v 1.15 2012/06/05 12:55:04 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/ChangeLog,v 1.16 2012/08/03 08:51:49 hasufell Exp $
+
+  03 Aug 2012; Julian Ospald <hasufell@gentoo.org> gmusicbrowser-1.1.8.ebuild,
+  gmusicbrowser-1.1.9.ebuild, gmusicbrowser-1.1.9.1_pre20120526.ebuild,
+  gmusicbrowser-9999.ebuild:
+  simplify LINGUAS stuff, relocate icon dest, update icon cache
 
   05 Jun 2012; Julian Ospald <hasufell@gentoo.org> gmusicbrowser-1.1.8.ebuild,
   gmusicbrowser-1.1.9.ebuild, gmusicbrowser-1.1.9.1_pre20120526.ebuild,
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.8.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.8.ebuild
index 52e6eca0f742..6bd85184e161 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.8.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.8.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/gmusicbrowser-1.1.8.ebuild,v 1.5 2012/06/05 12:55:04 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/gmusicbrowser-1.1.8.ebuild,v 1.6 2012/08/03 08:51:49 hasufell Exp $
 
 # note: dev-perl/Gtk2-MozEmbed left out in purpose because gtkmozembed and xulrunner are obsolete
 
 EAPI=4
 
-inherit fdo-mime
+inherit fdo-mime gnome2-utils
 
 DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
 HOMEPAGE="http://gmusicbrowser.org/"
@@ -47,30 +47,31 @@ done
 unset l
 
 src_prepare() {
-	sed -i -e '/menudir/d' Makefile || die
+	sed -i \
+		-e '/menudir/d' \
+		-e '/^LINGUAS=/d' \
+		Makefile || die
 }
 
 src_install() {
-	local LINGUAS
-	local l
-	for l in ${LANGS}; do
-		if use linguas_${l}; then
-			LINGUAS="${LINGUAS} ${l}"
-		fi
-	done
-
 	emake \
 		DOCS="AUTHORS NEWS README" \
 		DESTDIR="${D}" \
-		iconsdir="${D}/usr/share/pixmaps" \
-		LINGUAS="${LINGUAS}" \
+		iconsdir="${D}/usr/share/icons/hicolor/32x32/apps" \
+		liconsdir="${D}/usr/share/icons/hicolor/48x48/apps" \
+		miconsdir="${D}/usr/share/pixmaps" \
 		install
 
 	dohtml layout_doc.html
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
 	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
 
 	elog "Gmusicbrowser supports gstreamer, mplayer and mpg123/ogg123..."
 	elog "for audio playback. Needed dependencies:"
@@ -89,4 +90,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
 }
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.1_pre20120526.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.1_pre20120526.ebuild
index c86421addc18..43c2c7c87f4b 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.1_pre20120526.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.1_pre20120526.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.1_pre20120526.ebuild,v 1.2 2012/06/05 12:55:04 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.1_pre20120526.ebuild,v 1.3 2012/08/03 08:51:49 hasufell Exp $
 
 EAPI=4
 
-inherit fdo-mime vcs-snapshot
+inherit fdo-mime gnome2-utils vcs-snapshot
 
 DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
 HOMEPAGE="http://gmusicbrowser.org/"
@@ -46,31 +46,31 @@ done
 unset l
 
 src_prepare() {
-	sed -i -e '/menudir/d' Makefile || die
+	sed -i \
+		-e '/menudir/d' \
+		-e '/^LINGUAS=/d' \
+		Makefile || die
 }
 
 src_install() {
-	local LINGUAS
-	local l
-	for l in ${LANGS}; do
-		if use linguas_${l}; then
-			LINGUAS="${LINGUAS} ${l}"
-		fi
-	done
-
 	emake \
 		DOCS="AUTHORS NEWS README" \
 		DESTDIR="${D}" \
-		iconsdir="${D}/usr/share/pixmaps" \
-		LINGUAS="${LINGUAS}" \
-		VERSION="${PV}" \
+		iconsdir="${D}/usr/share/icons/hicolor/32x32/apps" \
+		liconsdir="${D}/usr/share/icons/hicolor/48x48/apps" \
+		miconsdir="${D}/usr/share/pixmaps" \
 		install
 
 	dohtml layout_doc.html
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
 	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
 
 	elog "Gmusicbrowser supports gstreamer, mplayer and mpg123/ogg123..."
 	elog "for audio playback. Needed dependencies:"
@@ -89,4 +89,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
 }
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.ebuild
index 633317b5c591..7b174266edbf 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.ebuild,v 1.4 2012/06/05 12:55:04 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/gmusicbrowser-1.1.9.ebuild,v 1.5 2012/08/03 08:51:49 hasufell Exp $
 
 EAPI=4
 
-inherit fdo-mime
+inherit fdo-mime gnome2-utils
 
 DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
 HOMEPAGE="http://gmusicbrowser.org/"
@@ -45,30 +45,31 @@ done
 unset l
 
 src_prepare() {
-	sed -i -e '/menudir/d' Makefile || die
+	sed -i \
+		-e '/menudir/d' \
+		-e '/^LINGUAS=/d' \
+		Makefile || die
 }
 
 src_install() {
-	local LINGUAS
-	local l
-	for l in ${LANGS}; do
-		if use linguas_${l}; then
-			LINGUAS="${LINGUAS} ${l}"
-		fi
-	done
-
 	emake \
 		DOCS="AUTHORS NEWS README" \
 		DESTDIR="${D}" \
-		iconsdir="${D}/usr/share/pixmaps" \
-		LINGUAS="${LINGUAS}" \
+		iconsdir="${D}/usr/share/icons/hicolor/32x32/apps" \
+		liconsdir="${D}/usr/share/icons/hicolor/48x48/apps" \
+		miconsdir="${D}/usr/share/pixmaps" \
 		install
 
 	dohtml layout_doc.html
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
 	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
 
 	elog "Gmusicbrowser supports gstreamer, mplayer and mpg123/ogg123..."
 	elog "for audio playback. Needed dependencies:"
@@ -87,4 +88,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
 }
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
index 9e8e86c9accc..64fcd1039563 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild,v 1.3 2012/06/05 12:55:04 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild,v 1.4 2012/08/03 08:51:49 hasufell Exp $
 
 EAPI=4
 
-inherit fdo-mime git-2
+inherit fdo-mime git-2 gnome2-utils
 
 DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
 HOMEPAGE="http://gmusicbrowser.org/"
@@ -46,30 +46,31 @@ done
 unset l
 
 src_prepare() {
-	sed -i -e '/menudir/d' Makefile || die
+	sed -i \
+		-e '/menudir/d' \
+		-e '/^LINGUAS=/d' \
+		Makefile || die
 }
 
 src_install() {
-	local LINGUAS
-	local l
-	for l in ${LANGS}; do
-		if use linguas_${l}; then
-			LINGUAS="${LINGUAS} ${l}"
-		fi
-	done
-
 	emake \
 		DOCS="AUTHORS NEWS README" \
 		DESTDIR="${D}" \
-		iconsdir="${D}/usr/share/pixmaps" \
-		LINGUAS="${LINGUAS}" \
+		iconsdir="${D}/usr/share/icons/hicolor/32x32/apps" \
+		liconsdir="${D}/usr/share/icons/hicolor/48x48/apps" \
+		miconsdir="${D}/usr/share/pixmaps" \
 		install
 
 	dohtml layout_doc.html
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
 	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
 
 	elog "Gmusicbrowser supports gstreamer, mplayer and mpg123/ogg123..."
 	elog "for audio playback. Needed dependencies:"
@@ -88,4 +89,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
 }