fixes for bugs #19812 and #19844

4 files changed, 15 insertions, 7 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 774fe69c3330..90399a00cbf3 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,9 +1,13 @@
 # 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.128 2003/04/21 03:31:52 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.129 2003/04/24 19:59:47 leahcim Exp $
 
 *xfree-4.3.0-r2 (08 Apr 2003)
 
+  23 Apr 2003; Michael Fitzpatrick <leahcim@gentoo.org> xfree-4.3.0-r2.ebuild:
+  Updated patch tarball to v1.1.3. Adds a tdfx patch to prevent a dri hang bug
+  #19812. Allow X to auto use vc13(+) bug #19844.
+
   20 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest,
   xfree-4.3.0-r2.ebuild:
   Added TaD's three gentoo themes, changed the default cursor to core. Also,
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index d6493c5a1769..25d73de55220 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,7 +1,7 @@
 MD5 9cfbfe89fd92ba6f600d359992506b21 xfree-4.3.0.ebuild 24877
 MD5 f11ed1feb06c079f6d570a0ca23d647c xfree-4.1.0-r6.ebuild 2963
 MD5 69091bec71465197dc2f80366eff6924 xfree-4.2.1-r1.ebuild 23158
-MD5 d68ebb3e5f8a97f7b39d184d509616bb xfree-4.3.0-r2.ebuild 30174
+MD5 a01b76e99aa2ac6be829bedfe971b4b4 xfree-4.3.0-r2.ebuild 30329
 MD5 825bc2b98968ff9a0722de4c3ac9ba0e xfree-4.2.1.ebuild 18563
 MD5 bb861f39027aa9e72b4fd36c63b4bb5b xfree-4.3.0-r1.ebuild 24919
 MD5 bd9ddb285a3d2f153656f2639025a9e0 xfree-4.2.1-r2.ebuild 24195
diff --git a/x11-base/xfree/files/digest-xfree-4.3.0-r2 b/x11-base/xfree/files/digest-xfree-4.3.0-r2
index b73a95302d6c..87026cfb1b6f 100644
--- a/x11-base/xfree/files/digest-xfree-4.3.0-r2
+++ b/x11-base/xfree/files/digest-xfree-4.3.0-r2
@@ -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 c7b321e69c5727306f2b2cff3593c300 XFree86-4.3.0-patches-1.1.2.tar.bz2 420921
+MD5 422d25619affcdfb29e817805c46bca4 XFree86-4.3.0-patches-1.1.3.tar.bz2 428355
 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-r2.ebuild b/x11-base/xfree/xfree-4.3.0-r2.ebuild
index 9eaf9ccd7817..9709cf242595 100644
--- a/x11-base/xfree/xfree-4.3.0-r2.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r2.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-r2.ebuild,v 1.18 2003/04/21 10:13:57 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r2.ebuild,v 1.19 2003/04/24 19:59:47 leahcim 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
 # Are we using a snapshot ?
 USE_SNAPSHOT="no"
 
-PATCH_VER="1.1.2"
+PATCH_VER="1.1.3"
 FT2_VER="2.1.3"
 XCUR_VER="0.2"
 SISDRV_VER="180403-1"
@@ -201,10 +201,13 @@ src_unpack() {
 	then
 		rm -f ${WORKDIR}/patch/202_all_4.2.99.3-acecad-debug.patch.bz2
 	fi
-
+# FIXME: bug #19812, 075 should be deprecated by 076, left as
+# TDFX_RISKY for feedback (put in -r3 if no problems)
 	if [ "`use 3dfx`" -a "${TDFX_RISKY}" = "yes" ]
 	then
-		rm #{WORKDIR}/patch/075*
+		rm -f ${WORKDIR}/patch/075*
+	else
+		rm -f ${WORKDIR}/patch/076*
 	fi
 
 	# Various Patches from all over
@@ -1025,6 +1028,7 @@ pkg_postinst() {
 	einfo "Any custom cursor sets should be placed in that directory"
 	einfo "This is different from the previous versions of 4.3 and"
 	einfo "the 4.2.99 series."
+
 }
 
 pkg_postrm() {