fix doicon mess, bug #420117 by Richard Freeman

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

4 files changed, 19 insertions, 14 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index 8f434fb0501b..5ced7e427f36 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/lyx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.262 2012/05/28 15:58:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.263 2012/06/08 15:06:55 aballier Exp $
+
+  08 Jun 2012; Alexis Ballier <aballier@gentoo.org> lyx-1.6.10.ebuild,
+  lyx-2.0.3.ebuild:
+  fix doicon mess, bug #420117 by Richard Freeman
 
   28 May 2012; Raúl Porcel <armin76@gentoo.org> lyx-2.0.3.ebuild:
   alpha/ia64/sparc stable wrt #411941
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index df6945a1db6c..28a0b6047cef 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -10,16 +10,17 @@ DIST lyx-1.6.10.tar.bz2 12559454 RMD160 b84409c19d320f915c3254d56d8aa0b40e61540d
 DIST lyx-2.0.1.tar.xz 10119588 RMD160 d8a4ed2f546994220ee7fc84246f1aceccaa6ed9 SHA1 225b4d853f38463e986a9b42a39cac432da56d8a SHA256 a58b7e0f27afce0497fffec0d19fc95fb1b3ac36818e8d02ecaf9e882c8f3852
 DIST lyx-2.0.2.tar.xz 10175756 RMD160 ab2436c05fd4ea2bb76111d6bab140359162b317 SHA1 47b9c7fa73ef827907622cefe78421a356481ca9 SHA256 e5eacacd200d4502808f59e244d380634dca421b2bc89a5c213b3faddadcbd18
 DIST lyx-2.0.3.tar.xz 10265532 RMD160 fcb3a09626fb5dc49ae25654b5f98e9989d5ff00 SHA1 109dae0ef22a7d8944964b32ee380ad170b0665f SHA256 4e1c993754acfb14d5e0f2bd2521fb6686d08e0656ec6e5fde0406c285a05ac8
-EBUILD lyx-1.6.10.ebuild 4032 RMD160 b061a3163e0b3007b3916b95d1071e9941820844 SHA1 7965945555ce216a779df2c640f884a079f8ed8b SHA256 87cfaab07eb650245fc97fab3d9d193fd2a41706f3775ebd509315b23a91c802
+EBUILD lyx-1.6.10.ebuild 4018 RMD160 43c549bd8128445c85bd16c6e5ec244340f0228e SHA1 4ab4090f78033a19e9d7afd888ad629913161f72 SHA256 46f429dcf7832e79813cdb6eb5a19b0df2bb382cf51204119db92665573a1d3d
 EBUILD lyx-2.0.1.ebuild 4583 RMD160 d477bf5cfbf0cd92192553a999851d01132ec1f5 SHA1 f34bc532d137699df0bfb325a9e20071b3bdc4dc SHA256 89e7c125b0318b919140016a8382b0fd7288925b3a7ecd8b207c2e45f03678f8
 EBUILD lyx-2.0.2.ebuild 4664 RMD160 89ef350a09d6ac474d20640977f760c3c8480e3e SHA1 4591e29ceec0ffafe2c15df00ffa60db3b2a3470 SHA256 d6b977d76ff908116f3fa1a817e724b92f4e80a5595dfcea74e81998b874f43c
-EBUILD lyx-2.0.3.ebuild 4469 RMD160 9a3f1d7e84bb4143e850198fb9b5aa8e0c42828d SHA1 1561bc63f36137c9b4357d03c37eb83043837004 SHA256 e8910b5d99b2035b7cee2adfb4c807011ab5a3962d2e7b3b7d2488f6c7417f72
-MISC ChangeLog 35681 RMD160 f55dab0a826a169d3e3b9020538297ae5466ebe6 SHA1 a25949109908641b1a4a00ce1b80b73f7591c525 SHA256 f0d0521409ad5f0515297c967e4c1acab802586e0abada10b12587098c8e6571
+EBUILD lyx-2.0.3.ebuild 4454 RMD160 7bd9a55ac08e89100eceab2eb5519cd1e7de5421 SHA1 c1e7093296da74e6317591064016985e3c0bde61 SHA256 756de3fa150d1ea389181cc40612dd5fc119e14e42cb98f5508adf7c7061d790
+MISC ChangeLog 35824 RMD160 3d1afa67ef68051d7a3611ba0788911e539e51c8 SHA1 c946d4a05673cea3f252d71eac1c4f4186053921 SHA256 6a10c8d24bcd4bb71c8f09e85a9f2db812c24a64cddb47ac2790be2adee2cbad
+MISC lyx-1.6.10.ebuild.orig 4032 RMD160 b061a3163e0b3007b3916b95d1071e9941820844 SHA1 7965945555ce216a779df2c640f884a079f8ed8b SHA256 87cfaab07eb650245fc97fab3d9d193fd2a41706f3775ebd509315b23a91c802
 MISC metadata.xml 1572 RMD160 850394a1700004439f7258d04732517216d8e31c SHA1 99c60675f6273f853498479676a4be74e07182b3 SHA256 330d0d86b06c6ce15cea6cfdd3bd070bddc82309346902481883575fd211ec14
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/DoJ8ACgkQuQc30/atMkDNagCffjj07YVwBjaAafM1CSHdtisk
-9/sAnRK19iZ73k8i/lpUbi3cRI5s+/ie
-=/HjM
+iEYEARECAAYFAk/SFRUACgkQvFcC4BYPU0pyfgCfRWuSQInHc4sNlwXDAu38hhbL
+Bh8An0JRxQzLiLO+dRNpqgJQlbq8MUmk
+=Q715
 -----END PGP SIGNATURE-----
diff --git a/app-office/lyx/lyx-1.6.10.ebuild b/app-office/lyx/lyx-1.6.10.ebuild
index c6f38023236a..ecb179a5b655 100644
--- a/app-office/lyx/lyx-1.6.10.ebuild
+++ b/app-office/lyx/lyx-1.6.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-office/lyx/lyx-1.6.10.ebuild,v 1.10 2012/05/03 20:00:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.6.10.ebuild,v 1.11 2012/06/08 15:06:55 aballier Exp $
 
 EAPI=2
 
@@ -124,8 +124,8 @@ src_install() {
 		doins "${T}"/hebrew.bind || die
 	fi
 
-	doicon ${PN} "$S/development/Win32/packaging/icons/lyx_32x32.png"
-	make_desktop_entry ${PN} "LyX" "/usr/share/pixmaps/lyx_32x32.png" "Office" "MimeType=application/x-lyx;"
+	newicon -s 32 "$S/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
+	make_desktop_entry ${PN} "LyX" "${PN}" "Office" "MimeType=application/x-lyx;"
 
 	# fix for bug 91108
 	if use latex ; then
diff --git a/app-office/lyx/lyx-2.0.3.ebuild b/app-office/lyx/lyx-2.0.3.ebuild
index 6efabaed0c50..ff410b4d494e 100644
--- a/app-office/lyx/lyx-2.0.3.ebuild
+++ b/app-office/lyx/lyx-2.0.3.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-office/lyx/lyx-2.0.3.ebuild,v 1.10 2012/05/28 15:58:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.3.ebuild,v 1.11 2012/06/08 15:06:55 aballier Exp $
 
 EAPI=3
 
@@ -129,8 +129,8 @@ src_install() {
 		doins "${T}"/hebrew.bind || die
 	fi
 
-	doicon ${PN} "$S/development/Win32/packaging/icons/lyx_32x32.png"
-	make_desktop_entry ${PN} "LyX" "/usr/share/pixmaps/lyx_32x32.png" "Office" "MimeType=application/x-lyx;"
+	newicon -s 32 "$S/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
+	make_desktop_entry ${PN} "LyX" "${PN}" "Office" "MimeType=application/x-lyx;"
 
 	# fix for bug 91108
 	if use latex ; then