Install desktop file for qtconfig (bug 441712); fix subcategory for linguist desktop file.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

3 files changed, 27 insertions, 11 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 4abb57f77443..804348821e34 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.203 2012/10/14 17:09:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.204 2012/11/14 10:17:49 pesa Exp $
+
+  14 Nov 2012; Davide Pesavento <pesa@gentoo.org> qt-gui-4.8.3-r1.ebuild:
+  Install desktop file for qtconfig (bug 441712); fix subcategory for linguist
+  desktop file.
 
   14 Oct 2012; Raúl Porcel <armin76@gentoo.org> qt-gui-4.8.2.ebuild:
   alpha/ia64/sparc stable wrt #424625
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index 1cb13cb29e0a..e82e0c43d557 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -13,13 +13,23 @@ DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861b
 EBUILD qt-gui-4.7.4-r1.ebuild 6539 SHA256 594b225277de239c72fefe3369f8a75c811a7f39ada9bff62c1eb7fa52c8fea9 SHA512 475cef3c2705bea4c7d6fe83f05670b14edb00f2029951a612e3a2f4ffcd836efe3b3ee5864e5e749f052da012c6ab4a3c9dfd1d45b02375178d8d2e3c27b91b WHIRLPOOL b0fa06ffb86674c3eb7e5ca5916dbac1d14f988021e507c659c0018e83d2bf68a45669f16fdfc6e4f1968024edf4304f9237ac26d0616820b3eccea920a3b354
 EBUILD qt-gui-4.8.1-r1.ebuild 7974 SHA256 579fdce730a330c3b75bd0faecf2c67f7f79287a8c3e3669c79c964360c64d84 SHA512 752b34346708453c282eb6c8f678570ee55483048a10f850ea0e5ce294c1ab02c993e7e771ee159e885f99c8a1e9c148d0cf9dcfaad0a14b58fdeef8dd2cc953 WHIRLPOOL f246a9fbe1c93545298e3d360570686f86a8adbff56c1248446bfeb7c46729f59a19c64496a72f9fe705d56c1078f65940c58f23d60b48c6b1299719d08bf201
 EBUILD qt-gui-4.8.2.ebuild 8094 SHA256 22ff75f68c175d0a53ae359bf2caa621a4758a0c5bca25cca0f141ca90ff1dec SHA512 7e48218b4f5fd5a13ec8ef992f42f97d512573d22209a8e5c5a4bac13ed7324fe346293f78c61847807fbebf4bd40b9b8d40751b0444032bd987b9bb090036d3 WHIRLPOOL 6956b54355d3042a57001c20fbe91676e6a067714d3f46bbc2bad7664170d65dd9121aacf38d3a43e4e0918a991b6de84a5297414a404c00c78ad4daf1bf540f
-EBUILD qt-gui-4.8.3-r1.ebuild 8024 SHA256 345f9a58c1e1c2912928e01bfc7b10622869504720d03a193cd3390f0f3c503c SHA512 ab6189f8054fad46185a8dd3b493b6338c0cdfd04be3eb387907fae3165fe2cc9fa477fc3bbf54b0d2f97daba20696d348e6e4388473d928da6868e0925dfc09 WHIRLPOOL 766135567e6fa26613bbb58743b76775280c9112397ab579ab09b5bee08229bfdf7a71cfeeb00aca86735c0e0697986bdd6c0d1d1440613abab1de10f07f660c
-MISC ChangeLog 30224 SHA256 3b111b7feaca77ac324c43bf025c8058bbd347e18ed11fffd0a507b00ac6fe77 SHA512 344f326d22014468c75477ca35eaf74ac15e01811f3fef9332eac17419585fef9cad7ea0fb5975d74dea34ec9b85e2ccdcf640b3a4db930982b4b88d6dd7f63e WHIRLPOOL 507a062205c5091eea61cd41ff35e4085bb5bd22cf4e856767fb268183022d812984a05409f2088bdb27dc105799d7adc81cdd946752b1f2693d6a5bc4b837b2
+EBUILD qt-gui-4.8.3-r1.ebuild 8198 SHA256 b55ff426112631bc9fdc6dcef61f12b4165a58b4f3dcfcc035fddbd9a144ff9f SHA512 c0d1424614290d25a87640dfc9018ccd6cd5d6a706b3f14184f5668d9103284f529ee9566d7511daa7b84f94aa8e993092dddabb466a0ad52b8d06bbc60a77ea WHIRLPOOL 7a4f0249aad9b80c37c465724faf71c794fdb5b657e577d2b70f81d6c4d7945ab8cae6a497de4614c2f9ca09977be6311d4f1ef50ae1c3f2264fa90d5e12688e
+MISC ChangeLog 30391 SHA256 85e10132baa3324c3009014d59456bd882f712991ff639cfab6c74de450395d4 SHA512 168dd2b953b6985f1e670ace2c56ed30596fa1ad764e7065768a455af4a023d0ea086d0b34d2d1423a89f14815df2939009fe0a61521fe0d5ec6a839ec9add06 WHIRLPOOL 47552554ccf248c3eda416932e80a37518a21b3407c1c3af81241693b34576d6fde67ce569f5ee0f0d4fa4a47fe6a1f704294be407e5cf6108ff992b344163f0
 MISC metadata.xml 1408 SHA256 3c6009d441bc2d4b414c5fbf0e804fb3afe40e510bd7801fed237feb15fefa28 SHA512 7cdc018a47e690332784ac9d99b749f12a82b882b3d43b94bebe829be371b83f816c0d91ed98cd04c866ec9dd0745e83ff416056593b77d7845545041d599548 WHIRLPOOL 2f11be380287ed99becebb3a26ad03fbc266edcbdeef6bd1a25a58c7229fb6574f00f857fe53393466aac979c7ec7153f56b2ffe1b2b9a6c3c13539e6395e8c4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB68cwACgkQuQc30/atMkCwKgCeLV6RP/0H5vIiOQ84nBm6wfSr
-ZFEAoIVsRMftWioKQY5qrSOoi3eZYgrX
-=if56
+iQIcBAEBCAAGBQJQo2/gAAoJENXLsxwXqFxyN4AP/iCa3nczOxZaRiYVoDkiFyDh
+6S9cJ5lS0welSCdFnkBGSNPYnlsHB8xXXXFWYPZO1FAcxceAdSHwFA2VK1W/BdEz
+G2JV0cHtMS3gdaogG7SqAzNpYr2npSDfsdfgHHVSlTwmh15m0mt/yOieMiuUR9fZ
+PzGulJXAiopSK29xQyLhIuGq2JQxeiQWoq7V04JOp7BYuy9ShbCZbQizjlfpgk6y
+shnMGzqZwyv4sV/VTUD+dIlizDpuwHEPMMD2jWKKc3+Z0+DoHA9+czhMZDD9rR6h
+7m7aT3OxUHmDbelhwhzUJbWS1aCtCW7zgOuo3KOezR7ANtnAFpWZJI3G7N3R1a1O
+Cr1JFc/6HMdBjd0hwEIw8VS2OO3Kggt2T1b8kp95f24okfAoeMTuMFzI+aofHucV
+sIShoMIHZl8ZH1AvofWN0JsJY4/EeO0XY8j10ckuld7d+3Qvfvu/trLLyPOCjP4W
+XLNExB1EMV55jk7Zt5GZot+Ej0MWHqeJZmMFzsV8/NdpG6c/lZbYBrDRaLAC0ciL
+TtQYDRRMkI0u0ewu+NJQ1PHiCOdA1an3kWxRJGXq4DP19pUQ+3HlGR1B4OodhZRK
+OHHz5F+dseUALf8mYv7SVjPXn5kr66pUlau8XwxY+WJMFLCbvQ0EnNN4dhtMMvbs
+DhugsU58uKN5wyTgxxrA
+=+m0m
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-gui/qt-gui-4.8.3-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.8.3-r1.ebuild
index f5839c5dc692..facfdb30f6be 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.3-r1.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.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/x11-libs/qt-gui/qt-gui-4.8.3-r1.ebuild,v 1.1 2012/09/16 04:15:21 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.3-r1.ebuild,v 1.2 2012/11/14 10:17:49 pesa Exp $
 
 EAPI=4
 
@@ -224,11 +224,13 @@ src_install() {
 	echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
 	touch "${ED}"/usr/share/qt4/graphicssystems/native || die
 
-	doicon tools/designer/src/designer/images/designer.png \
-		tools/linguist/linguist/images/icons/linguist-128-32.png
-	use dbus && doicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png
+	doicon tools/designer/src/designer/images/designer.png
+	newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png
+	newicon tools/qtconfig/images/appicon.png qtconfig.png
+	use dbus && newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
 	make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner'
-	make_desktop_entry linguist Linguist linguist-128-32 'Qt;Development;GUIDesigner'
+	make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation'
+	make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
 }
 
 pkg_postinst() {