projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a2af712)
patch for handling a possible compilation error in special cases where Emacs was...
authorChristian Faulhammer <fauli@gentoo.org>
Tue, 20 Feb 2007 22:21:59 +0000 (22:21 +0000)
committerChristian Faulhammer <fauli@gentoo.org>
Tue, 20 Feb 2007 22:21:59 +0000 (22:21 +0000)
Package-Manager: portage-2.1.2-r9

app-editors/emacs-cvs/ChangeLog patch | blob | history
app-editors/emacs-cvs/Manifest patch | blob | history
app-editors/emacs-cvs/emacs-cvs-22.0.93-r2.ebuild patch | blob | history
app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r2 patch | blob | history
app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0-r1 patch | blob | history
app-editors/emacs-cvs/files/emacs-cvs-blessmail-build.patch [new file with mode: 0644] patch | blob

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 2d630404decf0b54449b72a31e9ba1a0c223c6a1..2c131bd90de63a25f22760816530153776d0c32e 100644 (file)
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.81 2007/02/08 14:03:45 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.82 2007/02/20 22:21:59 opfer Exp $
+
+  20 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
+  +files/emacs-cvs-blessmail-build.patch, emacs-cvs-22.0.93-r2.ebuild:
+  patch for handling a possible compilation error in special cases where Emacs
+  was called without disabling the start-up file (bug 166059). Everything
+  provided by Ulrich Mueller <ulm@kph.uni-mainz.de>
 
   08 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
   emacs-cvs-22.0.93-r2.ebuild, emacs-cvs-22.0.9999-r2.ebuild:
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 3e9d77e7bfa2d4d5e2de9fcabf72f3418147eec4..a40a863dd8b5c15c069f98fa5d77c0d59d4563e3 100644 (file)
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -21,6 +21,10 @@ AUX emacs-cvs-21.3.50-nofink.diff 1520 RMD160 31c8fc31a4715d26e1566d87f09b947d16
 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
+AUX emacs-cvs-blessmail-build.patch 651 RMD160 77bda6cf13b94186eec0e078ebed8ee58baba21c SHA1 cece1d588f7b49261750c641c80e0fb7ec70fd2d SHA256 eb9a52dd38b05eda6f3155469147c860a95d0ccdc09c881f010cf9d16db39d62
+MD5 4ff9b93cb0b51bcdfbab1652f05f0625 files/emacs-cvs-blessmail-build.patch 651
+RMD160 77bda6cf13b94186eec0e078ebed8ee58baba21c files/emacs-cvs-blessmail-build.patch 651
+SHA256 eb9a52dd38b05eda6f3155469147c860a95d0ccdc09c881f010cf9d16db39d62 files/emacs-cvs-blessmail-build.patch 651
 AUX emacs-cvs-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 SHA1 71c6d9ee3b3e5149a33d440373a212b56fbd064c SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b
 MD5 33cdd958f1be433095a69bff6be18148 files/emacs-cvs-freebsd-sparc.patch 475
 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 files/emacs-cvs-freebsd-sparc.patch 475
@@ -34,10 +38,10 @@ 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.93.tar.gz 37118034 RMD160 c70a745662495c68470f2b483f61d68d09e8ed73 SHA1 1c226f1c03e33fef66b759e6afd6eb580adc948b SHA256 44dd612b521a47d923c759525b1134bbc571350cae80bdc543c31f30acc7739e
-EBUILD emacs-cvs-22.0.93-r2.ebuild 6682 RMD160 a3b26539f5686207a24b843ebfd8e8e782533877 SHA1 998e394217feb3ef47cd9867112f50b5692eb8b1 SHA256 065db95457f397d12df5b9d9827fe9604ab6f7061bab75c763e768cf186c1e2f
-MD5 0d6562c5ce85c59962c82555f792851c emacs-cvs-22.0.93-r2.ebuild 6682
-RMD160 a3b26539f5686207a24b843ebfd8e8e782533877 emacs-cvs-22.0.93-r2.ebuild 6682
-SHA256 065db95457f397d12df5b9d9827fe9604ab6f7061bab75c763e768cf186c1e2f emacs-cvs-22.0.93-r2.ebuild 6682
+EBUILD emacs-cvs-22.0.93-r2.ebuild 6745 RMD160 f51b789971cf92ab87a081ade5db2c6c0b4348e4 SHA1 2120d4babd1fee60d3f0a3ef4ab5bd1740b74ff4 SHA256 e129655a9b8cbb7395c374c25f341eb92dc09aea8c77c86d3aa697dd1fc95e0b
+MD5 3be0eac2733216ac9543ba014d250b4b emacs-cvs-22.0.93-r2.ebuild 6745
+RMD160 f51b789971cf92ab87a081ade5db2c6c0b4348e4 emacs-cvs-22.0.93-r2.ebuild 6745
+SHA256 e129655a9b8cbb7395c374c25f341eb92dc09aea8c77c86d3aa697dd1fc95e0b emacs-cvs-22.0.93-r2.ebuild 6745
 EBUILD emacs-cvs-22.0.9999-r2.ebuild 6739 RMD160 e825492844163a33a22efec6072a16dc3dd26659 SHA1 3e0e611d6eac28c3f48b87ec0bf3abd2ba3aee3e SHA256 52ac5df7b6b0b4a710a1c4c05356d15c216486e6cfd95f6773c44307a6cf32ce
 MD5 2da62a2d364735a4a47314f14d91ece3 emacs-cvs-22.0.9999-r2.ebuild 6739
 RMD160 e825492844163a33a22efec6072a16dc3dd26659 emacs-cvs-22.0.9999-r2.ebuild 6739
@@ -46,10 +50,10 @@ EBUILD emacs-cvs-23.0.0-r1.ebuild 5904 RMD160 2bb97d0bb0fbb4e426297d58b3a97402e2
 MD5 61bac54173aa6dc34e29d7f75935ff36 emacs-cvs-23.0.0-r1.ebuild 5904
 RMD160 2bb97d0bb0fbb4e426297d58b3a97402e21f4764 emacs-cvs-23.0.0-r1.ebuild 5904
 SHA256 9a20533595e3949519d4e75e3857c1c729dfaf124e891253e63631ff962a8b9b emacs-cvs-23.0.0-r1.ebuild 5904
-MISC ChangeLog 15254 RMD160 c3549840fc69e2682259bd60a69e293cfe53055b SHA1 0d8963cdffe4b6a6cd23dfc0a044e25f4934d974 SHA256 2dd3c9ce02c28dccfafe4a0fdecbd8921f6191d99f42b404d257068622c2b788
-MD5 74d8852715dbbbb0dce73d24293892b0 ChangeLog 15254
-RMD160 c3549840fc69e2682259bd60a69e293cfe53055b ChangeLog 15254
-SHA256 2dd3c9ce02c28dccfafe4a0fdecbd8921f6191d99f42b404d257068622c2b788 ChangeLog 15254
+MISC ChangeLog 15586 RMD160 584214849e9dd19d36b8b56356cf5cdc6f300762 SHA1 3326571dc60a14108f105f626129cfa5649143d2 SHA256 7cfc64f225c80dc424d685ff1f4c992898c61f6141b90ee47685e57f7b877657
+MD5 aaa67f4b33b61445b9dfe8d80d7e9774 ChangeLog 15586
+RMD160 584214849e9dd19d36b8b56356cf5cdc6f300762 ChangeLog 15586
+SHA256 7cfc64f225c80dc424d685ff1f4c992898c61f6141b90ee47685e57f7b877657 ChangeLog 15586
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -57,16 +61,16 @@ SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata
 MD5 6be53866d89e1729a1b8e95197a92e12 files/digest-emacs-cvs-22.0.93-r2 247
 RMD160 950a3ffa592585b775efb646394050c72c7020a7 files/digest-emacs-cvs-22.0.93-r2 247
 SHA256 96f31c2909fddc7c78c9ab53a2d31af907624424c22698aee57a8c160c9c93fa files/digest-emacs-cvs-22.0.93-r2 247
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.9999-r2 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.9999-r2 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.9999-r2 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-23.0.0-r1 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-23.0.0-r1 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-23.0.0-r1 1
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r2 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r2 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0-r1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0-r1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0-r1 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFyy2aNQqtfCuFneMRAuN9AJ90sDajyJFqbhdUdOTBSaQakDMGbwCfUt2/
-CawZaM8EOX4o1BPxaqvBOOE=
-=ht/q
+iD8DBQFF23RbNQqtfCuFneMRAmt9AJ97+NihC+avyww50RPNH8ZdCUiYTQCfb8+H
+89S09JxHNJV0Bo6ur3etxpQ=
+=Z0ws
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.93-r2.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.93-r2.ebuild
index 8f743bab44becf991c140cce4e70e252463eb86c..1fa906550a267c7830e2b2bffafd92b0ed73f501 100644 (file)
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.93-r2.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.93-r2.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.93-r2.ebuild,v 1.7 2007/02/08 14:03:45 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.93-r2.ebuild,v 1.8 2007/02/20 22:21:59 opfer Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -49,6 +49,7 @@ src_unpack() {
                -e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
                "${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
        epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
+       epatch "${FILESDIR}/emacs-cvs-blessmail-build.patch"
        eautoreconf
 }
 
@@ -163,7 +164,7 @@ EOF
        fi
        dodoc BUGS ChangeLog README
 
-       make_desktop_entry emacs Emacs /usr/share/emacs/${SLOT}/etc/images/icons/emacs_48.png   editors
+       make_desktop_entry /usr/bin/emacs Emacs /usr/share/emacs/${SLOT}/etc/images/icons/emacs_48.png  editors
 }
 
 update-alternatives() {
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-blessmail-build.patch b/app-editors/emacs-cvs/files/emacs-cvs-blessmail-build.patch
new file mode 100644 (file)
index 0000000..03b0723
--- /dev/null
+++ b/app-editors/emacs-cvs/files/emacs-cvs-blessmail-build.patch
@@ -0,0 +1,22 @@
+--- emacs-22.0.93/lib-src/Makefile.in~ 2007-01-17 16:53:20.000000000 +0100
++++ emacs-22.0.93/lib-src/Makefile.in  2007-02-17 11:29:06.000000000 +0100
+@@ -23,6 +23,10 @@
+ # inherited from the environment.
+ SHELL = /bin/sh
+ 
++# following two lines taken from ../lisp/Makefile.in
++EMACS = ../src/emacs
++EMACSOPT = -batch --no-site-file --multibyte
++
+ # ==================== Things `configure' will edit ====================
+ 
+ CC=@CC@
+@@ -279,7 +283,7 @@
+ 
+ #ifdef MOVEMAIL_NEEDS_BLESSING
+ blessmail:
+-      ../src/emacs -batch -l $(srcdir)/../lisp/mail/blessmail.el
++      $(EMACS) $(EMACSOPT) -l $(srcdir)/../lisp/mail/blessmail.el
+       chmod +x blessmail
+ #endif
+ 
Unnamed repository; edit this file 'description' to name the repository.