Updating XFree86 ebuilds to fix arch problems with synpatics, and remove need for as large ${FILESDIR}

9 files changed, 146 insertions, 120 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 7b5e4aa135ed..090de8087c6c 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.271 2004/01/13 05:25:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.272 2004/01/27 11:53:57 cyfred Exp $
+
+  27 Jan 2004; Andrew Bevitt <cyfred@gentoo.org>; xfree-4.2.1-r2.ebuild,
+  xfree-4.3.0-r2.ebuild, xfree-4.3.0-r3.ebuild, xfree-4.3.99.16.ebuild,
+  xfree-4.3.99.901.ebuild, xfree-4.3.99.902.ebuild:
+  Fixing various ARCH problems with synaptics, and porting to files / patch
+  tarballs for 4.2.1-r2 to reduce portage tree size
 
   13 Jan 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.1-r2.ebuild,
   xfree-4.3.0-r2.ebuild, xfree-4.3.0-r3.ebuild:
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index b8a115d41576..91c6dd24ff77 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,63 +1,63 @@
+MD5 7b0993d5cc21592929c201ec5604e838 xfree-4.3.99.902.ebuild 30967
+MD5 1092134beb34bd60fdb5a4768b949413 xfree-4.3.0-r2.ebuild 31524
+MD5 cc90ae1ff6bb0e6803d41718d9e16037 xfree-4.3.99.16.ebuild 32379
+MD5 919b818ac9df1dc5556266173ca09af8 xfree-4.3.99.901.ebuild 31589
+MD5 2ac9fcb51029684bee2bd797b2e75c6b xfree-4.2.1-r2.ebuild 23610
+MD5 42a5ededafbbc1f1c49a7e853829360e xfree-4.3.0-r3.ebuild 34584
+MD5 a5c831420fd8a200311b29d2d471bdd9 ChangeLog 61049
 MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
-MD5 3ca760dd2b7b77f2898bbf23aa16a1f2 xfree-4.2.1-r2.ebuild 24144
-MD5 7c814e9f41e166d81f2b498a2db70711 xfree-4.3.0-r2.ebuild 31522
-MD5 b5c3fdec7ce78d3c908aa7aa47d05152 xfree-4.3.0-r3.ebuild 34300
-MD5 dc3b83378bf0118fdc6a7d24806279e5 xfree-4.3.99.16.ebuild 32367
-MD5 693a1c50da33227c640fdfed215aa835 xfree-4.3.99.901.ebuild 31577
-MD5 f967bea74ad504c76d658b6a98aeafc3 xfree-4.3.99.902.ebuild 30955
-MD5 1c728bb1d55911ff533e870a2b8181f2 ChangeLog 60726
-MD5 a9371704cf72bcb8d1aa713ca4b27546 files/XFree86-4.2.1-Xft11-Imakefile.patch 341
-MD5 bc3aad4b056a41f47d427c036edcef9f files/XFree86-4.2.1-Xft11-hack.patch 1163
-MD5 f37019cb2d1cac6358077bda58d062ed files/digest-xfree-4.2.1-r2 1267
+MD5 10e681917f61e8ed068030a373694906 files/xfree-4.2.x-home_end-keys.patch 666
+MD5 7c78312b314118c4217fb71c2e3d9ad5 files/digest-xfree-4.2.1-r2 1342
 MD5 6a542004d031451f668989af76b28a0f files/digest-xfree-4.3.0-r2 1928
 MD5 5aa0593eae1bc9dec93ac67a83843b52 files/digest-xfree-4.3.0-r3 2000
+MD5 6c0fe2e04a359ddc367dbd0dd00c61a1 files/xfree-4.2.x.-bison.fixes.patch 2854
+MD5 a9371704cf72bcb8d1aa713ca4b27546 files/XFree86-4.2.1-Xft11-Imakefile.patch 341
 MD5 aeb9aaa17c923c3e99e4f4fe2aaf8598 files/digest-xfree-4.3.99.16 1251
 MD5 4f34915a9d5a680553021bdbbda5dc6c files/digest-xfree-4.3.99.901 1254
 MD5 5a482320482c76552022a45b3fc282ff files/digest-xfree-4.3.99.902 1254
-MD5 10e681917f61e8ed068030a373694906 files/xfree-4.2.x-home_end-keys.patch 666
-MD5 6c0fe2e04a359ddc367dbd0dd00c61a1 files/xfree-4.2.x.-bison.fixes.patch 2854
-MD5 8d524f120fa5c2e49ccc8f989d50907c files/4.2.1-patches/018_all_4.2.0-ati-radeon-misc-bugfixes.patch.bz2 4651
+MD5 bc3aad4b056a41f47d427c036edcef9f files/XFree86-4.2.1-Xft11-hack.patch 1163
+MD5 4485c7fa46907db803d219218f62a5df files/4.3.0/xinitrc 918
+MD5 9cb44182ea92068b22973bcb0afda322 files/4.3.0/xserver.pamd 284
+MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/4.3.0/Xsession 1521
+MD5 0e84cb8a3f7b821072b2a75482b83f97 files/4.3.0/Xsetup_0 880
+MD5 e194f962a63f74c674887c9ade54a5ea files/4.3.0/site.def 3731
+MD5 d0cb338160e3be8790524af8071cc4df files/4.3.0/xdm.pamd 380
+MD5 fbc03cfe0d80be07ad487d9ec7d9952e files/4.3.0/xfs.conf.d 801
+MD5 55ed160cbb7076b1292ea8e3772a2761 files/4.3.0/xfs.config 1331
+MD5 7b0aac9992e53a3da3ecfef90b81b528 files/4.3.0/chooser.sh 1584
+MD5 605199b87a6477a337d57269fccc6faa files/4.3.0/startDM.sh 909
+MD5 43ac558897008a3dabff6cc4fa1e0e05 files/4.3.0/xdm.start 2847
+MD5 a29418c10f780d4bfebbd346be495c43 files/4.3.0/xfs.start 6661
+MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.3.0/XftConfig 7750
+MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.3.0/10xfree 182
+MD5 bd912edd0e5a73b29305374ed988216a files/4.2.1-patches/080_all_4.2.1-mit-shm-security.patch.bz2 3446
+MD5 31541a840d9412b73f0e759f650efb57 files/4.2.1-patches/022_all_4.2.0-FIRSTINDEX-breaks-ttmkfdir.patch.bz2 896
 MD5 0989e2d6a78afc18a4e17243c4eb9a7a files/4.2.1-patches/019_all_4.2.0-ati-radeon-pci-drm-enable.patch.bz2 659
-MD5 888975c53177c889bf161c7c6ca1134e files/4.2.1-patches/020_all_4.2.1-libICE-remove-stupid-delay.patch.bz2 338
+MD5 8d524f120fa5c2e49ccc8f989d50907c files/4.2.1-patches/018_all_4.2.0-ati-radeon-misc-bugfixes.patch.bz2 4651
 MD5 55ffb69e24966e208cbc32e5e97a6f09 files/4.2.1-patches/021_all_4.1.0-xtt.patch.bz2 133585
-MD5 31541a840d9412b73f0e759f650efb57 files/4.2.1-patches/022_all_4.2.0-FIRSTINDEX-breaks-ttmkfdir.patch.bz2 896
-MD5 bd912edd0e5a73b29305374ed988216a files/4.2.1-patches/080_all_4.2.1-mit-shm-security.patch.bz2 3446
+MD5 888975c53177c889bf161c7c6ca1134e files/4.2.1-patches/020_all_4.2.1-libICE-remove-stupid-delay.patch.bz2 338
 MD5 a42f86c7c3c0eb01316bd325e07f25a9 files/4.2.1-patches/094_all_4.2.1-Xft1-Imake-config.patch.bz2 1288
-MD5 8c48b242627d1157afa04fb6af06f2ca files/4.2.1-r2/036_all_4.2.0-trident-driver-update-bug10624.patch.bz2 20913
-MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.2.1-r2/10xfree 182
-MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.2.1-r2/XftConfig 7750
+MD5 4485c7fa46907db803d219218f62a5df files/4.2.1-r2/xinitrc 918
+MD5 9cb44182ea92068b22973bcb0afda322 files/4.2.1-r2/xserver.pamd 284
 MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/4.2.1-r2/Xsession 1521
 MD5 5002823053814f70a5fa568beee80aed files/4.2.1-r2/Xsetup_0 866
-MD5 a4faaaebb9eb237b36c9a55e8bbbf7bc files/4.2.1-r2/chooser.sh 1596
+MD5 ca411cceb6124020fdb07edef6df90eb files/4.2.1-r2/xft-quality.diff 848
 MD5 bdad7157e991bc78312f7ac6bbc8dbbd files/4.2.1-r2/site.def 3408
-MD5 200db00808e991ba97118faa139502be files/4.2.1-r2/startDM.sh 903
+MD5 8c48b242627d1157afa04fb6af06f2ca files/4.2.1-r2/036_all_4.2.0-trident-driver-update-bug10624.patch.bz2 20913
 MD5 d0cb338160e3be8790524af8071cc4df files/4.2.1-r2/xdm.pamd 380
-MD5 92420d8ba67b5cd54490a81472036de5 files/4.2.1-r2/xdm.start 2812
 MD5 58b46611c39b0322c25b234abe3ad10a files/4.2.1-r2/xfs.conf.d 803
 MD5 55ed160cbb7076b1292ea8e3772a2761 files/4.2.1-r2/xfs.config 1331
+MD5 a4faaaebb9eb237b36c9a55e8bbbf7bc files/4.2.1-r2/chooser.sh 1596
+MD5 200db00808e991ba97118faa139502be files/4.2.1-r2/startDM.sh 903
+MD5 92420d8ba67b5cd54490a81472036de5 files/4.2.1-r2/xdm.start 2812
 MD5 cb721d66b1b67c88708ce1613648ee1d files/4.2.1-r2/xfs.start 6602
-MD5 ca411cceb6124020fdb07edef6df90eb files/4.2.1-r2/xft-quality.diff 848
-MD5 4485c7fa46907db803d219218f62a5df files/4.2.1-r2/xinitrc 918
-MD5 9cb44182ea92068b22973bcb0afda322 files/4.2.1-r2/xserver.pamd 284
-MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.3.0/XftConfig 7750
-MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.3.0/10xfree 182
-MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/4.3.0/Xsession 1521
-MD5 0e84cb8a3f7b821072b2a75482b83f97 files/4.3.0/Xsetup_0 880
-MD5 7b0aac9992e53a3da3ecfef90b81b528 files/4.3.0/chooser.sh 1584
-MD5 e194f962a63f74c674887c9ade54a5ea files/4.3.0/site.def 3731
-MD5 605199b87a6477a337d57269fccc6faa files/4.3.0/startDM.sh 909
-MD5 d0cb338160e3be8790524af8071cc4df files/4.3.0/xdm.pamd 380
-MD5 43ac558897008a3dabff6cc4fa1e0e05 files/4.3.0/xdm.start 2847
-MD5 fbc03cfe0d80be07ad487d9ec7d9952e files/4.3.0/xfs.conf.d 801
-MD5 55ed160cbb7076b1292ea8e3772a2761 files/4.3.0/xfs.config 1331
-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 a0ce0f1c8a5771a1194f5895211a3f66 files/4.2.1-r2/Sessions/Xsession 2187
-MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.2.1-r2/lib/libGL.la 777
-MD5 18e1ac4e97a57fdba470897aa2cb452e files/4.2.1-r2/lib/libGLU.la 769
-MD5 b2c509837ddfbd12d8f1ed9b50254f01 files/4.2.1-r2/lib/libOSMesa.la 788
-MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/4.3.0/Sessions/Xsession 2187
-MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.3.0/lib/libGL.la 777
-MD5 18e1ac4e97a57fdba470897aa2cb452e files/4.3.0/lib/libGLU.la 769
+MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.2.1-r2/XftConfig 7750
+MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.2.1-r2/10xfree 182
 MD5 b2c509837ddfbd12d8f1ed9b50254f01 files/4.3.0/lib/libOSMesa.la 788
+MD5 18e1ac4e97a57fdba470897aa2cb452e files/4.3.0/lib/libGLU.la 769
+MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.3.0/lib/libGL.la 777
+MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/4.3.0/Sessions/Xsession 2187
+MD5 b2c509837ddfbd12d8f1ed9b50254f01 files/4.2.1-r2/lib/libOSMesa.la 788
+MD5 18e1ac4e97a57fdba470897aa2cb452e files/4.2.1-r2/lib/libGLU.la 769
+MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.2.1-r2/lib/libGL.la 777
+MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/4.2.1-r2/Sessions/Xsession 2187
diff --git a/x11-base/xfree/files/digest-xfree-4.2.1-r2 b/x11-base/xfree/files/digest-xfree-4.2.1-r2
index 516fe351a9da..494577b7f911 100644
--- a/x11-base/xfree/files/digest-xfree-4.2.1-r2
+++ b/x11-base/xfree/files/digest-xfree-4.2.1-r2
@@ -3,7 +3,8 @@ MD5 dae33268a9f2735b9678a81fb23e8d3e X420src-2.tgz 23227328
 MD5 560899e175a02ab592185b69756f539e X420src-3.tgz 9306679
 MD5 2f2852c80924a9b5356c3037a471c1a1 fcpackage.2_1.tar.gz 544661
 MD5 38adc94a4953a6b29e8619c25dda4887 4.2.0-4.2.1.diff.gz 54763
-MD5 2f370568407c37b43a21ac027967d8a6 XFree86-4.2.1-patches-1.3.tar.bz2 403237
+MD5 b39c9764f155e204f4edc05dc6260eb6 XFree86-4.2.1-patches-1.4.tar.bz2 405078
+MD5 12179b90b41b35f9f03f93968613cb05 XFree86-4.2.1-files-0.1.tar.bz2 34199
 MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156
 MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974
 MD5 4550c4f28637be556e2000676072de32 sis_drv_src_311003-1.tar.gz 419840
diff --git a/x11-base/xfree/xfree-4.2.1-r2.ebuild b/x11-base/xfree/xfree-4.2.1-r2.ebuild
index a78a49c412d8..5d18203914b7 100644
--- a/x11-base/xfree/xfree-4.2.1-r2.ebuild
+++ b/x11-base/xfree/xfree-4.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r2.ebuild,v 1.35 2004/01/13 05:25:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r2.ebuild,v 1.36 2004/01/27 11:53:57 cyfred 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 ...
@@ -38,12 +38,16 @@ replace-flags "-mcpu=v9" "-mcpu=v8 -mtune=v9"
 # <azarah@gentoo.org> (13 Oct 2002)
 strip-flags
 
-PATCH_VER="1.3"
+PATCH_VER="1.4"
+FILES_VER="0.1"
 FT2_VER="2.1.2"
 FC2_VER="2.1"
 SISDRV_VER="311003-1"
 SAVDRV_VER="1.1.27t"
 
+PATCH_DIR="${WORKDIR}/patch"
+FILES_DIR="${WORKDIR}/files"
+
 BASE_PV="4.2.0"
 MY_SV="${BASE_PV//\.}"
 S="${WORKDIR}/xc"
@@ -54,10 +58,9 @@ SRC_PATH1="ftp://ftp1.sourceforge.net/pub/mirrors/XFree86/${BASE_PV}/source"
 HOMEPAGE="http://www.xfree.org"
 
 X_PATCHES="http://ftp.xfree86.org/pub/XFree86/${PV}/patches/${BASE_PV}-${PV}.diff.gz
-	mirror://gentoo/XFree86-${PV}-patches-${PATCH_VER}.tar.bz2
-	http://www.gentoo.org/~azarah/XFree86-${PV}-patches-${PATCH_VER}.tar.bz2"
-# Need to get this thing up for testing, but ibiblio havent synced in a few
-# hours ...
+	mirror://gentoo/XFree86-${PV}-patches-${PATCH_VER}.tar.bz2"
+
+X_FILES="mirror://gentoo/XFree86-${PV}-files-${FILES_VER}.tar.bz2"
 
 X_DRIVERS="http://people.mandrakesoft.com/~flepied/projects/wacom/xf86Wacom.c.gz
 	http://www.probo.com/timr/savage-${SAVDRV_VER}.zip
@@ -87,6 +90,7 @@ SRC_URI="${SRC_PATH0}/X${MY_SV}src-1.tgz
 	${SRC_PATH1}/X${MY_SV}src-3.tgz
 	http://fontconfig.org/release/fcpackage.${FC2_VER/\./_}.tar.gz
 	${X_PATCHES}
+	${X_FILES}
 	${X_DRIVERS}
 	truetype? ( ${MS_FONT_URLS} )"
 
@@ -125,7 +129,8 @@ src_unpack() {
 
 	unpack X${MY_SV}src-{1,2,3}.tgz \
 		fcpackage.${FC2_VER/\./_}.tar.gz \
-		XFree86-${PV}-patches-${PATCH_VER}.tar.bz2
+		XFree86-${PV}-patches-${PATCH_VER}.tar.bz2 \
+		XFree86-${PV}-files-${FILES_VER}.tar.bz2
 
 	# Fix permissions
 	chmod -R 0755 ${WORKDIR}/fcpackage.${FC2_VER/\./_}/
@@ -157,10 +162,6 @@ src_unpack() {
 		${S}/lib/Xrender/Imakefile.orig > ${S}/lib/Xrender/Imakefile
 	eend 0
 
-	# Need to fix patches for trident driver, bug #10624
-	rm -f ${WORKDIR}/patch/036*
-	cp ${FILESDIR}/${PVR}/036*bug* ${WORKDIR}/patch/
-
 	if [ "`gcc-version`" = "2.95" ]
 	then
 		# Do not apply this patch for gcc-2.95.3, as it cause compile to fail,
@@ -170,24 +171,16 @@ src_unpack() {
 
 	# Remove 082 patch which b0rks keycodes,
 	# see bug #13073
-	rm -f ${WORKDIR}/patch/082*
+	rm -f ${PATCH_DIR}/082*
 
 	# Do not disable DRI for 3dfx cards if resolution higher than 1024x768,
 	# bug #15001.
-	rm -f ${WORKDIR}/patch/035*
+	rm -f ${PATCH_DIR}/035*
 
 	# Various Patches from all over
-	epatch ${WORKDIR}/patch/
+	epatch ${PATCH_DIR}
 	unset EPATCH_EXCLUDE
 
-	# Fix bison parse errors with bison-1.50 and up, bug #11595
-	#
-	#   http://www.jg555.com/cvs/cvsweb.cgi/~checkout~/patches/xfree/xfree-4.2.x.-bison.fixes.patch
-	epatch ${FILESDIR}/xfree-4.2.x.-bison.fixes.patch
-
-	# Fix HOME and END keys to work in xterm, bug #15254
-	epatch ${FILESDIR}/xfree-4.2.x-home_end-keys.patch
-
 	# Update the Savage Driver
 	ebegin "Updating Savage driver"
 	cd ${S}/programs/Xserver/hw/xfree86/drivers
@@ -231,7 +224,7 @@ src_unpack() {
 	fi
 
 	ebegin "Setting up config/cf/host.def"
-	cd ${S}; cp ${FILESDIR}/${PVR}/site.def config/cf/host.def || die
+	cd ${S}; cp ${FILES_DIR}/site.def config/cf/host.def || die
 	echo "#define XVendorString \"Gentoo Linux (XFree86 ${PV}, revision ${PR})\"" \
 		>> config/cf/host.def
 
@@ -371,7 +364,7 @@ src_install() {
 	fi
 
 	# Make sure the user running xterm can only write to utmp.
-	fowners root:utmp /usr/X11R6/bin/xterm
+	fowners root.utmp /usr/X11R6/bin/xterm
 	fperms 2755 /usr/X11R6/bin/xterm
 
 	# Fix permissions on locale/common/*.so
@@ -396,8 +389,8 @@ src_install() {
 
 	insinto /etc/X11
 	# We still use freetype for now ...
-	doins ${FILESDIR}/${PVR}/XftConfig
-	newins ${FILESDIR}/${PVR}/XftConfig XftConfig.new
+	doins ${FILES_DIR}/XftConfig
+	newins ${FILES_DIR}/XftConfig XftConfig.new
 	# This is if we are using Fontconfig only ...
 	#newins ${S}/lib/Xft1/XftConfig-OBSOLETE XftConfig
 	dosym ../../../../etc/X11/XftConfig /usr/X11R6/lib/X11/XftConfig
@@ -438,7 +431,7 @@ src_install() {
 
 	# .la files for libtool support
 	insinto /usr/X11R6/lib
-	doins ${FILESDIR}/${PVR}/lib/*.la
+	doins ${FILES_DIR}/lib/*.la
 
 	# Some Xft2.0 checks to ease things a bit
 	if [ -L ${ROOT}/usr/X11R6/lib/libXft.so ]
@@ -486,34 +479,34 @@ src_install() {
 
 	exeinto /etc/X11
 	# new session management script
-	doexe ${FILESDIR}/${PVR}/chooser.sh
+	doexe ${FILES_DIR}/chooser.sh
 	# new display manager script
-	doexe ${FILESDIR}/${PVR}/startDM.sh
+	doexe ${FILES_DIR}/startDM.sh
 	exeinto /etc/X11/Sessions
-	for x in ${FILESDIR}/${PVR}/Sessions/*
+	for x in ${FILES_DIR}/Sessions/*
 	do
 		[ -f ${x} ] && doexe ${x}
 	done
 	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/10xfree
+	doins ${FILES_DIR}/10xfree
 	insinto /etc/X11/xinit
-	doins ${FILESDIR}/${PVR}/xinitrc
+	doins ${FILES_DIR}/xinitrc
 	exeinto /etc/X11/xdm
-	doexe ${FILESDIR}/${PVR}/Xsession ${FILESDIR}/${PVR}/Xsetup_0
+	doexe ${FILES_DIR}/Xsession ${FILES_DIR}/Xsetup_0
 	insinto /etc/X11/fs
-	newins ${FILESDIR}/${PVR}/xfs.config config
+	newins ${FILES_DIR}/xfs.config config
 	if [ -n "`use pam`" ]
 	then
 		insinto /etc/pam.d
-		newins ${FILESDIR}/${PVR}/xdm.pamd xdm
+		newins ${FILES_DIR}/xdm.pamd xdm
 		# Need to fix console permissions first
-		newins ${FILESDIR}/${PVR}/xserver.pamd xserver
+		newins ${FILES_DIR}/xserver.pamd xserver
 	fi
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/${PVR}/xdm.start xdm
-	newexe ${FILESDIR}/${PVR}/xfs.start xfs
+	newexe ${FILES_DIR}/xdm.start xdm
+	newexe ${FILES_DIR}/xfs.start xfs
 	insinto /etc/conf.d
-	newins ${FILESDIR}/${PVR}/xfs.conf.d xfs
+	newins ${FILES_DIR}/xfs.conf.d xfs
 
 	# we want libGLU.so* in /usr/lib
 	mv ${D}/usr/X11R6/lib/libGLU.* ${D}/usr/lib
diff --git a/x11-base/xfree/xfree-4.3.0-r2.ebuild b/x11-base/xfree/xfree-4.3.0-r2.ebuild
index d0842b17d0b5..c7a0b77ed558 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-2004 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.51 2004/01/13 05:25:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r2.ebuild,v 1.52 2004/01/27 11:53:57 cyfred 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 ...
@@ -113,7 +113,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="X11 MSttfEULA"
 SLOT="0"
-KEYWORDS="x86 ppc sparc ~alpha ~mips ~hppa arm"
+KEYWORDS="x86 ppc sparc ~alpha ~mips ~hppa"
 
 DEPEND=">=sys-apps/baselayout-1.8.3
 	>=sys-libs/ncurses-5.1
@@ -136,7 +136,7 @@ DEPEND=">=sys-apps/baselayout-1.8.3
 # unzip - needed for savage driver (version 1.1.27t)
 # x11-libs/xft -- blocked because of interference with xfree's
 
-PDEPEND="3dfx? ( >=media-libs/glide-v3-3.10 )"
+PDEPEND="x86? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )"
 
 PROVIDE="virtual/x11
 	virtual/opengl
diff --git a/x11-base/xfree/xfree-4.3.0-r3.ebuild b/x11-base/xfree/xfree-4.3.0-r3.ebuild
index 6b3a82c9affb..6d31cbcb130b 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-2004 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.92 2004/01/13 05:25:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.93 2004/01/27 11:53:57 cyfred 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 ...
@@ -34,6 +34,17 @@ ALLOWED_FLAGS="-fstack-protector -march -mcpu -O -O1 -O2 -O3 -pipe"
 # <azarah@gentoo.org> (13 Oct 2002)
 strip-flags
 
+# Configure for SYNAPTICS support
+if [ "${ARCH}" = "x86" ]
+then
+	if [ -z "${SYNAPTICS}" ]
+	then
+		SYNAPTICS="yes"
+	fi
+else
+	unset SYNAPTICS
+fi
+
 # Are we using a snapshot ?
 USE_SNAPSHOT="no"
 
@@ -103,7 +114,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="X11 MSttfEULA"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha mips hppa arm amd64 ia64"
+KEYWORDS="x86 ppc sparc alpha mips hppa amd64 ia64"
 
 DEPEND=">=sys-apps/baselayout-1.8.3
 	>=sys-libs/ncurses-5.1
@@ -126,7 +137,7 @@ DEPEND=">=sys-apps/baselayout-1.8.3
 # unzip - needed for savage driver (version 1.1.27t)
 # x11-libs/xft -- blocked because of interference with xfree's
 
-PDEPEND="3dfx? ( >=media-libs/glide-v3-3.10 )"
+PDEPEND="x86? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )"
 
 PROVIDE="virtual/x11
 	virtual/opengl
@@ -199,10 +210,13 @@ src_unpack() {
 	cd ${S}
 	eend 0
 
-	ebegin "Adding Synaptics touchpad driver"
-	cd ${WORKDIR}
-	unpack synaptics-${SYNDRV_VER}.tar.bz2 > /dev/null
-	eend 0
+	if [ "${SYNAPTICS}" = "yes" ]
+	then
+		ebegin "Adding Synaptics touchpad driver"
+		cd ${WORKDIR}
+		unpack synaptics-${SYNDRV_VER}.tar.bz2 > /dev/null
+		eend 0
+	fi
 	cd ${S}
 
 #	ebegin "Adding VIA driver"
@@ -568,10 +582,13 @@ src_compile() {
 		cd ${S}
 	fi
 
-	ebegin "Building Synaptics driver..."
-	cd ${SYNDIR}
-	make
-	eend 0
+	if [ "${SYNAPTICS}" = "yes" ]
+	then
+		ebegin "Building Synaptics driver..."
+		cd ${SYNDIR}
+		make
+		eend 0
+	fi
 
 }
 
@@ -888,13 +905,16 @@ src_install() {
 	insinto /usr/share/cursors/xfree/gentoo-silver/cursors
 	doins ${WORKDIR}/cursors/gentoo-silver/cursors/*
 
-	# Install Synaptics touchpad driver and docs
-	insinto /usr/X11R6/lib/modules/input
-	doins ${SYNDIR}/synaptics_drv.o
-	exeinto /usr/X11R6/bin
-	doexe ${SYNDIR}/synclient
-	docinto synaptics
-	dodoc ${SYNDIR}/{COMPATIBILITY,FEATURES,FILES,INSTALL,INSTALL.DE,LICENSE,NEWS,PARAMETER,TODO,VERSION}
+	if [ "${SYNAPTICS}" = "yes" ]
+	then
+		# Install Synaptics touchpad driver and docs
+		insinto /usr/X11R6/lib/modules/input
+		doins ${SYNDIR}/synaptics_drv.o
+		exeinto /usr/X11R6/bin
+		doexe ${SYNDIR}/synclient
+		docinto synaptics
+		dodoc ${SYNDIR}/{COMPATIBILITY,FEATURES,FILES,INSTALL,INSTALL.DE,LICENSE,NEWS,PARAMETER,TODO,VERSION}
+	fi
 }
 
 pkg_preinst() {
diff --git a/x11-base/xfree/xfree-4.3.99.16.ebuild b/x11-base/xfree/xfree-4.3.99.16.ebuild
index a4c2d0c826d1..01dbd60b324d 100644
--- a/x11-base/xfree/xfree-4.3.99.16.ebuild
+++ b/x11-base/xfree/xfree-4.3.99.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.99.16.ebuild,v 1.7 2003/12/14 10:40:00 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.99.16.ebuild,v 1.8 2004/01/27 11:53:57 cyfred 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 ...
@@ -119,8 +119,10 @@ DEPEND=">=sys-apps/baselayout-1.8.3
 # unzip - needed for savage driver (version 1.1.27t)
 # x11-libs/xft -- blocked because of interference with xfree's
 
-PDEPEND="3dfx? ( >=media-libs/glide-v3-3.10 )
-		input_devices_synaptics? ( x11-misc/synaptics )"
+PDEPEND="x86? (
+			3dfx? ( >=media-libs/glide-v3-3.10 )
+			input_devices_synaptics? ( x11-misc/synaptics )
+		)"
 
 PROVIDE="virtual/x11
 	virtual/opengl
diff --git a/x11-base/xfree/xfree-4.3.99.901.ebuild b/x11-base/xfree/xfree-4.3.99.901.ebuild
index 97270e6c0ab3..3c5bab69bdc7 100644
--- a/x11-base/xfree/xfree-4.3.99.901.ebuild
+++ b/x11-base/xfree/xfree-4.3.99.901.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.99.901.ebuild,v 1.6 2003/12/14 10:40:00 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.99.901.ebuild,v 1.7 2004/01/27 11:53:57 cyfred 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 ...
@@ -119,8 +119,10 @@ DEPEND=">=sys-apps/baselayout-1.8.3
 # unzip - needed for savage driver (version 1.1.27t)
 # x11-libs/xft -- blocked because of interference with xfree's
 
-PDEPEND="3dfx? ( >=media-libs/glide-v3-3.10 )
-		input_devices_synaptics? ( x11-misc/synaptics )"
+PDEPEND="x86? (
+			3dfx? ( >=media-libs/glide-v3-3.10 )
+			input_devices_synaptics? ( x11-misc/synaptics )
+		)"
 
 PROVIDE="virtual/x11
 	virtual/opengl
diff --git a/x11-base/xfree/xfree-4.3.99.902.ebuild b/x11-base/xfree/xfree-4.3.99.902.ebuild
index 321162ed5258..82159d822f70 100644
--- a/x11-base/xfree/xfree-4.3.99.902.ebuild
+++ b/x11-base/xfree/xfree-4.3.99.902.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.99.902.ebuild,v 1.6 2004/01/06 06:27:54 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.99.902.ebuild,v 1.7 2004/01/27 11:53:57 cyfred 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 ...
@@ -119,8 +119,10 @@ DEPEND=">=sys-apps/baselayout-1.8.3
 # unzip - needed for savage driver (version 1.1.27t)
 # x11-libs/xft -- blocked because of interference with xfree's
 
-PDEPEND="3dfx? ( >=media-libs/glide-v3-3.10 )
-		input_devices_synaptics? ( x11-misc/synaptics )"
+PDEPEND="x86? (
+			3dfx? ( >=media-libs/glide-v3-3.10 )
+			input_devices_synaptics? ( x11-misc/synaptics )
+		)"
 
 PROVIDE="virtual/x11
 	virtual/opengl