Added a patch to fix AltGr key behaviour. Thanks to Sergio Polini <s.polini@mclink.it> for providing a link to the patch. This closes bug #66508. Changed binaries' suffix from "-${SLOT}" to ".emacs-${SLOT}" (b2m, ctags, etags and rcs-checkin from xemacs conflict with those from emacs). See bug #62991 for detail.

5 files changed, 193 insertions, 13 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index f365a007302f..6fb31ca862f2 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.44 2004/11/06 16:06:15 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.45 2004/11/23 12:18:58 usata Exp $
+
+*emacs-21.3-r5 (23 Nov 2004)
+
+  23 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/emacs-21.3-xorg.patch, +emacs-21.3-r5.ebuild:
+  Added a patch to fix AltGr key behaviour. Thanks to Sergio Polini
+  <s.polini@mclink.it> for providing a link to the patch.
+  This closes bug #66508. Changed binaries' suffix from "-${SLOT}" to
+  ".emacs-${SLOT}" (b2m, ctags, etags and rcs-checkin from xemacs
+  conflict with those from emacs). See bug #62991 for detail.
 
 *emacs-21.3.50_pre20041027 (07 Nov 2004)
 
@@ -9,7 +19,7 @@
   Added Carbon Emacs (aqua USE flag). See bug #64362.
   Also added multi-tty patch.
 
-  19 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> emacs-21.3-r4.ebuild:
+  19 Oct 2004; Bryan ƒŠstergaard <kloeri@gentoo.org> emacs-21.3-r4.ebuild:
   ~alpha keyword.
 
   19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> emacs-21.3-r3.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 09d527ce89a2..41ac64a8ea53 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,20 +1,23 @@
 MD5 e8f90b5126b4d417c84c51206292695a ChangeLog 6842
+MD5 79e10dfdc98aa043b4c978e51646c3d1 emacs-21.3-r5.ebuild 3853
+MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 MD5 7c1bb3b83cc8d65547925c15dd605a71 emacs-21.3-r2.ebuild 2190
+MD5 4ff8a8c4e69f80929f2c1f7aac9a7dd3 emacs-18.59.ebuild 2002
 MD5 cd950ca660715c0324588702db8b152c emacs-21.3-r3.ebuild 2606
 MD5 8749d387dde406327092a725cfce898c emacs-21.3-r4.ebuild 3683
-MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
-MD5 4ff8a8c4e69f80929f2c1f7aac9a7dd3 emacs-18.59.ebuild 2002
 MD5 7256fd55a9cb306388b31eed27342df3 emacs-21.3.50_pre20041027.ebuild 5089
-MD5 0d7a5eba9d25e527c53da9a73c3bb767 files/digest-emacs-18.59 216
-MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
+MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r5 126
 MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r2 126
-MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r3 126
-MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r4 126
+MD5 2f000567bd6037e79de677b0edd814ab files/60emacs-21.envd 34
+MD5 6aafc439ab1c05f97db2bfefc707bdcc files/emacs-21.desktop 196
+MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
+MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
 MD5 bb29381a50b72e88d869fb09a2c0a34e files/emacs-21.3-amd64.patch 7938
 MD5 3763ec7eaed9e5bb4da2f3f7c3795594 files/emacs-21.3-hppa.patch 2493
-MD5 2aaf4fc4c9513f13c4edb24327247f83 files/emacs-21.3-ppc64.patch 1622
-MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
-MD5 6aafc439ab1c05f97db2bfefc707bdcc files/emacs-21.desktop 196
-MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-nofink-gentoo.diff 1520
-MD5 2f000567bd6037e79de677b0edd814ab files/60emacs-21.envd 34
+MD5 0d7a5eba9d25e527c53da9a73c3bb767 files/digest-emacs-18.59 216
+MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r3 126
 MD5 6ad048aba58fdae6c516ed18ad728d95 files/digest-emacs-21.3.50_pre20041027 242
+MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-nofink-gentoo.diff 1520
+MD5 ef8adf470d7d95802802b3860ef8d9a9 files/emacs-21.3-xorg.patch 394
+MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r4 126
+MD5 2aaf4fc4c9513f13c4edb24327247f83 files/emacs-21.3-ppc64.patch 1622
diff --git a/app-editors/emacs/emacs-21.3-r5.ebuild b/app-editors/emacs/emacs-21.3-r5.ebuild
new file mode 100644
index 000000000000..bd01a43d3b5d
--- /dev/null
+++ b/app-editors/emacs/emacs-21.3-r5.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r5.ebuild,v 1.1 2004/11/23 12:18:58 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-${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="21"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm hppa ~amd64 -ia64 ~s390 ~ppc64"
+IUSE="X Xaw3d gnome leim lesstif motif nls nosendmail"
+
+RDEPEND="sys-libs/ncurses
+	sys-libs/gdbm
+	X? ( virtual/x11
+		>=media-libs/libungif-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 )
+		motif? (
+			lesstif? ( x11-libs/lesstif )
+			!lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
+		gnome? ( gnome-base/gnome-desktop )
+		)
+	)
+	nls? ( sys-devel/gettext )
+	!nosendmail ( virtual/mta )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58"
+
+PROVIDE="virtual/emacs virtual/editor"
+SANDBOX_DISABLED="1"
+
+DFILE=emacs-${SLOT}.desktop
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-xorg.patch
+	epatch ${FILESDIR}/${P}-amd64.patch
+	epatch ${FILESDIR}/${P}-hppa.patch
+	use ppc64 && epatch ${FILESDIR}/${P}-ppc64.patch
+	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
+}
+
+src_compile() {
+
+	# -fstack-protector gets internal compiler error at xterm.c (bug 33265)
+	filter-flags -fstack-protector
+
+	# gcc 3.4 with -O3 or stronger flag spoils emacs
+	if [ "$(gcc-major-version)" -ge 3 -a "$(gcc-minor-version)" -ge 4 ] ; then
+		replace-flags -O[3-9] -O2
+	fi
+
+	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 || 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"
+
+	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
+		gzip -9 ${T}/emacs-${SLOT}/${i##*/}.info
+	done
+	mv ${T}/emacs-${SLOT} ${D}/usr/share/info
+	mv ${T}/dir ${D}/usr/share/info/emacs-${SLOT}
+
+	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 644
+	find ${D} -type d |xargs chmod 755
+
+	keepdir /usr/share/emacs/${PV}/leim
+
+	dodoc BUGS ChangeLog README
+
+	if use gnome ; then
+		insinto /usr/share/gnome/apps/Application
+		doins ${FILESDIR}/${DFILE}
+	fi
+}
+
+update-alternatives() {
+	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
+}
+
+pkg_postinst() {
+	update-alternatives
+	if use nosendmail ; then
+	ewarn
+	ewarn "You disabled sendmail support for Emacs. If you will install any MTA"
+	ewarn "you need to recompile Emacs after that. See bug #11104."
+	ewarn
+	fi
+}
+
+pkg_postrm() {
+	update-alternatives
+}
diff --git a/app-editors/emacs/files/digest-emacs-21.3-r5 b/app-editors/emacs/files/digest-emacs-21.3-r5
new file mode 100644
index 000000000000..7aafc8e2fda1
--- /dev/null
+++ b/app-editors/emacs/files/digest-emacs-21.3-r5
@@ -0,0 +1,2 @@
+MD5 a0bab457cbf5b4f8eb99d1d0a3ada420 emacs-21.3.tar.gz 20399831
+MD5 1c968c37e22be0f0d8f8cd57cebe5a5e leim-21.3.tar.gz 3291224
diff --git a/app-editors/emacs/files/emacs-21.3-xorg.patch b/app-editors/emacs/files/emacs-21.3-xorg.patch
new file mode 100644
index 000000000000..a97bb108b621
--- /dev/null
+++ b/app-editors/emacs/files/emacs-21.3-xorg.patch
@@ -0,0 +1,12 @@
+diff -Naur emacs-21.3-old/src/xterm.h emacs-21.3/src/xterm.h
+--- emacs-21.3-old/src/xterm.h  2002-02-22 11:41:44.000000000 +0100
++++ emacs-21.3/src/xterm.h      2004-10-30 12:33:12.000000000 +0200
+@@ -21,8 +21,8 @@
+ 
+ #include <X11/Xlib.h>
+ #include <X11/cursorfont.h>
+-#include <X11/Xutil.h>
+ #include <X11/keysym.h>
++#include <X11/Xutil.h>
+ #include <X11/Xatom.h>
+ #include <X11/Xresource.h>