4 files changed, 69 insertions, 13 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 200396a7d8d9..9a26521b4665 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # 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.30 2004/07/04 14:15:47 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.31 2004/07/15 18:08:12 tgall Exp $
+
+  15 Jul 2004; Tom Gall <tgall@gentoo.org> emacs-21.3-r4.ebuild:
+  added ~ppc64 bug #55328
 
 *emacs-21.3-r4 (04 Jul 2004)
 
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 048a5ca31cb1..4ea7ad34c8bb 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,21 +1,22 @@
+MD5 4ac7d2082dfd359343c67d7a345c5b04 ChangeLog 4803
+MD5 654a5dfdd1da223468f3eaa1f913cc73 emacs-18.59.ebuild 2005
 MD5 815768d41e602e71dd2e51d9f336796f emacs-21.1-r4.ebuild 2139
-MD5 7d975de4f15aed0d378b05aac474de1d emacs-21.3-r2.ebuild 2189
 MD5 2a994cbeab581cade6f48cfd07ce4230 emacs-21.2-r2.ebuild 1828
-MD5 4897f6ab71bca20a247cc0d1ef15f8ca emacs-21.3-r4.ebuild 2807
-MD5 29d0757b42b6fbd05dd13bd5cb234731 ChangeLog 4711
-MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
-MD5 654a5dfdd1da223468f3eaa1f913cc73 emacs-18.59.ebuild 2005
+MD5 68a090218768238fef92095925725408 emacs-21.3-r4.ebuild 2864
+MD5 7d975de4f15aed0d378b05aac474de1d emacs-21.3-r2.ebuild 2189
 MD5 c2e92c0988b4afc7a81ed1b6b6e12f8f emacs-21.3-r3.ebuild 2356
-MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
+MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
+MD5 2dc071ea24db58587a5e72af42addbc4 files/digest-emacs-18.59 147
 MD5 da1e3cd3b08e0f57770ac6bb3a900a37 files/digest-emacs-21.1-r4 64
 MD5 e8ce9306bc0d26ebc1d4cd6c6c7765d8 files/digest-emacs-21.2-r2 126
 MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r4 126
 MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r2 126
-MD5 0c27886961e8f16d3889fbd36b4da14d files/emacs-21.1-gentoo.diff 532
-MD5 bb29381a50b72e88d869fb09a2c0a34e files/emacs-21.3-amd64.patch 7938
-MD5 3763ec7eaed9e5bb4da2f3f7c3795594 files/emacs-21.3-hppa.patch 2493
-MD5 2dc071ea24db58587a5e72af42addbc4 files/digest-emacs-18.59 147
 MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r3 126
 MD5 e307f213cb2015347f1c01d7828e28eb files/emacs-18.59-gcc-gentoo.patch 4240
 MD5 d9a84fa25df38b43cdce07e9ca4f53c0 files/emacs-18.59-gentoo.patch 3901
 MD5 2179ae07d8caf10bdb4e36126353f0b1 files/emacs-18.59-unexelf.patch 30720
+MD5 0c27886961e8f16d3889fbd36b4da14d files/emacs-21.1-gentoo.diff 532
+MD5 bb29381a50b72e88d869fb09a2c0a34e files/emacs-21.3-amd64.patch 7938
+MD5 3763ec7eaed9e5bb4da2f3f7c3795594 files/emacs-21.3-hppa.patch 2493
+MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
+MD5 2aaf4fc4c9513f13c4edb24327247f83 files/emacs-21.3-ppc64.patch 1622
diff --git a/app-editors/emacs/emacs-21.3-r4.ebuild b/app-editors/emacs/emacs-21.3-r4.ebuild
index cd856d83d665..a284249a1dcb 100644
--- a/app-editors/emacs/emacs-21.3-r4.ebuild
+++ b/app-editors/emacs/emacs-21.3-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-r4.ebuild,v 1.1 2004/07/04 14:15:47 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r4.ebuild,v 1.2 2004/07/15 18:08:12 tgall Exp $
 
 inherit flag-o-matic eutils alternatives
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="${PV}"
-KEYWORDS="~x86 ~ppc ~sparc -alpha ~arm -hppa ~amd64 -ia64 ~s390"
+KEYWORDS="~x86 ~ppc ~sparc -alpha ~arm -hppa ~amd64 -ia64 ~s390 ~ppc64"
 IUSE="X nls motif leim gnome Xaw3d lesstif"
 
 RDEPEND="sys-libs/ncurses
@@ -45,6 +45,7 @@ src_compile() {
 
 	epatch ${FILESDIR}/${P}-amd64.patch
 	epatch ${FILESDIR}/${P}-hppa.patch
+	use ppc64 && epatch ${FILESDIR}/${P}-ppc64.patch
 
 	export WANT_AUTOCONF=2.1
 	autoconf
diff --git a/app-editors/emacs/files/emacs-21.3-ppc64.patch b/app-editors/emacs/files/emacs-21.3-ppc64.patch
new file mode 100644
index 000000000000..757213794b59
--- /dev/null
+++ b/app-editors/emacs/files/emacs-21.3-ppc64.patch
@@ -0,0 +1,51 @@
+--- emacs-21.3/src/m/macppc.h.sopwith	2001-10-23 02:43:33.000000000 -0400
++++ emacs-21.3/src/m/macppc.h	2003-05-02 09:17:37.000000000 -0400
+@@ -95,11 +95,47 @@
+ 
+ #ifdef LINUX
+ #define LINKER $(CC) -nostdlib
+-#define LD_SWITCH_MACHINE -Xlinker -m -Xlinker elf32ppc
++#ifdef __powerpc64__
++#define LD_SWITCH_MACHINE -m64 -Xlinker -m -Xlinker elf64ppc
++#else
++#define LD_SWITCH_MACHINE -m32 -Xlinker -m -Xlinker elf32ppc
++#endif
+ /* s/gnu-linux.h defines this to `-z nocombreloc' which does not work here
+    because prefix-args is not used.  */
+ #undef LD_SWITCH_SYSTEM_TEMACS
+ #define LD_SWITCH_MACHINE_TEMACS -Xlinker -znocombreloc
++
++#ifdef __powerpc64__
++/* Misc 64-bit fixups, patterned after the x86_64 file */
++#undef BITS_PER_LONG
++#undef BITS_PER_EMACS_INT
++#undef VALBITS
++#undef PNTR_COMPARISON_TYPE
++#undef MARKBIT
++#undef XINT
++#undef XUINT
++#undef XPNTR
++#undef START_FILES
++#undef LIB_STANDARD
++#undef EMACS_INT
++#undef EMACS_UINT
++#undef SPECIAL_EMACS_INT
++
++#define BITS_PER_LONG 64
++#define BITS_PER_EMACS_INT 64
++#define VALBITS 60
++#define PNTR_COMPARISON_TYPE unsigned long
++#define MARKBIT         0x8000000000000000L
++
++#define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
++#define XUINT(a) ((long) (a) & VALMASK)
++#define XPNTR(a) XUINT (a)
++#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
++#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
++#define EMACS_INT               long
++#define EMACS_UINT              unsigned long
++#define SPECIAL_EMACS_INT
++#endif
+ #endif
+ 
+ #if 0  /* This breaks things on PPC GNU/Linux ecept for Yellowdog,