Fix hppa compilation with a patch. Marked stable on hppa.

4 files changed, 111 insertions, 6 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 3b57e28eed6d..bf269ad6d27a 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.18 2003/12/14 03:55:22 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.19 2003/12/20 16:14:33 gmsoft Exp $
 
   13 Dec 2003; Brad House <brad_mssw@gentoo.org> emacs-21.3-r2.ebuild,
   files/emacs-21.3-amd64.patch:
@@ -8,6 +8,10 @@
 
 *emacs-21.3-r2 (08 Dec 2003)
 
+  20 Dec 2003; Guy Martin <gmsoft@gentoo.org> emacs-21.3-r2.ebuild
+  files/emacs-21.3-hppa.patch :
+  Fix hppa compilation with a patch. Marked stable on hppa.
+
   08 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> emacs-21.3-r2.ebuild:
   Disable Xaw3d if USE="-Xaw3d" even when it is installed, bug 35300
 
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 041fba99393c..139ea5f61767 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,15 +1,16 @@
-MD5 809317ba88321a87cf0fb1b4902da76c ChangeLog 2664
+MD5 5e4dab46f3ac9ca351947376f59121a0 ChangeLog 2821
 MD5 40853be493e6a30b2ec3ad49e706ebbc emacs-21.1-r4.ebuild 2161
 MD5 e0550e49a5777e8f5e8bd1788b17bd58 emacs-21.2-r2.ebuild 1850
-MD5 36d06141fefba9516cfc88589d6476d8 emacs-21.3-r2.ebuild 2172
 MD5 7eaa157a450131d846ceaf85091e01b9 emacs-21.3-r1.ebuild 2131
+MD5 8d1dd90b5ec5db646fdae4e33c9aec29 emacs-21.3-r2.ebuild 2211
 MD5 ad5123de506f2484f1dfa0f962aa947d emacs-21.3.ebuild 2001
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 MD5 da1e3cd3b08e0f57770ac6bb3a900a37 files/digest-emacs-21.1-r4 64
-MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r2 126
 MD5 e8ce9306bc0d26ebc1d4cd6c6c7765d8 files/digest-emacs-21.2-r2 126
 MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3 126
 MD5 c196c1f14bc7e319f1dadb065f39bbfb files/digest-emacs-21.3-r1 323
+MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r2 126
 MD5 0c27886961e8f16d3889fbd36b4da14d files/emacs-21.1-gentoo.diff 532
 MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
 MD5 bb29381a50b72e88d869fb09a2c0a34e files/emacs-21.3-amd64.patch 7938
+MD5 3763ec7eaed9e5bb4da2f3f7c3795594 files/emacs-21.3-hppa.patch 2493
diff --git a/app-editors/emacs/emacs-21.3-r2.ebuild b/app-editors/emacs/emacs-21.3-r2.ebuild
index 045beff87f96..6081332487db 100644
--- a/app-editors/emacs/emacs-21.3-r2.ebuild
+++ b/app-editors/emacs/emacs-21.3-r2.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/emacs/emacs-21.3-r2.ebuild,v 1.2 2003/12/14 03:55:22 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r2.ebuild,v 1.3 2003/12/20 16:14:33 gmsoft Exp $
 
 IUSE="X nls motif leim gnome Xaw3d"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.gz
 HOMEPAGE="http://www.gnu.org/software/emacs"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha amd64 hppa"
 
 DEPEND="sys-libs/ncurses
 	sys-libs/gdbm
@@ -38,6 +38,8 @@ filter-flags -fstack-protector
 
 src_compile() {
 	epatch ${FILESDIR}/${P}-amd64.patch
+	epatch ${FILESDIR}/${P}-hppa.patch
+
 	unset WANT_AUTOCONF_2_5
 	export WANT_AUTOCONF_2_1=1
 	autoconf
diff --git a/app-editors/emacs/files/emacs-21.3-hppa.patch b/app-editors/emacs/files/emacs-21.3-hppa.patch
new file mode 100644
index 000000000000..6955f9385ee0
--- /dev/null
+++ b/app-editors/emacs/files/emacs-21.3-hppa.patch
@@ -0,0 +1,98 @@
+diff -uNr emacs-21.3.orig/configure emacs-21.3/configure
+--- emacs-21.3.orig/configure	2003-12-20 15:03:19.622159984 +0000
++++ emacs-21.3/configure	2003-12-20 15:13:56.550332184 +0000
+@@ -1179,6 +1179,10 @@
+     machine=hp800 opsys=nextstep
+   ;;
+ 
++  hppa*-*-linux-gnu* )
++    machine=hp800 psys=gnu-linux
++  ;;
++  
+   ## Orion machines
+   orion-orion-bsd* )
+     machine=orion opsys=bsd4-2
+diff -uNr emacs-21.3.orig/configure.in emacs-21.3/configure.in
+--- emacs-21.3.orig/configure.in	2003-12-20 15:03:19.624159680 +0000
++++ emacs-21.3/configure.in	2003-12-20 15:15:22.825216408 +0000
+@@ -553,6 +553,10 @@
+     machine=hp800 opsys=nextstep
+   ;;
+ 
++  hppa*-*-linux-gnu* )
++    machine=hp800 opsys=gnu-linux
++  ;;
++
+   ## Orion machines
+   orion-orion-bsd* )
+     machine=orion opsys=bsd4-2
+--- emacs21-21.2.orig/src/m/hp800.h
++++ emacs21-21.2/src/m/hp800.h
+@@ -85,7 +85,7 @@
+ #define bcmp		memcmp
+ #endif
+ 
+-#ifdef __hpux
++#if defined(__hpux) || defined(__linux__)
+ /* Now define a symbol for the cpu type, if your compiler
+    does not define it automatically:
+    Ones defined so far include vax, m68000, ns16000, pyramid,
+@@ -94,6 +94,15 @@
+ #     define hp9000s800
+ #endif
+ 
++#ifdef __linux__
++/* Data type of load average, as read out of kmem.  */
++
++#define LOAD_AVE_TYPE long
++
++/* Convert that into an integer that is 100 for a load average of 1.0  */
++
++#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
++#else
+ /* Data type of load average, as read out of kmem.  */
+ 
+ #define LOAD_AVE_TYPE double
+@@ -101,7 +110,7 @@
+ /* Convert that into an integer that is 100 for a load average of 1.0  */
+ 
+ #define LOAD_AVE_CVT(x) ((int) (x * 100.0))
+-
++#endif
+ 
+ /* Define CANNOT_DUMP on machines where unexec does not work.
+    Then the function dump-emacs will not be defined
+@@ -116,6 +125,7 @@
+    Otherwise Emacs assumes that text space precedes data space,
+    numerically.  */
+ 
++#ifdef __hpux
+ #define VIRT_ADDR_VARIES
+ 
+ /* Define C_ALLOCA if this machine does not support a true alloca
+@@ -134,6 +144,9 @@
+ 
+ #define DATA_START    0x40000000
+ #define TEXT_START    0x00000000
++#else
++#define HAVE_ALLOCA
++#endif
+ 
+ #define STACK_DIRECTION 1 
+ 
+@@ -147,6 +160,7 @@
+ /* This machine requires completely different unexec code
+    which lives in a separate file.  Specify the file name.  */
+ 
++#ifdef __hpux
+ #define UNEXEC unexhp9k800.o
+ 
+ #define LIBS_MACHINE
+@@ -179,5 +193,5 @@
+ 
+ #define index strchr
+ #define rindex strrchr
+-
+-#endif /* __hpux */
++#endif
++#endif