bumped to patch_Ver 1.1.4

5 files changed, 138 insertions, 97 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index a7fc46ced248..a006a71c4e6a 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,13 @@
 # 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.131 2003/05/20 12:37:02 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.132 2003/05/28 20:53:01 seemant Exp $
+
+*xfree-4.3.0-r3 (28 May 2003)
+
+  28 May 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild,
+  xfree-4.3.0-r3.ebuild:
+  added patch to fix some i810 issues, to try and solve bug #8927 by Jan Knipper
+  <jan-gentoo@spline.de>
 
   20 May 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.2.1-r1.ebuild,
   xfree-4.2.1-r1.ebuild, xfree-4.3.0-r1.ebuild, xfree-4.3.0-r1.ebuild,
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index f1e678e8cccf..5911ce624639 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,7 +1,8 @@
 MD5 f11ed1feb06c079f6d570a0ca23d647c xfree-4.1.0-r6.ebuild 2963
+MD5 a93ffea04a403d1bb4bfcf72ba3c1056 xfree-4.3.0-r2.ebuild 30491
 MD5 bd9ddb285a3d2f153656f2639025a9e0 xfree-4.2.1-r2.ebuild 24195
-MD5 47f5627362825e5b26f859bf21764f63 xfree-4.3.0-r3.ebuild 30524
-MD5 bb0c74eff729638ea6f682023cdfbe9e ChangeLog 29102
+MD5 328c7769d52bdf2530874b86418b7060 xfree-4.3.0-r3.ebuild 30523
+MD5 6f7cfee07ae81a2e32d05b9fa4465afd ChangeLog 29340
 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
diff --git a/x11-base/xfree/files/digest-xfree-4.3.0-r3 b/x11-base/xfree/files/digest-xfree-4.3.0-r3
index 74fc6ecd6f74..b3a1c1179caf 100644
--- a/x11-base/xfree/files/digest-xfree-4.3.0-r3
+++ b/x11-base/xfree/files/digest-xfree-4.3.0-r3
@@ -1,11 +1,31 @@
 MD5 4f241a4f867363f40efa2b00dca292af X430src-1.tgz 10993622
 MD5 844c2ee908d21dbf8911fd13115bf8b4 X430src-2.tgz 7962239
 MD5 b82a0443e1b7bf860e4343e6b6766cb6 X430src-3.tgz 12366363
+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 422d25619affcdfb29e817805c46bca4 XFree86-4.3.0-patches-1.1.3.tar.bz2 428355
+MD5 04b211ac8c4d6bb54e5ceb31e88e95bb XFree86-4.3.0-patches-1.1.4.tar.bz2 421341
 MD5 e0c52f0e726e20db445e9708665a26d4 xfree86-dri-resume-v8.patch 15333
 MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156
 MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974
 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
+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
+MD5 2b30de40bb5e803a0452c7715fc835d1 comic32.exe 246008
+MD5 4e412c772294403ab62fb2d247d85c60 courie32.exe 646368
+MD5 4d90016026e2da447593b41a8d8fa8bd georgi32.exe 392440
+MD5 7907c7dd6684e9bade91cff82683d9d7 impact32.exe 173288
+MD5 ed39c8ef91b9fb80f76f702568291bd5 times32.exe 661728
+MD5 0d7ea16cac6261f8513a061fbfcdb2b5 trebuc32.exe 357200
+MD5 12d2a75f8156e10607be1eaa8e8ef120 verdan32.exe 351992
+MD5 230a1d13a365b22815f502eb24d9149b webdin32.exe 185072
diff --git a/x11-base/xfree/xfree-4.3.0-r2.ebuild b/x11-base/xfree/xfree-4.3.0-r2.ebuild
index ee321a953b54..9dc565a9dd2e 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.21 2003/05/24 04:58:53 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r2.ebuild,v 1.22 2003/05/28 20:53:01 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 ...
@@ -39,7 +39,7 @@ strip-flags
 # Are we using a snapshot ?
 USE_SNAPSHOT="no"
 
-PATCH_VER="1.1.3"
+PATCH_VER="1.1.4"
 FT2_VER="2.1.3"
 XCUR_VER="0.2"
 SISDRV_VER="180403-1"
diff --git a/x11-base/xfree/xfree-4.3.0-r3.ebuild b/x11-base/xfree/xfree-4.3.0-r3.ebuild
index a7596082ccb2..9b329b067a8a 100644
--- a/x11-base/xfree/xfree-4.3.0-r3.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r3.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-r3.ebuild,v 1.3 2003/05/28 10:18:17 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.4 2003/05/28 20:53:01 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 ...
@@ -39,7 +39,7 @@ strip-flags
 # Are we using a snapshot ?
 USE_SNAPSHOT="no"
 
-PATCH_VER="1.1.3"
+PATCH_VER="1.1.4"
 FT2_VER="2.1.3"
 XCUR_VER="0.2"
 SISDRV_VER="180403-1"
@@ -49,7 +49,6 @@ MGADRV_VER="1_3_0beta"
 BASE_PV="${PV}"
 MY_SV="${BASE_PV//\.}"
 S="${WORKDIR}/xc"
-DESCRIPTION="Xfree86: famous and free X server"
 SRC_PATH0="ftp://ftp.xfree.org/pub/XFree86/${BASE_PV}/source"
 SRC_PATH1="ftp://ftp1.sourceforge.net/pub/mirrors/XFree86/${BASE_PV}/source"
 HOMEPAGE="http://www.xfree.org"
@@ -68,12 +67,27 @@ X_DRIVERS="http://people.mandrakesoft.com/~flepied/projects/wacom/xf86Wacom.c.gz
 # Latest SIS drivers:  http://www.winischhofer.net/
 # Glide headers for compiling the tdfx modules
 
+# For the MS Core fonts ..
+MS_COREFONTS="./andale32.exe ./arial32.exe
+	./arialb32.exe ./comic32.exe
+	./courie32.exe ./georgi32.exe
+	./impact32.exe ./times32.exe
+	./trebuc32.exe ./verdan32.exe
+	./webdin32.exe"
+#	./IELPKTH.CAB"
+# Need windows license to use this one
+MS_FONT_URLS="${MS_COREFONTS//\.\//mirror://sourceforge/corefonts/}"
+
 SRC_URI="${SRC_PATH0}/X${MY_SV}src-1.tgz
 	${SRC_PATH0}/X${MY_SV}src-2.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_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
 	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
@@ -82,17 +96,18 @@ SRC_URI="${SRC_PATH0}/X${MY_SV}src-1.tgz
 SRC_URI="${SRC_URI}
 	${X_PATCHES}
 	${X_DRIVERS}
-	mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.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"
-
+	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"
 SLOT="0"
-LICENSE="X11"
 KEYWORDS="x86 ppc sparc ~alpha ~mips ~hppa arm"
 
 DEPEND=">=sys-apps/baselayout-1.8.3
@@ -125,26 +140,31 @@ PROVIDE="virtual/x11
 #do the right thing. Otherwise RDEPEND doesn't get set properly.
 inherit eutils flag-o-matic gcc
 
+DESCRIPTION="Xfree86: famous and free X server"
+
 src_unpack() {
-	ebegin "unpacking shit"
+
 	# Unpack source and patches
-	unpack X${MY_SV}src-{1,2,3}.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
-	eend 0
 
 	# Unpack extra fonts stuff from Mandrake
-#	if [ -n "`use nls`" ]
-#	then
-#		unpack gemini-koi8-u.tar.bz2
-#	fi
-#	unpack eurofonts-X11.tar.bz2
-#	unpack xfsft-encodings.tar.bz2
+	if [ -n "`use nls`" ]
+	then
+		unpack gemini-koi8-u.tar.bz2
+	fi
+	unpack eurofonts-X11.tar.bz2
+	unpack xfsft-encodings.tar.bz2
 	
 	# Remove bum encoding
-#	rm -f ${WORKDIR}/usr/X11R6/lib/X11/fonts/encodings/urdunaqsh-0.enc
+	rm -f ${WORKDIR}/usr/X11R6/lib/X11/fonts/encodings/urdunaqsh-0.enc
 	
 	# Update the Savage Driver
 	# savage driver 1.1.27t is a .zip and contains a savage directory
@@ -193,9 +213,7 @@ src_unpack() {
 	else
 		rm -f ${WORKDIR}/patch/076*
 	fi
-	
-	rm ${WORKDIR}/patch/063*
-	rm ${WORKDIR}/patch/107*
+
 	# Various Patches from all over
 	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patch/
 	
@@ -219,28 +237,27 @@ src_unpack() {
 		eend 0
 	fi
 	
+	# Unpack the MS fonts
+	if [ -n "`use truetype`" ]
+	then
+		einfo "Unpacking MS Core Fonts..."
+		mkdir -p ${WORKDIR}/truetype; cd ${WORKDIR}/truetype
+		for x in ${MS_COREFONTS}
+		do
+			if [ -f ${DISTDIR}/${x} ]
+			then
+				einfo "  ${x/\.\/}..."
+				cabextract --lowercase ${DISTDIR}/${x} > /dev/null || die
+			fi
+		done
+		ebegin "Done unpacking Core Fonts"; eend 0
+	fi
 	# Customise font directory to /usr/share/fonts
 	ebegin "Changing Font directory to /usr/share/fonts"
 	sed -i "s:#define FontDir.*:#define FontDir /usr/share/fonts:" \
 		${S}/config/cf/X11.tmpl
 	eend 0
 
-	# Unpack the MS fonts
-#	if [ -n "`use truetype`" ]
-#	then
-#		einfo "Unpacking MS Core Fonts..."
-#		mkdir -p ${WORKDIR}/truetype; cd ${WORKDIR}/truetype
-#		for x in ${MS_COREFONTS}
-#		do
-#			if [ -f ${DISTDIR}/${x} ]
-#			then
-#				einfo "  ${x/\.\/}..."
-#				cabextract --lowercase ${DISTDIR}/${x} > /dev/null || die
-#			fi
-#		done
-#		ebegin "Done unpacking Core Fonts"; eend 0
-#	fi
-	
 	ebegin "Setting up config/cf/host.def"
 	cd ${S}; cp ${FILESDIR}/${PV}/site.def config/cf/host.def || die
 	echo "#define XVendorString \"Gentoo Linux (XFree86 ${PV}, revision ${PR})\"" \
@@ -281,7 +298,7 @@ src_unpack() {
 		echo "#define XFree86Devel	YES" >> config/cf/host.def
 		echo "#define DoLoadableServer	NO" >>config/cf/host.def
 	else
-	#	echo "#define ExtraXInputDrivers acecad" >> config/cf/host.def
+		echo "#define ExtraXInputDrivers acecad" >> config/cf/host.def
 		# use less ram .. got this from Spider's makeedit.eclass :)
 		echo "#define GccWarningOptions -Wno-return-type -w" \
 			>> config/cf/host.def
@@ -375,26 +392,22 @@ src_unpack() {
 	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
+	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
 
-	echo "#define BuildFonts NO" >> config/cf/host.def
-	echo "#define DefaultFontPath /usr/share/fonts" >> config/cf/host.def
-	echo "#define FontDir /usr/share/fonts" >> 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
@@ -411,11 +424,11 @@ src_unpack() {
 	# End the host.def definitions here
 	eend 0
 
-#	cd ${S}
-#	bzcat ${DISTDIR}/XFree86-compose.dir.bz2 > nls/compose.dir
-#	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
+	cd ${S}
+	bzcat ${DISTDIR}/XFree86-compose.dir.bz2 > nls/compose.dir
+	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
 	
 	if use doc
 	then
@@ -543,21 +556,21 @@ src_install() {
 	newins ${S}/programs/Xserver/hw/xfree86/XF86Config XF86Config.example
 	
 	# Install MS fonts.
-#	if [ -n "`use truetype`" ]
-#	then
-#		ebegin "Installing MS Core Fonts"
-#		dodir /usr/X11R6/lib/X11/fonts/truetype
-#		cp -af ${WORKDIR}/truetype/*.ttf ${D}/usr/X11R6/lib/X11/fonts/truetype
-#		eend 0
-#	fi
+	if [ -n "`use truetype`" ]
+	then
+		ebegin "Installing MS Core Fonts"
+		dodir /usr/share/fonts/truetype
+		cp -af ${WORKDIR}/truetype/*.ttf ${D}/usr/share/fonts/truetype
+		eend 0
+	fi
 
 	# EURO support
-#	ebegin "Euro Support..."
-#	${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-8x14.bdf | \
-#		gzip -9 > ${D}/usr/X11R6/lib/X11/fonts/misc/Xlat9-8x14-lat9.pcf.gz
-#	${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-9x16.bdf | \
-#		gzip -9 > ${D}/usr/X11R6/lib/X11/fonts/misc/Xlat9-9x16-lat9.pcf.gz
-#	eend 0
+	ebegin "Euro Support..."
+	${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-8x14.bdf | \
+		gzip -9 > ${D}/usr/share/fonts/misc/Xlat9-8x14-lat9.pcf.gz
+	${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-9x16.bdf | \
+		gzip -9 > ${D}/usr/share/fonts/misc/Xlat9-9x16-lat9.pcf.gz
+	eend 0
 
 	# Standard symlinks
 	dodir /usr/{bin,include,lib}
@@ -643,16 +656,16 @@ src_install() {
 	done
 	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
+	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/share/fonts
+		eend 0
+	fi
 	
 	exeinto /etc/X11
 	# new session management script
@@ -903,7 +916,7 @@ pkg_postinst() {
 				     -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ]
 				then
 					${ROOT}/usr/X11R6/bin/ttmkfdir -x 2 \
-						-e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/encodings.dir \
+						-e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
 						-o ${x}/fonts.scale -d ${x}
 				fi
 			done