remove the dir file in the correct place and also remove desktop entry for live ebuil...

Package-Manager: portage-2.1.2.2

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index a8fda95f7d88a55e84d4edc89a2360c126282a94..957672686c546aa6aa8cc1c5cf300807d9fef815 100644 (file)
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.91 2007/03/07 05:21:07 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.92 2007/03/12 09:05:57 opfer Exp $
+
+  12 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.95-r1.ebuild, emacs-cvs-22.0.9999-r5.ebuild:
+  remove the dir file in the correct place and also remove desktop entry for
+  live ebuild, fixes bug 170133
 
   07 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
   -files/40aspell-gentoo.el, emacs-cvs-22.0.95-r1.ebuild,

diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 09d2e4d3d80b6b3e7a75d70e34b2a882847b85ab..694606f2919414dd91f6bb37446ae9bb8e4d9db2 100644 (file)
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -34,22 +34,22 @@ MD5 97a1860f95596f13a074a96456ffeac4 files/emacs.desktop.in 236
 RMD160 47bddcb74a8bc45fba3f5f5c5656f1e40469d3c8 files/emacs.desktop.in 236
 SHA256 8bbfa1b6bb241fd3653b5b1c25ef1ecd298c63d7e0fdc87baab8b274eb627342 files/emacs.desktop.in 236
 DIST emacs-22.0.95.tar.gz 37754533 RMD160 e5aa6001a255538dbc8fb2d548d1b67979f94033 SHA1 90cd5a6078d26b3bd0eb4f2da0561df759bc880f SHA256 5e25e8f221fe18f07feadd831bb482e6cde53c9470713c63f059ff2d3e715b1d
-EBUILD emacs-cvs-22.0.95-r1.ebuild 6759 RMD160 41025ea0a33d9df487641c0bd53536b26eb134ec SHA1 03f76eec5fae43625bf9f36009342ab0e2791a7d SHA256 1436dd88eaefcbf06f7778586f45cd6c155f768f70717df643f2254566e1a671
-MD5 9c8215708d3882cf649c5cf5d22ba663 emacs-cvs-22.0.95-r1.ebuild 6759
-RMD160 41025ea0a33d9df487641c0bd53536b26eb134ec emacs-cvs-22.0.95-r1.ebuild 6759
-SHA256 1436dd88eaefcbf06f7778586f45cd6c155f768f70717df643f2254566e1a671 emacs-cvs-22.0.95-r1.ebuild 6759
-EBUILD emacs-cvs-22.0.9999-r5.ebuild 6912 RMD160 54ced70d5a462b8299a067b248b449b2b67c988d SHA1 9cc1d9a90253df6158a9d1c452f5d6dcd4679d7f SHA256 d8fa7d7f71af4c116a1c251d6bccfcf136ff2650ac406c455364c9e6f45db68e
-MD5 e8dc688f4021d2e29f2cf7d60a708889 emacs-cvs-22.0.9999-r5.ebuild 6912
-RMD160 54ced70d5a462b8299a067b248b449b2b67c988d emacs-cvs-22.0.9999-r5.ebuild 6912
-SHA256 d8fa7d7f71af4c116a1c251d6bccfcf136ff2650ac406c455364c9e6f45db68e emacs-cvs-22.0.9999-r5.ebuild 6912
+EBUILD emacs-cvs-22.0.95-r1.ebuild 6760 RMD160 60c6d548160b857d091c2d88b9315b88338dfd42 SHA1 2d6beec1a0f9bde1db7d40b7db23b98eed7400b4 SHA256 3627436fe05b9565e774ca139e7a726a9c5e862b06ca0175891d9829ed5fd97f
+MD5 88decf1e388046f2ed133b8836d078cb emacs-cvs-22.0.95-r1.ebuild 6760
+RMD160 60c6d548160b857d091c2d88b9315b88338dfd42 emacs-cvs-22.0.95-r1.ebuild 6760
+SHA256 3627436fe05b9565e774ca139e7a726a9c5e862b06ca0175891d9829ed5fd97f emacs-cvs-22.0.95-r1.ebuild 6760
+EBUILD emacs-cvs-22.0.9999-r5.ebuild 6817 RMD160 1cb8df07358055e3ba6f02aa0ebef8c8af2d65f8 SHA1 1abfa0253389c3909a76ce05c85999eb07a92f8b SHA256 f9b3379c5c16f00066bc325b9d50b3e2a61486d263f4b36d4e93997bbfaf6622
+MD5 05a9c9296a0b64b384a83788d3c9d82d emacs-cvs-22.0.9999-r5.ebuild 6817
+RMD160 1cb8df07358055e3ba6f02aa0ebef8c8af2d65f8 emacs-cvs-22.0.9999-r5.ebuild 6817
+SHA256 f9b3379c5c16f00066bc325b9d50b3e2a61486d263f4b36d4e93997bbfaf6622 emacs-cvs-22.0.9999-r5.ebuild 6817
 EBUILD emacs-cvs-23.0.0-r1.ebuild 5743 RMD160 b164c9e764fecd991e65a61d89c804080b71b766 SHA1 b663e3b75bb561439fbff9e7cb536258180d16d3 SHA256 cb3e09f1383533c93947f4a4043e5b70848250a0c8843295c0b1e65dbe0c9c73
 MD5 9416690d34c620c0cc3d6853039dc367 emacs-cvs-23.0.0-r1.ebuild 5743
 RMD160 b164c9e764fecd991e65a61d89c804080b71b766 emacs-cvs-23.0.0-r1.ebuild 5743
 SHA256 cb3e09f1383533c93947f4a4043e5b70848250a0c8843295c0b1e65dbe0c9c73 emacs-cvs-23.0.0-r1.ebuild 5743
-MISC ChangeLog 17598 RMD160 cb1c835c7013c603eb27ce2429f29bd5c05828fc SHA1 e27566b2144025b66691eb937aaf8a860b46608d SHA256 264848a3ba6cade0767d104c4b7873095e451186fe62a43818560c0b88fe1952
-MD5 362f2cdb68375e178ba29e6e65f3d513 ChangeLog 17598
-RMD160 cb1c835c7013c603eb27ce2429f29bd5c05828fc ChangeLog 17598
-SHA256 264848a3ba6cade0767d104c4b7873095e451186fe62a43818560c0b88fe1952 ChangeLog 17598
+MISC ChangeLog 17825 RMD160 81bf6e1d4dbb4b52aec9d1b4f2a03ca2e61e6f65 SHA1 e31ff6e346336d8a7dc0adb68b61ae97c4f29060 SHA256 e1714d777613a8570c0456bb7f12ea6fbdb92a2063d82f774f7d6aad97912094
+MD5 ba395d75bd11a5596354c46eac2d0607 ChangeLog 17825
+RMD160 81bf6e1d4dbb4b52aec9d1b4f2a03ca2e61e6f65 ChangeLog 17825
+SHA256 e1714d777613a8570c0456bb7f12ea6fbdb92a2063d82f774f7d6aad97912094 ChangeLog 17825
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -66,7 +66,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF7kuONQqtfCuFneMRAgTVAKCXeIpyDt/rW1K4KNEj28iyMnEYyACeMAnG
-GFOrGRIYbL/+pNt3fucO4us=
-=7cB8
+iD8DBQFF9Rf6NQqtfCuFneMRAlooAJ98Bbq5QZGLJeelVv88cCl7bDBMsgCfW8uW
+jpJRirmgyJgB6sX7nui63uw=
+=5rni
 -----END PGP SIGNATURE-----

diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.ebuild
index 03006b31a7cc7964d4ff1a97f80962961fa415ff..20c69f908735e488b8c9fa7eb3907ebfc8b4be55 100644 (file)
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.ebuild,v 1.3 2007/03/07 05:21:07 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.95-r1.ebuild,v 1.4 2007/03/12 09:05:57 opfer Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -195,7 +195,7 @@ pkg_postinst() {
        # ecompress from Portage 2.2.* does auto-compression
        # which is not desired for the dir file, so remove it to
        # let it be recreated
-       rm "${D}/usr/share/info/emacs-${SLOT}/dir.bz2" 2> /dev/null
+       rm "${ROOT}/usr/share/info/emacs-${SLOT}/dir.*" 2> /dev/null
 
        if use X; then
                elog "You need to install some fonts for Emacs.  Under monolithic"

diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r5.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r5.ebuild
index 41811c7bcaf256ade870b236a913b0776f963af6..931e7b7a40620ba9313c1233cd685060c16523b8 100644 (file)
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r5.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r5.ebuild,v 1.3 2007/03/07 05:21:07 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r5.ebuild,v 1.4 2007/03/12 09:05:57 opfer Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -170,8 +170,6 @@ EOF
        fi
 
        dodoc BUGS ChangeLog README
-
-       make_desktop_entry emacs Emacs /usr/share/emacs/${SLOT}/etc/images/icons/emacs_48.png   editors
 }
 
 update-alternatives() {
@@ -202,7 +200,7 @@ pkg_postinst() {
        # ecompress from Portage 2.2.* does auto-compression
        # which is not desired for the dir file, so remove it to
        # let it be recreated
-       rm "${D}/usr/share/info/emacs-${SLOT}/dir.bz2" 2> /dev/null
+       rm "${ROOT}/usr/share/info/emacs-${SLOT}/dir.*" 2> /dev/null
 
        if use X; then
                elog "You need to install some fonts for Emacs.  Under monolithic"