add mkfontdirs target to xfs rc-script; some cleanups

4 files changed, 38 insertions, 17 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 6fed57ca0f9c..fde9492f4b2f 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.119 2003/04/11 18:11:21 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.120 2003/04/13 01:02:03 azarah Exp $
+
+  12 Apr 2003; Martin Schlemmer <azarah@gentoo.org> xfree-4.3.0-r2.ebuild,
+  files/4.3.0/xfs.start :
+  Add 'mkfontdirs' target for users that do not use xfs to be able to
+  regenerate the font dirs.  Some small tweaks to the ebuild for corner
+  cases.
 
 *xfree-4.3.0-r2 (08 Apr 2003)
 
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index 66b2ffcdec51..deacedd95b8b 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,10 +1,10 @@
-MD5 1f74122ccde1f44e6a7cd036e482cecd ChangeLog 24421
+MD5 ef62444167fde7a888e49ce0af4cb5be ChangeLog 24420
 MD5 f11ed1feb06c079f6d570a0ca23d647c xfree-4.1.0-r6.ebuild 2963
 MD5 c702fab31b9adac56477a9a5c16911c4 xfree-4.2.0-r12.ebuild 10302
 MD5 69091bec71465197dc2f80366eff6924 xfree-4.2.1-r1.ebuild 23158
 MD5 bd9ddb285a3d2f153656f2639025a9e0 xfree-4.2.1-r2.ebuild 24195
 MD5 825bc2b98968ff9a0722de4c3ac9ba0e xfree-4.2.1.ebuild 18563
-MD5 e829f18999867add73d70b5a4bd2d58d xfree-4.3.0-r2.ebuild 27626
+MD5 31ca9fee4fa191fc08b52572f2761b32 xfree-4.3.0-r2.ebuild 27625
 MD5 32960690f1f4c20d57b427d1db5eb85c xfree-4.3.0.ebuild 24877
 MD5 246764b7aaa72b0eeb35fa94f2f1dd0d manifest 10486
 MD5 d4a679808c5efc36d64b69c19f515508 xfree-4.3.0-r1.ebuild 24862
@@ -120,7 +120,7 @@ MD5 d0cb338160e3be8790524af8071cc4df files/4.3.0/xdm.pamd 380
 MD5 df994262f837448b346405eb7b7a997c files/4.3.0/xdm.start 2853
 MD5 fbc03cfe0d80be07ad487d9ec7d9952e files/4.3.0/xfs.conf.d 801
 MD5 55ed160cbb7076b1292ea8e3772a2761 files/4.3.0/xfs.config 1331
-MD5 c7146865df24223294b331e2792b9628 files/4.3.0/xfs.start 6662
+MD5 a29418c10f780d4bfebbd346be495c43 files/4.3.0/xfs.start 6661
 MD5 4485c7fa46907db803d219218f62a5df files/4.3.0/xinitrc 918
 MD5 9cb44182ea92068b22973bcb0afda322 files/4.3.0/xserver.pamd 284
 MD5 4e73fd85163c7ea9774f01f4dd36b2da files/4.3.0-patches/XFree86-4.3.0-enable-nv-on-ppc.patch 427
diff --git a/x11-base/xfree/files/4.3.0/xfs.start b/x11-base/xfree/files/4.3.0/xfs.start
index c8e56489aafd..52ee0ab4484e 100644
--- a/x11-base/xfree/files/4.3.0/xfs.start
+++ b/x11-base/xfree/files/4.3.0/xfs.start
@@ -2,11 +2,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.3.0/xfs.start,v 1.1 2003/02/28 04:28:29 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.3.0/xfs.start,v 1.2 2003/04/13 01:02:03 azarah Exp $
 
 #NB: Config is in /etc/conf.d/xfs
 
 
+opts="${opts} mkfontdirs"
+
 depend() {
 	use logger
 }
@@ -258,6 +260,10 @@ setup_font_dirs() {
 	fi
 }
 
+mkfontdirs() {
+	setup_font_dirs
+}
+
 start() {
 	check_config || return 1
 
diff --git a/x11-base/xfree/xfree-4.3.0-r2.ebuild b/x11-base/xfree/xfree-4.3.0-r2.ebuild
index 265ec2b44331..cb764dd0e2b9 100644
--- a/x11-base/xfree/xfree-4.3.0-r2.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r2.ebuild,v 1.6 2003/04/11 18:11:21 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r2.ebuild,v 1.7 2003/04/13 01:02:03 azarah Exp $
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -141,7 +141,7 @@ src_unpack() {
 	unpack eurofonts-X11.tar.bz2
 	unpack xfsft-encodings.tar.bz2
 	
-	# remove bum font
+	# Remove bum encoding
 	rm -f ${WORKDIR}/usr/X11R6/lib/X11/fonts/encodings/urdunaqsh-0.enc
 	
 	# Update the Savage Driver
@@ -311,14 +311,16 @@ src_unpack() {
 
 	if [ "${ARCH}" = "alpha" ]
 	then
-		echo "#define XF86CardDrivers mga nv tga s3virge sis rendition neomagic i170 tdfx cirrus tseng trident chips apm fbdev ati vga v4l glint"  \
-			>> config/cf/host.def
+		echo "#define XF86CardDrivers mga nv tga s3virge sis rendition \
+			neomagic i170 tdfx cirrus tseng trident chips apm fbdev ati \
+			vga v4l glint" >> config/cf/host.def
 	fi
 
 	if [ "${ARCH}" = "ppc" ]
 	then
-		echo "#define XF86CardDrivers mga glint s3virge sis savage trident chips tdfx fbdev ati DevelDrivers vga nv XF86OSCardDrivers XF86ExtraCardDrivers" \
-			>> config/cf/host.def
+		echo "#define XF86CardDrivers mga glint s3virge sis savage trident \
+			chips tdfx fbdev ati DevelDrivers vga nv XF86OSCardDrivers \
+			XF86ExtraCardDrivers" >> config/cf/host.def
 	fi
 
 	if [ -n "`use xml`" ]
@@ -483,7 +485,14 @@ src_install() {
 	eend 0
 
 	# Change the silly red pointer to a white one ...
-	dosed 's:redglass:whiteglass:' /usr/X11R6/lib/X11/icons/default/index.theme
+	if [ -f "${D}/usr/X11R6/lib/X11/icons/default/index.theme" ]
+	then
+		dosed 's:redglass:whiteglass:' /usr/X11R6/lib/X11/icons/default/index.theme
+	
+	elif [ -f "${D}/usr/share/cursors/xfree/default/index.theme" ]
+	then
+		dosed 's:redglass:whiteglass:'/usr/share/cursors/xfree/default/index.theme
+	fi
 
 	# Standard symlinks
 	dodir /usr/{bin,include,lib}
@@ -521,7 +530,7 @@ src_install() {
 	dosym Xwrapper /usr/X11R6/bin/X
 	dosym ../../usr/X11R6/bin/XFree86 /etc/X11/X
 
-	# fix perms
+	# Fix perms
 	fperms 755 /usr/X11R6/lib/X11/xkb/geometry/sgi
 	fperms 755 /usr/X11R6/bin/dga
 
@@ -563,8 +572,10 @@ src_install() {
 	cp -a ${WORKDIR}/usr/X11R6/lib/X11/fonts/encodings/* \
 		${D}/usr/X11R6/lib/X11/fonts/encodings
 	
-	gzip -9 -f ${D}/usr/X11R6/lib/X11/fonts/encodings/*.enc
-#	gzip -9 -f ${D}/usr/X11R6/lib/X11/fonts/encodings/large/*.enc
+	for x in ${D}/usr/X11R6/lib/X11/fonts/encodings/{.,large}/*.enc
+	do
+		[ -f "${x}" ] && gzip -9 -f ${x}
+	done
 	eend 0
 
 	ebegin "gemini-koi8 fonts..."
@@ -575,8 +586,6 @@ src_install() {
 	cp -a ${WORKDIR}/ukr ${D}/usr/X11R6/lib/X11/fonts
 	eend 0
 	
-	
-	
 	exeinto /etc/X11
 	# new session management script
 	doexe ${FILESDIR}/${PV}/chooser.sh