Revert last commit, it had too much in it.

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 049824697655e2f4cc3a81723d32e6f42783ed74..1f974a49804e05672e547b290118fa4eabddba37 100644 (file)
--- 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 <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Revert last commit, it had too much in it.
 
   20 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.0-r4.ebuild:

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 9fabde9fe31f73b98c56ca2f1304aa792e31ba68..5450f5c63dc5d949c41b5c7209f4a7d2ced24b3a 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,11 +1,11 @@
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 9215e5f10589329a5056f366aa6820e8 xorg-x11-6.7.0-r2.ebuild 38086
 MD5 6ebaf0954dc02b95d2102bec0cd6bc43 xorg-x11-6.8.0-r1.ebuild 41340
-MD5 d0befbfd5152107628a093e35fde94b2 ChangeLog 48411
+MD5 6644ef5392d644676b9f0c919dfc2225 ChangeLog 48540
 MD5 cb102f4f4368c4b252805362396cde47 xorg-x11-6.8.0-r2.ebuild 50246
 MD5 223a7a19eeeceddfe21fc50e9de60db1 xorg-x11-6.7.0-r3.ebuild 38098
 MD5 71c0c4d6c6042712ace52ffa727857e8 xorg-x11-6.8.0-r3.ebuild 39789
-MD5 9675d57eadb63d0804c3ce11f613816b xorg-x11-6.8.0-r4.ebuild 51526
+MD5 f7a821be3372f24ff78f9e1aea9964c5 xorg-x11-6.8.0-r4.ebuild 50681
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
 MD5 d9a6c2ccdb525a489e8850cce8728dc3 files/digest-xorg-x11-6.8.0-r2 908

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 83b3d2ba9428112d7f216568c0edaf337a14895c..9f3de19384cfcbee12a8431bbc2e4541d4f226b1 100644 (file)
--- 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 <spyderous@gentoo.org>
-                               # 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