Rolling proper ebuild, as per policy, original was direct copy of 99.904

3 files changed, 48 insertions, 71 deletions

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 1734a817a5a5..3fe727b604c6 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,10 +1,10 @@
 MD5 e01fe16e6bdfd8cf45e246521621a7ae xorg-x11-6.7.0-r2.ebuild 37980
-MD5 8df770523fd1d373d0fdfe0b22085710 xorg-x11-6.8.0.ebuild 41974
+MD5 4e5ec0502f6b92f7f5a2a5551295c630 xorg-x11-6.8.0.ebuild 40870
 MD5 7a025fba9928b2f643aea2da070e52f5 xorg-x11-6.7.99.902.ebuild 39939
 MD5 54f7b5341467451bc4b70bfe0bfed641 xorg-x11-6.7.99.904.ebuild 42080
 MD5 c525cb4363e44aacb13f6ea3fec9e3ce xorg-x11-6.7.0-r1.ebuild 41733
 MD5 07aebe7113492f714a1f2a88aa963c32 xorg-x11-6.7.99.903.ebuild 41120
-MD5 5c06109fe76b060bcb38934f0363d6f9 ChangeLog 25461
+MD5 c4a59571f838da5572df2e42c7bd0de7 ChangeLog 25592
 MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230
 MD5 d2be7dc9989b9f7c3e2ccb84e5297eeb files/digest-xorg-x11-6.7.0-r1 906
 MD5 51c9e80b73eced56c98721ff90648866 files/digest-xorg-x11-6.7.0-r2 904
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0 b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0
new file mode 100644
index 000000000000..9f11d3b812f3
--- /dev/null
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0
@@ -0,0 +1,13 @@
+MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811
+MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892
+MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991
+MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
+MD5 02aadc16fe9ce67246dc5819e340ce9d xorg-x11-6.8.0-files-0.1.tar.bz2 9383
+MD5 8491e4087b1930f5d2a555a14a28fe6d xorg-x11-6.8.0-patches-0.1.tar.bz2 58295
+MD5 c31a2e1c226e659c2ff29abfe55386e3 X11R6.8.0-src1.tar.gz 30560275
+MD5 4089bb6efb6c5bc73fbcfc23fafcb0c8 X11R6.8.0-src2.tar.gz 5808901
+MD5 488a5ebbbdf48d974efbc3a0bde92bf4 X11R6.8.0-src3.tar.gz 10014266
+MD5 0ffaef789784ae16ca263e7ae60db656 X11R6.8.0-src4.tar.gz 13166526
+MD5 af129720efbe82a1a82505c23227f70b X11R6.8.0-src5.tar.gz 4386145
+MD5 4be7648c1512d5da7e738e500dd5ba30 X11R6.8.0-src6.tar.gz 3181068
+MD5 888ced8bc85fbd2bd4880dba23a7f44a X11R6.8.0-src7.tar.gz 5052439
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0.ebuild
index bf89c49938e2..4ef5b660ee0f 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0.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.ebuild,v 1.1 2004/09/09 00:46:07 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0.ebuild,v 1.2 2004/09/09 00:58:53 cyfred Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -38,7 +38,7 @@ HOMEPAGE="http://freedesktop.org/XOrg"
 
 # Misc patches we may need to fetch ..
 X_PATCHES="mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2
-	http://dev.gentoo.org/~seemant/distfiles/${P}-patches-${PATCH_VER}.tar.bz2"
+	http://dev.gentoo.org/~cyfred/distfiles/${P}-patches-${PATCH_VER}.tar.bz2"
 
 X_DRIVERS=""
 #	mirror://gentoo/${P}-drivers-via-${VIADRV_VER}.tar.bz2"
@@ -46,26 +46,24 @@ X_DRIVERS=""
 # Latest SIS drivers:  http://www.winischhofer.net/
 
 GENTOO_FILES="mirror://gentoo/${P}-files-${FILES_VER}.tar.bz2
-	http://dev.gentoo.org/~seemant/distfiles/${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/~spyderous/xorg/${PN}/patchsets/${PV}/xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2
+	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}
 	${X_DRIVERS}
 	${X_PATCHES}
-	mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~seemant/distfiles/${P}.tar.bz2"
-#	http://freedesktop.org/~xorg/X11R${PV}/src/X11R${PV}-src1.tar.gz
-#	http://freedesktop.org/~xorg/X11R${PV}/src//X11R${PV}-src2.tar.gz
-#	http://freedesktop.org/~xorg/X11R${PV}/src//X11R${PV}-src3.tar.gz
-#	http://freedesktop.org/~xorg/X11R${PV}/src//X11R${PV}-src4.tar.gz
-#	http://freedesktop.org/~xorg/X11R${PV}/src//X11R${PV}-src5.tar.gz
-#	doc? (
-#		http://freedesktop.org/~xorg/X11R${PV}/src//X11R${PV}-src6.tar.gz
-#		http://freedesktop.org/~xorg/X11R${PV}/src//X11R${PV}-src7.tar.gz
-#	)"
+	http://freedesktop.org/~xorg/X11R${PV}/src/X11R${PV}-src1.tar.gz
+	http://freedesktop.org/~xorg/X11R${PV}/src//X11R${PV}-src2.tar.gz
+	http://freedesktop.org/~xorg/X11R${PV}/src//X11R${PV}-src3.tar.gz
+	http://freedesktop.org/~xorg/X11R${PV}/src//X11R${PV}-src4.tar.gz
+	http://freedesktop.org/~xorg/X11R${PV}/src//X11R${PV}-src5.tar.gz
+	doc? (
+		http://freedesktop.org/~xorg/X11R${PV}/src//X11R${PV}-src6.tar.gz
+		http://freedesktop.org/~xorg/X11R${PV}/src//X11R${PV}-src7.tar.gz
+	)"
 
 LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2
 	bigelow-holmes-urw-gmbh-luxi christopher-g-demetriou national-semiconductor
@@ -435,26 +433,14 @@ host_def_setup() {
 		# Use the xorg Xft2 lib
 		echo "#define SharedLibXft YES" >> ${HOSTCONF}
 
-		# Set up docs building
-		if use doc
-		then
-			local DOC="YES"
-		else
-			local DOC="NO"
-		fi
-
 		# with USE="X doc' circular dep w/ virtual/ghostscript
 		# echo "#define HasGhostScript ${DOC}" >> ${HOSTCONF}
 		# Caused issues, basic docs aren't installed
-		#echo "#define BuildLinuxDocText ${DOC}" >> ${HOSTCONF}
-#		echo "#define BuildLinuxDocHtml ${DOC}" >> ${HOSTCONF}
-#		echo "#define BuildLinuxDocPS ${DOC}" >> ${HOSTCONF}
-#		echo "#define BuildSpecsDocs ${DOC}" >> ${HOSTCONF}
-#		echo "#define BuildHtmlManPages ${DOC}" >> ${HOSTCONF}
 		use_build doc BuildLinuxDocText
 		use_build doc BuildLinuxDocPS
 		use_build doc BuildSpecsDocs
 		use_build doc BuildHtmlManPages
+		use_build doc InstallHardcopyDocs
 
 		# enable Japanese docs, optionally
 #		if use cjk
@@ -464,49 +450,26 @@ host_def_setup() {
 		use doc && use_build cjk InstallJapaneseDocs
 
 		# Native Language Support Fonts
+		use_build nls BuildCyrillicFonts
+		use_build nls BuildArabicFonts
+		use_build nls BuildGreekFonts
+		use_build nls BuildHebrewFonts
+		use_build nls BuildThaiFonts
+
 		if use !nls
 		then
-			echo "#define BuildCyrillicFonts NO" >> ${HOSTCONF}
-			echo "#define BuildArabicFonts NO" >> ${HOSTCONF}
-			echo "#define BuildGreekFonts NO" >> ${HOSTCONF}
-			echo "#define BuildHebrewFonts NO" >> ${HOSTCONF}
-			echo "#define BuildThaiFonts NO" >> ${HOSTCONF}
-
-			if use !cjk
-			then
-				echo "#define BuildCIDFonts NO" >> ${HOSTCONF}
-				echo "#define BuildJapaneseFonts NO" >> ${HOSTCONF}
-				echo "#define BuildKoreanFonts NO" >> ${HOSTCONF}
-				echo "#define BuildChineseFonts NO" >> ${HOSTCONF}
-			fi
+			use_build cjk BuildCIDFonts
+			use_build cjk BuildJapaneseFonts
+			use_build cjk BuildKoreanFonts
+			use_build cjk BuildChineseFonts
 		fi
 
 		# Crappy bitmap fonts
-#		if use bitmap-fonts
-#		then
-#			echo "#define Build75DpiFonts YES" >> ${HOSTCONF}
-#			echo "#define Build100DpiFonts YES" >> ${HOSTCONF}
-#		else
-#			echo "#define Build75DpiFonts NO" >> ${HOSTCONF}
-#			echo "#define Build100DpiFonts NO" >> ${HOSTCONF}
-#		fi
 		use_build bitmap-fonts Build75DpiFonts
 		use_build bitmap-fonts Build100DpiFonts
 
-#		if use dmx
-#		then
-#			echo "#define BuildDmx YES" >> ${HOSTCONF}
-#		else
-#			echo "#define BuildDmx NO" >> ${HOSTCONF}
-#		fi
 		use_build dmx BuildDmx
 
-#		if use insecure-drivers
-#		then
-#			echo "#define BuildDevelDRIDrivers YES" >> ${HOSTCONF}
-#		else
-#			echo "#define BuildDevelDRIDrivers NO" >> ${HOSTCONF}
-#		fi
 		use_build insecure-drivers BuildDevelDRIDrivers
 
 		if use ipv6
@@ -518,6 +481,7 @@ host_def_setup() {
 #		else
 #			echo "#define BuildIPv6 NO" >> ${HOSTCONF}
 		fi
+
 		use_build ipv6 BuildIPv6
 
 		# Ajax is the man for getting this going for us
@@ -573,16 +537,16 @@ src_unpack() {
 
 	# Unpack source and patches
 	ebegin "Unpacking source"
-		unpack ${P}.tar.bz2
-#		unpack X11R${PV}-src[1..5].tar.gz
+#		unpack ${P}.tar.bz2
+		unpack X11R${PV}-src{1,2,3,4,5}.tar.gz
 	eend 0
 
-#	if use doc
-#	then
-#		ebegin "Unpacking documentation"
-#			unpack X11R${PV}-src{6,7}.tar.gz
-#		eend 0
-#	fi
+	if use doc
+	then
+		ebegin "Unpacking documentation"
+			unpack X11R${PV}-src{6,7}.tar.gz
+		eend 0
+	fi
 
 	ebegin "Unpacking Gentoo files and patches"
 		unpack ${P}-files-${FILES_VER}.tar.bz2 > /dev/null