Use "official" icons from Emacs 22.

(Portage version: 2.1.2.5)

3 files changed, 19 insertions, 6 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/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