Use "official" icons from Emacs 22.

Package-Manager: portage-2.1.2.5

4 files changed, 34 insertions, 21 deletions

diff --git a/x11-misc/emacs-desktop/ChangeLog b/x11-misc/emacs-desktop/ChangeLog
index f09f0b5a1ca4..1f01c93ccd4e 100644
--- a/x11-misc/emacs-desktop/ChangeLog
+++ b/x11-misc/emacs-desktop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/emacs-desktop
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/emacs-desktop/ChangeLog,v 1.10 2007/04/30 21:43:52 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/emacs-desktop/ChangeLog,v 1.11 2007/05/05 07:04:51 ulm Exp $
+
+*emacs-desktop-0.2-r1 (01 May 2007)
+
+  01 May 2007; Ulrich Mueller <ulm@gentoo.org> -emacs-desktop-0.2.ebuild,
+  +emacs-desktop-0.2-r1.ebuild:
+  Use "official" icons from Emacs 22.
 
   30 Apr 2007; Tony Vroon <chainsaw@gentoo.org> emacs-desktop-0.2.ebuild:
   Add ~ppc keyword. Tested on a PowerBook 5,9 with GCC 4.1.2
diff --git a/x11-misc/emacs-desktop/Manifest b/x11-misc/emacs-desktop/Manifest
index 7540bced98ea..87456a8ccb93 100644
--- a/x11-misc/emacs-desktop/Manifest
+++ b/x11-misc/emacs-desktop/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA1
 
 DIST emacs-desktop-0.2.tar.gz 14028 RMD160 37371779c8a181f4d0ef83e9f742fb85b85c106b SHA1 15cb6cfc43ba2bef33aec50c66490446b9318d0c SHA256 4bb6af7db887d177813972be3985722a97a6836765604276c772b379c20cba5b
-EBUILD emacs-desktop-0.2.ebuild 684 RMD160 7b0a6eeec35975534ca60ff3243ec96fa06e577b SHA1 48e14a6056b5027c33384ddd5ed5585280a0dfa0 SHA256 e67af6a3800cd1644abfd83c910ba54f6b13d89ccc0ba9ac81fbe08e69d2a903
-MD5 6b05f887e7f3701fd459dd59d675ccd2 emacs-desktop-0.2.ebuild 684
-RMD160 7b0a6eeec35975534ca60ff3243ec96fa06e577b emacs-desktop-0.2.ebuild 684
-SHA256 e67af6a3800cd1644abfd83c910ba54f6b13d89ccc0ba9ac81fbe08e69d2a903 emacs-desktop-0.2.ebuild 684
-MISC ChangeLog 1501 RMD160 3dc90ed94fc6781d195b1767c9ab4ef7c6f3ef51 SHA1 92fd63392eb3d487dacfb36ca1e7bc6600fa5546 SHA256 aedaf9b7ec00047b55b5308049baf10f940b7ae242220b2282b8f7f0e65a9fbd
-MD5 880cd952f1652854badb2960c65bd3cc ChangeLog 1501
-RMD160 3dc90ed94fc6781d195b1767c9ab4ef7c6f3ef51 ChangeLog 1501
-SHA256 aedaf9b7ec00047b55b5308049baf10f940b7ae242220b2282b8f7f0e65a9fbd ChangeLog 1501
+EBUILD emacs-desktop-0.2-r1.ebuild 877 RMD160 eb4bf9c444b066fa33f4cda588fe1f90f760ffb9 SHA1 27c0a65d0e2e727d9b2592d220407527ec639aa2 SHA256 327d839b82a6b0b4e57254eca3d0c18a58e6d4e232e12699898b79798738566c
+MD5 b6213fc8f3e7a142a38fe63deadc3fbd emacs-desktop-0.2-r1.ebuild 877
+RMD160 eb4bf9c444b066fa33f4cda588fe1f90f760ffb9 emacs-desktop-0.2-r1.ebuild 877
+SHA256 327d839b82a6b0b4e57254eca3d0c18a58e6d4e232e12699898b79798738566c emacs-desktop-0.2-r1.ebuild 877
+MISC ChangeLog 1678 RMD160 3816a97dea4e6b72235c947da7ee339a9c2474ee SHA1 bbf65b8263178d03c62647cd755ac48d7c425e08 SHA256 84a58b487958f0273fb06a11b6ea745c217d2d3fb18f925f4204cf5977391cf8
+MD5 cb02bcf879a27bef03d8c0ef5e560774 ChangeLog 1678
+RMD160 3816a97dea4e6b72235c947da7ee339a9c2474ee ChangeLog 1678
+SHA256 84a58b487958f0273fb06a11b6ea745c217d2d3fb18f925f4204cf5977391cf8 ChangeLog 1678
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
-MD5 f06ff1ad41ced1be7241391f49344848 files/digest-emacs-desktop-0.2 250
-RMD160 5e869d2aa8f86659c21be3e685059914745f496c files/digest-emacs-desktop-0.2 250
-SHA256 c3a346514d5afa55bbe17a0ff3245d24389371e9cc5aaf9fff0992638a4abc33 files/digest-emacs-desktop-0.2 250
+MD5 f06ff1ad41ced1be7241391f49344848 files/digest-emacs-desktop-0.2-r1 250
+RMD160 5e869d2aa8f86659c21be3e685059914745f496c files/digest-emacs-desktop-0.2-r1 250
+SHA256 c3a346514d5afa55bbe17a0ff3245d24389371e9cc5aaf9fff0992638a4abc33 files/digest-emacs-desktop-0.2-r1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGNmYcp5vW4rUFj5oRAvNcAKCbx6q28YY1kNRkLVdGLgpXtg53/ACgm/WU
-7ryAGZQMyuHOX5tYLDXna0Q=
-=YVd8
+iD8DBQFGPC0UOeoy/oIi7uwRAl07AKDYx+KkdHb5JvrW1BavKq5SNSWOzQCfS7fk
+F8r/Hw1JkDwW+BzKEu9bwt0=
+=Gxd5
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/emacs-desktop/emacs-desktop-0.2.ebuild b/x11-misc/emacs-desktop/emacs-desktop-0.2-r1.ebuild
index dcb80df8e9f4..a83091f7583a 100644
--- a/x11-misc/emacs-desktop/emacs-desktop-0.2.ebuild
+++ b/x11-misc/emacs-desktop/emacs-desktop-0.2-r1.ebuild
@@ -1,27 +1,34 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/emacs-desktop/emacs-desktop-0.2.ebuild,v 1.9 2007/04/30 21:43:52 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/emacs-desktop/emacs-desktop-0.2-r1.ebuild,v 1.1 2007/05/05 07:04:51 ulm Exp $
 
-inherit eutils fdo-mime
+inherit eutils fdo-mime gnome2-utils
 
 DESCRIPTION="Desktop entry and icon for Emacs"
-HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/index.xml"
+HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~ppc"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 src_install() {
+	local i
 	domenu emacs.desktop emacsclient.desktop
-	doicon emacs.png
+	newicon emacs_48.png emacs.png
+	for i in 16 24 32 48; do
+		insinto /usr/share/icons/hicolor/${i}x${i}/apps
+		newins emacs_${i}.png emacs.png
+	done
 }
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
 }
diff --git a/x11-misc/emacs-desktop/files/digest-emacs-desktop-0.2 b/x11-misc/emacs-desktop/files/digest-emacs-desktop-0.2-r1
index a9ce28ade94c..a9ce28ade94c 100644
--- a/x11-misc/emacs-desktop/files/digest-emacs-desktop-0.2
+++ b/x11-misc/emacs-desktop/files/digest-emacs-desktop-0.2-r1