ia64 keywords + patch

4 files changed, 38 insertions, 8 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index b7425165d213..a10217776666 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.187 2003/09/17 08:17:52 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.188 2003/09/21 20:33:38 avenj Exp $
+
+  21 Sep 2003; Jon Portnoy <avenj@gentoo.org> xfree-4.3.0-r3.ebuild,
+  files/xfree-4.3.0-ia64-elfloader.patch :
+  Tiny patch from splite for XFree86 on IA64. Added IA-64 keywords.
 
   17 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r2.ebuild:
   Bumped patchset to 1.1.8. Added Savage memory leak patches from -r3, fixed
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index c9ab43df9e73..b6f05e5e51a4 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,11 +1,11 @@
-MD5 ae73fef72cbc05c09d45c3a44bb2771d ChangeLog 42490
+MD5 fd6df450171307b0db0438bd7b199911 ChangeLog 42667
 MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
 MD5 d1ee4ee801fe27008bcb498ff5076621 xfree-4.1.0-r6.ebuild 2939
 MD5 2e730b1127a59eabfc864b23049418d6 xfree-4.2.0-r12.ebuild 10299
 MD5 e01435598f0611dafe440192d953b222 xfree-4.2.1-r2.ebuild 24143
 MD5 9afeabe9fa568c38b51e96a261c66078 xfree-4.3.0-r1.ebuild 25074
 MD5 45cbef38b91be23634352c6dca1528b3 xfree-4.3.0-r2.ebuild 31330
-MD5 37613246319992afde9a0f47217a4686 xfree-4.3.0-r3.ebuild 34011
+MD5 135fb7fe0b8029840016b0521f7fe732 xfree-4.3.0-r3.ebuild 34135
 MD5 d5b7d8db6e1c3cc9ccbf5fd18d733fa8 xfree-4.3.99.10.ebuild 31001
 MD5 c320ac0ee10e81c164f4a91a80100e39 xfree-4.3.99.11.ebuild 31796
 MD5 69f6ac0a840908e2a924f7ab00553104 xfree-4.3.99.12.ebuild 31941
@@ -24,8 +24,9 @@ MD5 119d37ee6d742244b4628cb92d99e4ac files/digest-xfree-4.3.99.12 1394
 MD5 9f7043b0fff9699184d56a3bb32cf18b files/digest-xfree-4.3.99.9 558
 MD5 10e681917f61e8ed068030a373694906 files/xfree-4.2.x-home_end-keys.patch 666
 MD5 6c0fe2e04a359ddc367dbd0dd00c61a1 files/xfree-4.2.x.-bison.fixes.patch 2854
-MD5 0e3eb0ef30faacadc0372721d57c51f3 files/4.1.0-r6/10xfree 113
+MD5 f125858e092390f05eea73022b776cb7 files/xfree-4.3.0-ia64-elfloader.patch 476
 MD5 027d2f93b478a1c419b8aee64ab2914b files/4.1.0-r6/XftConfig 2002
+MD5 0e3eb0ef30faacadc0372721d57c51f3 files/4.1.0-r6/10xfree 113
 MD5 e110b49a8eef223cbdb65b1ff0ac27c8 files/4.1.0-r6/Xsession 986
 MD5 771ae94bc02c664f7359a5fd6d03893d files/4.1.0-r6/site.def 547
 MD5 bae1bbaf9d55f072280a213e4dc6774f files/4.1.0-r6/xdm 140
@@ -44,8 +45,8 @@ MD5 bbfd4878d1572717afeeee8ca421d0d3 files/4.2.0/XFree86-4.2.0-i810_i845_2002052
 MD5 a1e2e9ce27b67b046b9bfe24febe581a files/4.2.0/XFree86-4.2.0-r128-lockup.patch.bz2 344
 MD5 6181d7161c3c58d9c3f80a9dcca7873e files/4.2.0/XFree86-4.2.0-v4l.patch.bz2 1201
 MD5 9471f5a22f1b43f75f7c92054192d904 files/4.2.0/XFree86-4.2.0-xft-leak.patch.bz2 423
-MD5 58fd7e06e4f838fd972399c28a365be1 files/4.2.0-r12/10xfree 144
 MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.2.0-r12/XftConfig 7750
+MD5 58fd7e06e4f838fd972399c28a365be1 files/4.2.0-r12/10xfree 144
 MD5 c790204c66b659a34ed3cce3c65fe740 files/4.2.0-r12/Xsession 1357
 MD5 5002823053814f70a5fa568beee80aed files/4.2.0-r12/Xsetup_0 866
 MD5 429888e61c7c6a055bb8d8a249e8f058 files/4.2.0-r12/chooser.sh 1734
@@ -81,8 +82,8 @@ MD5 cb721d66b1b67c88708ce1613648ee1d files/4.2.1-r2/xfs.start 6602
 MD5 ca411cceb6124020fdb07edef6df90eb files/4.2.1-r2/xft-quality.diff 848
 MD5 4485c7fa46907db803d219218f62a5df files/4.2.1-r2/xinitrc 918
 MD5 9cb44182ea92068b22973bcb0afda322 files/4.2.1-r2/xserver.pamd 284
-MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.3.0/10xfree 182
 MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.3.0/XftConfig 7750
+MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.3.0/10xfree 182
 MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/4.3.0/Xsession 1521
 MD5 5002823053814f70a5fa568beee80aed files/4.3.0/Xsetup_0 866
 MD5 7b0aac9992e53a3da3ecfef90b81b528 files/4.3.0/chooser.sh 1584
diff --git a/x11-base/xfree/files/xfree-4.3.0-ia64-elfloader.patch b/x11-base/xfree/files/xfree-4.3.0-ia64-elfloader.patch
new file mode 100644
index 000000000000..b699cfdc50d3
--- /dev/null
+++ b/x11-base/xfree/files/xfree-4.3.0-ia64-elfloader.patch
@@ -0,0 +1,19 @@
+--- elfloader.c	2003-09-21 15:08:36.000000000 -0500
++++ elfloader-ia64	2003-09-21 15:12:07.000000000 -0500
+@@ -2180,6 +2180,7 @@
+ 	    ia64_flush_cache(dest64);
+ 	    break;
+ 
++#if 0
+ 	case R_IA64_PCREL64LSB:
+ 	    dest64=(unsigned long *)(secp+rel->r_offset);
+ #ifdef ELFDEBUG
+@@ -2191,6 +2192,8 @@
+ #endif
+ 	    *dest64 = symval + rel->r_addend - (unsigned long)dest64;
+ 	    break;
++
++#endif
+ 	
+ 	case R_IA64_PCREL64LSB:
+ 	    dest64=(unsigned long *)(secp+rel->r_offset);
diff --git a/x11-base/xfree/xfree-4.3.0-r3.ebuild b/x11-base/xfree/xfree-4.3.0-r3.ebuild
index dcca2fb9ff28..6aa3557bd8ae 100644
--- a/x11-base/xfree/xfree-4.3.0-r3.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r3.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/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.51 2003/09/16 14:30:19 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.52 2003/09/21 20:33:38 avenj Exp $
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -114,7 +114,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="X11 MSttfEULA"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm amd64 ia64"
 
 DEPEND=">=sys-apps/baselayout-1.8.3
 	>=sys-libs/ncurses-5.1
@@ -536,6 +536,12 @@ src_unpack() {
 			fi
 		done
 	fi
+
+	if use ia64
+	then
+		cd ${S}/programs/Xserver/hw/xfree86/loader
+		epatch ${FILESDIR}/xfree-4.3.0-ia64-elfloader.patch
+	fi
 }
 
 src_compile() {