simplify LINGUAS stuff, relocate icon dest, update icon cache

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

6 files changed, 83 insertions, 71 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/Manifest b/media-sound/gmusicbrowser/Manifest
index 5541d0a47351..2de79421a4d6 100644
--- a/media-sound/gmusicbrowser/Manifest
+++ b/media-sound/gmusicbrowser/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST gmusicbrowser-1.1.8.tar.gz 1507101 RMD160 a931a4f58e85e178ee97b8ab2e2bb32ac99efaf9 SHA1 13a27963645c72a363d741ee69d292872084795d SHA256 94e3e7ff23b853d9b6a03b3b1a48cb378bb4cc251c3861fe82e2e0bc3ae27689
-DIST gmusicbrowser-1.1.9.1_pre20120526.tar.gz 1035824 RMD160 e1b5906d26ec4cf849dbdc710f22bdc951f81e5c SHA1 46747834728c17ac4391fddbe29a111a8830b157 SHA256 8920f726bea77adfd96ddca0c297a5773a1eb7c7cfb20c286395a6aebce6747a
-DIST gmusicbrowser-1.1.9.tar.gz 1631107 RMD160 b5fa64a67948ebc77d0846f0c7f4a387e47fcc1f SHA1 380be9c805b076d94c155f2084465b8ea042e51b SHA256 7612ec91d8addc8f511e20fd6025ffe735cc1281a8e7b3278368a23f5cb0bd24
-EBUILD gmusicbrowser-1.1.8.ebuild 2271 RMD160 89bd2f9fc7952eee794a4ca203765e0a73049ae4 SHA1 174cf07ac450a3f85babcc4300f0e4aedde31f8c SHA256 130f5c71532d191611b6b09c62f6a24a7d5b7c94cd8fc3fa4061e016e6d80121
-EBUILD gmusicbrowser-1.1.9.1_pre20120526.ebuild 2283 RMD160 ee3a6c671731509cc702e2fe6618d9260231e529 SHA1 c023fb029a1657ed9f27829d97946879c63009a8 SHA256 7eac7b3412902ab4db3f0dfc7ce50f473edeff513af5306d5ae4ed81095e14f3
-EBUILD gmusicbrowser-1.1.9.ebuild 2174 RMD160 b7165228098e78b41c3b33b8971d618904b3183c SHA1 601c85cf42bb523561858224f7233da35a6a34ef SHA256 039af49e22f539a4c8887381c49f9286dd798852d2f551f38628ad0d01addd76
-EBUILD gmusicbrowser-9999.ebuild 2184 RMD160 94609a010a3d8c3322eab3868fd83e21f707e5a4 SHA1 b59f6b68edc34b6e7a62674fc10dd0af975fce12 SHA256 0ef639389c1ffb932020e34e10896b7486920281564c08a78c40fc6a48e45530
-MISC ChangeLog 2499 RMD160 b632cb3af052bdeb2ce4cb991dcbea1bda809cb9 SHA1 fef6d5b4e06a0681d2a721883e1b3567c54bd0fc SHA256 2f8c6745bebf2bab8ca29933329bd1168bea22ee1ac76a1b5d087df2c0bd38a3
-MISC metadata.xml 313 RMD160 0d4c33953458e7caa7ed483b3323039795eef5f3 SHA1 7ca74c6ddb2cf4efe27909190c7acb67763d1bfa SHA256 bb85693bc492a9b9051a51d29bbf6169f6123de54d13389e8df006aa8445decd
+DIST gmusicbrowser-1.1.8.tar.gz 1507101 SHA256 94e3e7ff23b853d9b6a03b3b1a48cb378bb4cc251c3861fe82e2e0bc3ae27689 SHA512 c20e928e775102ff14346d4de2a301abb777e470386eb8e2cc8cc12b204c0e13b4561236b09b85959ece76264d4786fffcfe90a5886623695f886627dca49e9b WHIRLPOOL f6403c15458aa900eaef3277ee62553886c3c2f91d12580d356afaa410be5dcd7e415a7d99f48088e8ea505acde63e9d1fe7ca13def2e658d988dd94b68cdc13
+DIST gmusicbrowser-1.1.9.1_pre20120526.tar.gz 1035824 SHA256 8920f726bea77adfd96ddca0c297a5773a1eb7c7cfb20c286395a6aebce6747a SHA512 00e9aa5e47cd96c19a9a052a6944c861b1c49128f7e41eb7b723f87e9d5722a1b5b541a52b07923134cb1b3fcbdf433efc78874968ade480702857c6f0180dc1 WHIRLPOOL be51416afc784000aea38d0eacd8b94a39dc9b8f93ec25dc6d767f5070f6a99bc5f0d64e8a81ff1ae9909f872c7a2098383ae3426f93c6cf574b34f9e2267a9e
+DIST gmusicbrowser-1.1.9.tar.gz 1631107 SHA256 7612ec91d8addc8f511e20fd6025ffe735cc1281a8e7b3278368a23f5cb0bd24 SHA512 311fa00eebd579f9b2bb9f7b551b92d08a50c64a426477169166b78d485a47aa99242bfdb5e02c9ae457e1330ebf6ec239e92fec1b88eefb32e7e0debef3f08a WHIRLPOOL 91335d684f23b978c376735626b4ad697a45100d62f36372d5ff98cdf8c1986de301034013a5024f74321af15f532943429942440f60519905516c221b58b43e
+EBUILD gmusicbrowser-1.1.8.ebuild 2378 SHA256 7a78ee9cfdfba70b4088b11c33da61098b298bd774aed85fda38160daa5b27cb SHA512 189ea2bfbdfee3768c6373fb0cddd4ab9f1e732fb928a3e76633ae447911f231dd232c7767fbfcf0a10e8a2510743b95a133d1bbd7477cfb080286072c36ab1d WHIRLPOOL 9d80e151b7102ffeec23024c942d440a2cf3621d472f9b4cbfdfcdf2e41ab104b17bfb264c1b086eee015ac2b7e884e16de08b4e9dda9cd338afdfff3f38f108
+EBUILD gmusicbrowser-1.1.9.1_pre20120526.ebuild 2370 SHA256 973da833d1dd23b13ea900ff06e99cdbcab10c69beecfa714787dddebc8c347d SHA512 b780181a89677a7be50115117955018cee4d5c76f065f2b2c10c933fb26c70359c6e5b782a53cadbb198f4457f50562082e3b7b5cddf78740f6d7b77dc294e1c WHIRLPOOL c07137d149455360304d43cec78754d75542b5f2e4d6e466179e3137a2c9f5d3d27b4def9e0727470a9fbbfbf8a9bcb24f57857aad90bf6f4fcc1a5683a37df9
+EBUILD gmusicbrowser-1.1.9.ebuild 2281 SHA256 0baa779e39894a346e8dc3aa97e778d0b585926d46e48a41692ed4b417f6db87 SHA512 ed959b598cc9553b229d121008ab277d97afe441017b7ae5896ba062163e52b70ab055fb12fd0901bdda585d901c62a6b55ed05e65774f914b926703c807db3f WHIRLPOOL b566c9e8e88feaa8c8e6ac81c87b73621278dad1e811463500472e0d345d8c240bafa8337d346bafc7560d86e70d3385a9e969ba3d5f6c1e84f1c09de0e93277
+EBUILD gmusicbrowser-9999.ebuild 2291 SHA256 9ed27dd2a5aadb8e98532d3656d18e9bfca303ce72b87d080b61a0c29667a6c5 SHA512 5c31f9f15ccaec9593b359f84cd9873b3a5ecfed762a5c6f22beeff67cc961b066efbf8e3cf7453317d0185a0a2991a95c8e66c80cc242dddf8c5529004ed3d0 WHIRLPOOL 0e12390885636cb9a5aba6c7009ef230cbffc30f34a11e8b14e34566a9c37d5fb70d42196188006f86a7f08eaf20f769775baf0908edc3f1e5247daa75881869
+MISC ChangeLog 2744 SHA256 ead05b714a4db6b75c5ecee403d15f564f645e476dbc041d7f56acdcf955a6c5 SHA512 09c1796be0616c22f4af00f5e4ab860719626ac8d439621486ccaa44862fe52c4653deef56ecb42aa9d2f00d79a044acb228814646951c7eb29bb6775c06b651 WHIRLPOOL cf898d9a6c0a885cd00cbeaf8135b20626d481271695b4a8dac90fd259ad483dd29892cca071c45f64cc8ca1be951a72a2c2dd07eafc7b4de5ecd97a1bf899d3
+MISC metadata.xml 313 SHA256 bb85693bc492a9b9051a51d29bbf6169f6123de54d13389e8df006aa8445decd SHA512 0405931fa5c6f0145bcd881e660eed51d76f969b8efbc308a6fbbdd500fa26f63e611d95523f8d795409d1f32b407512bbd3a43aae483666e943d294168dddeb WHIRLPOOL ecbabfde03141da23374eb804dfbd02174bb9c257c3b15c49bac36efc897e69b623dce329af5001a37eac93dcb6bd2a752de2b4fa3be3990284cc4d90828a90c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPzgEFAAoJEFpvPKfnPDWz9lcIAKVkFzCtYF8eNdxBA0yTqHQY
-BMJgNmCxC+4NmTWCFWgMaRqYnxcovlvoFdo3mt9navLUP9gIm7ZgqpTJYBPAxuhz
-ZdSZM5+FXZOYA2JBXizhSVnBiTDEvT2xeNSzChGJn8R2ne75VbkSaYpuK9t6bU0a
-eGchyXTIipZzgecmUOTF0U+u1v9Lm6JyrWcFzfmCNmdNcvd+LGeMjzLye72Prr70
-Ys7kXVwIjHCkjNtKNmnu063me8q+fcVd2ZW7SidZMlsAbgwqQfnb+ilpz68Gfv/J
-VMuVnfEDea7kbxVk7Om+bvHmuDmcYraIFcg/cTGLEWE/FWwUdohgr0xhY8R6SBQ=
-=bxd/
+iQEcBAEBCAAGBQJQG5AdAAoJEFpvPKfnPDWzvhgIAINirNtARiseakmsoNogbbvL
+XPOq5Oai/JClUViNEwboh7PpwNHgW9tJL10/RSWugclu/1ILvJv4jh+bcelCtLOi
+/yIXNHi2FMSmCGhLMIsdcDZbWrSKq0hrncv3seE7NL/XCvetdfY39bSHAi5G/Qkx
+DZbUZwxop+vu3TIn5fcM1CEGFAJ0CoG8Xlx89YzzUIXi2akPXoZbKz4whlYE5VKr
+BtH5889z2BBOi4FzNAGKBMT/9fT5sPzId9/Jxhs9ufV0vgyX1gOf3zqPKKOeomgE
+l3xsRVV9t8nszS6SStI+tt9GyumtjuPlWKDWYlzceVcjRnr/39Wf5kV6Xi1OQoY=
+=oRK4
 -----END PGP SIGNATURE-----
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
 }