Attachment #66274 for bug #103022




# 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 xprint xv"
# IUSE_INPUT_DEVICES="synaptics wacom"

FILES_VER="0.7"

		alpha? (
			3dfx? ( >=media-libs/glide-v3-3.10 )
		)
		!elibc_uclibc? ( x11-terms/xterm )"

PROVIDE="virtual/x11
	opengl? virtual/opengl


			# If you want more drivers built with minimal, file a bug
			# -Donnie Berkholz <spyderous@gentoo.org>
			local mindrv=
			if use x86; then
				# Remove glint, tga, s3, s3virge, rendition, neomagic, i740,
				# cirrus, tseng, trident, chips, apm, ark, cyrix, siliconmotion

				# Leave vmware driver for testing minimal setups using VMWare
				# XF86OSCardDrivers includes v4l and fbdev on linux
				# DevelDrivers includes imstt and newport on x86
				mindrv="vmware vesa vga dummy XF86OSCardDrivers XF86ExtraCardDrivers"
				mindrv="${mindrv} ${XORG_MINIMAL_USER_DRIVERS}"
				echo "#define XF86CardDrivers ${mindrv}" >> ${HOSTCONF}
			# (#93339)
			elif use sparc; then
				mindrv="vesa vga fbdev sunffb suncg6 ${XORG_MINIMAL_USER_DRIVERS}"
				echo "#define XF86CardDrivers ${mindrv}" >> ${HOSTCONF}
			fi
		fi



use_specific_hacks() {
	# uclibc lacks sinf and cosf
	if use elibc_uclibc; then
		sed -i -e 's:GLXCLIENTDIRS = glxinfo glxgears:GLXCLIENTDIRS = :' \
			${S}/programs/Imakefile
	fi

minimal_install() {
		# Get rid of all unnecessary fonts (saves ~5.5 MB)
		find ${D}/usr/share/fonts/misc/ -name '*.pcf.gz' \
			-not -name '*7x14*' -not -name 'cursor.pcf.gz' -exec rm {} \;
		# Woohoo, another 772K
		rm -rf ${D}/usr/share/doc
}

	# (#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

Return to bug 103022

Lines 34-40 Link Here

(-)/mnt/gn2_iportage/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild (-8 / +17 lines)
34	# IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004)	34	# IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004)
35	IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server	35	IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server
36	insecure-drivers ipv6 minimal mmx nls nocxx opengl pam sdk sse static	36	insecure-drivers ipv6 minimal mmx nls nocxx opengl pam sdk sse static
37	truetype-fonts type1-fonts uclibc xprint xv"	37	truetype-fonts type1-fonts xprint xv"
38	# IUSE_INPUT_DEVICES="synaptics wacom"	38	# IUSE_INPUT_DEVICES="synaptics wacom"
39		39
40	FILES_VER="0.7"	40	FILES_VER="0.7"
Lines 118-124 Link Here
118	alpha? (	118	alpha? (
119	3dfx? ( >=media-libs/glide-v3-3.10 )	119	3dfx? ( >=media-libs/glide-v3-3.10 )
120	)	120	)
121	!uclibc? ( x11-terms/xterm )"	121	!elibc_uclibc? ( x11-terms/xterm )"
122		122
123	PROVIDE="virtual/x11	123	PROVIDE="virtual/x11
124	opengl? virtual/opengl	124	opengl? virtual/opengl
Lines 851-856 Link Here
851		851
852	# If you want more drivers built with minimal, file a bug	852	# If you want more drivers built with minimal, file a bug
853	# -Donnie Berkholz <spyderous@gentoo.org>	853	# -Donnie Berkholz <spyderous@gentoo.org>
		854	local mindrv=
854	if use x86; then	855	if use x86; then
855	# Remove glint, tga, s3, s3virge, rendition, neomagic, i740,	856	# Remove glint, tga, s3, s3virge, rendition, neomagic, i740,
856	# cirrus, tseng, trident, chips, apm, ark, cyrix, siliconmotion	857	# cirrus, tseng, trident, chips, apm, ark, cyrix, siliconmotion
Lines 859-870 Link Here
859	# Leave vmware driver for testing minimal setups using VMWare	860	# Leave vmware driver for testing minimal setups using VMWare
860	# XF86OSCardDrivers includes v4l and fbdev on linux	861	# XF86OSCardDrivers includes v4l and fbdev on linux
861	# DevelDrivers includes imstt and newport on x86	862	# DevelDrivers includes imstt and newport on x86
862	echo "#define XF86CardDrivers vmware vesa vga dummy \	863	mindrv="vmware vesa vga dummy XF86OSCardDrivers XF86ExtraCardDrivers"
863	XF86OSCardDrivers XF86ExtraCardDrivers" >> ${HOSTCONF}	864	mindrv="${mindrv} ${XORG_MINIMAL_USER_DRIVERS}"
		865	echo "#define XF86CardDrivers ${mindrv}" >> ${HOSTCONF}
864	# (#93339)	866	# (#93339)
865	elif use sparc; then	867	elif use sparc; then
866	echo "#define XF86CardDrivers vesa vga fbdev sunffb suncg6 \	868	mindrv="vesa vga fbdev sunffb suncg6 ${XORG_MINIMAL_USER_DRIVERS}"
867	sunleo" >> ${HOSTCONF}	869	echo "#define XF86CardDrivers ${mindrv}" >> ${HOSTCONF}
868	fi	870	fi
869	fi	871	fi
870		872
Lines 930-936 Link Here
930		932
931	use_specific_hacks() {	933	use_specific_hacks() {
932	# uclibc lacks sinf and cosf	934	# uclibc lacks sinf and cosf
933	if use uclibc; then	935	if use elibc_uclibc; then
934	sed -i -e 's:GLXCLIENTDIRS = glxinfo glxgears:GLXCLIENTDIRS = :' \	936	sed -i -e 's:GLXCLIENTDIRS = glxinfo glxgears:GLXCLIENTDIRS = :' \
935	${S}/programs/Imakefile	937	${S}/programs/Imakefile
936	fi	938	fi
Lines 1305-1311 Link Here
1305	minimal_install() {	1307	minimal_install() {
1306	# Get rid of all unnecessary fonts (saves ~5.5 MB)	1308	# Get rid of all unnecessary fonts (saves ~5.5 MB)
1307	find ${D}/usr/share/fonts/misc/ -name '*.pcf.gz' \	1309	find ${D}/usr/share/fonts/misc/ -name '*.pcf.gz' \
1308	-not -name '6x13' -not -name 'cursor.pcf.gz' -exec rm {} \;	1310	-not -name '7x14' -not -name 'cursor.pcf.gz' -exec rm {} \;
1309	# Woohoo, another 772K	1311	# Woohoo, another 772K
1310	rm -rf ${D}/usr/share/doc	1312	rm -rf ${D}/usr/share/doc
1311	}	1313	}
Lines 1831-1836 Link Here
1831	# (#76985)	1833	# (#76985)
1832	einfo "Visit http://www.gentoo.org/doc/en/index.xml?catid=desktop"	1834	einfo "Visit http://www.gentoo.org/doc/en/index.xml?catid=desktop"
1833	einfo "for more information on configuring X."	1835	einfo "for more information on configuring X."
		1836
		1837	if use minimal; then
		1838	echo
		1839	einfo "If you want to build more video card drivers, set the"
		1840	einfo "XORG_MINIMAL_USER_DRIVERS variable in /etc/make.conf"
		1841	echo
		1842	fi
1834		1843
1835	# Try to get people to read /usr/X11R6/libdir move	1844	# Try to get people to read /usr/X11R6/libdir move
1836	ebeep 5	1845	ebeep 5