Call gnome2_icon_savelist in src_install instead of pkg_preinst.

Package-Manager: portage-2.2_rc30/cvs/Linux i686

4 files changed, 11 insertions, 17 deletions

diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index d41491eb8649..042552df2a94 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for app-emacs/emacs-common-gentoo
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.11 2009/04/12 13:40:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.12 2009/04/12 13:53:08 ulm Exp $
 
   12 Apr 2009; Ulrich Mueller <ulm@gentoo.org>
   emacs-common-gentoo-0.3.ebuild, emacs-common-gentoo-1.0.ebuild:
-  Call gnome2_icon_savelist in pkg_preinst, bug 155993.
+  Call gnome2_icon_savelist in src_install, bug 155993.
 
   04 Apr 2009; Brent Baude <ranger@gentoo.org>
   emacs-common-gentoo-1.0.ebuild:
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index 20b96185adc5..22b479055267 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 DIST emacs-common-gentoo-1.0.tar.gz 14268 RMD160 3dad4c2955fc8d9be095500305d67c36e587eef0 SHA1 2d646e3761a2eb23c359e0fb45743f553ade07b6 SHA256 eafc05a71b7b77084073ab82e9bf92c4a4dec1b61feb8a7adaa0b3194f95e2cd
 DIST emacs-desktop-0.3.tar.gz 14364 RMD160 bfcc3977ac602696330fde87878b2bc263267851 SHA1 9aab71bafad38be598d9f8ffcbd8c6b7b2a87854 SHA256 e4bc226140ce242679c400298a3760441dfd33e37f9e9a7f01f960b4a6eb97ae
-EBUILD emacs-common-gentoo-0.3.ebuild 1047 RMD160 fd8a522f5ff74ccc068dcb1a00ee7d537337e84b SHA1 0e892b7714ff3f609c9cd07434ba38f7333e201e SHA256 0040933636775e98d025adb0f7f7a89f11cf75f8ee1b3bf15507a0700006cf25
-EBUILD emacs-common-gentoo-1.0.ebuild 3537 RMD160 a6754e2411cf0d06cc61c60b2bf7536f8e467cb1 SHA1 de8af61adc4db3b2f02c6e93014d11809fcdb85c SHA256 91bcdb6f5c4ea3a0cefb33e05154aa5f762cecb6b641eab904a1f66a004c51e3
-MISC ChangeLog 5118 RMD160 05ede8a1bfc59fd4f4833f9098878f143243a617 SHA1 706f847b88b747ee0cb957b7de9ee52c06560cdd SHA256 7f59afad11d46a4fb771448eb053fe04013b0ab88e5c19f178c27a62ce5875b6
+EBUILD emacs-common-gentoo-0.3.ebuild 1028 RMD160 17e00a4e1ddb231604f629fb6ea9937dcdf38228 SHA1 da9dfc27c04c84f92aadac0de3d0628af3a88000 SHA256 65ea0d544da252c9bfdae6af465a42ad70e3dedba0724dedda3a096962a26543
+EBUILD emacs-common-gentoo-1.0.ebuild 3510 RMD160 89c123f39a506fb7272d02c8a1db65cc2a18434a SHA1 24544197d05bec00a4be73d1a579508e67e66fe1 SHA256 6c4e976d05f908d1793d6e413d63acb754e35cf929d3d3f0a9b38179d5205a8c
+MISC ChangeLog 5118 RMD160 7849362bbcf4485091932f1c00a6cfd74f5f8901 SHA1 6a113d0ffc400ccaffd114507a7d7ada1725248b SHA256 1eea7e7ee08a627766ca858c53942eb765d6ae9b4cd91ad28b3d8cb6994da2ae
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAknh75sACgkQOeoy/oIi7uyb2wCdG1sQxE/4p0Vai+y8c0juiXqV
-QHIAoLYLIHMwE2mN+/RXwJuX1hVN0yCx
-=C57A
+iEYEARECAAYFAknh8poACgkQOeoy/oIi7uykgACeJQUgRJ7FO6gn8BSZO0pCQPxR
+cJUAnj3bqgQjOZ0qsLLoHNDiGALk83WS
+=hx2d
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-0.3.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-0.3.ebuild
index 62198d055601..381dd895e9a3 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-0.3.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-0.3.ebuild,v 1.2 2009/04/12 13:40:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-0.3.ebuild,v 1.3 2009/04/12 13:53:08 ulm Exp $
 
 inherit eutils fdo-mime gnome2-utils
 
@@ -25,9 +25,6 @@ src_install() {
 		insinto /usr/share/icons/hicolor/${i}x${i}/apps
 		newins emacs_${i}.png emacs.png
 	done
-}
-
-pkg_preinst() {
 	gnome2_icon_savelist
 }
 
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild
index 2172a0f7b63b..940714a07986 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild,v 1.12 2009/04/12 13:40:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.0.ebuild,v 1.13 2009/04/12 13:53:08 ulm Exp $
 
 inherit elisp-common eutils fdo-mime gnome2-utils
 
@@ -38,6 +38,7 @@ src_install() {
 			insinto /usr/share/icons/hicolor/${i}x${i}/apps
 			newins emacs_${i}.png emacs.png || die
 		done
+		gnome2_icon_savelist
 	fi
 }
 
@@ -72,10 +73,6 @@ pkg_config() {
 	fi
 }
 
-pkg_preinst() {
-	use X && gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	if use X; then
 		fdo-mime_desktop_database_update