some minor patches added, and dupe patches removed

4 files changed, 22 insertions, 30 deletions

diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index de0515224183..edcbb95cabef 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,12 +1,12 @@
 MD5 32960690f1f4c20d57b427d1db5eb85c 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 bb1aa9f287ff329bcc16435519683c49 xfree-4.3.0-r2.ebuild 27406
+MD5 4419bb315a970ea63eae4e28210fde7f xfree-4.3.0-r2.ebuild 27406
 MD5 825bc2b98968ff9a0722de4c3ac9ba0e xfree-4.2.1.ebuild 18563
 MD5 246764b7aaa72b0eeb35fa94f2f1dd0d manifest 10486
 MD5 d4a679808c5efc36d64b69c19f515508 xfree-4.3.0-r1.ebuild 24862
 MD5 bd9ddb285a3d2f153656f2639025a9e0 xfree-4.2.1-r2.ebuild 24195
-MD5 c2b226ff40b7d242024796a90de72eee ChangeLog 23650
+MD5 c996d5f9dc81a988e58fccd2678b11f4 ChangeLog 24168
 MD5 c702fab31b9adac56477a9a5c16911c4 xfree-4.2.0-r12.ebuild 10302
 MD5 ab68703ef80727e333fd52ed5806df2d files/digest-xfree-4.1.0-r6 240
 MD5 10e681917f61e8ed068030a373694906 files/xfree-4.2.x-home_end-keys.patch 666
diff --git a/x11-base/xfree/files/4.3.0/site.def b/x11-base/xfree/files/4.3.0/site.def
index 9338bf46c273..25a0a1fadb6c 100644
--- a/x11-base/xfree/files/4.3.0/site.def
+++ b/x11-base/xfree/files/4.3.0/site.def
@@ -38,7 +38,7 @@
 
 #define BuildFonts             YES
 /* #define BuildCyrillicFonts     YES */
-
+#define DefaultCursorTheme	whiteglass
 #define BuildXF86MiscExt       YES
 #define BuildXInputExt         YES
 #define BuildXKB               YES
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 826cbe34eb03..bf1824d5dd5e 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 4753879da60881d489bd81c8ae07e2b0 XFree86-4.3.0-patches-1.0.2.tar.bz2 310969
+MD5 6195649f29fe55e6eea57564d46fbba1 XFree86-4.3.0-patches-1.0.5.tar.bz2 415164
 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 f2fafc978d0a..265ec2b44331 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.5 2003/04/11 01:56:59 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r2.ebuild,v 1.6 2003/04/11 18:11:21 seemant 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.0.2"
+PATCH_VER="1.0.5"
 FT2_VER="2.1.3"
 SISDRV_VER="060403-1"
 SAVDRV_VER="1.1.27t"
@@ -148,30 +148,22 @@ src_unpack() {
 	# savage driver 1.1.27t is a .zip and contains a savage directory
 	# (that's why we have to be in drivers, not in savage subdir).
 	# Could be USE flag based
-#	if [ -n "`use savage`" ]
-#	then
-		ebegin "Updating Savage driver"
-		cd ${S}/programs/Xserver/hw/xfree86/drivers
-		unzip -oqq ${DISTDIR}/savage-${SAVDRV_VER}.zip || die
-		ln -s ${S}/programs/Xserver/hw/xfree86/vbe/vbe.h \
-			${S}/programs/Xserver/hw/xfree86/drivers/savage
-		cd ${S}
-		eend 0
-#	else
-#		rm -f ${WORKDIR}/patch/30*
-#	fi
-    
-	# Update the SIS Driver
-#	if [ -n "`use sis`" ]
-#	then
-		ebegin "Updating SiS driver"
-		cd ${S}/programs/Xserver/hw/xfree86/drivers/sis
-		tar -zxf ${DISTDIR}/sis_drv_src_${SISDRV_VER}.tar.gz || die
-		ln -s ${S}/programs/Xserver/hw/xfree86/vbe/vbe.h \
-			${S}/programs/Xserver/hw/xfree86/drivers/sis
-		cd ${S}
-		eend 0
-#	fi
+
+	ebegin "Updating Savage driver"
+	cd ${S}/programs/Xserver/hw/xfree86/drivers
+	unzip -oqq ${DISTDIR}/savage-${SAVDRV_VER}.zip || die
+	ln -s ${S}/programs/Xserver/hw/xfree86/vbe/vbe.h \
+		${S}/programs/Xserver/hw/xfree86/drivers/savage
+	cd ${S}
+	eend 0
+
+	ebegin "Updating SiS driver"
+	cd ${S}/programs/Xserver/hw/xfree86/drivers/sis
+	tar -zxf ${DISTDIR}/sis_drv_src_${SISDRV_VER}.tar.gz || die
+	ln -s ${S}/programs/Xserver/hw/xfree86/vbe/vbe.h \
+		${S}/programs/Xserver/hw/xfree86/drivers/sis
+	cd ${S}
+	eend 0
     
 
 	if [ "`gcc-version`" = "2.95" ]