[patch] Ebuild patch without the font size change

xorg-x11-6.8.2-r2.ebuild.diff (text/plain), 2.42 KB, created by René Rhéaume (a.k.a. repzilon, rener) on 2005-09-21 16:35:33 UTC

--- /mnt/gn2_iportage/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild	2005-07-29 20:06:10.000000000 -0400
+++ /home/rener/tmp/xorg-x11-6.8.2-r2.ebuild	2005-08-18 19:19:18.000000000 -0400
@@ -34,7 +34,7 @@
 # IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004)
 IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server
 	insecure-drivers ipv6 minimal mmx nls nocxx opengl pam sdk sse static
-	truetype-fonts type1-fonts uclibc xprint xv"
+	truetype-fonts type1-fonts xprint xv"
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
 FILES_VER="0.7"
@@ -118,7 +118,7 @@
 		alpha? (
 			3dfx? ( >=media-libs/glide-v3-3.10 )
 		)
-		!uclibc? ( x11-terms/xterm )"
+		!elibc_uclibc? ( x11-terms/xterm )"
 
 PROVIDE="virtual/x11
 	opengl? virtual/opengl
@@ -851,6 +851,7 @@
 
 			# If you want more drivers built with minimal, file a bug
 			# -Donnie Berkholz <[e-mail]>
+			local mindrv=
 			if use x86; then
 				# Remove glint, tga, s3, s3virge, rendition, neomagic, i740,
 				# cirrus, tseng, trident, chips, apm, ark, cyrix, siliconmotion
@@ -859,12 +860,13 @@
 				# Leave vmware driver for testing minimal setups using VMWare
 				# XF86OSCardDrivers includes v4l and fbdev on linux
 				# DevelDrivers includes imstt and newport on x86
-				echo "#define XF86CardDrivers vmware vesa vga dummy \
-					XF86OSCardDrivers XF86ExtraCardDrivers" >> ${HOSTCONF}
+				mindrv="vmware vesa vga dummy XF86OSCardDrivers XF86ExtraCardDrivers"
+				mindrv="${mindrv} ${XORG_MINIMAL_USER_DRIVERS}"
+				echo "#define XF86CardDrivers ${mindrv}" >> ${HOSTCONF}
 			# (#93339)
 			elif use sparc; then
-				echo "#define XF86CardDrivers vesa vga fbdev sunffb suncg6 \
-					sunleo" >> ${HOSTCONF}
+				mindrv="vesa vga fbdev sunffb suncg6 ${XORG_MINIMAL_USER_DRIVERS}"
+				echo "#define XF86CardDrivers ${mindrv}" >> ${HOSTCONF}
 			fi
 		fi
 
@@ -930,7 +932,7 @@
 
 use_specific_hacks() {
 	# uclibc lacks sinf and cosf
-	if use uclibc; then
+	if use elibc_uclibc; then
 		sed -i -e 's:GLXCLIENTDIRS = glxinfo glxgears:GLXCLIENTDIRS = :' \
 			${S}/programs/Imakefile
 	fi
@@ -1831,6 +1833,13 @@
 	# (#76985)
 	einfo "Visit http://www.gentoo.org/doc/en/index.xml?catid=desktop"
 	einfo "for more information on configuring X."
+	
+	if use minimal; then
+		echo
+		einfo "If you want to build more video card drivers, set the"
+		einfo "XORG_MINIMAL_USER_DRIVERS variable in /etc/make.conf"
+		echo
+	fi
 
 	# Try to get people to read /usr/X11R6/libdir move
 	ebeep 5