From a32a61b22b0b34b85a8be88561e456957347d393 Mon Sep 17 00:00:00 2001 From: Donnie Berkholz Date: Sat, 20 Nov 2004 22:06:45 +0000 Subject: Revert last commit, it had too much in it. --- x11-base/xorg-x11/ChangeLog | 6 +++++- x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild | 33 ++++++++---------------------- 2 files changed, 13 insertions(+), 26 deletions(-) (limited to 'x11-base') diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 049824697655..1f974a49804e 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.215 2004/11/20 21:43:23 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.216 2004/11/20 22:06:45 spyderous Exp $ + + 20 Nov 2004; Donnie Berkholz ; + xorg-x11-6.8.0-r4.ebuild: + Revert last commit, it had too much in it. 20 Nov 2004; Donnie Berkholz ; xorg-x11-6.8.0-r4.ebuild: diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild index 83b3d2ba9428..9f3de19384cf 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.6 2004/11/20 21:43:23 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.7 2004/11/20 22:06:45 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -862,38 +862,21 @@ host_def_setup() { if use minimal; then echo "#define BuildClients NO" >> ${HOSTCONF} - - # Without nls, truetype-fonts, type1-fonts, we only build misc - # Now let's try to reduce what gets built in misc - # iso8859-1 has the "fixed" font - echo "#define BuildISO8859_2Fonts NO" >> ${HOSTCONF} - echo "#define BuildISO8859_3Fonts NO" >> ${HOSTCONF} - echo "#define BuildISO8859_4Fonts NO" >> ${HOSTCONF} - # 5 is cyrillic, 6 isn't in misc, 7 is greek, 8 is hebrew - echo "#define BuildISO8859_9Fonts NO" >> ${HOSTCONF} - echo "#define BuildISO8859_10Fonts NO" >> ${HOSTCONF} - # 11 is thai, 12 isn't in misc - echo "#define BuildISO8859_13Fonts NO" >> ${HOSTCONF} - echo "#define BuildISO8859_14Fonts NO" >> ${HOSTCONF} - echo "#define BuildISO8859_15Fonts NO" >> ${HOSTCONF} - echo "#define BuildISO8859_16Fonts NO" >> ${HOSTCONF} - + echo "#define BuildFonts NO" >> ${HOSTCONF} echo "#define XnestServer NO" >> ${HOSTCONF} echo "#define XVirtualFramebufferServer NO" >> ${HOSTCONF} echo "#define XInputDrivers mouse keyboard" >> ${HOSTCONF} # Don't want to add to defaults for other archs, set above if use x86; then + # Removed nsc + echo "#define i386Drivers i810" >> ${HOSTCONF} # If you want more drivers built with minimal, file a bug # -Donnie Berkholz - # Remove glint, tga, s3, s3virge, rendition, neomagic, i740, + # Removed glint, tga, s3, s3virge, rendition, neomagic, i740, # cirrus, tseng, trident, chips, apm, ark, cyrix, siliconmotion - # mga, nv, sis, tdfx, savage, GlideDriver, i386Drivers - # (nsc, i810), ati, DevelDrivers, via - # 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} + echo "#define XF86CardDrivers mga nv sis tdfx savage vmware \ + GlideDriver i386Drivers ati DevelDrivers via vesa vga \ + dummy XF86OSCardDrivers XF86ExtraCardDrivers" >> ${HOSTCONF} fi fi -- cgit v1.2.3-65-gdbad