Don't hide things behind USE=minimal that are already behind other USE flags, so...

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 6182f2429481556a275989059e1e63731fa3a763..be9e204c41a140cd0f711006ac8155d48cb6ad9a 100644 (file)
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
 # 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.219 2004/11/21 22:42:56 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.220 2004/11/21 22:49:34 spyderous Exp $
+
+  21 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Don't hide things behind USE=minimal that are already behind other USE
+  flags, so we can combine minimal with various other things.
 
   21 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 d0017c1193db93c2404aeea1b0b86c4b504f81ed..35304be0d2b2b85924b6bdf7fd844a7fa0740e9b 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 b59503416aecce7a888004b930733eca ChangeLog 50109
+MD5 9f20164897d37a505e791675c6e1672c ChangeLog 50328
 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 a4ee7d92a5c199926ecb6453ff9274a5 xorg-x11-6.8.0-r4.ebuild 52108
+MD5 8ccd2fc328e13e7157b4375b6f9fd898 xorg-x11-6.8.0-r4.ebuild 52009
 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 02d93dc2e9e848a62cbf4811b24478c425a55aad..0cf2a47553cdebe85dd3b814ad3505fc1ed14d10 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.10 2004/11/21 22:42:56 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.11 2004/11/21 22:49:34 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -68,9 +68,9 @@ GENTOO_FILES="http://dev.gentoo.org/~spyderous/${PN}/patchsets/${PV}/${P}-files-
        mirror://gentoo/${P}-files-${FILES_VER}.tar.bz2"
 
 SRC_URI="!minimal? ( mirror://gentoo/eurofonts-X11.tar.bz2 )
-       !minimal? ( font-server? ( http://dev.gentoo.org/~cyfred/xorg/${PN}/patchsets/${PV}/xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 ) )
+       ( font-server? ( http://dev.gentoo.org/~cyfred/xorg/${PN}/patchsets/${PV}/xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 )
        !minimal? ( mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2 )
-       !minimal? ( nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 ) )
+       ( nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 )
        ${GENTOO_FILES}
        ${X_DRIVERS}
        ${X_PATCHES}
@@ -207,19 +207,19 @@ src_unpack() {
                ebegin "Unpacking Gentoo cursors"
                        unpack gentoo-cursors-tad-${XCUR_VER}.tar.bz2 > /dev/null
                eend 0
-
-               # Unpack extra fonts stuff from Mandrake
-               ebegin "Unpacking fonts"
-                       if use nls; then
-                               unpack gemini-koi8-u.tar.bz2 > /dev/null
-                       fi
-                       unpack eurofonts-X11.tar.bz2 > /dev/null
-                       if use font-server; then
-                               unpack xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 > /dev/null
-                       fi
-               eend 0
        fi
 
+       # Unpack extra fonts stuff from Mandrake
+       ebegin "Unpacking fonts"
+               if use nls; then
+                       unpack gemini-koi8-u.tar.bz2 > /dev/null
+               fi
+               unpack eurofonts-X11.tar.bz2 > /dev/null
+               if use font-server; then
+                       unpack xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 > /dev/null
+               fi
+       eend 0
+
        # Remove bum encoding
        rm -f ${WORKDIR}/usr/share/fonts/encodings/urdunaqsh-0.enc
 
@@ -333,14 +333,12 @@ src_install() {
 
        compose_files_setup
 
-       if ! use minimal; then
-               if use font-server; then
-                       encode_xfsft_files
-               fi
+       if use font-server; then
+               encode_xfsft_files
+       fi
 
-               if use nls; then
-                       setup_koi8_fonts
-               fi
+       if use nls; then
+               setup_koi8_fonts
        fi
 
        etc_files_install
@@ -438,9 +436,7 @@ pkg_postinst() {
        if [ "${ROOT}" = "/" ]; then
                umask 022
 
-               if ! use minimal; then
-                       font_setup
-               fi
+               font_setup
 
                if use opengl; then
                        switch_opengl_implem