Create new emacs-subdirs-el-gentoo.diff for latest CVS; Resolves Bug #124999.

(Portage version: 2.1_pre5-r1)

3 files changed, 30 insertions, 34 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index ea9fc43f2c18..de04fed5560e 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.40 2006/02/26 21:48:47 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.41 2006/03/06 00:15:00 mkennedy Exp $
+
+  06 Mar 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  files/emacs-subdirs-el-gentoo.diff:
+  Create new emacs-subdirs-el-gentoo.diff for latest CVS; Resolves Bug #124999.
 
   26 Feb 2006; Matthew Kennedy <mkennedy@gentoo.org>
   -files/50emacs-22.0.50.envd, emacs-cvs-22.0.50-r1.ebuild,
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 4e4906190f1c..596559dfa288 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 702f3011653a39651e4a0720ba9a19dc ChangeLog 6943
 RMD160 b8bb68f7f0c345e5e8bb3ab2ca5114e679200667 ChangeLog 6943
 SHA256 da67ffb4ce277ebe6dc7be2d1c7396b5c6938f0bece5a6dfe7f7ce499375be98 ChangeLog 6943
@@ -31,9 +28,9 @@ SHA256 3931cd9401f587dae3bc898f39bffebe349b3597bbf7bd3199b7ec1ab01167d1 files/em
 MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-cvs-21.3.50-nofink.diff 1520
 RMD160 31c8fc31a4715d26e1566d87f09b947d1664b136 files/emacs-cvs-21.3.50-nofink.diff 1520
 SHA256 09f387ecc0a53f02acbe445b3e9c82cd815700c7313329e0bc5d8baa39a925a7 files/emacs-cvs-21.3.50-nofink.diff 1520
-MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
-RMD160 142e80ab7dc4620275ec9623f646e0b2c4a1c6bf files/emacs-subdirs-el-gentoo.diff 1369
-SHA256 c407b31c785b275f12337e41e58ff8386219b1c94a1c98b69eee82a10eb54074 files/emacs-subdirs-el-gentoo.diff 1369
+MD5 bd7222d2c80bddb9077f389897887cdf files/emacs-subdirs-el-gentoo.diff 1580
+RMD160 fea0e4ade096977b4f77b7b0234c8097dda3650e files/emacs-subdirs-el-gentoo.diff 1580
+SHA256 d01a8119a565689a37499e6d5aedcbf7e9329e1612840d281ae5a0c183059d6e files/emacs-subdirs-el-gentoo.diff 1580
 MD5 91da809381cbee2642bee45da75c182b files/xft-bgalpha.patch 690
 RMD160 eb4bee1226982b1b470f0b267960fd177cbc5eb1 files/xft-bgalpha.patch 690
 SHA256 51e1ee64d1fbfebec95e1863b476692c7291f44fb32a7f85e025b57c447d5f6f files/xft-bgalpha.patch 690
@@ -46,10 +43,3 @@ SHA256 03643e029572a5bcbe6404d584537228c690df472426371b0585414b5d283966 files/xf
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFEAiJMyiNZaEAZA+ARAsoZAJ9EnJGLMTJM+EZ6zHYzfUz7n5hjYgCfSLIA
-l5XlrbKqC+VRFIcpiW0oV+g=
-=cqVV
------END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff b/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff
index c76aab71b771..3ca46deaa796 100644
--- a/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff
+++ b/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff
@@ -1,32 +1,34 @@
---- Makefile.in	2002-10-19 10:21:01.000000000 +0900
-+++ Makefile.in.subdirs-el	2004-08-02 17:01:35.852417016 +0900
-@@ -387,18 +387,21 @@
+diff -ur emacs.orig/Makefile.in emacs/Makefile.in
+--- emacs.orig/Makefile.in	2006-03-05 17:38:35.000000000 -0600
++++ emacs/Makefile.in	2006-03-05 18:04:23.000000000 -0600
+@@ -445,18 +445,21 @@
  	then true; \
  	else \
  	  (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
-+	   echo "    (normal-top-level-add-subdirs-to-load-path))"; \
-+	   echo "(setq default-directory \"/usr/share/emacs/site-lisp\")"; \
-+	   echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
++           echo "    (normal-top-level-add-subdirs-to-load-path))"; \
++           echo "(setq default-directory \"/usr/share/emacs/site-lisp\")"; \
++           echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
  	   echo "    (normal-top-level-add-subdirs-to-load-path))") \
- 	    > ${datadir}/emacs/${version}/site-lisp/subdirs.el; \
+ 	    > $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el; \
  	fi
- 	chmod a+r ${datadir}/emacs/${version}/site-lisp/subdirs.el
--	-if [ -f ${datadir}/emacs/site-lisp/subdirs.el ]; \
+ 	chmod a+r $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el
+-	-if [ -f $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el ]; \
 -	then true; \
 -	else \
 -	  (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
 -	   echo "    (normal-top-level-add-subdirs-to-load-path))") \
--	    > ${datadir}/emacs/site-lisp/subdirs.el; \
+-	    > $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el; \
 -	fi
--	-chmod a+r ${datadir}/emacs/site-lisp/subdirs.el
-+#	-if [ -f ${datadir}/emacs/site-lisp/subdirs.el ]; \
-+#	then true; \
-+#	else \
-+#	  (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
-+#	   echo "    (normal-top-level-add-subdirs-to-load-path))") \
-+#	    > ${datadir}/emacs/site-lisp/subdirs.el; \
-+#	fi
-+#	-chmod a+r ${datadir}/emacs/site-lisp/subdirs.el
+-	-chmod a+r $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el
++# 	-if [ -f $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el ]; \
++# 	then true; \
++# 	else \
++# 	  (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
++# 	   echo "    (normal-top-level-add-subdirs-to-load-path))") \
++# 	    > $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el; \
++# 	fi
++# 	-chmod a+r $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el
  	-unset CDPATH; \
- 	if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
+ 	if [ `(cd ./etc; /bin/pwd)` != `(cd $(DESTDIR)${docdir}; /bin/pwd)` ]; \
  	then \
+Only in emacs: Makefile.in.~1.311.~