Added keepdir /usr/share/emacs/site-lisp to fix bug #93329 and use leim-21.4.tar.gz to fix bug #91665.

Package-Manager: portage-2.0.51.19

5 files changed, 18 insertions, 13 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 82aa83132ca2..0cda2329bfd7 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.62 2005/05/03 10:54:12 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.63 2005/05/21 20:22:13 usata Exp $
+
+  21 May 2005; Mamoru KOMACHI <usata@gentoo.org> emacs-21.4.ebuild,
+  emacs-21.4-r1.ebuild:
+  Added keepdir /usr/share/emacs/site-lisp to fix bug #93329 and use
+  leim-21.4.tar.gz to fix bug #91665.
 
   03 May 2005; Mamoru KOMACHI <usata@gentoo.org> files/emacs-21.desktop,
   files/emacs-22.0.50.desktop, -files/emacs.desktop, emacs-21.4-r1.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index e63923ff50c6..a99dee247e9d 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,10 +1,10 @@
-MD5 001c8b0a6b1cf0e95aeb082e6fd48125 emacs-21.4.ebuild 4105
+MD5 870802726485f04f143c5e053d7a9209 emacs-21.4.ebuild 4141
 MD5 27ad4010641ab075702e1ca9bea2e506 emacs-22.0.50_pre20050225.ebuild 5421
-MD5 3aae0ec1e5ac86901d2fd4ee5220c244 ChangeLog 9714
+MD5 4df432ebe76868becb9784349be61ac6 ChangeLog 9914
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 MD5 767c6035b2be8309041a7c2e81bfd7a0 emacs-18.59.ebuild 2007
-MD5 3c6fa74230070b5f651471199caad92e emacs-21.4-r1.ebuild 4386
-MD5 56a239d1965c2bac249e787b1ef6a1f5 files/digest-emacs-21.4-r1 126
+MD5 6f9f3a44aa1359843b03ff62b95583a9 emacs-21.4-r1.ebuild 4361
+MD5 77362e2a2494f71a2869096cc89ca8f2 files/digest-emacs-21.4-r1 127
 MD5 ab4757cbbda4ac6f848021b947d1f2b2 files/emacs-21.desktop 238
 MD5 0d61f19c0e6fcdb6657ae1d4d9e69801 files/60emacs-22.0.50.envd 39
 MD5 3a0ce8880fff1be2f5e8281633532546 files/emacs-22.0.50.desktop 242
diff --git a/app-editors/emacs/emacs-21.4-r1.ebuild b/app-editors/emacs/emacs-21.4-r1.ebuild
index 602383f5085e..45f7115936d3 100644
--- a/app-editors/emacs/emacs-21.4-r1.ebuild
+++ b/app-editors/emacs/emacs-21.4-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r1.ebuild,v 1.4 2005/05/03 10:54:12 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r1.ebuild,v 1.5 2005/05/21 20:22:13 usata Exp $
 
 inherit flag-o-matic eutils alternatives toolchain-funcs
 
 DESCRIPTION="An incredibly powerful, extensible text editor"
 HOMEPAGE="http://www.gnu.org/software/emacs"
-SRC_URI="mirror://gnu/emacs/${P}.tar.gz
-	leim? ( mirror://gnu/emacs/leim-21.3.tar.gz )"
+SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
+	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
 
 LICENSE="GPL-2"
 SLOT="21"
@@ -40,8 +40,6 @@ SANDBOX_DISABLED="1"
 DFILE=emacs-${SLOT}.desktop
 
 src_unpack() {
-	# Emacs 21.4 uses leim from 21.3
-	ln -s emacs-21.4 emacs-21.3
 
 	unpack ${A}
 
@@ -139,6 +137,7 @@ src_install() {
 	find ${D} -type d |xargs chmod 755
 
 	keepdir /usr/share/emacs/${PV}/leim
+	keepdir /usr/share/emacs/site-lisp
 
 	dodoc BUGS ChangeLog README
 
diff --git a/app-editors/emacs/emacs-21.4.ebuild b/app-editors/emacs/emacs-21.4.ebuild
index 307bc9a320b8..8c932a897df8 100644
--- a/app-editors/emacs/emacs-21.4.ebuild
+++ b/app-editors/emacs/emacs-21.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4.ebuild,v 1.10 2005/04/12 13:34:03 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4.ebuild,v 1.11 2005/05/21 20:22:13 usata Exp $
 
 inherit flag-o-matic eutils alternatives toolchain-funcs
 
@@ -133,6 +133,7 @@ src_install() {
 	find ${D} -type d |xargs chmod 755
 
 	keepdir /usr/share/emacs/${PV}/leim
+	keepdir /usr/share/emacs/site-lisp
 
 	dodoc BUGS ChangeLog README
 
diff --git a/app-editors/emacs/files/digest-emacs-21.4-r1 b/app-editors/emacs/files/digest-emacs-21.4-r1
index 57a8aeb49fa3..bd9b5378ba0c 100644
--- a/app-editors/emacs/files/digest-emacs-21.4-r1
+++ b/app-editors/emacs/files/digest-emacs-21.4-r1
@@ -1,2 +1,2 @@
-MD5 0a68ea5b29bb2f081ba8dd85d37bb9bc emacs-21.4.tar.gz 20516657
-MD5 1c968c37e22be0f0d8f8cd57cebe5a5e leim-21.3.tar.gz 3291224
+MD5 8f9d97cbd126121bd5d97e5e31168a87 emacs-21.4a.tar.gz 20403483
+MD5 32938cb5a7505d995a1e835639d19707 leim-21.4.tar.gz 3291433