nls, cjk, doc USE based bloat reduction

4 files changed, 119 insertions, 37 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 654347d8c138..774fe69c3330 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,9 +1,15 @@
 # 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.127 2003/04/19 12:56:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.128 2003/04/21 03:31:52 seemant Exp $
 
 *xfree-4.3.0-r2 (08 Apr 2003)
 
+  20 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest,
+  xfree-4.3.0-r2.ebuild:
+  Added TaD's three gentoo themes, changed the default cursor to core. Also,
+  i18n fonts are built when "nls" is set in USE. and CJK fonts when both
+  "nls" and "cjk" are set in USE.
+
   19 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest,
   xfree-4.3.0-r2.ebuild:
   Updated the patch tarball - this time to 1.1.1 -- this contains two more DRI
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index 5668897c707a..ec40e75dd1dd 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,18 +1,19 @@
 MD5 9cfbfe89fd92ba6f600d359992506b21 xfree-4.3.0.ebuild 24877
 MD5 f11ed1feb06c079f6d570a0ca23d647c xfree-4.1.0-r6.ebuild 2963
 MD5 69091bec71465197dc2f80366eff6924 xfree-4.2.1-r1.ebuild 23158
-MD5 c8155180a62629b7306ccf4b4972decf xfree-4.3.0-r2.ebuild 27756
+MD5 95ac497d25339157ae9e04275f286182 xfree-4.3.0-r2.ebuild 30177
 MD5 825bc2b98968ff9a0722de4c3ac9ba0e xfree-4.2.1.ebuild 18563
+MD5 246764b7aaa72b0eeb35fa94f2f1dd0d manifest 10486
 MD5 bb861f39027aa9e72b4fd36c63b4bb5b xfree-4.3.0-r1.ebuild 24919
 MD5 bd9ddb285a3d2f153656f2639025a9e0 xfree-4.2.1-r2.ebuild 24195
-MD5 5c00b101edaf1ce82d53b54f2c3c6fe8 ChangeLog 27324
+MD5 b7cd11588b4f109880edcb80ac25268d ChangeLog 27596
 MD5 c702fab31b9adac56477a9a5c16911c4 xfree-4.2.0-r12.ebuild 10302
 MD5 ab68703ef80727e333fd52ed5806df2d files/digest-xfree-4.1.0-r6 240
 MD5 10e681917f61e8ed068030a373694906 files/xfree-4.2.x-home_end-keys.patch 666
 MD5 bbac6486d36a6cc3ff9ca129ad01dde5 files/digest-xfree-4.2.1-r1 1267
 MD5 e7a9b48bfe345c76aa9a5bf5b3149ea4 files/digest-xfree-4.2.1-r2 10826
 MD5 be43a94caab2339e3a00372906f115a0 files/digest-xfree-4.3.0-r1 1384
-MD5 17dc18b7625c83f79c69a8fafe1793fb files/digest-xfree-4.3.0-r2 1848
+MD5 075f03cc9b5fc902b79fbfcea4728b85 files/digest-xfree-4.3.0-r2 1924
 MD5 21d5f7a63f9dbf1948cc7df8b2bf67fc files/digest-xfree-4.2.0-r12 576
 MD5 6c0fe2e04a359ddc367dbd0dd00c61a1 files/xfree-4.2.x.-bison.fixes.patch 2854
 MD5 a9371704cf72bcb8d1aa713ca4b27546 files/XFree86-4.2.1-Xft11-Imakefile.patch 341
diff --git a/x11-base/xfree/files/digest-xfree-4.3.0-r2 b/x11-base/xfree/files/digest-xfree-4.3.0-r2
index 95271671c483..b73a95302d6c 100644
--- a/x11-base/xfree/files/digest-xfree-4.3.0-r2
+++ b/x11-base/xfree/files/digest-xfree-4.3.0-r2
@@ -5,11 +5,11 @@ MD5 567903747018f2534965ab6cb3976b38 X430src-4.tgz 12906091
 MD5 4dbdbe9a85c8f7f98dd0ee015a3c7b4f X430src-5.tgz 4388018
 MD5 163d9864e1353a4a9f992cb3843c240f X430src-6.tgz 8074919
 MD5 e002e70f24098ca4f62fabd1c2809ed1 X430src-7.tgz 9317241
-MD5 ea2e7c4d366edeb0425cf12642d060ba XFree86-4.3.0-patches-1.1.1.tar.bz2 416567
+MD5 c7b321e69c5727306f2b2cff3593c300 XFree86-4.3.0-patches-1.1.2.tar.bz2 420921
 MD5 e0c52f0e726e20db445e9708665a26d4 xfree86-dri-resume-v8.patch 15333
 MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156
 MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974
-MD5 697518974d185cc2cf110d4160eb4f8e sis_drv_src_130403-1.tar.gz 409600
+MD5 e3848a87ea835bd80ed91f674e24fb02 sis_drv_src_180403-1.tar.gz 378880
 MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
 MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811
 MD5 cfdef5d00cd4a7937ff4bc136dab1932 xfsft-encodings.tar.bz2 11811
@@ -17,6 +17,7 @@ MD5 794107aa54dda238ab1ab4776b36274d XFree86-compose.dir.bz2 1883
 MD5 aafd74e26c541382bb382ff338f81f87 XFree86-en_US.UTF-8.old.bz2 7068
 MD5 2e2263bb4adaee6f959fbb6c8df5336a XFree86-locale.alias.bz2 3592
 MD5 d4402be729da91e849aa5b9f506bda06 XFree86-locale.dir.bz2 2094
+MD5 3585b8924a92d3dab36db8912d2a0581 gentoo-cursors-tad-0.2.tar.bz2 1203605
 MD5 cbdc2fdd7d2ed0832795e86a8b9ee19a andale32.exe 198384
 MD5 9637df0e91703179f0723ec095a36cb5 arial32.exe 554208
 MD5 c9089ae0c3b3d0d8c4b0a95979bb9ff0 arialb32.exe 168176
diff --git a/x11-base/xfree/xfree-4.3.0-r2.ebuild b/x11-base/xfree/xfree-4.3.0-r2.ebuild
index 5d220dc035ff..582f6bc2f301 100644
--- a/x11-base/xfree/xfree-4.3.0-r2.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r2.ebuild
@@ -1,13 +1,13 @@
 # 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.16 2003/04/19 12:56:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r2.ebuild,v 1.17 2003/04/21 03:31:52 seemant 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 ...
 DEBUG="yes"
 RESTRICT="nostrip"
 
-IUSE="3dfx sse mmx 3dnow xml truetype"
+IUSE="3dfx sse mmx 3dnow xml truetype nls cjk doc"
 
 inherit eutils flag-o-matic gcc
 
@@ -40,10 +40,12 @@ strip-flags
 # Are we using a snapshot ?
 USE_SNAPSHOT="no"
 
-PATCH_VER="1.1.1"
+PATCH_VER="1.1.2"
 FT2_VER="2.1.3"
-SISDRV_VER="130403-1"
+XCUR_VER="0.2"
+SISDRV_VER="180403-1"
 SAVDRV_VER="1.1.27t"
+MGADRV_VER="1_3_0beta"
 
 BASE_PV="${PV}"
 MY_SV="${BASE_PV//\.}"
@@ -60,6 +62,7 @@ X_PATCHES="mirror://gentoo/XFree86-${PV}-patches-${PATCH_VER}.tar.bz2
 X_DRIVERS="http://people.mandrakesoft.com/~flepied/projects/wacom/xf86Wacom.c.gz
 	http://www.probo.com/timr/savage-${SAVDRV_VER}.zip
 	http://www.winischhofer.net/sis/sis_drv_src_${SISDRV_VER}.tar.gz"
+#	ftp://ftp.matrox.com/pub/mga/archive/linux/2001/beta_1_3_0/mga-${MGADRV_VER}.tgz"
 #	3dfx? ( mirror://gentoo/glide3-headers.tar.bz2 )"
 # Updated Wacom driver:  http://people.mandrakesoft.com/~flepied/projects/wacom/
 # Latest Savaga drivers:  http://www.probo.com/timr/savage40.html
@@ -82,26 +85,27 @@ SRC_URI="${SRC_PATH0}/X${MY_SV}src-1.tgz
 	${SRC_PATH0}/X${MY_SV}src-3.tgz
 	${SRC_PATH0}/X${MY_SV}src-4.tgz
 	${SRC_PATH0}/X${MY_SV}src-5.tgz
-	${SRC_PATH0}/X${MY_SV}src-6.tgz
-	${SRC_PATH0}/X${MY_SV}src-7.tgz
 	${SRC_PATH1}/X${MY_SV}src-1.tgz
 	${SRC_PATH1}/X${MY_SV}src-2.tgz
 	${SRC_PATH1}/X${MY_SV}src-3.tgz
 	${SRC_PATH1}/X${MY_SV}src-4.tgz
 	${SRC_PATH1}/X${MY_SV}src-5.tgz
-	${SRC_PATH1}/X${MY_SV}src-6.tgz
-	${SRC_PATH1}/X${MY_SV}src-7.tgz"
+	doc? ( ${SRC_PATH0}/X${MY_SV}src-6.tgz
+		${SRC_PATH0}/X${MY_SV}src-7.tgz
+		${SRC_PATH1}/X${MY_SV}src-6.tgz
+		${SRC_PATH1}/X${MY_SV}src-7.tgz )"
 
 SRC_URI="${SRC_URI}
 	${X_PATCHES}
 	${X_DRIVERS}
-	mirror://gentoo/gemini-koi8-u.tar.bz2
+	nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 )
 	mirror://gentoo/eurofonts-X11.tar.bz2
 	mirror://gentoo/xfsft-encodings.tar.bz2
 	mirror://gentoo/XFree86-compose.dir.bz2
 	mirror://gentoo/XFree86-en_US.UTF-8.old.bz2
 	mirror://gentoo/XFree86-locale.alias.bz2
 	mirror://gentoo/XFree86-locale.dir.bz2
+	mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2
 	truetype? ( ${MS_FONT_URLS} )"
 
 LICENSE="X11 MSttfEULA"
@@ -122,7 +126,7 @@ DEPEND=">=sys-apps/baselayout-1.8.3
 	pam? ( >=sys-libs/pam-0.75 )
 	truetype? ( app-arch/cabextract )
 	app-arch/unzip
-	!media-libs/xft" 
+	!virtual/xft" 
 
 # unzip - needed for savage driver (version 1.1.27t)
 # x11-libs/xft -- blocked because of interference with xfree's
@@ -137,11 +141,21 @@ PROVIDE="virtual/x11
 src_unpack() {
 
 	# Unpack source and patches
-	unpack X${MY_SV}src-{1,2,3,4,5,6,7}.tgz
+	unpack X${MY_SV}src-{1,2,3,4,5}.tgz
+	if [ -n "`use doc`" ]
+	then
+		unpack X${MY_SV}src-{6,7}.tgz
+	fi
 	unpack XFree86-${PV}-patches-${PATCH_VER}.tar.bz2
 
+	# Unpack TaD's gentoo cursors
+	unpack gentoo-cursors-tad-${XCUR_VER}.tar.bz2
+
 	# Unpack extra fonts stuff from Mandrake
-	unpack gemini-koi8-u.tar.bz2
+	if [ -n "`use nls`" ]
+	then
+		unpack gemini-koi8-u.tar.bz2
+	fi
 	unpack eurofonts-X11.tar.bz2
 	unpack xfsft-encodings.tar.bz2
 	
@@ -169,6 +183,12 @@ src_unpack() {
 	cd ${S}
 	eend 0
     
+#	ebegin "Updating Matrox HAL driver"
+#	unpack mga-${MGADRV_VER}.tgz
+#	touch ${WORKDIR}/mga/HALlib/mgaHALlib.a
+#	mv ${WORKDIR}/mga/HALlib/mgaHALlib.a \
+#		#{S}/programs/Xserver/hw/xfree86/drivers/mga/HALlib
+#	eend 0
 
 	if [ "`gcc-version`" = "2.95" ]
 	then
@@ -343,6 +363,43 @@ src_unpack() {
 
 	# Use the xfree Xft2 lib
 	echo "#define SharedLibXft YES" >> config/cf/host.def
+	
+	# disable docs if doc not in USE
+	if [ -z "`use doc`" ]
+	then
+		echo "#define BuildLinuxDocText NO" >> config/cf/host.def
+		echo "#define BuildLinuxDocHtml NO" >> config/cf/host.def
+		echo "#define BuildLinuxDocPS NO" >> config/cf/host.def
+		echo "#define BuildSpecsDocs NO" >> config/cf/host.def
+	fi
+
+	# enable Japanese docs, optionally
+	if [ -n "`use cjk`" -a -n "`use doc`" ]
+	then
+		echo "#define InstallJapaneseDocs YES" >> config/cf/host.def
+	fi
+
+	# Native Language Support Fonts
+	if [ -z "`use nls`" ]
+	then
+		echo "#define BuildCyrillicFonts NO" >> config/cf/host.def
+		echo "#define BuildArabicFonts NO" >> config/cf/host.def
+		echo "#define BuildGreekFonts NO" >> config/cf/host.def
+		echo "#define BuildHebrewFonts NO" >> config/cf/host.def
+		echo "#define BuildThaiFonts NO" >> config/cf/host.def
+
+		if [ -z "`use cjk`" ]
+		then
+			echo "#define BuildCIDFonts NO" >> config/cf/host.def
+			echo "#define BuildJapaneseFonts NO" >> config/cf/host.def
+			echo "#define BuildKoreanFonts NO" >> config/cf/host.def
+			echo "#define BuildChineseFonts NO" >> config/cf/host.def
+		fi
+	fi
+
+#	# Build with the binary MatroxHAL driver
+#	echo "#define HaveMatroxHal YES" >> config/cf/host.def
+#	echo "#define UseMatroxHal YES" >> config/cf/host.def
 
 # Will uncomment this after kde, qt, and *box ebuilds are alterered to use
 # it
@@ -360,18 +417,21 @@ src_unpack() {
 	bzcat ${DISTDIR}/XFree86-locale.alias.bz2 > nls/locale.alias
 	bzcat ${DISTDIR}/XFree86-locale.dir.bz2 > nls/locale.dir
 	bzcat ${DISTDIR}/XFree86-en_US.UTF-8.old.bz2 > nls/Compose/en_US.UTF-8
-
-	# These are not included anymore as they are obsolete
-	rm -rf ${S}/doc/hardcopy/{XIE,PEX5}
-	for x in ${S}/programs/Xserver/hw/xfree86/{XF98Conf.cpp,XF98Config}
-	do
-		if [ -f ${x} ]
-		then
-			cp ${x} ${x}.orig
-			grep -iv 'Load[[:space:]]*"\(pex5\|xie\)"' ${x}.orig > ${x}
-			rm -f ${x}.orig
-		fi
-	done
+	
+	if use doc
+	then
+		# These are not included anymore as they are obsolete
+		rm -rf ${S}/doc/hardcopy/{XIE,PEX5}
+		for x in ${S}/programs/Xserver/hw/xfree86/{XF98Conf.cpp,XF98Config}
+		do
+			if [ -f ${x} ]
+			then
+				cp ${x} ${x}.orig
+				grep -iv 'Load[[:space:]]*"\(pex5\|xie\)"' ${x}.orig > ${x}
+				rm -f ${x}.orig
+			fi
+		done
+	fi
 }
 
 src_compile() {
@@ -584,13 +644,16 @@ src_install() {
 	done
 	eend 0
 
-	ebegin "gemini-koi8 fonts..."
-	cd ${WORKDIR}/ukr
-	gunzip *.Z
-	gzip -9 *.pcf
-	cd ${S}
-	cp -a ${WORKDIR}/ukr ${D}/usr/X11R6/lib/X11/fonts
-	eend 0
+	if [ -n "`use nls`" ]
+	then
+		ebegin "gemini-koi8 fonts..."
+		cd ${WORKDIR}/ukr
+		gunzip *.Z
+		gzip -9 *.pcf
+		cd ${S}
+		cp -a ${WORKDIR}/ukr ${D}/usr/X11R6/lib/X11/fonts
+		eend 0
+	fi
 	
 	exeinto /etc/X11
 	# new session management script
@@ -657,6 +720,10 @@ src_install() {
 	done
 	eend 0
 
+	# Make the core cursor the default.  People seem not to like whiteglass
+	# for some reason.
+	dosed 's:whiteglass:core:' /usr/share/cursors/xfree/default/index.theme
+
 	einfo "Striping binaries and libraries..."
 	# This bit I got from Redhat ... strip binaries and drivers ..
 	# NOTE:  We do NOT want to strip the drivers, modules or DRI modules!
@@ -685,6 +752,13 @@ src_install() {
 		fi
 	done
 
+	# Install TaD's gentoo cursors
+	insinto /usr/share/cursors/xfree/gentoo/cursors
+	doins ${WORKDIR}/cursors/gentoo/cursors/*
+	insinto /usr/share/cursors/xfree/gentoo-blue/cursors
+	doins ${WORKDIR}/cursors/gentoo-blue/cursors/*
+	insinto /usr/share/cursors/xfree/gentoo-silver/cursors
+	doins ${WORKDIR}/cursors/gentoo-silver/cursors/*
 }
 
 pkg_preinst() {