(#128448) Fix xprint (Ed Catmur). Still needs a dep added on xplsprinters when xprint is in USE, but arches haven't keyworded it yet.

Package-Manager: portage-2.1_pre9-r3

9 files changed, 360 insertions, 28 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 6098d850154b..9423ee112199 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.105 2006/04/21 09:12:50 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.106 2006/04/23 22:32:14 spyderous Exp $
+
+  23 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/xorg-server-1.0.2-Xprt-build.patch,
+  +files/1.0.2-Xprint-xprintdir.patch,
+  +files/xorg-server-1.0.2-xprint-init.patch,
+  +files/1.0.99.901-Xprint-xprintdir.patch, xorg-server-1.0.2-r3.ebuild,
+  xorg-server-1.0.99.901-r1.ebuild:
+  (#128448) Fix xprint (Ed Catmur). Still needs a dep added on xplsprinters
+  when xprint is in USE, but arches haven't keyworded it yet.
 
 *xorg-server-1.0.99.901-r1 (21 Apr 2006)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 9450c05c055b..41cca2aacd5b 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,48 +1,85 @@
-MD5 6257a30edaf31ee381265f8d8ff17718 ChangeLog 22437
-RMD160 60637c463e9f1e30d0a396ba111e7a3790354026 ChangeLog 22437
-SHA256 71b1299dc3662bcaf8ca5f684824996d50ba743ce471ba6f0e763ed09555f9c4 ChangeLog 22437
+AUX 1.0.2-Xprint-xprintdir.patch 563 RMD160 559a4330ffe34a232e7e60dc9350925801beeb9b SHA1 3565e1fc60e062d0e176e69be00afedf4b08bd0a SHA256 eec3e9eab8fa9ba6f84bd76c0048ffb48f39749f7355bd4d7d1c8423cb34fae1 size 563
+MD5 177828cd6b8ab3ce98f95bf2363d2036 files/1.0.2-Xprint-xprintdir.patch 563
+RMD160 559a4330ffe34a232e7e60dc9350925801beeb9b files/1.0.2-Xprint-xprintdir.patch 563
+SHA256 eec3e9eab8fa9ba6f84bd76c0048ffb48f39749f7355bd4d7d1c8423cb34fae1 files/1.0.2-Xprint-xprintdir.patch 563
+AUX 1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021 RMD160 5cffbd24fc7d3d817b050de268ce23e64ed83b5d SHA1 838913c520e5fa4a62a06afb9882e9117458e181 SHA256 6c32348b9c8460250b2600ae8672c5cadce4b5cca5577b9937a703afbfc57620 size 2021
 MD5 6d3ecb7a2b6736047a08447cda7f8ed6 files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
 RMD160 5cffbd24fc7d3d817b050de268ce23e64ed83b5d files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
 SHA256 6c32348b9c8460250b2600ae8672c5cadce4b5cca5577b9937a703afbfc57620 files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
+AUX 1.0.2-try-to-fix-xorgcfg.patch 3420 RMD160 1dae01b97ba89cab4209371aa6de9f92fbb9a0e0 SHA1 1487c444de9f6348e49d150a1cdb0517569030ab SHA256 65193968dffac2127626ef9e05aa8da9ec32d39703e4c3530e89bab059dfed74 size 3420
 MD5 bf743bd4e1b1c3a6b3d3122f48f8f6a7 files/1.0.2-try-to-fix-xorgcfg.patch 3420
 RMD160 1dae01b97ba89cab4209371aa6de9f92fbb9a0e0 files/1.0.2-try-to-fix-xorgcfg.patch 3420
 SHA256 65193968dffac2127626ef9e05aa8da9ec32d39703e4c3530e89bab059dfed74 files/1.0.2-try-to-fix-xorgcfg.patch 3420
+AUX 1.0.99.901-Xprint-xprintdir.patch 447 RMD160 7728ad1173bb6e8fcb73ddcfc3ef29f93cdde4f3 SHA1 387df8c7669b525fc7b041ce7574324680dbce48 SHA256 4dcd1bcebfccf0b51956ea6f30bae2f0f9b7b1f62e215d16b63ef19b7433d955 size 447
+MD5 e4ab51b8df81d9a3be044112dff3736f files/1.0.99.901-Xprint-xprintdir.patch 447
+RMD160 7728ad1173bb6e8fcb73ddcfc3ef29f93cdde4f3 files/1.0.99.901-Xprint-xprintdir.patch 447
+SHA256 4dcd1bcebfccf0b51956ea6f30bae2f0f9b7b1f62e215d16b63ef19b7433d955 files/1.0.99.901-Xprint-xprintdir.patch 447
+AUX 1.0.99.901-fix-kdrive-build.patch 738 RMD160 23fa3168f9610e13a07465ddec67dac9dbc9de11 SHA1 934d042e6d28cbd29ab881b5aaaa48e2a37e44e2 SHA256 3adde5d55c785fadfae0791fbb673479077f836d0d75bdeddc81020fc317836a size 738
 MD5 c76ebf90ba7cf5fd217465b1868ef0b0 files/1.0.99.901-fix-kdrive-build.patch 738
 RMD160 23fa3168f9610e13a07465ddec67dac9dbc9de11 files/1.0.99.901-fix-kdrive-build.patch 738
 SHA256 3adde5d55c785fadfae0791fbb673479077f836d0d75bdeddc81020fc317836a files/1.0.99.901-fix-kdrive-build.patch 738
+AUX 1.0.99.901-wrap-sdk-headers.patch 914 RMD160 285b01e2b818ccea777a0129341b038be3aeed44 SHA1 6f0f9feb9b69939116aff2789aba8d03c6f87f5d SHA256 6912b4a3207ac7b66b53d1f685ea50c430005e1c5cbfc8f9e0e161eddf3892a7 size 914
 MD5 118c7a490303b1de014605d94d7700b9 files/1.0.99.901-wrap-sdk-headers.patch 914
 RMD160 285b01e2b818ccea777a0129341b038be3aeed44 files/1.0.99.901-wrap-sdk-headers.patch 914
 SHA256 6912b4a3207ac7b66b53d1f685ea50c430005e1c5cbfc8f9e0e161eddf3892a7 files/1.0.99.901-wrap-sdk-headers.patch 914
-MD5 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r3 771
-RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r3 771
-SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r3 771
-MD5 35cf82436f552d3077d2bf7db5258ff9 files/digest-xorg-server-1.0.99.901-r1 515
-RMD160 7b0015585596fe2e1ab85b3a8a51662a92eaed69 files/digest-xorg-server-1.0.99.901-r1 515
-SHA256 b4209c7a80d882cc5c256ced8527eb7c8c4a873b920fb051699e1dda54e0d0b6 files/digest-xorg-server-1.0.99.901-r1 515
+AUX xorg-server-1.0.2-64bit-fix-for-glx.patch 414 RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 SHA1 3464a0f714810d36da11424103550e604f93b22f SHA256 1b2337fa0438c72fc8a17d710133f79ed17d49650efd9bc530bbb97b116427c4 size 414
 MD5 900d8194df467de2c86276d446522062 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
 RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
 SHA256 1b2337fa0438c72fc8a17d710133f79ed17d49650efd9bc530bbb97b116427c4 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
+AUX xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663 RMD160 ce0868d46d92431db41d474a77fea184f6a61682 SHA1 08db11a8a841415496f5ff8ef8a21b1425d392cd SHA256 3535e137595623f7f5f23b0a8ee8b52d4d5acf7b6dfb534dff5f537e68603c6b size 663
 MD5 1b8b160cdbeaf3a2994f50e83d9fa8d7 files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663
 RMD160 ce0868d46d92431db41d474a77fea184f6a61682 files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663
 SHA256 3535e137595623f7f5f23b0a8ee8b52d4d5acf7b6dfb534dff5f537e68603c6b files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663
+AUX xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766 RMD160 595ccef38810f2ec5056999ba1f5ce8f22b29bd0 SHA1 49def422c5b5189dde7581ac295aac1f510bc14d SHA256 1bceddffeacbf67202b2aff6dba27234746b37004a186415560a4cd8896458f1 size 766
 MD5 8fa71f7fa2e17a2ccd41532909b153a8 files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766
 RMD160 595ccef38810f2ec5056999ba1f5ce8f22b29bd0 files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766
 SHA256 1bceddffeacbf67202b2aff6dba27234746b37004a186415560a4cd8896458f1 files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766
+AUX xorg-server-1.0.2-Sbus.patch 2388 RMD160 f9757cbfed84e0e873f706e7a33ac04216b7dd72 SHA1 b2f5ca6d167d885282a44cdf700ac51043a92043 SHA256 5e3255a38216599ddd7e3b108eb96c53a9c1d595ceee80ac3c698e1d0af7811e size 2388
 MD5 912a66d58d73ad9c95c1c7d40c71f679 files/xorg-server-1.0.2-Sbus.patch 2388
 RMD160 f9757cbfed84e0e873f706e7a33ac04216b7dd72 files/xorg-server-1.0.2-Sbus.patch 2388
 SHA256 5e3255a38216599ddd7e3b108eb96c53a9c1d595ceee80ac3c698e1d0af7811e files/xorg-server-1.0.2-Sbus.patch 2388
+AUX xorg-server-1.0.2-Xprt-build.patch 7747 RMD160 ab0e209f517f7e501f473cf8043c8224f0307366 SHA1 2da85693520d1f787d4ee9e3bd52f14261adee9b SHA256 06f275c528e1decac56245c3ad50638fec5fdfe765040c02d3218c1c99210c73 size 7747
+MD5 fb7fc524e87b10dd3cb506c3398741cf files/xorg-server-1.0.2-Xprt-build.patch 7747
+RMD160 ab0e209f517f7e501f473cf8043c8224f0307366 files/xorg-server-1.0.2-Xprt-build.patch 7747
+SHA256 06f275c528e1decac56245c3ad50638fec5fdfe765040c02d3218c1c99210c73 files/xorg-server-1.0.2-Xprt-build.patch 7747
+AUX xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062 RMD160 ba444145faf16e3bf4e31e07053df064bc07be7f SHA1 957e201d1095ef4cc4ec1c87736897d37c0103d7 SHA256 220bafc2023ef45413713d9463c4f593c5bc390a3bba009b0a20989fd8d3b05b size 1062
 MD5 39d2b9cdc89d0882a414d621cb496982 files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062
 RMD160 ba444145faf16e3bf4e31e07053df064bc07be7f files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062
 SHA256 220bafc2023ef45413713d9463c4f593c5bc390a3bba009b0a20989fd8d3b05b files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062
+AUX xorg-server-1.0.2-xprint-init.patch 417 RMD160 e29f58581c421724adf09f1df3e991092f89a017 SHA1 7d2a4eb212cc770cc22a496df2696a0bca1f7774 SHA256 89c8e2253b374b2152908dd4514a19ff302b753d6a7c8be272999ad192edc905 size 417
+MD5 5106c724275e86950e5f4c88913198a1 files/xorg-server-1.0.2-xprint-init.patch 417
+RMD160 e29f58581c421724adf09f1df3e991092f89a017 files/xorg-server-1.0.2-xprint-init.patch 417
+SHA256 89c8e2253b374b2152908dd4514a19ff302b753d6a7c8be272999ad192edc905 files/xorg-server-1.0.2-xprint-init.patch 417
+AUX xprint.init 598 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e SHA1 1590a29e11f813bb1353b4cc815708e97bfbb96b SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13 size 598
 MD5 9bf4e36931c99f405aa6766ff5614e51 files/xprint.init 598
 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e files/xprint.init 598
 SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13 files/xprint.init 598
+DIST 1.0.2-overlay-window.patch.bz2 6388 RMD160 f1223f88da72461585ff72e5cc3c0e15cd9a1306 SHA256 99653c8f59a3d3dd2bd6979e4a52cfb81a32dd3d8bead0bd06274bad57823a67 size 6388
+DIST MesaLib-6.4.2.tar.bz2 2913009 RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86 size 2913009
+DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd size 3062363
+DIST xorg-server-1.0.2.tar.bz2 6006486 RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba size 6006486
+DIST xorg-server-1.0.99.901.tar.bz2 1730071 RMD160 bbb285c986c84bd0179e7f30bceeeeeba6ba4762 SHA256 84935ba1a6cac96199f5d07655957a340a7ed327ad9b90ce7090a0c6e4bd709b size 1730071
+EBUILD xorg-server-1.0.2-r3.ebuild 5676 RMD160 bd3d7175771e0301511bdb18f8ff2dc61b7e0d74 SHA1 c22b9c76db8a9fd0b372bff65425362c72de80c0 SHA256 01652c5b184d6dae6ed4121e53c126fc174d8ef42dd19e391308e438208fdc5c size 5676
+MD5 af32676eaa7ddc9861e6d36e14eb4620 xorg-server-1.0.2-r3.ebuild 5676
+RMD160 bd3d7175771e0301511bdb18f8ff2dc61b7e0d74 xorg-server-1.0.2-r3.ebuild 5676
+SHA256 01652c5b184d6dae6ed4121e53c126fc174d8ef42dd19e391308e438208fdc5c xorg-server-1.0.2-r3.ebuild 5676
+EBUILD xorg-server-1.0.99.901-r1.ebuild 7843 RMD160 f02d888f38602dcb3d31f9663663a3f9ac6debae SHA1 c541d85733ed0dab8b0e9a3f5ba42248fd56b420 SHA256 bf6c87079a2fa44abe9fbbedb8473767ea6bc22e098b47a5904e57ad58f0b1cb size 7843
+MD5 a9a364c5c040eee99811aaebf75be274 xorg-server-1.0.99.901-r1.ebuild 7843
+RMD160 f02d888f38602dcb3d31f9663663a3f9ac6debae xorg-server-1.0.99.901-r1.ebuild 7843
+SHA256 bf6c87079a2fa44abe9fbbedb8473767ea6bc22e098b47a5904e57ad58f0b1cb xorg-server-1.0.99.901-r1.ebuild 7843
+MISC ChangeLog 22870 RMD160 75f9131ae9afb86b5842163560d906e6ab967113 SHA1 fd23908f23004588c45f4425754307a896258482 SHA256 0bebcb66a1dcb5387d01cbf008e45875c42101c7159d805641b210f8cc45dfd2 size 22870
+MD5 754c41b33be7e5522a4be5e6093157ea ChangeLog 22870
+RMD160 75f9131ae9afb86b5842163560d906e6ab967113 ChangeLog 22870
+SHA256 0bebcb66a1dcb5387d01cbf008e45875c42101c7159d805641b210f8cc45dfd2 ChangeLog 22870
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 size 156
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 58e86230b7323561aab974f5f5dbba00 xorg-server-1.0.2-r3.ebuild 5559
-RMD160 cbcba899a37174e4a5af894352afbe90843a1038 xorg-server-1.0.2-r3.ebuild 5559
-SHA256 ef205bb8b076e9bc5f03236939959a81e0b7c0a3b144fca40f5b623f39fb86c1 xorg-server-1.0.2-r3.ebuild 5559
-MD5 749e3983b6a449007f30a15a6a22c27f xorg-server-1.0.99.901-r1.ebuild 7749
-RMD160 16db0acc7bed294d033dfb11f808ef10027edc64 xorg-server-1.0.99.901-r1.ebuild 7749
-SHA256 bfbbfc69a5f0735c9b4ff9cd87a351d622d56b7a48084146b18553ea56596b60 xorg-server-1.0.99.901-r1.ebuild 7749
+MD5 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r3 771
+RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r3 771
+SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r3 771
+size 771 files/digest-xorg-server-1.0.2-r3 771
+MD5 a1cda8162c9124423c6bca90cb0b36bd files/digest-xorg-server-1.0.99.901-r1 515
+RMD160 45dd2bfc816565c45c459338bcffe0af834c81fc files/digest-xorg-server-1.0.99.901-r1 515
+SHA256 75074ce6677ebb5fc5ec2557ce0e6fe33f76858dd8758ae1bbf1acbf1def7923 files/digest-xorg-server-1.0.99.901-r1 515
+size 515 files/digest-xorg-server-1.0.99.901-r1 515
diff --git a/x11-base/xorg-server/files/1.0.2-Xprint-xprintdir.patch b/x11-base/xorg-server/files/1.0.2-Xprint-xprintdir.patch
new file mode 100644
index 000000000000..0992565fc943
--- /dev/null
+++ b/x11-base/xorg-server/files/1.0.2-Xprint-xprintdir.patch
@@ -0,0 +1,12 @@
+diff -urN xorg-server-1.0.2.orig/Xprint/Makefile.am xorg-server-1.0.2/Xprint/Makefile.am
+--- xorg-server-1.0.2.orig/Xprint/Makefile.am	2006-04-23 14:26:07.000000000 -0700
++++ xorg-server-1.0.2/Xprint/Makefile.am	2006-04-23 14:26:23.000000000 -0700
+@@ -4,7 +4,7 @@
+ 
+ Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
+ 	-DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
+-	-DXPRINTDIR=\"$(prefix)/lib/X11/xserver\"    \
++	-DXPRINTDIR=\"$(libdir)/X11/xserver\"    \
+ 	-DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
+ 
+ Xprt_LDFLAGS = -L$(top_srcdir)
diff --git a/x11-base/xorg-server/files/1.0.99.901-Xprint-xprintdir.patch b/x11-base/xorg-server/files/1.0.99.901-Xprint-xprintdir.patch
new file mode 100644
index 000000000000..5a91db4572fe
--- /dev/null
+++ b/x11-base/xorg-server/files/1.0.99.901-Xprint-xprintdir.patch
@@ -0,0 +1,11 @@
+--- xserver/xorg/Xprint/Makefile.am	2006/04/21 13:38:39	1.1
++++ xserver/xorg/Xprint/Makefile.am	2006/04/21 13:38:52
+@@ -4,7 +4,7 @@ bin_PROGRAMS = Xprt
+ 
+ Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
+ 	-DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
+-	-DXPRINTDIR=\"$(prefix)/X11/xserver\"    \
++	-DXPRINTDIR=\"$(libdir)/X11/xserver\"    \
+ 	-DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
+ 
+ Xprt_LDFLAGS = -L$(top_srcdir)
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.99.901-r1 b/x11-base/xorg-server/files/digest-xorg-server-1.0.99.901-r1
index bf488330ebe8..170ec42ff655 100644
--- a/x11-base/xorg-server/files/digest-xorg-server-1.0.99.901-r1
+++ b/x11-base/xorg-server/files/digest-xorg-server-1.0.99.901-r1
@@ -1,6 +1,6 @@
 MD5 61beda590bfc5b4a12e979d5f2d70d7a MesaLib-6.5.tar.bz2 3062363
 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd MesaLib-6.5.tar.bz2 3062363
 SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd MesaLib-6.5.tar.bz2 3062363
-MD5 9100da4b892b8f8bf741db7ac371476e xorg-server-1.0.99.901.tar.bz2 6317980
-RMD160 7824f82b876d207ba5363f02e6dde1d0ec40e407 xorg-server-1.0.99.901.tar.bz2 6317980
-SHA256 c0d029ebf35bc1f1039a2ac57e97958857c5bda86bc9792164cdc08815259898 xorg-server-1.0.99.901.tar.bz2 6317980
+MD5 fd6c43bf6ca416cb11b3c40a0be33a9b xorg-server-1.0.99.901.tar.bz2 1730071
+RMD160 bbb285c986c84bd0179e7f30bceeeeeba6ba4762 xorg-server-1.0.99.901.tar.bz2 1730071
+SHA256 84935ba1a6cac96199f5d07655957a340a7ed327ad9b90ce7090a0c6e4bd709b xorg-server-1.0.99.901.tar.bz2 1730071
diff --git a/x11-base/xorg-server/files/xorg-server-1.0.2-Xprt-build.patch b/x11-base/xorg-server/files/xorg-server-1.0.2-Xprt-build.patch
new file mode 100644
index 000000000000..85f9db0f97ea
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.0.2-Xprt-build.patch
@@ -0,0 +1,241 @@
+Index: configure.ac
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
+retrieving revision 1.157
+diff -u -r1.157 configure.ac
+--- configure.ac	30 Dec 2005 12:05:47 -0000	1.157
++++ configure.ac	6 Jan 2006 16:05:21 -0000
+@@ -1632,6 +1632,7 @@
+ Xprint/Makefile
+ Xprint/doc/Makefile
+ Xprint/pcl/Makefile
++Xprint/pcl-mono/Makefile
+ Xprint/raster/Makefile
+ Xprint/ps/Makefile
+ Xprint/etc/Makefile
+Index: Xprint/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/Xprint/Makefile.am,v
+retrieving revision 1.6
+diff -u -r1.6 Makefile.am
+--- Xprint/Makefile.am	2 Dec 2005 06:02:38 -0000	1.6
++++ Xprint/Makefile.am	6 Jan 2006 16:05:22 -0000
+@@ -1,13 +1,17 @@
+-SUBDIRS = doc pcl raster ps etc
++SUBDIRS = doc pcl pcl-mono raster ps etc
+ 
+ bin_PROGRAMS = Xprt
+ 
+ Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
+-	-DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
+-	-DXPRINTDIR=\"$(prefix)/X11/xserver\"  
++	-DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
++	-DXPRINTDIR=\"$(prefix)/lib/X11/xserver\"    \
++	-DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
+ 
+ Xprt_LDFLAGS = -L$(top_srcdir)
+-Xprt_LDADD = @XPRINT_LIBS@ pcl/libpcl.la raster/libraster.la
++Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la  \
++	pcl/libpcl.la pcl-mono/libpcl.la  \
++	../mfb/libmfb.la ../mi/libmi.la  \
++	../cfb32/libcfb32.la ../cfb/libcfb.la ../Xext/libXext.la
+ 
+ miinitext-wrapper.c:
+ 	echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@
+Index: Xprint/ddxInit.c
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/Xprint/ddxInit.c,v
+retrieving revision 1.7
+diff -u -r1.7 ddxInit.c
+--- Xprint/ddxInit.c	3 Jul 2005 07:01:09 -0000	1.7
++++ Xprint/ddxInit.c	6 Jan 2006 16:05:22 -0000
+@@ -85,6 +85,11 @@
+ 
+     pScreenInfo->numPixmapFormats = 0; /* get them in PrinterInitOutput */
+     screenInfo.numVideoScreens = 0;
++    
++#ifdef PRINT_ONLY_SERVER
++    PrinterInitOutput(pScreenInfo, argc, argv);
++#endif
++
+ }
+ 
+ static void
+Index: Xprint/pcl/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/Xprint/pcl/Makefile.am,v
+retrieving revision 1.3
+diff -u -r1.3 Makefile.am
+--- Xprint/pcl/Makefile.am	2 Dec 2005 06:02:38 -0000	1.3
++++ Xprint/pcl/Makefile.am	6 Jan 2006 16:05:22 -0000
+@@ -1,31 +1,6 @@
+ noinst_LTLIBRARIES = libpcl.la
+ 
+-INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
++PCL_DRIVER = -DXP_PCL_COLOR
+ 
+-AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
+-	-D_XP_PRINT_SERVER_ -DPSZ=8
++include ../pcl/Makefile.am.inc
+ 
+-libpcl_la_SOURCES =		\
+-	PclArc.c		\
+-	PclArea.c		\
+-	PclAttr.c		\
+-	PclAttVal.c		\
+-	PclColor.c		\
+-	PclCursor.c		\
+-	PclDef.h		\
+-	PclFonts.c		\
+-	PclGC.c			\
+-	Pcl.h			\
+-	PclInit.c		\
+-	PclLine.c		\
+-	Pclmap.h		\
+-	PclMisc.c		\
+-	PclPixel.c		\
+-	PclPixmap.c		\
+-	PclPolygon.c		\
+-	PclPrint.c		\
+-	PclSFonts.c		\
+-	PclSFonts.h		\
+-	PclSpans.c		\
+-	PclText.c		\
+-	PclWindow.c
+Index: cfb/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/cfb/Makefile.am,v
+retrieving revision 1.7
+diff -u -r1.7 Makefile.am
+--- cfb/Makefile.am	2 Dec 2005 06:02:39 -0000	1.7
++++ cfb/Makefile.am	6 Jan 2006 16:05:22 -0000
+@@ -9,7 +9,7 @@
+ 
+ libcfb_la_LIBADD = ../mfb/libmfb.la
+ 
+-AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
++AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+ 
+ INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
+ 
+Index: cfb/Makefile.am.inc
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/cfb/Makefile.am.inc,v
+retrieving revision 1.2
+diff -u -r1.2 Makefile.am.inc
+--- cfb/Makefile.am.inc	21 Sep 2005 00:24:10 -0000	1.2
++++ cfb/Makefile.am.inc	6 Jan 2006 16:05:22 -0000
+@@ -138,3 +138,16 @@
+ cfbglrop8.c:
+ 	echo "#define GLYPHROP" > $@
+ 	echo "#include \"$(top_srcdir)/cfb/cfbglblt8.c\"" >> $@
++
++
++if XPRINT
++
++PLATFORMDEFS = -DXFREE86
++
++cfb8bit.c:   compiler.h
++
++compiler.h:
++	echo "#include \"$(top_srcdir)/hw/xfree86/common/compiler.h\"" >> $@
++
++endif
++
+Index: cfb16/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/cfb16/Makefile.am,v
+retrieving revision 1.4
+diff -u -r1.4 Makefile.am
+--- cfb16/Makefile.am	2 Dec 2005 06:02:39 -0000	1.4
++++ cfb16/Makefile.am	6 Jan 2006 16:05:22 -0000
+@@ -6,4 +6,4 @@
+ 
+ INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
+ 
+-AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
++AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+Index: cfb24/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/cfb24/Makefile.am,v
+retrieving revision 1.4
+diff -u -r1.4 Makefile.am
+--- cfb24/Makefile.am	2 Dec 2005 06:02:39 -0000	1.4
++++ cfb24/Makefile.am	6 Jan 2006 16:05:22 -0000
+@@ -6,6 +6,6 @@
+ 
+ EXTRA_DIST = cfbrrop24.h
+ 
+-AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
++AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+ 
+ INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
+Index: cfb32/Makefile.am
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/cfb32/Makefile.am,v
+retrieving revision 1.4
+diff -u -r1.4 Makefile.am
+--- cfb32/Makefile.am	2 Dec 2005 06:02:39 -0000	1.4
++++ cfb32/Makefile.am	6 Jan 2006 16:05:22 -0000
+@@ -6,4 +6,4 @@
+ 
+ INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support
+ 
+-AM_CFLAGS = -DPSZ=32 @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
++AM_CFLAGS = -DPSZ=32  $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+Index: mi/miinitext.c
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/mi/miinitext.c,v
+retrieving revision 1.28
+diff -u -r1.28 miinitext.c
+--- mi/miinitext.c	29 Dec 2005 00:19:33 -0000	1.28
++++ mi/miinitext.c	6 Jan 2006 16:05:27 -0000
+@@ -250,7 +250,7 @@
+ #include <X11/extensions/lbxstr.h>
+ #endif
+ #ifdef XPRINT
+-#include "Print.h"
++#include <X11/extensions/Print.h>
+ #endif
+ #ifdef XAPPGROUP
+ #define _XAG_SERVER_
+--- Xprint/pcl-mono/Makefile.am	2006/04/13 22:11:44	1.1
++++ Xprint/pcl-mono/Makefile.am	2006/04/13 22:11:49
+@@ -0,0 +1,5 @@
++noinst_LTLIBRARIES = libpcl.la
++
++PCL_DRIVER = -DXP_PCL_MONO
++
++include ../pcl/Makefile.am.inc
+--- Xprint/pcl/Makefile.am.inc	2006/04/13 22:11:44     1.1
++++ Xprint/pcl/Makefile.am.inc	2006/04/13 22:11:49
+@@ -0,0 +1,29 @@
++INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
++ 
++AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
++	-D_XP_PRINT_SERVER_ -DPSZ=8 $(PCL_DRIVER)
++ 
++libpcl_la_SOURCES =		\
++	$(srcdir)/../pcl/PclArc.c	\
++	$(srcdir)/../pcl/PclArea.c	\
++	$(srcdir)/../pcl/PclAttr.c	\
++	$(srcdir)/../pcl/PclAttVal.c	\
++	$(srcdir)/../pcl/PclColor.c	\
++	$(srcdir)/../pcl/PclCursor.c	\
++	$(srcdir)/../pcl/PclDef.h	\
++	$(srcdir)/../pcl/PclFonts.c	\
++	$(srcdir)/../pcl/PclGC.c	\
++	$(srcdir)/../pcl/Pcl.h		\
++	$(srcdir)/../pcl/PclInit.c	\
++	$(srcdir)/../pcl/PclLine.c	\
++	$(srcdir)/../pcl/Pclmap.h	\
++	$(srcdir)/../pcl/PclMisc.c	\
++	$(srcdir)/../pcl/PclPixel.c	\
++	$(srcdir)/../pcl/PclPixmap.c	\
++	$(srcdir)/../pcl/PclPolygon.c	\
++	$(srcdir)/../pcl/PclPrint.c	\
++	$(srcdir)/../pcl/PclSFonts.c	\
++	$(srcdir)/../pcl/PclSFonts.h	\
++	$(srcdir)/../pcl/PclSpans.c	\
++	$(srcdir)/../pcl/PclText.c	\
++	$(srcdir)/../pcl/PclWindow.c
diff --git a/x11-base/xorg-server/files/xorg-server-1.0.2-xprint-init.patch b/x11-base/xorg-server/files/xorg-server-1.0.2-xprint-init.patch
new file mode 100644
index 000000000000..a4783abbeca1
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.0.2-xprint-init.patch
@@ -0,0 +1,15 @@
+--- Xprint/etc/init.d/Makefile.am	2006/04/14 04:47:28	1.1
++++ Xprint/etc/init.d/Makefile.am	2006/04/14 05:26:42
+@@ -1 +1,12 @@
++include $(top_srcdir)/cpprules.in
++
++noinst_PRE = xprint
++BUILT_SOURCES = $(noinst_PRE)
++CLEANFILES = $(noinst_PRE) xprint.pre
++
++CPP_FILES_FLAGS = -DProjectRoot='"$(PROJECTROOT)"' -DOS_LINUX
++
++xprint.pre: xprint.cpp
++	$(SED) -e 's/^\(\s\+\)#/\1XCOMM/' $< > $@
++
+ EXTRA_DIST = xprint.cpp
diff --git a/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild b/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild
index da72b69283a5..47d8c5c09cc0 100644
--- a/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild,v 1.4 2006/04/17 23:27:06 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild,v 1.5 2006/04/23 22:32:14 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
-#SNAPSHOT="yes"
+SNAPSHOT="yes"
 
 inherit flag-o-matic x-modular multilib
 
@@ -20,6 +20,9 @@ PATCHES="${FILESDIR}/${P}-Sbus.patch
 	${FILESDIR}/${P}-64bit-fix-indirect-vertex-array.patch
 	${FILESDIR}/${P}-64bit-fix-have-dix-config.patch
 	${FILESDIR}/${P}-64bit-fix-for-glx.patch
+	${FILESDIR}/${P}-Xprt-build.patch
+	${FILESDIR}/${P}-xprint-init.patch
+	${FILESDIR}/${PV}-Xprint-xprintdir.patch
 	${FILESDIR}/${PV}-try-to-fix-xorgcfg.patch
 	${FILESDIR}/${PV}-fix-xorgconfig-rgbpath-and-mouse.patch
 	${DISTDIR}/${PV}-overlay-window.patch.bz2"
@@ -170,9 +173,10 @@ switch_opengl_implem() {
 xprint_src_install() {
 	# RH-style init script, we provide a wrapper
 	exeinto /usr/$(get_libdir)/misc
-	# Actually a shell script, someone messed up
-	newexe ${S}/Xprint/etc/init.d/xprint.cpp xprint
-	sed -e 's/XCOMM/#/' -i ${D}/usr/$(get_libdir)/misc/xprint
+	doexe ${S}/Xprint/etc/init.d/xprint
+	# Patch init script for fonts location
+	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
+		-i ${D}/usr/$(get_libdir)/misc/xprint
 	# Install the wrapper
 	newinitd ${FILESDIR}/xprint.init xprint
 	# Install profile scripts
diff --git a/x11-base/xorg-server/xorg-server-1.0.99.901-r1.ebuild b/x11-base/xorg-server/xorg-server-1.0.99.901-r1.ebuild
index b2da1fcaf0de..d15f88e130aa 100644
--- a/x11-base/xorg-server/xorg-server-1.0.99.901-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.0.99.901-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.99.901-r1.ebuild,v 1.1 2006/04/21 09:12:50 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.99.901-r1.ebuild,v 1.2 2006/04/23 22:32:14 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
@@ -16,6 +16,8 @@ MESA_P="${MESA_PN}-${MESA_PV}"
 MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
 
 PATCHES="${FILESDIR}/${PN}-1.0.2-Sbus.patch
+	${FILESDIR}/${PN}-1.0.2-xprint-init.patch
+	${FILESDIR}/${PV}-Xprint-xprintdir.patch
 	${FILESDIR}/1.0.2-try-to-fix-xorgcfg.patch
 	${FILESDIR}/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch
 	${FILESDIR}/${PV}-fix-kdrive-build.patch
@@ -258,9 +260,10 @@ switch_opengl_implem() {
 xprint_src_install() {
 	# RH-style init script, we provide a wrapper
 	exeinto /usr/$(get_libdir)/misc
-	# Actually a shell script, someone messed up
-	newexe ${S}/Xprint/etc/init.d/xprint.cpp xprint
-	sed -e 's/XCOMM/#/' -i ${D}/usr/$(get_libdir)/misc/xprint
+	doexe ${S}/Xprint/etc/init.d/xprint
+	# Patch init script for fonts location
+	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
+		-i ${D}/usr/$(get_libdir)/misc/xprint
 	# Install the wrapper
 	newinitd ${FILESDIR}/xprint.init xprint
 	# Install profile scripts