~ppc fix

4 files changed, 31 insertions, 16 deletions

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index 6150532fe202..2cabd58fedfe 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/xemacs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.35 2003/06/10 08:21:44 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.36 2003/06/28 23:30:08 lu_zero Exp $
+
+  29 Jun 2003; Luca Barbato <lu_zero@gentoo.org> xemacs-21.4.12.ebuild:
+  Fixed ppc problems and masked ~ppc
 
   10 Jun 2003; <rac@gentoo.org> xemacs-21.4.12.ebuild:
   Remove unused lucid variable from IUSE
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index bc270f2ee3b4..63b9d4b28b90 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,20 +1,21 @@
-MD5 8e6c7e5f547765b625504a091c913687 xemacs-21.4.10-r2.ebuild 4839
-MD5 222b865b71e85afec2cdc643b2e321bb xemacs-21.4.11.ebuild 4863
+MD5 a997ec9d336e8533d81d689a87008ffc ChangeLog 6803
 MD5 9a620eab0506045f21790d6d037eba52 xemacs-21.4.10-r1.ebuild 4928
+MD5 8e6c7e5f547765b625504a091c913687 xemacs-21.4.10-r2.ebuild 4839
 MD5 67f3723920ee8ebadd377a18c53d97a4 xemacs-21.4.10.ebuild 4030
+MD5 62634e8c7aa8bcdc045e3bfecba53966 xemacs-21.4.12.ebuild 5092
 MD5 58f9e7da94d3f4e82778324e73708625 xemacs-21.4.9.ebuild 4299
-MD5 555e8390331e408e3e7c67740b160070 xemacs-21.4.12.ebuild 5053
-MD5 c31b52cc6b01caf295e907892c839de7 ChangeLog 6689
-MD5 115eb28610752622c6d6e1189d9e5ec8 files/emodules.info-21.4.8-gentoo.patch 468
-MD5 39fc9657b72b09c8b91f52ee50758ad2 files/xemacs-21.4.12-ppc.diff 1075
-MD5 94beef92edcaf12edef657556fbb7a7e files/xemacs-21.4.9-ppc.diff 1032
+MD5 222b865b71e85afec2cdc643b2e321bb xemacs-21.4.11.ebuild 4863
+MD5 df382940daa67bb8888fbae22d617cb4 files/README.Gentoo 1426
 MD5 c0105f25a98b5dde2f43d624e3e24ca8 files/digest-xemacs-21.4.10 274
-MD5 bb8787846b0aa574609da98ac6cb7c39 files/digest-xemacs-21.4.11 68
+MD5 9d39ec32a092541d819789bc9ec482c8 files/digest-xemacs-21.4.10-r1 274
+MD5 9d39ec32a092541d819789bc9ec482c8 files/digest-xemacs-21.4.10-r2 274
 MD5 6d3780dc77d3dd7c017d8864d2f0b07d files/digest-xemacs-21.4.12 130
+MD5 39fc9657b72b09c8b91f52ee50758ad2 files/xemacs-21.4.12-ppc.diff 1075
 MD5 678239bc0954d838f5a9c53a6570c850 files/xemacs-21.4.9-ppc-glibc-2.3.x.diff 1112
-MD5 df382940daa67bb8888fbae22d617cb4 files/README.Gentoo 1426
-MD5 27a8dcab7441389fc05c3406096bb8be files/emodules.info-gentoo.patch 479
 MD5 892c698f9b7d3ca42a83df34518b0946 files/digest-xemacs-21.4.9 273
-MD5 9d39ec32a092541d819789bc9ec482c8 files/digest-xemacs-21.4.10-r1 274
-MD5 9d39ec32a092541d819789bc9ec482c8 files/digest-xemacs-21.4.10-r2 274
+MD5 115eb28610752622c6d6e1189d9e5ec8 files/emodules.info-21.4.8-gentoo.patch 468
+MD5 27a8dcab7441389fc05c3406096bb8be files/emodules.info-gentoo.patch 479
 MD5 94beef92edcaf12edef657556fbb7a7e files/xemacs-21.4.8-ppc.diff 1032
+MD5 94beef92edcaf12edef657556fbb7a7e files/xemacs-21.4.9-ppc.diff 1032
+MD5 bb8787846b0aa574609da98ac6cb7c39 files/digest-xemacs-21.4.11 68
+MD5 ace9b77c4d23c9500c1e81a3606545f8 files/quick-fix.patch 393
diff --git a/app-editors/xemacs/files/quick-fix.patch b/app-editors/xemacs/files/quick-fix.patch
new file mode 100644
index 000000000000..26aafcee0a42
--- /dev/null
+++ b/app-editors/xemacs/files/quick-fix.patch
@@ -0,0 +1,11 @@
+diff -ruN xemacs-21.4.12.orig/configure xemacs-21.4.12/configure
+--- xemacs-21.4.12.orig/configure	2003-06-29 00:48:56.000000000 +0200
++++ xemacs-21.4.12/configure	2003-06-29 00:49:09.000000000 +0200
+@@ -2966,7 +2966,6 @@
+ fi
+ 
+ 
+-test "$machine$opsys" = "powerpclinux" && start_flags="-T $srcdir/src/ppc.ldscript"
+ 
+ if test "$unexec" = "unexaix.o"; then
+   if   test "$dynamic" = "no"; then
diff --git a/app-editors/xemacs/xemacs-21.4.12.ebuild b/app-editors/xemacs/xemacs-21.4.12.ebuild
index 3ee136618572..e34fb024bdd0 100644
--- a/app-editors/xemacs/xemacs-21.4.12.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.12.ebuild,v 1.4 2003/06/10 08:21:44 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.12.ebuild,v 1.5 2003/06/28 23:30:08 lu_zero Exp $
 
 IUSE="gpm postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna  athena neXt Xaw3d"
 
@@ -57,7 +57,7 @@ PROVIDE="virtual/xemacs virtual/editor"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 -ppc alpha ~sparc"
+KEYWORDS="~x86 ~ppc alpha ~sparc"
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -69,7 +69,7 @@ src_unpack() {
 	if [ ${ARCH} = "ppc" ] ; then
 		patch -p0 < ${FILESDIR}/${P}-ppc.diff || die
 	fi
-
+	epatch ${FILESDIR}/quick-fix.patch
 	# copy Next_XEmacs icons into toolbar dir
 	cp ${WORKDIR}/NeXT.XEmacs/xemacs-icons/* ${S}/etc/toolbar/
 }