patch updates

16 files changed, 32 insertions, 4 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 382314293277..fa0f475996e9 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.42 2002/09/14 00:45:23 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.43 2002/09/19 21:15:27 azarah Exp $
+
+  19 Sep 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild :
+
+  Reimplement patch scheme.  Add patch for Sparc PCI domains, should
+  close bug #7790 (for sparc at least).
 
   14 Sep 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild :
 
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-G450.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/001_all_4.2.0-G450.patch.bz2
index f5467c95bd0e..f5467c95bd0e 100644
--- a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-G450.patch.bz2
+++ b/x11-base/xfree/files/4.2.1-patches/001_all_4.2.0-G450.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-ati-r128-vtswitch-fix-busmaster-enable.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/002_all_4.2.0-ati-r128-vtswitch-fix-busmaster-enable.patch.bz2
index 28b2cf5fd040..28b2cf5fd040 100644
--- a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-ati-r128-vtswitch-fix-busmaster-enable.patch.bz2
+++ b/x11-base/xfree/files/4.2.1-patches/002_all_4.2.0-ati-r128-vtswitch-fix-busmaster-enable.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-ati-radeon-mobility-FireGL-7800.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/003_all_4.2.0-ati-radeon-mobility-FireGL-7800.patch.bz2
index 390bad769d6e..390bad769d6e 100644
--- a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-ati-radeon-mobility-FireGL-7800.patch.bz2
+++ b/x11-base/xfree/files/4.2.1-patches/003_all_4.2.0-ati-radeon-mobility-FireGL-7800.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-ati-radeon-vtswitch-fix-busmaster-enable.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/004_all_4.2.0-ati-radeon-vtswitch-fix-busmaster-enable.patch.bz2
index 68839e5af1f8..68839e5af1f8 100644
--- a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-ati-radeon-vtswitch-fix-busmaster-enable.patch.bz2
+++ b/x11-base/xfree/files/4.2.1-patches/004_all_4.2.0-ati-radeon-vtswitch-fix-busmaster-enable.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-elf-loader-empty-symbol-table.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/005_all_4.2.0-elf-loader-empty-symbol-table.patch.bz2
index b984e316846f..b984e316846f 100644
--- a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-elf-loader-empty-symbol-table.patch.bz2
+++ b/x11-base/xfree/files/4.2.1-patches/005_all_4.2.0-elf-loader-empty-symbol-table.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-i810-vtswitch-sync-fix.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/006_all_4.2.0-i810-vtswitch-sync-fix.patch.bz2
index 40c9cd81f5ab..40c9cd81f5ab 100644
--- a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-i810-vtswitch-sync-fix.patch.bz2
+++ b/x11-base/xfree/files/4.2.1-patches/006_all_4.2.0-i810-vtswitch-sync-fix.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-tdfx-fix-vtswitch-font-corruption.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/007_all_4.2.0-tdfx-fix-vtswitch-font-corruption.patch.bz2
index 8a13446f22e7..8a13446f22e7 100644
--- a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-tdfx-fix-vtswitch-font-corruption.patch.bz2
+++ b/x11-base/xfree/files/4.2.1-patches/007_all_4.2.0-tdfx-fix-vtswitch-font-corruption.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/008_all_4.2.0-trident-driver-update-cvs-20020617.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/008_all_4.2.0-trident-driver-update-cvs-20020617.patch.bz2
new file mode 100644
index 000000000000..25beb48761e2
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1-patches/008_all_4.2.0-trident-driver-update-cvs-20020617.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-xkb-fix-deadkey-quotedbl-us_intl.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/009_all_4.2.0-xkb-fix-deadkey-quotedbl-us_intl.patch.bz2
index bebf7b32ce37..bebf7b32ce37 100644
--- a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-xkb-fix-deadkey-quotedbl-us_intl.patch.bz2
+++ b/x11-base/xfree/files/4.2.1-patches/009_all_4.2.0-xkb-fix-deadkey-quotedbl-us_intl.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/050_sparc_4.2.1-sparc-pci-domains.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/050_sparc_4.2.1-sparc-pci-domains.patch.bz2
new file mode 100644
index 000000000000..e92ec8915d46
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1-patches/050_sparc_4.2.1-sparc-pci-domains.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/060_sparc64_4.2.1-sparc-pci-domains.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/060_sparc64_4.2.1-sparc-pci-domains.patch.bz2
new file mode 100644
index 000000000000..e92ec8915d46
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1-patches/060_sparc64_4.2.1-sparc-pci-domains.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.1-fix-shared-libXau-link.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/090_all_4.2.1-fix-shared-libXau-link.patch.bz2
index f41e83a12f22..f41e83a12f22 100644
--- a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.1-fix-shared-libXau-link.patch.bz2
+++ b/x11-base/xfree/files/4.2.1-patches/090_all_4.2.1-fix-shared-libXau-link.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.1-freetype212.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/091_all_4.2.1-freetype212.patch.bz2
index 8a9eb5726127..8a9eb5726127 100644
--- a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.1-freetype212.patch.bz2
+++ b/x11-base/xfree/files/4.2.1-patches/091_all_4.2.1-freetype212.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/freetype2-enable-bytecode-interpreter.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/092_all_4.2.1-freetype2-enable-bytecode-interpreter.patch.bz2
index e9932cec390b..e9932cec390b 100644
--- a/x11-base/xfree/files/4.2.1-patches/freetype2-enable-bytecode-interpreter.patch.bz2
+++ b/x11-base/xfree/files/4.2.1-patches/092_all_4.2.1-freetype2-enable-bytecode-interpreter.patch.bz2
diff --git a/x11-base/xfree/xfree-4.2.1.ebuild b/x11-base/xfree/xfree-4.2.1.ebuild
index 04c8e23b952a..10e1075c87b6 100644
--- a/x11-base/xfree/xfree-4.2.1.ebuild
+++ b/x11-base/xfree/xfree-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1.ebuild,v 1.6 2002/09/14 15:51:26 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1.ebuild,v 1.7 2002/09/19 21:15:27 azarah Exp $
 
 inherit flag-o-matic gcc
 # Compile problems with these ...
@@ -139,12 +139,35 @@ src_unpack() {
 
 	# Various patches from all over
 	einfo "Applying various patches (bugfixes/updates)..."
-	for x in ${WORKDIR}/*.patch.bz2 ${FILESDIR}/${PV}-patches/*.patch.bz2
+	for x in ${WORKDIR}/*.patch.bz2
 	do
 		if [ -f ${x} ]
 		then
 			einfo "  ${x##*/}..."
-			bzip2 -dc ${x} | patch -p2 > /dev/null || die
+			bzip2 -dc ${x} | patch -p2 > /dev/null || die "Failed Patch: ${x##*/}!"
+		fi
+	done
+	for x in ${FILESDIR}/${PV}-patches/*.patch.bz2
+	do
+		# New ARCH dependant patch naming scheme...
+		# 
+		# Ranges:
+		#
+		#   1-19  - generic stuff
+		#   20-29 - x86 stuff
+		#   30-39 - ppc stuff
+		#   40-49 - sparc stuff
+		#   50-59 - sparc64 stuff
+		#   60-69 - alpha stuff
+		#   90-?? - own stuff
+		#
+		# NOTE: can mabye thing about merging sparc and sparc64
+		#
+		if [ -f ${x} ] && \
+		   [ "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ]
+		then
+			einfo "  ${x##*/}..."
+			bzip2 -dc ${x} | patch -p2 > /dev/null || die "Failed Patch: ${x##*/}!"
 		fi
 	done