Patchset 2.1.14. Adding patches 0261 and 0262 to fix module loading issues on ia64. 0261 is from splite, 0262 I got from Mike Harris's patches. Fixing bug #29430 as well.

4 files changed, 20 insertions, 17 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index a10217776666..aebf06ef68ab 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,11 @@
 # 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.188 2003/09/21 20:33:38 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.189 2003/09/24 07:00:48 spyderous Exp $
+
+  24 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild:
+  Patchset 2.1.14. Adding patches 0261 and 0262 to fix module loading issues on
+  ia64. 0261 is from splite, 0262 I got from Mike Harris's patches. Fixing bug
+  #29430 as well.
 
   21 Sep 2003; Jon Portnoy <avenj@gentoo.org> xfree-4.3.0-r3.ebuild,
   files/xfree-4.3.0-ia64-elfloader.patch :
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index b6f05e5e51a4..6fa77bb84ed6 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,15 +1,15 @@
-MD5 fd6df450171307b0db0438bd7b199911 ChangeLog 42667
+MD5 2f8f3f248ada183e05e9b31b45bd54bd ChangeLog 42927
 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 135fb7fe0b8029840016b0521f7fe732 xfree-4.3.0-r3.ebuild 34135
+MD5 dd1ea8123bacb6b81a42cbc32188d5c9 xfree-4.3.0-r3.ebuild 34188
 MD5 d5b7d8db6e1c3cc9ccbf5fd18d733fa8 xfree-4.3.99.10.ebuild 31001
+MD5 b47af0b9938531a1691504189a76fa74 xfree-4.3.99.9.ebuild 31543
 MD5 c320ac0ee10e81c164f4a91a80100e39 xfree-4.3.99.11.ebuild 31796
 MD5 69f6ac0a840908e2a924f7ab00553104 xfree-4.3.99.12.ebuild 31941
-MD5 b47af0b9938531a1691504189a76fa74 xfree-4.3.99.9.ebuild 31543
 MD5 a9371704cf72bcb8d1aa713ca4b27546 files/XFree86-4.2.1-Xft11-Imakefile.patch 341
 MD5 bc3aad4b056a41f47d427c036edcef9f files/XFree86-4.2.1-Xft11-hack.patch 1163
 MD5 ab68703ef80727e333fd52ed5806df2d files/digest-xfree-4.1.0-r6 240
@@ -17,13 +17,13 @@ MD5 21d5f7a63f9dbf1948cc7df8b2bf67fc files/digest-xfree-4.2.0-r12 576
 MD5 373ecdb2a152d8f047a7f08dffdc40af files/digest-xfree-4.2.1-r2 1267
 MD5 be43a94caab2339e3a00372906f115a0 files/digest-xfree-4.3.0-r1 1384
 MD5 99571ab50326492501cdb59ecb055fa4 files/digest-xfree-4.3.0-r2 1928
-MD5 45d0b451965eaa47536c0f32b1c6a115 files/digest-xfree-4.3.0-r3 2158
+MD5 7368a368c51bff8f9211f27e6f2376b2 files/digest-xfree-4.3.0-r3 2158
 MD5 b54e3468ffe57d029e79273008937c0e files/digest-xfree-4.3.99.10 1630
-MD5 ed8d13c2b7f149b9578d52fe96f4d85d files/digest-xfree-4.3.99.11 1394
-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 ed8d13c2b7f149b9578d52fe96f4d85d files/digest-xfree-4.3.99.11 1394
+MD5 119d37ee6d742244b4628cb92d99e4ac files/digest-xfree-4.3.99.12 1394
 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
diff --git a/x11-base/xfree/files/digest-xfree-4.3.0-r3 b/x11-base/xfree/files/digest-xfree-4.3.0-r3
index 266e1b6481b1..a113cc5c9a31 100644
--- a/x11-base/xfree/files/digest-xfree-4.3.0-r3
+++ b/x11-base/xfree/files/digest-xfree-4.3.0-r3
@@ -5,7 +5,7 @@ MD5 567903747018f2534965ab6cb3976b38 X430src-4.tgz 12906091
 MD5 4dbdbe9a85c8f7f98dd0ee015a3c7b4f X430src-5.tgz 4388018
 MD5 163d9864e1353a4a9f992cb3843c240f X430src-6.tgz 8074919
 MD5 e002e70f24098ca4f62fabd1c2809ed1 X430src-7.tgz 9317241
-MD5 5ffb4ea60c625830a0211bb352102b49 XFree86-4.3.0-patches-2.1.13.tar.bz2 425887
+MD5 4d4627bddb9c64b00ed84d0c22300eff XFree86-4.3.0-patches-2.1.14.tar.bz2 428460
 MD5 e0c52f0e726e20db445e9708665a26d4 xfree86-dri-resume-v8.patch 15333
 MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156
 MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974
diff --git a/x11-base/xfree/xfree-4.3.0-r3.ebuild b/x11-base/xfree/xfree-4.3.0-r3.ebuild
index 6aa3557bd8ae..92af97d6bb2a 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.52 2003/09/21 20:33:38 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.53 2003/09/24 07:00:48 spyderous 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 ...
@@ -37,7 +37,7 @@ strip-flags
 # Are we using a snapshot ?
 USE_SNAPSHOT="no"
 
-PATCH_VER="2.1.13"
+PATCH_VER="2.1.14"
 FT2_VER="2.1.3"
 XCUR_VER="0.3.1"
 SISDRV_VER="100803-1"
@@ -56,7 +56,7 @@ SRC_PATH1="ftp://ftp1.sourceforge.net/pub/mirrors/XFree86/${BASE_PV}/source"
 HOMEPAGE="http://www.xfree.org"
 
 # Misc patches we may need to fetch ..
-X_PATCHES="mirror://gentoo/XFree86-${PV}-patches-${PATCH_VER}.tar.bz2
+X_PATCHES="http://dev.gentoo.org/~spyderous/xfree/patchsets/XFree86-${PV}-patches-${PATCH_VER}.tar.bz2
 	http://www.cpbotha.net/files/dri_resume/xfree86-dri-resume-v8.patch"
 
 X_DRIVERS="http://people.mandrakesoft.com/~flepied/projects/wacom/xf86Wacom.c.gz
@@ -231,6 +231,10 @@ src_unpack() {
 	# to randomly die (spyderous).
 	mv -f ${PATCH_DIR}/0120* ${PATCH_DIR}/excluded
 
+	# This is splite's ia64 patch. Is it necessary,
+	# now that 0262 is applied? (spyderous)
+	mv -f ${PATCH_DIR}/0261* ${PATCH_DIR}/excluded
+
 	if use debug
 	then
 		mv -f ${PATCH_DIR}/5901* ${PATCH_DIR}/excluded
@@ -536,12 +540,6 @@ 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() {