PATCH_VER 0.3. Skipped 0.2. Add 0181_all_4.3.0-amd64-nolib64.patch from 4.3.0-r3, because upstream 32/64 lib separation appears screwed up (Brad House). This makes sure it's all 64-bit and gets installed to /usr/X11R6/lib/. Rename all patches from _arch_ to _all_ to try to prevent possible breakage with all the combinations. Drop 0280 in favor of using 0251_all_4.3.0-alpha-hppa-build-zlib-with-fpic.patch for both hppa and alpha. This required some ebuild modifications to exclude it for other archs. Drop 0180_amd64_4.2.99.4-glx-nopic.patch, because -fPIC is required on AMD64 for all shared objects (Brad House).

4 files changed, 25 insertions, 7 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index f0b250b63c9d..5a10d528ff3e 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,18 @@
 # 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.268 2003/12/30 14:19:54 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.269 2004/01/06 06:23:55 spyderous Exp $
+
+  06 Jan 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-4.3.99.902.ebuild:
+  PATCH_VER 0.3. Skipped 0.2. Add 0181_all_4.3.0-amd64-nolib64.patch from
+  4.3.0-r3, because upstream 32/64 lib separation appears screwed up (Brad
+  House). This makes sure it's all 64-bit and gets installed to /usr/X11R6/lib/.
+  Rename all patches from _arch_ to _all_ to try to prevent possible breakage
+  with all the combinations. Drop 0280 in favor of using
+  0251_all_4.3.0-alpha-hppa-build-zlib-with-fpic.patch for both hppa and alpha.
+  This required some ebuild modifications to exclude it for other archs. Drop
+  0180_amd64_4.2.99.4-glx-nopic.patch, because -fPIC is required on AMD64 for
+  all shared objects (Brad House).
 
   30 Dec 2003; Jason Wever <weeve@gentoo.org> xfree-4.3.99.902.ebuild:
   Added ~sparc for those crazed /etc/portage/package.unmask denizens.
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index 25ff94f033dd..b23431849282 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,19 +1,19 @@
-MD5 701eb5fdb860fa48622585379c0d8075 ChangeLog 59702
 MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
-MD5 0f9e68a1dd0d46928b5e7b487c72c642 xfree-4.3.99.902.ebuild 30759
 MD5 e169e0fe0574ecb23f62d4787abe3dcb xfree-4.2.1-r2.ebuild 24144
 MD5 5f94c08cc5ea918aa4e9a73dd1ed9494 xfree-4.3.0-r2.ebuild 31522
 MD5 e50a27d1bd0a08d0b17f4fe392e3e389 xfree-4.3.0-r3.ebuild 34300
 MD5 dc3b83378bf0118fdc6a7d24806279e5 xfree-4.3.99.16.ebuild 32367
 MD5 693a1c50da33227c640fdfed215aa835 xfree-4.3.99.901.ebuild 31577
+MD5 297d241da3341a93bebd09ee573ec245 xfree-4.3.99.902.ebuild 30948
+MD5 84ea74877afb1b5214b2b9cb6db654f2 ChangeLog 60425
 MD5 a9371704cf72bcb8d1aa713ca4b27546 files/XFree86-4.2.1-Xft11-Imakefile.patch 341
 MD5 bc3aad4b056a41f47d427c036edcef9f files/XFree86-4.2.1-Xft11-hack.patch 1163
-MD5 195753e7075d46b1250d1245cf3c51c0 files/digest-xfree-4.3.99.902 1254
 MD5 f37019cb2d1cac6358077bda58d062ed files/digest-xfree-4.2.1-r2 1267
 MD5 6a542004d031451f668989af76b28a0f files/digest-xfree-4.3.0-r2 1928
 MD5 5aa0593eae1bc9dec93ac67a83843b52 files/digest-xfree-4.3.0-r3 2000
 MD5 aeb9aaa17c923c3e99e4f4fe2aaf8598 files/digest-xfree-4.3.99.16 1251
 MD5 4f34915a9d5a680553021bdbbda5dc6c files/digest-xfree-4.3.99.901 1254
+MD5 5a482320482c76552022a45b3fc282ff files/digest-xfree-4.3.99.902 1254
 MD5 10e681917f61e8ed068030a373694906 files/xfree-4.2.x-home_end-keys.patch 666
 MD5 6c0fe2e04a359ddc367dbd0dd00c61a1 files/xfree-4.2.x.-bison.fixes.patch 2854
 MD5 8d524f120fa5c2e49ccc8f989d50907c files/4.2.1-patches/018_all_4.2.0-ati-radeon-misc-bugfixes.patch.bz2 4651
diff --git a/x11-base/xfree/files/digest-xfree-4.3.99.902 b/x11-base/xfree/files/digest-xfree-4.3.99.902
index dd564e1d9bb2..566b998816ab 100644
--- a/x11-base/xfree/files/digest-xfree-4.3.99.902
+++ b/x11-base/xfree/files/digest-xfree-4.3.99.902
@@ -17,4 +17,4 @@ MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
 MD5 41725543cce9a2e417f92f0425f46bc2 XFree86-4.3.99.902-files-0.1.tar.bz2 10772
 MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156
 MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974
-MD5 918927d64dc6559a7423467b15913115 XFree86-4.3.99.902-patches-0.1.tar.bz2 88192
+MD5 37af6335410eaaec3f541e5c144ec78a XFree86-4.3.99.902-patches-0.3.tar.bz2 88034
diff --git a/x11-base/xfree/xfree-4.3.99.902.ebuild b/x11-base/xfree/xfree-4.3.99.902.ebuild
index b3b7f6fd2a96..7f6acfc6636c 100644
--- a/x11-base/xfree/xfree-4.3.99.902.ebuild
+++ b/x11-base/xfree/xfree-4.3.99.902.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.99.902.ebuild,v 1.4 2003/12/30 14:19:54 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.99.902.ebuild,v 1.5 2004/01/06 06:23:55 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 ...
@@ -40,7 +40,7 @@ strip-flags
 USE_SNAPSHOT="yes"
 
 FILES_VER="0.1"
-PATCH_VER="0.1"
+PATCH_VER="0.3"
 FT2_VER="2.1.4"
 XCUR_VER="0.3.1"
 SISDRV_VER="021203-1"
@@ -201,6 +201,12 @@ src_unpack() {
 		mv -f ${PATCH_DIR}/5901*acecad-debug* ${PATCH_DIR}/excluded
 	fi
 
+	# Only apply for hppa/alpha (exclude for others)
+	if [ ! "${ARCH}" = "hppa" -o ! "${ARCH}" = "alpha" ]
+	then
+		mv -f ${PATCH_DIR}/0251*build-zlib-with-fpic* ${PATCH_DIR}/excluded
+	fi
+
 	# TDFX_RISKY - 16-bit, 1024x768 or higher on low-memory voodoo3's
 	if [ "`use 3dfx`" -a "${TDFX_RISKY}" = "yes" ]
 	then