revision bump with patches to handle rests of temporary path strings in the executabl...

Package-Manager: portage-2.1.2-r9

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index eec8e5af7111861f4722fb44de407a444abd0e32..dd373c3f40d854813003793858a8037a9df849e0 100644 (file)
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.119 2007/02/14 14:46:28 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.120 2007/02/20 22:15:16 opfer Exp $
+
+*emacs-21.4-r7 (20 Feb 2007)
+
+  20 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
+  +files/emacs-21.4-autosave-tmp.patch,
+  +files/emacs-21.4-blessmail-build.patch, +emacs-21.4-r7.ebuild:
+  revision bump with patches to handle rests of temporary path strings in the
+  executable (bug 22563); and 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>
 
 *emacs-18.59-r1 (14 Feb 2007)
 

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 5e6e32f5350d3e82f12ed7945e35cf1387e9a255..2924edf8f0fbbdbf94a1b0672ff865615e19b36b 100644 (file)
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -45,6 +45,14 @@ AUX emacs-21.3-xorg.patch 394 RMD160 51d64c84aaa61cd1eb6b08c8fa7688a10bc09949 SH
 MD5 ef8adf470d7d95802802b3860ef8d9a9 files/emacs-21.3-xorg.patch 394
 RMD160 51d64c84aaa61cd1eb6b08c8fa7688a10bc09949 files/emacs-21.3-xorg.patch 394
 SHA256 191c93e97587a7d7b9000d2cba24ef45233aa029719865646bf8d73b26510622 files/emacs-21.3-xorg.patch 394
+AUX emacs-21.4-autosave-tmp.patch 525 RMD160 db34685ca46b419dc1807acd0ebcc52ef622b20e SHA1 5865d14c568ed8046b3a8fc6971fa538347eb15e SHA256 18bb63c546d2496ead9544f69f8c33041fdf2da6d7b7a9bf13304b37fd54608a
+MD5 57a5ad0e9c07aa3ee8060eaff08f499b files/emacs-21.4-autosave-tmp.patch 525
+RMD160 db34685ca46b419dc1807acd0ebcc52ef622b20e files/emacs-21.4-autosave-tmp.patch 525
+SHA256 18bb63c546d2496ead9544f69f8c33041fdf2da6d7b7a9bf13304b37fd54608a files/emacs-21.4-autosave-tmp.patch 525
+AUX emacs-21.4-blessmail-build.patch 651 RMD160 77bda6cf13b94186eec0e078ebed8ee58baba21c SHA1 cece1d588f7b49261750c641c80e0fb7ec70fd2d SHA256 eb9a52dd38b05eda6f3155469147c860a95d0ccdc09c881f010cf9d16db39d62
+MD5 4ff9b93cb0b51bcdfbab1652f05f0625 files/emacs-21.4-blessmail-build.patch 651
+RMD160 77bda6cf13b94186eec0e078ebed8ee58baba21c files/emacs-21.4-blessmail-build.patch 651
+SHA256 eb9a52dd38b05eda6f3155469147c860a95d0ccdc09c881f010cf9d16db39d62 files/emacs-21.4-blessmail-build.patch 651
 AUX emacs-21.4-libungif-gif-gentoo.patch 1534 RMD160 8bc5ef391e644ad00f46c7d34e7341862572346a SHA1 dd0247426f98d3e7e7362792d228e21e1d8855be SHA256 61793086af3c4a56ced40830977ba0d6ebc285d84b4b612798b35ca08f1f1689
 MD5 1607d289126ca057110a993cde0e25fd files/emacs-21.4-libungif-gif-gentoo.patch 1534
 RMD160 8bc5ef391e644ad00f46c7d34e7341862572346a files/emacs-21.4-libungif-gif-gentoo.patch 1534
@@ -84,14 +92,18 @@ EBUILD emacs-21.4-r6.ebuild 5439 RMD160 4f3b1fb1a676ade42008069b06370e24b93c5cde
 MD5 a6603cf7b282b197e9267c5432e2dcae emacs-21.4-r6.ebuild 5439
 RMD160 4f3b1fb1a676ade42008069b06370e24b93c5cde emacs-21.4-r6.ebuild 5439
 SHA256 4228b2f70cf3eb38d0f77ed61f55df98543b3e092509bd1cf1a3f5102d58265f emacs-21.4-r6.ebuild 5439
+EBUILD emacs-21.4-r7.ebuild 5656 RMD160 d178435fa1a7910ef3b57bbc6c2f6160a64ba210 SHA1 0aca9f009a4e4b4270c50c2d75caa4c14acf60c3 SHA256 2b581f003f11530a84e758136cb4e58bfd5c1ecb4f9d882f2c2bff5e0d003573
+MD5 58d63df6f79d17a13a01ed083679623b emacs-21.4-r7.ebuild 5656
+RMD160 d178435fa1a7910ef3b57bbc6c2f6160a64ba210 emacs-21.4-r7.ebuild 5656
+SHA256 2b581f003f11530a84e758136cb4e58bfd5c1ecb4f9d882f2c2bff5e0d003573 emacs-21.4-r7.ebuild 5656
 EBUILD emacs-22.0.50_pre20050225.ebuild 5557 RMD160 11e3ea0cc9bdad886ce7ecb4946925dfda0d83ed SHA1 296bba1410b3575fd1ccf54bbcef7756adc5038a SHA256 12629d258f388c211c18ed21bb65cb6479b3375913a921e85305fab8ae9bbd39
 MD5 7e17815f1e5c1a8a92e12ce8a4a20951 emacs-22.0.50_pre20050225.ebuild 5557
 RMD160 11e3ea0cc9bdad886ce7ecb4946925dfda0d83ed emacs-22.0.50_pre20050225.ebuild 5557
 SHA256 12629d258f388c211c18ed21bb65cb6479b3375913a921e85305fab8ae9bbd39 emacs-22.0.50_pre20050225.ebuild 5557
-MISC ChangeLog 17632 RMD160 fafedbe968ab0240e445750a5b4a3a03b1bb9ef2 SHA1 fab7267b7102cb405596fd129a0bb7657bb932a0 SHA256 1b3ab892a3c8fcb94ad4b7ce959af0cedddd420f5e191d0049691d6d919060c1
-MD5 5e806984714dd81367dc7875b78dfd28 ChangeLog 17632
-RMD160 fafedbe968ab0240e445750a5b4a3a03b1bb9ef2 ChangeLog 17632
-SHA256 1b3ab892a3c8fcb94ad4b7ce959af0cedddd420f5e191d0049691d6d919060c1 ChangeLog 17632
+MISC ChangeLog 18125 RMD160 da66390ae6dc6b427bdb812665b058df7724f5f9 SHA1 eb6efdea62f1d40291faccec07594b9f7d240c1e SHA256 d31203895a42eaef8e4319a74aae36229c1e6127c66653e4e827b5c7f6cb8ee3
+MD5 879a689230bf3da36277445b8e2006d9 ChangeLog 18125
+RMD160 da66390ae6dc6b427bdb812665b058df7724f5f9 ChangeLog 18125
+SHA256 d31203895a42eaef8e4319a74aae36229c1e6127c66653e4e827b5c7f6cb8ee3 ChangeLog 18125
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -105,13 +117,16 @@ SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/di
 MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r6 473
 RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r6 473
 SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r6 473
+MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r7 473
+RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r7 473
+SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r7 473
 MD5 2df1eb628db6afebd06600c89c6b5632 files/digest-emacs-22.0.50_pre20050225 864
 RMD160 6ca2f9e46acf2ab0ef441365fc4943c399c84070 files/digest-emacs-22.0.50_pre20050225 864
 SHA256 101b72de2e3aabbc053bba0963fa2aac03ece43a8654250914eb700f5dea5c19 files/digest-emacs-22.0.50_pre20050225 864
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF0yCxNQqtfCuFneMRAtshAJ9s5quUKT8h+UQHYvlVhiV9udHlxACeMNBv
-kgOpv0ipAjvTyrOPuSG4NcY=
-=NjOh
+iD8DBQFF23LINQqtfCuFneMRAoW+AKCbtbTlt9fFTLgnXO6PnZQJUsAfwwCfd7Bf
+SWQ4tLNef6ggg148RhKnkic=
+=3AaL
 -----END PGP SIGNATURE-----

diff --git a/app-editors/emacs/emacs-21.4-r7.ebuild b/app-editors/emacs/emacs-21.4-r7.ebuild
new file mode 100644 (file)
index 0000000..c5ab35a
--- /dev/null
+++ b/app-editors/emacs/emacs-21.4-r7.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r7.ebuild,v 1.1 2007/02/20 22:15:16 opfer 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}a.tar.gz
+       leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="21"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="X Xaw3d leim lesstif motif nls nosendmail"
+
+RDEPEND="sys-libs/ncurses
+       X? ( || ( ( x11-libs/libXext
+                               x11-libs/libICE
+                               x11-libs/libSM
+                               x11-libs/libXmu
+                               x11-libs/libXpm
+                               || ( media-fonts/font-adobe-100dpi
+                                       media-fonts/font-adobe-75dpi )
+                       )
+                       virtual/x11
+               )
+               >=media-libs/giflib-4.1.0.1b
+               >=media-libs/jpeg-6b-r2
+               >=media-libs/tiff-3.5.5-r3
+               >=media-libs/libpng-1.2.1
+               !arm? (
+               Xaw3d? ( x11-libs/Xaw3d )
+               !Xaw3d? ( || ( x11-libs/libXaw virtual/x11 ) )
+               motif? (
+                       lesstif? ( x11-libs/lesstif )
+                       !lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
+               )
+       )
+       nls? ( sys-devel/gettext )
+       !nosendmail? ( virtual/mta )"
+
+DEPEND="${RDEPEND}
+       >=sys-devel/autoconf-2.58
+       X? ( || ( x11-misc/xbitmaps virtual/x11 ) )"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+DFILE=emacs-${SLOT}.desktop
+
+src_unpack() {
+
+       unpack ${A}
+
+       cd ${S}
+       epatch "${FILESDIR}/emacs-21.3-xorg.patch"
+       epatch "${FILESDIR}/emacs-21.3-amd64.patch"
+       epatch "${FILESDIR}/emacs-21.3-hppa.patch"
+       epatch "${FILESDIR}/emacs-21.2-sh.patch"
+       epatch "${FILESDIR}/emacs-21.4-libungif-gif-gentoo.patch"
+
+       use ppc64 && epatch "${FILESDIR}/emacs-21.3-ppc64.patch"
+
+       epatch "${FILESDIR}/emacs-subdirs-el-gentoo.diff"
+       epatch "${FILESDIR}/emacs-21.4-autosave-tmp.patch"
+       epatch "${FILESDIR}/emacs-21.4-blessmail-build.patch"
+
+       # This will need to be updated for X-Compilation
+       sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
+                  ${S}/src/s/gnu-linux.h
+}
+
+src_compile() {
+       export SANDBOX_ON=0
+
+       # -fstack-protector gets internal compiler error at xterm.c (bug 33265)
+       filter-flags -fstack-protector
+
+       # emacs doesn't handle LDFLAGS properly (bug #77430 and bug #65002)
+       unset LDFLAGS
+
+       # ever since GCC 3.2
+       replace-flags -O[3-9] -O2
+
+       # -march is known to cause signal 6 on some environment
+       filter-flags "-march=*"
+
+       export WANT_AUTOCONF=2.1
+       autoconf
+
+       local myconf
+       use nls || myconf="${myconf} --disable-nls"
+       if use X ; then
+               if use motif && use lesstif; then
+                       append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif
+                       export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include/lesstif"
+               fi
+               myconf="${myconf}
+                       --with-x
+                       --with-xpm
+                       --with-jpeg
+                       --with-tiff
+                       --with-gif
+                       --with-png"
+               if use Xaw3d ; then
+                       myconf="${myconf} --with-x-toolkit=athena"
+               elif use motif ; then
+                       myconf="${myconf} --with-x-toolkit=motif"
+               else
+                       # do not build emacs with any toolkit, bug 35300
+                       myconf="${myconf} --with-x-toolkit=no"
+               fi
+       else
+               myconf="${myconf} --without-x"
+       fi
+       econf ${myconf} || die
+       emake CC="$(tc-getCC)" || die
+
+       einfo "Recompiling patched lisp files..."
+       (cd lisp; emake recompile) || die
+       emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+       einstall || die
+       for i in ${D}/usr/bin/* ; do
+               mv ${i} ${i}.emacs-${SLOT} || die "mv ${i} failed"
+       done
+       mv ${D}/usr/bin/emacs{-${PV},}.emacs-${SLOT} || die "mv emacs failed"
+       dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT}
+
+       einfo "Fixing info documentation..."
+       mkdir ${T}/emacs-${SLOT}
+       mv ${D}/usr/share/info/dir ${T}
+       for i in ${D}/usr/share/info/*
+       do
+               mv ${i} ${T}/emacs-${SLOT}/${i##*/}.info
+       done
+       mv ${T}/emacs-${SLOT} ${D}/usr/share/info
+       mv ${T}/dir ${D}/usr/share/info/emacs-${SLOT}
+
+       if has_version 'app-text/aspell' ; then
+               # defaults to aspell if installed
+               elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
+       fi
+
+       newenvd ${FILESDIR}/60emacs-${SLOT}.envd 60emacs-${SLOT}
+
+       einfo "Fixing manpages..."
+       for m in ${D}/usr/share/man/man1/* ; do
+               mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv ${m} failed"
+       done
+
+       einfo "Fixing permissions..."
+       find ${D} -perm 664 |xargs chmod -f 644 2>/dev/null
+       find ${D} -type d |xargs chmod -f 755 2>/dev/null
+
+       keepdir /usr/share/emacs/${PV}/leim
+       keepdir /usr/share/emacs/site-lisp
+
+       dodoc BUGS ChangeLog README
+
+       insinto /usr/share/applications
+       doins ${FILESDIR}/${DFILE}
+}
+
+update-alternatives() {
+       # extract the suffix of the manpages to determine the correct compression program
+       local suffix=$(echo /usr/share/man/man1/emacs.emacs-*.1*|sed 's/.*\.1//')
+
+       # this creates symlinks for binaries and man pages, so the correct ones in a slotted
+       # environment can be accessed
+       for i in emacs emacsclient etags ctags b2m ebrowse \
+               rcs-checkin grep-changelog ; do
+               alternatives_auto_makesym "/usr/bin/$i" "/usr/bin/${i}.emacs-*"
+       done
+
+       for j in emacs etags ctags gfdl
+       do
+               alternatives_auto_makesym "/usr/share/man/man1/$j.1${suffix}" "/usr/share/man/man1/$j.emacs-*"
+       done
+}
+
+pkg_postinst() {
+       update-alternatives
+       if use nosendmail; then
+               while read line; do einfo "${line}"; done<<'EOF'
+
+You disabled sendmail support for Emacs.  If you later install a MTA
+then you will need to recompile Emacs. See Bug #11104.
+
+EOF
+       fi
+       if use X; then
+               while read line; do einfo "${line}"; done<<'EOF'
+
+You need to install some fonts for Emacs.  Under monolithic
+XFree86/Xorg you typically had such fonts installed by default.         With
+modular Xorg, you will have to perform this step yourself.
+
+Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic
+Emacs requirements under X11.
+
+EOF
+       fi
+
+
+}
+
+pkg_postrm() {
+       update-alternatives
+}

diff --git a/app-editors/emacs/files/digest-emacs-21.4-r7 b/app-editors/emacs/files/digest-emacs-21.4-r7
new file mode 100644 (file)
index 0000000..6898ecf
--- /dev/null
+++ b/app-editors/emacs/files/digest-emacs-21.4-r7
@@ -0,0 +1,6 @@
+MD5 8f9d97cbd126121bd5d97e5e31168a87 emacs-21.4a.tar.gz 20403483
+RMD160 c312e739935b56d08783bbfe97992297a363cb8a emacs-21.4a.tar.gz 20403483
+SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 emacs-21.4a.tar.gz 20403483
+MD5 32938cb5a7505d995a1e835639d19707 leim-21.4.tar.gz 3291433
+RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca leim-21.4.tar.gz 3291433
+SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b leim-21.4.tar.gz 3291433

diff --git a/app-editors/emacs/files/emacs-21.4-autosave-tmp.patch b/app-editors/emacs/files/emacs-21.4-autosave-tmp.patch
new file mode 100644 (file)
index 0000000..240439d
--- /dev/null
+++ b/app-editors/emacs/files/emacs-21.4-autosave-tmp.patch
@@ -0,0 +1,12 @@
+--- emacs-21.4/lisp/startup.el~        2003-03-16 23:05:59.000000000 +0100
++++ emacs-21.4/lisp/startup.el 2007-02-16 11:21:18.000000000 +0100
+@@ -629,6 +629,9 @@
+   (setq small-temporary-file-directory
+       (if (eq system-type 'ms-dos)
+           (getenv "TMPDIR")))
++  (setq auto-save-file-name-transforms
++      (list (list (caar auto-save-file-name-transforms)
++                  (expand-file-name "\\2" temporary-file-directory))))
+ 
+   ;; See if we should import version-control from the environment variable.
+   (let ((vc (getenv "VERSION_CONTROL")))

diff --git a/app-editors/emacs/files/emacs-21.4-blessmail-build.patch b/app-editors/emacs/files/emacs-21.4-blessmail-build.patch
new file mode 100644 (file)
index 0000000..03b0723
--- /dev/null
+++ b/app-editors/emacs/files/emacs-21.4-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
+