Updating to exclude patch 7500_all_4.0.1-s390-nohardware.patch on any arch except s390, fixes bug #37497

6 files changed, 53 insertions, 23 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 2a06e3c1426c..b9e76c7262c8 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.274 2004/01/31 17:52:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.275 2004/02/06 23:36:06 cyfred Exp $
+
+  07 Feb 2004; Andrew Bevitt <cyfred@gentoo.org>; xfree-4.3.0-r3.ebuild,
+  xfree-4.3.99.16.ebuild, xfree-4.3.99.901.ebuild, xfree-4.3.99.902.ebuild:
+  Updating to exclude 7500_all_4.0.1-s390-nohardware.patch on any arch except
+  non-existant s390
 
   31 Jan 2004; <donnie@gentoo.org> xfree-4.3.99.16.ebuild,
   xfree-4.3.99.901.ebuild, xfree-4.3.99.902.ebuild:
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index 0df65dd21571..6244d1da2485 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,32 +1,32 @@
-MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
-MD5 57426b9fa6fe8db9b10701a7d2efb787 xfree-4.3.99.902.ebuild 31043
+MD5 6a45600d75b563953c4ae441c9300f32 xfree-4.3.99.902.ebuild 31185
+MD5 d88e3d60ca8e77906b1556710eacce0e xfree-4.3.0-r2.ebuild 31527
+MD5 9e28cfd06f37e91902268e456173f327 xfree-4.3.99.16.ebuild 32594
+MD5 b742d26d55d842d22954406cdbc87e86 xfree-4.3.99.901.ebuild 31809
 MD5 460ff929c007dc7f7799fa3eb85942cd xfree-4.2.1-r2.ebuild 23613
-MD5 1092134beb34bd60fdb5a4768b949413 xfree-4.3.0-r2.ebuild 31524
-MD5 42a5ededafbbc1f1c49a7e853829360e xfree-4.3.0-r3.ebuild 34584
-MD5 766c53ddc550c98d703e61f965ff8a45 xfree-4.3.99.901.ebuild 31665
+MD5 9333ec80b63d2901dca2891178b1e4fc xfree-4.3.0-r3.ebuild 34726
 MD5 a251ef3113957df31d243a59c4173183 ChangeLog 61367
-MD5 17c0449a36ca16a610f411f0feebf75f xfree-4.3.99.16.ebuild 32452
-MD5 5a482320482c76552022a45b3fc282ff files/digest-xfree-4.3.99.902 1254
+MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
 MD5 7c78312b314118c4217fb71c2e3d9ad5 files/digest-xfree-4.2.1-r2 1342
 MD5 6a542004d031451f668989af76b28a0f files/digest-xfree-4.3.0-r2 1928
 MD5 5aa0593eae1bc9dec93ac67a83843b52 files/digest-xfree-4.3.0-r3 2000
-MD5 4f34915a9d5a680553021bdbbda5dc6c files/digest-xfree-4.3.99.901 1254
 MD5 aeb9aaa17c923c3e99e4f4fe2aaf8598 files/digest-xfree-4.3.99.16 1251
-MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.3.0/XftConfig 7750
-MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.3.0/10xfree 182
+MD5 4f34915a9d5a680553021bdbbda5dc6c files/digest-xfree-4.3.99.901 1254
+MD5 5a482320482c76552022a45b3fc282ff files/digest-xfree-4.3.99.902 1254
+MD5 4485c7fa46907db803d219218f62a5df files/4.3.0/xinitrc 918
+MD5 9cb44182ea92068b22973bcb0afda322 files/4.3.0/xserver.pamd 284
 MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/4.3.0/Xsession 1521
 MD5 0e84cb8a3f7b821072b2a75482b83f97 files/4.3.0/Xsetup_0 880
-MD5 7b0aac9992e53a3da3ecfef90b81b528 files/4.3.0/chooser.sh 1584
 MD5 e194f962a63f74c674887c9ade54a5ea files/4.3.0/site.def 3731
-MD5 605199b87a6477a337d57269fccc6faa files/4.3.0/startDM.sh 909
 MD5 d0cb338160e3be8790524af8071cc4df files/4.3.0/xdm.pamd 380
-MD5 43ac558897008a3dabff6cc4fa1e0e05 files/4.3.0/xdm.start 2847
 MD5 fbc03cfe0d80be07ad487d9ec7d9952e files/4.3.0/xfs.conf.d 801
 MD5 55ed160cbb7076b1292ea8e3772a2761 files/4.3.0/xfs.config 1331
+MD5 7b0aac9992e53a3da3ecfef90b81b528 files/4.3.0/chooser.sh 1584
+MD5 605199b87a6477a337d57269fccc6faa files/4.3.0/startDM.sh 909
+MD5 43ac558897008a3dabff6cc4fa1e0e05 files/4.3.0/xdm.start 2847
 MD5 a29418c10f780d4bfebbd346be495c43 files/4.3.0/xfs.start 6661
-MD5 4485c7fa46907db803d219218f62a5df files/4.3.0/xinitrc 918
-MD5 9cb44182ea92068b22973bcb0afda322 files/4.3.0/xserver.pamd 284
-MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/4.3.0/Sessions/Xsession 2187
-MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.3.0/lib/libGL.la 777
-MD5 18e1ac4e97a57fdba470897aa2cb452e files/4.3.0/lib/libGLU.la 769
+MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.3.0/XftConfig 7750
+MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.3.0/10xfree 182
 MD5 b2c509837ddfbd12d8f1ed9b50254f01 files/4.3.0/lib/libOSMesa.la 788
+MD5 18e1ac4e97a57fdba470897aa2cb452e files/4.3.0/lib/libGLU.la 769
+MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.3.0/lib/libGL.la 777
+MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/4.3.0/Sessions/Xsession 2187
diff --git a/x11-base/xfree/xfree-4.3.0-r3.ebuild b/x11-base/xfree/xfree-4.3.0-r3.ebuild
index 6d31cbcb130b..ac59f0485501 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-2004 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.93 2004/01/27 11:53:57 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.94 2004/02/06 23:36:06 cyfred 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 ...
@@ -243,6 +243,12 @@ src_unpack() {
 			${PATCH_DIR}/excluded
 	fi
 
+	# We dont have an implementation for S/390's yet...
+	if [ ! "${ARCH}" = "s390" ]
+	then
+		mv -f ${PATCH_DIR}/7500* ${PATCH_DIR}/excluded
+	fi
+
 	# This was formerly applied if USE=debug, but it causes builds
 	# to randomly die (spyderous).
 	mv -f ${PATCH_DIR}/0120* ${PATCH_DIR}/excluded
diff --git a/x11-base/xfree/xfree-4.3.99.16.ebuild b/x11-base/xfree/xfree-4.3.99.16.ebuild
index 82fdf2ddfa5b..c34a20c02d1e 100644
--- a/x11-base/xfree/xfree-4.3.99.16.ebuild
+++ b/x11-base/xfree/xfree-4.3.99.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.16.ebuild,v 1.9 2004/01/31 17:52:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.99.16.ebuild,v 1.10 2004/02/06 23:36:06 cyfred 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 ...
@@ -220,6 +220,12 @@ src_unpack() {
 	mv -f ${PATCH_DIR}/0120*parallel-make* ${PATCH_DIR}/excluded
 	mv -f ${PATCH_DIR}/0127*makefile-fastbuild* ${PATCH_DIR}/excluded
 
+	# We dont have an implementation for S/390's yet...
+	if [ ! "${ARCH}" = "s390" ]
+	then
+		mv -f ${PATCH_DIR}/7500* ${PATCH_DIR}/excluded
+	fi
+
 	if use debug
 	then
 		mv -f ${PATCH_DIR}/5901*acecad-debug* ${PATCH_DIR}/excluded
diff --git a/x11-base/xfree/xfree-4.3.99.901.ebuild b/x11-base/xfree/xfree-4.3.99.901.ebuild
index a5b70c4ccac9..ceca9f692e6a 100644
--- a/x11-base/xfree/xfree-4.3.99.901.ebuild
+++ b/x11-base/xfree/xfree-4.3.99.901.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.901.ebuild,v 1.8 2004/01/31 17:52:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.99.901.ebuild,v 1.9 2004/02/06 23:36:06 cyfred 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 ...
@@ -194,6 +194,13 @@ src_unpack() {
 	mv -f ${PATCH_DIR}/9960_all_4.3.0-exec-shield-GNU* ${PATCH_DIR}/excluded
 	mv -f ${PATCH_DIR}/9961_all_4.3.0-libGL-exec-shield* ${PATCH_DIR}/excluded
 
+	# We dont have an implementation for S/390's yet...
+	if [ ! "${ARCH}" = "s390" ]
+	then
+		mv -f ${PATCH_DIR}/7500* ${PATCH_DIR}/excluded
+	fi
+
+#
 #	if [ ! "`use gatos`" ]
 #	then
 		mv -f ${PATCH_DIR}/9841_all_4.3.0-gatos-mesa* ${PATCH_DIR}/excluded
diff --git a/x11-base/xfree/xfree-4.3.99.902.ebuild b/x11-base/xfree/xfree-4.3.99.902.ebuild
index c9df3db10951..040b72eb3b69 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-2004 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.8 2004/01/31 17:52:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.99.902.ebuild,v 1.9 2004/02/06 23:36:06 cyfred 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 ...
@@ -194,6 +194,12 @@ src_unpack() {
 	mv -f ${PATCH_DIR}/9960_all_4.3.0-exec-shield-GNU* ${PATCH_DIR}/excluded
 	mv -f ${PATCH_DIR}/9961_all_4.3.0-libGL-exec-shield* ${PATCH_DIR}/excluded
 
+	# We dont have an implementation for S/390's yet...
+	if [ ! "${ARCH}" = "s390" ]
+	then
+		mv -f ${PATCH_DIR}/7500* ${PATCH_DIR}/excluded
+	fi
+
 #	if [ ! "`use gatos`" ]
 #	then
 		mv -f ${PATCH_DIR}/9841_all_4.3.0-gatos-mesa* ${PATCH_DIR}/excluded