From 238199ffdc891399771d58c23b2a1bcf37c20f4f Mon Sep 17 00:00:00 2001 From: Donnie Berkholz Date: Mon, 11 Oct 2004 08:15:09 +0000 Subject: [PATCH] Make font server optional with xfs USE flag. --- x11-base/xorg-x11/ChangeLog | 6 ++- x11-base/xorg-x11/Manifest | 4 +- x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild | 51 ++++++++++++++-------- 3 files changed, 40 insertions(+), 21 deletions(-) diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index e4c086ae7791..ad4ca5e96d4e 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.139 2004/10/11 08:10:33 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.140 2004/10/11 08:15:09 spyderous Exp $ + + 11 Oct 2004; Donnie Berkholz ; + xorg-x11-6.8.0-r2.ebuild: + Make font server optional with xfs USE flag. *xorg-x11-6.8.0-r2 (11 Oct 2004) diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index f194b7ca9f9e..8666515bde59 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,6 +1,6 @@ -MD5 7cc30ae68a4c8ed1f31b15920d3ed2bb ChangeLog 30906 +MD5 31f7c0a580ae685e0265df39229c9556 ChangeLog 31037 MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230 -MD5 3f627454717910c83d9a118f524b62b3 xorg-x11-6.8.0-r2.ebuild 41436 +MD5 961e5fb4461f8aee47e289fab4554ddf xorg-x11-6.8.0-r2.ebuild 41606 MD5 c32f9bc44ffd10b49297b4898097096b xorg-x11-6.7.0-r2.ebuild 38142 MD5 42742dfe0e821f4d1978040a96be850c xorg-x11-6.8.0-r1.ebuild 41437 MD5 a3ef47fa1d11b9b29589eea734a6c6d2 files/digest-xorg-x11-6.8.0-r2 906 diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild index 99f00b9af70f..c6164442bc0d 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.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-r2.ebuild,v 1.1 2004/10/11 08:10:33 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.2 2004/10/11 08:15:09 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -23,7 +23,7 @@ RESTRICT="nostrip" # IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004) IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc hardened - insecure-drivers ipv6 mmx nls pam sdk sse static xprint" + insecure-drivers ipv6 mmx nls pam sdk sse static xfs xprint" # IUSE_INPUT_DEVICES="synaptics wacom" FILES_VER="0.2" @@ -52,7 +52,7 @@ GENTOO_FILES="mirror://gentoo/${P}-files-${FILES_VER}.tar.bz2 http://dev.gentoo.org/~cyfred/distfiles/${P}-files-${FILES_VER}.tar.bz2" SRC_URI="mirror://gentoo/eurofonts-X11.tar.bz2 - http://dev.gentoo.org/~cyfred/xorg/${PN}/patchsets/${PV}/xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 + xfs? ( http://dev.gentoo.org/~cyfred/xorg/${PN}/patchsets/${PV}/xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 ) mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2 nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 ) ${GENTOO_FILES} @@ -475,6 +475,9 @@ host_def_setup() { use_build bitmap-fonts Build75DpiFonts use_build bitmap-fonts Build100DpiFonts + # X Font Server + use_build xfs BuildFontServer + use_build dmx BuildDmx use_build insecure-drivers BuildDevelDRIDrivers @@ -574,7 +577,10 @@ src_unpack() { unpack gemini-koi8-u.tar.bz2 > /dev/null fi unpack eurofonts-X11.tar.bz2 > /dev/null - unpack xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 > /dev/null + if use xfs + then + unpack xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 > /dev/null + fi eend 0 # Remove bum encoding @@ -720,8 +726,11 @@ etc_files_install() { doins ${FILES_DIR}/xinitrc exeinto /etc/X11/xdm doexe ${FILES_DIR}/Xsession ${FILES_DIR}/Xsetup_0 - insinto /etc/X11/fs - newins ${FILES_DIR}/xfs.config config + if use xfs + then + insinto /etc/X11/fs + newins ${FILES_DIR}/xfs.config config + fi if use pam then insinto /etc/pam.d @@ -731,9 +740,12 @@ etc_files_install() { fi exeinto /etc/init.d newexe ${FILES_DIR}/xdm.start xdm - newexe ${FILES_DIR}/xfs.start xfs - insinto /etc/conf.d - newins ${FILES_DIR}/xfs.conf.d xfs + if use xfs + then + newexe ${FILES_DIR}/xfs.start xfs + insinto /etc/conf.d + newins ${FILES_DIR}/xfs.conf.d xfs + fi } setup_dynamic_libgl() { @@ -985,16 +997,19 @@ src_install() { compose_files_setup # Yet more Mandrake - ebegin "Encoding files for xfsft font server..." - dodir /usr/share/fonts/encodings - cp -a ${WORKDIR}/usr/share/fonts/encodings/* \ - ${D}/usr/share/fonts/encodings + if use xfs + then + ebegin "Encoding files for xfsft font server..." + dodir /usr/share/fonts/encodings + cp -a ${WORKDIR}/usr/share/fonts/encodings/* \ + ${D}/usr/share/fonts/encodings - for x in ${D}/usr/share/fonts/encodings/{.,large}/*.enc - do - [ -f "${x}" ] && gzip -9 -f ${x} - done - eend 0 + for x in ${D}/usr/share/fonts/encodings/{.,large}/*.enc + do + [ -f "${x}" ] && gzip -9 -f ${x} + done + eend 0 + fi if use nls then -- 2.26.2