rage/radeon locup fixes, and xft2 support

3 files changed, 18 insertions, 16 deletions

diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index 975359f287b2..c758d3fa1bb6 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 a84c3bad409326b9788f45bc30f98799 xfree-4.3.0-r2.ebuild 28057
+MD5 d5b68bd5bd50c2d338bcccfca4e7c366 xfree-4.3.0-r2.ebuild 28075
 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 497891de0a8c446366a11b5cf34507c8 ChangeLog 25502
+MD5 192e9d3ccff1fae34df0fc494e1723fc ChangeLog 25906
 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/digest-xfree-4.3.0-r2 b/x11-base/xfree/files/digest-xfree-4.3.0-r2
index dd615c541a36..9cd8d7b87ea1 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 c748204110aafc367507a53dc827edf6 XFree86-4.3.0-patches-1.0.7.tar.bz2 416516
+MD5 35821291879b8ea82de4bb3a70900bd3 XFree86-4.3.0-patches-1.0.8.tar.bz2 416335
 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 f8bab67de1dc..7c140f09e57e 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.11 2003/04/14 05:30:41 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r2.ebuild,v 1.12 2003/04/14 20:45:18 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.7"
+PATCH_VER="1.0.8"
 FT2_VER="2.1.3"
 SISDRV_VER="060403-1"
 SAVDRV_VER="1.1.27t"
@@ -121,14 +121,18 @@ DEPEND=">=sys-apps/baselayout-1.8.3
 	>=x11-misc/ttmkfdir-3.0.4
 	pam? ( >=sys-libs/pam-0.75 )
 	truetype? ( app-arch/cabextract )
-	app-arch/unzip" # needed for savage driver (version 1.1.27t)
-	
-PDEPEND=">=x11-libs/xft-2.0.1-r1
-	3dfx? ( >=media-libs/glide-v3-3.10 )"
+	app-arch/unzip
+	!media-libs/xft" 
+
+# unzip - needed for savage driver (version 1.1.27t)
+# media-libs/xft - blocked because of possible interferance with xfree
+ 	
+PDEPEND="3dfx? ( >=media-libs/glide-v3-3.10 )"
 
 PROVIDE="virtual/x11
 	virtual/opengl
-	virtual/glu"	
+	virtual/glu
+	virtual/xft"	
 
 src_unpack() {
 
@@ -337,6 +341,9 @@ src_unpack() {
 	echo "#define UseFontconfig YES" >> config/cf/host.def
 	echo "#define HasFontconfig YES" >> config/cf/host.def
 
+	# Use the xfree Xft2 lib
+	echo "#define SharedLibXft YES" >> config/cf/host.def
+
 # Will uncomment this after kde, qt, and *box ebuilds are alterered to use
 # it
 #	if use xinerama
@@ -411,10 +418,6 @@ src_install() {
 	fi
 
 	# We do not want these, so remove them ...
-	rm -rf ${D}/usr/X11R6/include/X11/Xft
-	rm -f ${D}/usr/X11R6/lib/libXft.{a,so}
-	rm -f ${D}/usr/X11R6/bin/xft-config
-	rm -f ${D}/usr/X11R6/man/man3/Xft.3x*
 	rm -rf ${D}/usr/X11R6/include/fontconfig
 	rm -f ${D}/usr/X11R6/lib/libfontconfig.*
 	rm -f ${D}/usr/X11R6/bin/{fontconfig-config,fc-cache,fc-list}
@@ -423,7 +426,7 @@ src_install() {
 
 	# This one needs to be in /usr/lib
 	insinto /usr/lib/pkgconfig
-	doins ${D}/usr/X11R6/lib/pkgconfig/xcursor.pc
+	doins ${D}/usr/X11R6/lib/pkgconfig/{xcursor,xft}.pc
 	# Now remove the invalid xft.pc, and co ...
 	rm -rf ${D}/usr/X11R6/lib/pkgconfig
 
@@ -958,7 +961,6 @@ 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() {