[x11-base/xorg-server] Add for patching.

54 files changed, 5588 insertions, 0 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
new file mode 100644
index 0000000..4d0a858
--- /dev/null
+++ b/x11-base/xorg-server/ChangeLog
@@ -0,0 +1,2302 @@
+# ChangeLog for x11-base/xorg-server
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.399 2009/05/10 22:18:05 remi Exp $
+
+  10 May 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.5.3-r5.ebuild,
+  xorg-server-1.5.3-r6.ebuild:
+  add x11-apps/xkbcomp to RDEPEND, fixes bug #265480
+
+*xorg-server-1.5.3-r6 (07 May 2009)
+
+  07 May 2009; Rémi Cardona <remi@gentoo.org> +xorg-server-1.5.3-r6.ebuild:
+  rewrite the complete git history in the patchball, add more patches from
+  upstream's 1.5 branch, add 2 patches to fix a cross-compile bug (see bug
+  #263679)
+
+  05 May 2009; Rémi Cardona <remi@gentoo.org>
+  xorg-server-1.3.0.0-r6.ebuild:
+  drop x11-misc/xkbdata support (see bug #196650)
+
+  05 May 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.4.2.ebuild,
+  xorg-server-1.5.3-r4.ebuild, xorg-server-1.5.3-r5.ebuild:
+  hard-disable dtrace support (fixes bug #263274)
+
+  16 Apr 2009; Jeroen Roovers <jer@gentoo.org> xorg-server-1.5.3-r5.ebuild:
+  Stable for HPPA (bug #251832).
+
+  16 Apr 2009; Gordon Malm <gengor@gentoo.org> xorg-server-1.4.2.ebuild,
+  xorg-server-1.5.3-r4.ebuild, xorg-server-1.5.3-r5.ebuild:
+  Filter SSP when building with <GCC4 on x86 only, bug #244352
+
+  15 Apr 2009; Gordon Malm <gengor@gentoo.org> xorg-server-1.4.2.ebuild,
+  xorg-server-1.5.3-r4.ebuild, xorg-server-1.5.3-r5.ebuild:
+  Filter SSP when building with <GCC4, bug #244352
+
+  15 Apr 2009; Raúl Porcel <armin76@gentoo.org>
+  xorg-server-1.5.3-r5.ebuild:
+  ia64/sh stable wrt #251832
+
+  07 Apr 2009; Rémi Cardona <remi@gentoo.org> -xorg-server-1.5.2.ebuild,
+  -xorg-server-1.5.3.ebuild, -xorg-server-1.5.3-r1.ebuild,
+  -xorg-server-1.5.3-r2.ebuild, -xorg-server-1.5.3-r3.ebuild:
+  prune older versions
+
+  06 Apr 2009; Friedrich Oslage <bluebird@gentoo.org>
+  xorg-server-1.5.3-r5.ebuild:
+  Stable on sparc, bug #251832
+
+  05 Apr 2009; Markus Meier <maekke@gentoo.org> xorg-server-1.5.3-r5.ebuild:
+  x86 stable, bug #251832
+
+  05 Apr 2009; Olivier Crête <tester@gentoo.org>
+  xorg-server-1.5.3-r5.ebuild:
+  Stable on amd64, bug #251832
+
+  03 Apr 2009; Brent Baude <ranger@gentoo.org> xorg-server-1.5.3-r5.ebuild:
+  Marking xorg-server-1.5.3-r5 ppc64 stable for bug 251832
+
+  03 Apr 2009; Brent Baude <ranger@gentoo.org> xorg-server-1.5.3-r5.ebuild:
+  Marking xorg-server-1.5.3-r5 ppc stable for bug 251832
+
+  19 Mar 2009; <solar@gentoo.org> xorg-server-1.5.3-r5.ebuild:
+  - tie in the libXCalibrate to wrap up xtscal support when tslib is enabled
+
+*xorg-server-1.5.3-r5 (16 Mar 2009)
+
+  16 Mar 2009; Rémi Cardona <remi@gentoo.org> +xorg-server-1.5.3-r5.ebuild:
+  backport patches to fix useless freetype error message (bug #261934) and
+  to always put the console into RAW mode (evdev related, bug #260700)
+
+  12 Mar 2009; Raúl Porcel <armin76@gentoo.org>
+  xorg-server-1.5.3-r4.ebuild:
+  Add ~arm/~sh
+
+*xorg-server-1.5.3-r4 (11 Mar 2009)
+
+  11 Mar 2009; Rémi Cardona <remi@gentoo.org> +xorg-server-1.5.3-r4.ebuild:
+  add a patch to fix xfs (bug #236847), remove unsupported video cards (bug
+  #261799)
+
+  11 Mar 2009; Markus Ullmann <jokey@gentoo.org>
+  xorg-server-1.5.3-r3.ebuild:
+  Add virtualbox use_expand for bug #238848
+
+*xorg-server-1.5.3-r3 (07 Mar 2009)
+
+  07 Mar 2009; Rémi Cardona <remi@gentoo.org> +xorg-server-1.5.3-r3.ebuild:
+  add patches to allow building with libXfont 1.4
+
+  02 Mar 2009; Peter Volkov <pva@gentoo.org> xorg-server-1.5.3-r2.ebuild:
+  newport works on mips, no need to block with it.
+
+  23 Feb 2009; Joshua Kinard <kumba@gentoo.org> xorg-server-1.5.3-r2.ebuild:
+  Added ~mips to KEYWORDS for #237411
+
+  19 Feb 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.5.3-r2.ebuild:
+  drop liblbxutil dep, there are no references to it in the sources
+
+*xorg-server-1.5.3-r2 (05 Feb 2009)
+
+  05 Feb 2009; Rémi Cardona <remi@gentoo.org> +xorg-server-1.5.3-r2.ebuild:
+  bump to patchset 4 which fixes a screensaver bug, a xinerama bug (bug
+  #18668) and hopefully bitmap fonts as well (bugs #257206 and #255082),
+  drop --with-default-font-path as 'built-ins' is always appended internally
+  (patch #60)
+
+  25 Jan 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.5.3-r1.ebuild:
+  silently update the patch-ball to 03 to fix bug #19691
+
+*xorg-server-1.5.3-r1 (13 Jan 2009)
+
+  13 Jan 2009; Rémi Cardona <remi@gentoo.org> +xorg-server-1.5.3-r1.ebuild:
+  include patches from upstream's server-1.5-branch and backport more EXA
+  fixes (including one for bug #251242)
+
+  16 Dec 2008; Brent Baude <ranger@gentoo.org> xorg-server-1.5.3.ebuild:
+  Marking xorg-server-1.5.3 ~ppc64 for bug 237411
+
+  16 Dec 2008; Jeroen Roovers <jer@gentoo.org> xorg-server-1.5.3.ebuild:
+  Marked ~hppa (bug #237411).
+
+  15 Dec 2008; Rémi Cardona <remi@gentoo.org> xorg-server-1.5.3.ebuild:
+  bump xkeyboard-config dep to 1.4, first version to provide the evdev
+  ruleset (thanks to Sven Köhler)
+
+*xorg-server-1.5.3 (15 Dec 2008)
+
+  15 Dec 2008; Rémi Cardona <remi@gentoo.org>
+  +files/1.5.3-builtin-fonts.patch, +xorg-server-1.5.3.ebuild:
+  bump to 1.5.3 with a monster EXA backport from git master
+
+  13 Dec 2008; Doug Goldstein <cardoe@gentoo.org> xorg-server-1.4.2.ebuild,
+  xorg-server-1.5.2.ebuild:
+  each nvidia-drivers pkg now specifies what Xorg version it's compatible
+  with. Just pull in the best nvidia-drivers version possible now.
+
+  19 Nov 2008; Luca Barbato <lu_zero@gentoo.org> xorg-server-1.5.2.ebuild:
+  ati-drivers now support xorg 1.5
+
+  02 Nov 2008; Ryan Hill <dirtyepic@gentoo.org> metadata.xml:
+  Tweak tslib flag descrip.
+
+  01 Nov 2008; <solar@gentoo.org> metadata.xml, xorg-server-1.4.2.ebuild,
+  xorg-server-1.5.2.ebuild:
+  - add local tslib support
+
+  26 Oct 2008; Rémi Cardona <remi@gentoo.org>
+  +files/1.5.2-fix-xvesa-with-new-kernels.patch, xorg-server-1.5.2.ebuild:
+  add patch to fix KDrive's Xvesa build (fixes bug #235789)
+
+  22 Oct 2008; Rémi Cardona <remi@gentoo.org>
+  xorg-server-1.3.0.0-r6.ebuild, xorg-server-1.4.2.ebuild,
+  xorg-server-1.5.2.ebuild:
+  pkgmove from xf86-video-i810 to xf86-video-intel
+
+  21 Oct 2008; Rémi Cardona <remi@gentoo.org> xorg-server-1.5.2.ebuild:
+  patch has been sent upstream, updating ebuild to reflect that
+
+  18 Oct 2008; Rémi Cardona <remi@gentoo.org>
+  -files/1.5.2-force-LANG-C-when-running-awk-due-to-unintended-erro.patch,
+  +files/1.5.2-force-LC_ALL-C-when-running-awk.patch,
+  xorg-server-1.5.2.ebuild:
+  another patch to fix bug #237119
+
+  17 Oct 2008; Rémi Cardona <remi@gentoo.org>
+  +files/1.5.2-force-LANG-C-when-running-awk-due-to-unintended-erro.patch,
+  xorg-server-1.5.2.ebuild:
+  add patch to fix build issue with some locales (see bug #237119)
+
+  14 Oct 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  -xorg-server-1.3.0.0-r4.ebuild, -xorg-server-1.3.0.0-r5.ebuild,
+  xorg-server-1.3.0.0-r6.ebuild, -xorg-server-1.4.0.90-r3.ebuild,
+  -xorg-server-1.4.99.902.ebuild, -xorg-server-1.4.99.905.ebuild,
+  -xorg-server-1.4.99.906.ebuild, -xorg-server-1.5.0.ebuild,
+  -xorg-server-1.5.1.ebuild:
+  Clean up old ebuilds.
+
+  14 Oct 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.5.2.ebuild:
+  Update a few dependencies. Require at least evdev 2.0.6, mutouch 1.2.1,
+  xtrans 1.2.2.
+
+*xorg-server-1.5.2 (14 Oct 2008)
+
+  14 Oct 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xorg-server-1.5.2.ebuild:
+  Version bump.
+
+  03 Oct 2008; Raúl Porcel <armin76@gentoo.org> xorg-server-1.5.1.ebuild:
+  Add ~ia64 wrt #237411
+
+*xorg-server-1.5.1 (29 Sep 2008)
+
+  29 Sep 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.5.1/0001-only-build-dri2-when-DRI2-is-enabled.patch,
+  +xorg-server-1.5.1.ebuild:
+  (#238841) Version bump. (#236900) Re-enable XTrap and Record extensions
+  except when USE=minimal.
+
+  24 Sep 2008; Alexis Ballier <aballier@gentoo.org>
+  xorg-server-1.5.0.ebuild:
+  keyword ~x86-fbsd
+
+  23 Sep 2008; Markus Rothe <corsair@gentoo.org> xorg-server-1.5.0.ebuild:
+  Added ~ppc
+
+  15 Sep 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.5.0.ebuild:
+  (#237411) Add VIDEO_CARDS=ast to IUSE.
+
+  14 Sep 2008; Friedrich Oslage <bluebird@gentoo.org>
+  xorg-server-1.5.0.ebuild:
+  Add ~sparc keyword, bug #237411
+
+  07 Sep 2008; Carsten Lohrke <carlo@gentoo.org> metadata.xml:
+  Fix a typo.
+
+  06 Sep 2008; <chainsaw@gentoo.org> xorg-server-1.5.0.ebuild:
+  Only depend on x11-drivers/xf86-input-synaptics as the older package does
+  not build against this new server. Closes bug #236870 by Seemant Kulleen
+  <seemant_g2@kulleen.org>.
+
+*xorg-server-1.5.0 (06 Sep 2008)
+
+  06 Sep 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xorg-server-1.5.0.ebuild:
+  Version bump.
+
+  05 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
+  add GLEP 56 USE flag desc from use.local.desc
+
+*xorg-server-1.4.99.906 (26 Jul 2008)
+
+  26 Jul 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xorg-server-1.4.99.906.ebuild:
+  Bump, keyword ~x86.
+
+  05 Jul 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4.99.905.ebuild:
+  Update dependencies to the new versions I bumped yesterday.
+
+*xorg-server-1.4.99.905 (01 Jul 2008)
+
+  01 Jul 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xorg-server-1.4.99.905.ebuild:
+  Bump to the latest RC.
+
+  27 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/1.4.2-unbreak-endianess.patch, xorg-server-1.4.2.ebuild:
+  (#227821) Remove patch because ati 6.9 driver appears to work fine without
+  it and breaks with it. If anyone wants to revert this, please discuss it
+  on the bug in advance.
+
+  27 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4.2.ebuild, xorg-server-1.4.99.902.ebuild:
+  Update deps related to xf86-video-ati split out of mach64/r128 drivers.
+  Pull in the latest versions of each.
+
+  24 Jun 2008; <chainsaw@gentoo.org> xorg-server-1.4.99.902.ebuild:
+  As of 173.14.09 we can stop blocking the nVidia proprietary drivers for
+  the 1.5 pre-release. Closes bug #226151 by Chris Gianelloni
+  <wolf31o2@gentoo.org>.
+
+  17 Jun 2008; Hanno Boeck <hanno@gentoo.org> xorg-server-1.4.99.902.ebuild:
+  Lower pixman dep, pixman 0.11 has many issues.
+
+  15 Jun 2008; Jeroen Roovers <jer@gentoo.org>
+  xorg-server-1.3.0.0-r6.ebuild:
+  Stable for HPPA (bug #225419).
+
+  15 Jun 2008; Luca Barbato <lu_zero@gentoo.org>
+  +files/1.4.2-unbreak-endianess.patch, xorg-server-1.4.2.ebuild:
+  Make xorg-server build again on ppc
+
+  13 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4.2.ebuild:
+  void driver must be at least 1.1.1.
+
+  13 Jun 2008; Steve Dibb <beandog@gentoo.org>
+  xorg-server-1.3.0.0-r6.ebuild:
+  amd64 stable, bug 225419
+
+  13 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  xorg-server-1.3.0.0-r6.ebuild:
+  ppc stable, bug #225419
+
+  11 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/1.4.0.90/0004-Config-D-Bus-Don-t-leak-timers.patch,
+  -files/1.4.0.90/0006-OS-Don-t-leak-connection-translation-table-on-regen.p
+  atch, -files/1.4.0.90/0012-Xephyr-One-time-keyboard-leak-fix.patch,
+  -files/1.4.0.90/0002-bgPixel-unsigned-long-is-64-bit-on-x86_64-so-1.patch,
+  -files/1.4.0.90/0013-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.pa
+  tch,
+  -files/1.4.0.90/0005-Config-HAL-Don-t-leak-options-on-failure-to-add-de.pa
+  tch,
+  -files/1.4.0.90/0018-Fix-for-CVE-2007-5958-File-existence-disclosure.patch
+  ,
+  -files/1.4.0.90/0007-KDrive-Xephyr-Don-t-leak-screen-damage-structure.patc
+  h,
+  -files/1.4.0.90/0015-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.pa
+  tch,
+  -files/1.4.0.90/0014-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.pa
+  tch,
+  -files/1.4.0.90/0019-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.pa
+  tch,
+  -files/1.4.0.90/0016-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.pa
+  tch,
+  -files/1.4.0.90/0017-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.pa
+  tch,
+  -files/1.4.0.90/0040-Bug-10324-dix-Add-scaling-of-X-and-Y-on-the-repo.patc
+  h,
+  -files/1.4.0.90/0001-Bug-13308-Verify-and-reject-obviously-broken-modes.pa
+  tch, -files/1.4.0.90/0003-Xprint-Clean-up-generated-files.patch,
+  -files/1.4.0.90/0008-Input-Don-t-reinit-devices.patch,
+  -files/1.4.0.90/0009-include-never-overwrite-realInputProc-with-enqueueI.p
+  atch, -files/1.4.0.90/0010-OS-IO-Zero-out-client-buffers.patch,
+  -files/1.4.0.90/0011-XKB-XkbCopyKeymap-Don-t-leak-all-the-sections.patch,
+  -files/1.4.0.90/0020-dix-set-the-correct-number-of-valuators-in-valuator.p
+  atch,
+  -files/1.4.0.90/0041-dix-Skip-call-to-clipAxis-for-relative-core-events.pa
+  tch,
+  -files/1.4.0.90/0021-xkb-don-t-update-LEDs-if-they-don-t-exist.-Bug-13.pat
+  ch,
+  -files/1.4.0.90/0042-dix-Move-motion-history-update-until-after-screen-c.p
+  atch,
+  -files/1.4.0.90/0022-security-Fix-for-Bug-14480-untrusted-access-broke.pat
+  ch,
+  -files/1.4.0.90/0023-Resize-composite-overlay-window-when-the-root-window.
+  patch,
+  -files/1.4.0.90/0024-Fix-rotation-for-multi-monitor-situation.patch,
+  -files/1.4.0.90/0025-Don-t-break-grab-and-focus-state-for-a-window-when-r.
+  patch, -files/1.4.0.90/0043-XKB-Actually-explain-keymap-failures.patch,
+  -files/1.4.0.90/0026-CVE-2007-6429-Always-test-for-size-offset-wrapping.pa
+  tch,
+  -files/1.4.0.90/0027-Fix-context-sharing-between-direct-indirect-contexts.
+  patch,
+  -files/1.4.0.90/0028-Add-some-more-support-for-DragonFly.-From-Joerg-Sonn.
+  patch, -files/1.4.0.90/0029-configure.ac-DragonFly-BSD-support.patch,
+  -files/1.4.0.90/0044-kdrive-allow-disabling-Composite.patch,
+  -files/1.4.0.90/0030-Fixed-configure.ac-for-autoconf-2.62.patch,
+  -files/1.4.0.90/0031-EXA-Fix-off-by-one-in-polyline-drawing.patch,
+  -files/1.4.0.90/0032-XKB-Fix-processInputProc-wrapping.patch,
+  -files/1.4.0.90/0045-When-XKB-fails-to-open-rules-file-log-the-file-name.p
+  atch,
+  -files/1.4.0.90/0033-xfree86-fix-AlwaysCore-handling.-Bug-14256.patch,
+  -files/1.4.0.90/0034-Ignore-not-just-block-SIGALRM-around-Popen-Pcl.patch,
+  -files/1.4.0.90/0035-Fix-build-on-FreeBSD-after-Popen-changes.patch,
+  -files/1.4.0.90/0036-So-like-checking-return-codes-of-system-calls-sig.pat
+  ch,
+  -files/1.4.0.90/0037-Check-for-sys-sdt.h-as-well-when-determining-to-en.pa
+  tch,
+  -files/1.4.0.90/0038-dix-Always-add-valuator-information-if-present.patch,
+  -files/1.4.0.90/0046-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.pa
+  tch,
+  -files/1.4.0.90/0039-Bug-10324-dix-Allow-arbitrary-value-ranges-in-Ge.patc
+  h, -files/1.4.0.90/0047-dmx-link-in-XSERVER_LIBS.patch,
+  -files/1.4.0.90/0048-xephyr-fix-linking-by-adding-pixman-and-using-XSERV.p
+  atch,
+  -files/1.4.0.90/0049-xprint-fix-build-by-adding-New-Delete-InputDeviceR.pa
+  tch,
+  -files/1.4.0.90/0050-xprint-fix-linking-by-including-XSERVER_LIBS.patch,
+  -files/1.4.0.90/0051-Fix-RandR-1.2-driver-interface-conversion-of-two-col.
+  patch,
+  -files/1.4.0.90/0052-Fix-overly-restrictive-integer-overflow-check-in-EXA.
+  patch, -files/1.4.0.90/0053-Fix-hal-shutdown-crash.patch,
+  -files/1.4.0.90/0054-Bump-DEFAULT_DPI-to-96.patch,
+  -files/1.4.0.90/0055-Bug-13962-Re-arm-the-DPMS-timer-when-re-enabling-D.pa
+  tch,
+  -files/1.4.0.90/0056-Prevent-the-wm-command-line-option-from-causing-a-S.p
+  atch,
+  -files/1.4.0.90/0057-EXA-Skip-empty-glyphs.-cherry-picked-from-commit-c.pa
+  tch,
+  -files/1.4.0.90/0058-xf86-Add-AutoConfig-driver-for-PCI-ID-1022-2081-to.pa
+  tch,
+  -files/1.4.0.90/0059-xkb-when-copying-the-keymap-make-sure-the-structs.pat
+  ch, -xorg-server-1.4.0.90-r4.ebuild:
+  This had pretty much the same patches that are in 1.4.2.
+
+  11 Jun 2008; Brent Baude <ranger@gentoo.org>
+  xorg-server-1.3.0.0-r6.ebuild:
+  Marking xorg-server-1.3.0.0-r6 ppc64 for bug 225419
+
+  11 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.3.0.0-r6.ebuild:
+  (#225419) Tested for stable on the bug.
+
+*xorg-server-1.4.2 (11 Jun 2008)
+*xorg-server-1.3.0.0-r6 (11 Jun 2008)
+
+  11 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/xorg-xserver-1.4-cve-2008-1377.diff,
+  +files/xorg-xserver-1.4-cve-2008-2360.diff,
+  +files/xorg-xserver-1.4-cve-2008-1379.diff,
+  +files/xorg-xserver-1.4-cve-2008-2361.diff,
+  +files/xorg-xserver-1.4-cve-2008-2362.diff,
+  +xorg-server-1.3.0.0-r6.ebuild, +xorg-server-1.4.2.ebuild:
+  (#225419) Security bump. Local root vulnerability, or must be already
+  authenticated to access X remotely (via xauth, xhost, etc.). The 1.4.x
+  series bump also contains large quantities of other bugfixes and will be a
+  stable candidate in 30 days.
+
+*xorg-server-1.4.99.902 (10 Jun 2008)
+
+  10 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xorg-server-1.4.99.902.ebuild:
+  Bump to 1.5 RC. Dropped keywords because of the move to libpciaccess. I'm
+  almost positive it's broken on alpha
+  <https://bugs.freedesktop.org/show_bug.cgi?id=15169>. Other less
+  mainstream architectures also need testing and filing of bugs at
+  bugs.freedesktop.org in the xorg product.
+
+  21 May 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4.0.90-r3.ebuild, xorg-server-1.4.0.90-r4.ebuild:
+  (#222683) Make sure libxf86config gets built PIC by always setting
+  SNAPSHOT=yes.
+
+  19 May 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/1.4.0.90/0038-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.pa
+  tch, -files/1.4.0.90/0039-dmx-link-in-XSERVER_LIBS.patch,
+  -files/1.4.0.90/0040-xephyr-fix-linking-by-adding-pixman-and-using-XSERV.p
+  atch,
+  -files/1.4.0.90/0041-xprint-fix-build-by-adding-New-Delete-InputDeviceR.pa
+  tch,
+  -files/1.4.0.90/0042-xprint-fix-linking-by-including-XSERVER_LIBS.patch,
+  -files/1.4.0.90/0043-Fix-RandR-1.2-driver-interface-conversion-of-two-col.
+  patch,
+  -files/1.4.0.90/0044-Fix-overly-restrictive-integer-overflow-check-in-EXA.
+  patch, +files/1.4.0.90/0044-kdrive-allow-disabling-Composite.patch,
+  +files/1.4.0.90/0045-When-XKB-fails-to-open-rules-file-log-the-file-name.p
+  atch,
+  +files/1.4.0.90/0046-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.pa
+  tch, +files/1.4.0.90/0047-dmx-link-in-XSERVER_LIBS.patch,
+  +files/1.4.0.90/0048-xephyr-fix-linking-by-adding-pixman-and-using-XSERV.p
+  atch,
+  +files/1.4.0.90/0049-xprint-fix-build-by-adding-New-Delete-InputDeviceR.pa
+  tch,
+  +files/1.4.0.90/0050-xprint-fix-linking-by-including-XSERVER_LIBS.patch,
+  +files/1.4.0.90/0051-Fix-RandR-1.2-driver-interface-conversion-of-two-col.
+  patch,
+  +files/1.4.0.90/0052-Fix-overly-restrictive-integer-overflow-check-in-EXA.
+  patch, +files/1.4.0.90/0053-Fix-hal-shutdown-crash.patch,
+  +files/1.4.0.90/0054-Bump-DEFAULT_DPI-to-96.patch,
+  +files/1.4.0.90/0055-Bug-13962-Re-arm-the-DPMS-timer-when-re-enabling-D.pa
+  tch,
+  +files/1.4.0.90/0056-Prevent-the-wm-command-line-option-from-causing-a-S.p
+  atch,
+  +files/1.4.0.90/0057-EXA-Skip-empty-glyphs.-cherry-picked-from-commit-c.pa
+  tch,
+  +files/1.4.0.90/0058-xf86-Add-AutoConfig-driver-for-PCI-ID-1022-2081-to.pa
+  tch,
+  +files/1.4.0.90/0059-xkb-when-copying-the-keymap-make-sure-the-structs.pat
+  ch:
+  Update 1.4.0.90 patches to latest in server-1.4-branch, which incorporates
+  all the Gentoo build/link fixes.
+
+  10 May 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.4.0.90/0038-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.pa
+  tch, +files/1.4.0.90/0039-dmx-link-in-XSERVER_LIBS.patch,
+  +files/1.4.0.90/0040-xephyr-fix-linking-by-adding-pixman-and-using-XSERV.p
+  atch,
+  +files/1.4.0.90/0041-xprint-fix-build-by-adding-New-Delete-InputDeviceR.pa
+  tch,
+  +files/1.4.0.90/0043-Fix-RandR-1.2-driver-interface-conversion-of-two-col.
+  patch,
+  +files/1.4.0.90/0042-xprint-fix-linking-by-including-XSERVER_LIBS.patch,
+  +files/1.4.0.90/0044-Fix-overly-restrictive-integer-overflow-check-in-EXA.
+  patch, xorg-server-1.4.0.90-r4.ebuild:
+  Add patches in my 'server-1.4-branch-gentoo' branch that I've submitted
+  upstream and am waiting for them to take.
+
+  09 May 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4.0.90-r4.ebuild:
+  (#214233) Require wacom 0.7.9 or newer to fix crashes on startup.
+
+  09 May 2008; Mart Raudsepp <leio@gentoo.org>
+  xorg-server-1.4.0.90-r3.ebuild, xorg-server-1.4.0.90-r4.ebuild:
+  Adapt with xf86-video-amd to xf86-video-geode move.
+
+*xorg-server-1.4.0.90-r4 (08 May 2008)
+
+  08 May 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.4.0.90/0004-Config-D-Bus-Don-t-leak-timers.patch,
+  +files/1.4.0.90/0006-OS-Don-t-leak-connection-translation-table-on-regen.p
+  atch, +files/1.4.0.90/0012-Xephyr-One-time-keyboard-leak-fix.patch,
+  +files/1.4.0.90/0002-bgPixel-unsigned-long-is-64-bit-on-x86_64-so-1.patch,
+  +files/1.4.0.90/0013-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.pa
+  tch,
+  +files/1.4.0.90/0005-Config-HAL-Don-t-leak-options-on-failure-to-add-de.pa
+  tch,
+  +files/1.4.0.90/0018-Fix-for-CVE-2007-5958-File-existence-disclosure.patch
+  ,
+  +files/1.4.0.90/0007-KDrive-Xephyr-Don-t-leak-screen-damage-structure.patc
+  h,
+  +files/1.4.0.90/0015-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.pa
+  tch,
+  +files/1.4.0.90/0001-Bug-13308-Verify-and-reject-obviously-broken-modes.pa
+  tch, +files/1.4.0.90/0003-Xprint-Clean-up-generated-files.patch,
+  +files/1.4.0.90/0008-Input-Don-t-reinit-devices.patch,
+  +files/1.4.0.90/0009-include-never-overwrite-realInputProc-with-enqueueI.p
+  atch, +files/1.4.0.90/0010-OS-IO-Zero-out-client-buffers.patch,
+  +files/1.4.0.90/0011-XKB-XkbCopyKeymap-Don-t-leak-all-the-sections.patch,
+  +files/1.4.0.90/0042-dix-Move-motion-history-update-until-after-screen-c.p
+  atch,
+  +files/1.4.0.90/0014-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.pa
+  tch,
+  +files/1.4.0.90/0019-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.pa
+  tch,
+  +files/1.4.0.90/0016-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.pa
+  tch, +files/1.4.0.90/0043-XKB-Actually-explain-keymap-failures.patch,
+  +files/1.4.0.90/0017-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.pa
+  tch,
+  +files/1.4.0.90/0040-Bug-10324-dix-Add-scaling-of-X-and-Y-on-the-repo.patc
+  h,
+  +files/1.4.0.90/0020-dix-set-the-correct-number-of-valuators-in-valuator.p
+  atch,
+  +files/1.4.0.90/0041-dix-Skip-call-to-clipAxis-for-relative-core-events.pa
+  tch,
+  +files/1.4.0.90/0021-xkb-don-t-update-LEDs-if-they-don-t-exist.-Bug-13.pat
+  ch,
+  +files/1.4.0.90/0022-security-Fix-for-Bug-14480-untrusted-access-broke.pat
+  ch,
+  +files/1.4.0.90/0023-Resize-composite-overlay-window-when-the-root-window.
+  patch,
+  +files/1.4.0.90/0024-Fix-rotation-for-multi-monitor-situation.patch,
+  +files/1.4.0.90/0025-Don-t-break-grab-and-focus-state-for-a-window-when-r.
+  patch,
+  +files/1.4.0.90/0026-CVE-2007-6429-Always-test-for-size-offset-wrapping.pa
+  tch,
+  +files/1.4.0.90/0027-Fix-context-sharing-between-direct-indirect-contexts.
+  patch,
+  +files/1.4.0.90/0028-Add-some-more-support-for-DragonFly.-From-Joerg-Sonn.
+  patch, +files/1.4.0.90/0029-configure.ac-DragonFly-BSD-support.patch,
+  +files/1.4.0.90/0030-Fixed-configure.ac-for-autoconf-2.62.patch,
+  +files/1.4.0.90/0031-EXA-Fix-off-by-one-in-polyline-drawing.patch,
+  +files/1.4.0.90/0032-XKB-Fix-processInputProc-wrapping.patch,
+  +files/1.4.0.90/0033-xfree86-fix-AlwaysCore-handling.-Bug-14256.patch,
+  +files/1.4.0.90/0034-Ignore-not-just-block-SIGALRM-around-Popen-Pcl.patch,
+  +files/1.4.0.90/0035-Fix-build-on-FreeBSD-after-Popen-changes.patch,
+  +files/1.4.0.90/0036-So-like-checking-return-codes-of-system-calls-sig.pat
+  ch,
+  +files/1.4.0.90/0037-Check-for-sys-sdt.h-as-well-when-determining-to-en.pa
+  tch,
+  +files/1.4.0.90/0038-dix-Always-add-valuator-information-if-present.patch,
+  +files/1.4.0.90/0039-Bug-10324-dix-Allow-arbitrary-value-ranges-in-Ge.patc
+  h, +xorg-server-1.4.0.90-r4.ebuild:
+  Add an unkeyworded new revision with tons of fixes from upstream's 1.4
+  branch. More patches may be coming soon, and rekeywording is pending on
+  that. I expect this to be a candidate for stable.
+
+  07 May 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.3.0.0-r5.ebuild, xorg-server-1.4.0.90-r3.ebuild:
+  (#213288) Fix xprint build by requiring printproto =1.0.3.
+
+  25 Apr 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  -xorg-server-1.3.0.0-r2.ebuild, -xorg-server-1.4.0.90-r2.ebuild:
+  Clean up a little. Still waiting on arm/sh stabilization in 1.3.0.0-r5 for
+  -r4 to get removed.
+
+  25 Apr 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.3.0.0-r5.ebuild:
+  (#219159) Add autotools patch here as well.
+
+  18 Apr 2008; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch,
+  xorg-server-1.4.0.90-r3.ebuild:
+  Add patch to fix building against newer autotools.  Fixes bug #217128.
+
+  10 Apr 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.3.0.0-r5.ebuild, xorg-server-1.4.0.90-r3.ebuild:
+  Switch from via to openchrome for VIDEO_CARDS=via to mirror upstream xorg
+  switch.
+
+  10 Mar 2008; Bo Ørsted Andresen <zlin@gentoo.org>
+  xorg-server-1.4.0.90-r2.ebuild, xorg-server-1.4.0.90-r3.ebuild:
+  Remove print_installed(). Bug #211588.
+
+  11 Feb 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  xorg-server-1.3.0.0-r5.ebuild:
+  Marked stable on amd64 as per security bug 208343.
+
+  09 Feb 2008; Raúl Porcel <armin76@gentoo.org>
+  xorg-server-1.3.0.0-r5.ebuild:
+  alpha/ia64/sparc stable wrt security #208343
+
+  02 Feb 2008; Jeroen Roovers <jer@gentoo.org>
+  xorg-server-1.3.0.0-r5.ebuild:
+  Stable for HPPA (bug #208343).
+
+  02 Feb 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  xorg-server-1.3.0.0-r5.ebuild:
+  ppc stable, bug #208343
+
+  02 Feb 2008; Brent Baude <ranger@gentoo.org>
+  xorg-server-1.3.0.0-r5.ebuild:
+  Marking xorg-server-1.3.0.0-r5 ppc64 for bug 208343
+
+  02 Feb 2008; Markus Meier <maekke@gentoo.org>
+  xorg-server-1.3.0.0-r5.ebuild:
+  x86 stable, security bug #208343
+
+*xorg-server-1.4.0.90-r3 (01 Feb 2008)
+*xorg-server-1.3.0.0-r5 (01 Feb 2008)
+
+  01 Feb 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch,
+  +files/1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch
+  , +xorg-server-1.3.0.0-r5.ebuild, +xorg-server-1.4.0.90-r3.ebuild:
+  (#208343) Another security bump, with two fixes. CVE-2007-6429: The old fix
+  for the MIT_SHM patch failed to check for the security issue in all cases.
+  CVE-2007-3920: The second fix is primarily for compiz users. There was a
+  patch in compiz for this but it was again an incomplete fix, because it
+  assumed the problem could only be caused by a specifically named executable.
+
+  18 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.3.0.0-r4.ebuild:
+  Restore keywords, since repoman wouldn't let me commit stable.
+
+*xorg-server-1.4.0.90-r2 (18 Jan 2008)
+*xorg-server-1.3.0.0-r4 (18 Jan 2008)
+
+  18 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch,
+  -xorg-server-1.3.0.0-r3.ebuild, +xorg-server-1.3.0.0-r4.ebuild,
+  -xorg-server-1.4.0.90-r1.ebuild, +xorg-server-1.4.0.90-r2.ebuild:
+  (#206490, #204362) Fix major regression in the MIT-SHM patch of the security
+  bump that prevented many applications (but apparently none that any distro
+  developers use, since this slipped by every distro) from running.
+
+  17 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/1.2.0-server-damage-version.patch,
+  -files/xorg-xserver-1.2.0-xcmisc.diff,
+  -files/1.2.0-server-randr-version.patch, -files/1.2.0-client-leak.patch,
+  -xorg-server-1.2.0-r3.ebuild, -xorg-server-1.3.0.0.ebuild,
+  -xorg-server-1.3.0.0-r1.ebuild, -xorg-server-1.4-r2.ebuild,
+  -xorg-server-1.4.0.90.ebuild:
+  Security cleanup. Still waiting on mips/sh/arm to stable 1.3.0.0-r3 before I
+  can pull -r2.
+
+  17 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.3.0.0-r3.ebuild:
+  Add stable keywords from testing on the security bug.
+
+*xorg-server-1.3.0.0-r3 (17 Jan 2008)
+
+  17 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch,
+  +files/1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch,
+  +xorg-server-1.3.0.0-r3.ebuild:
+  Here's the 1.3 version of those security bumps.
+
+*xorg-server-1.4.0.90-r1 (17 Jan 2008)
+
+  17 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.4-0001-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch,
+  +files/1.4-0002-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch,
+  +files/1.4-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch,
+  +files/1.4-0004-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch,
+  +files/1.4-0005-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch,
+  +files/1.4-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch,
+  +xorg-server-1.4.0.90-r1.ebuild:
+  (#204362) Security bump. Bump for 1.3 series coming in a couple hours.
+
+  16 Dec 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4.0.90.ebuild:
+  Don't print output of pushd/popd (Mike Frysinger).
+
+*xorg-server-1.4.0.90 (14 Dec 2007)
+
+  14 Dec 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.4.0.90-clean-generated-files.patch,
+  +files/1.4-dont-hang-openoffice.patch,
+  +files/1.4-fix-kdrive-automake.patch, +xorg-server-1.4.0.90.ebuild:
+  Bump to 1.4.1 release candidate. It's gotta be an improvement over 1.4, 
+  so i'm letting it go into ~arch.
+  
+  (#192221) 'xorg-server-1.4 - keyboard LEDs do not work' fixed upstream.
+  
+  (#201047) 'xorg-server 1.4 no longer loads xmodmap via xinitrc properly' 
+  fixed upstream.
+  
+  (#197104) 'xorg-server-1.3 and 1.4 consumes 100% CPU, locking the 
+  keyboard, apparently triggered by opening an OpenOffice pulldown menu' 
+  fixed with patch from master branch.
+  
+  (#196019) 'xorg-server creates unnecessary file 
+  /etc/X11/X11/Xsession.d/92xprint-xpserverlist' fixed by not installing 
+  the same file twice to 2 different places (Andy Crook).
+  
+  (#195886) 'xorg-server-1.4.0-r2 built with hal USE flag crashes on 
+  shutdown if dbus service is not running' fixed upstream.
+  
+  (#195551) 'xorg-server-1.4 fails to build w/kdrive on amd64' fixed with 
+  Makefile.am patch designed for easier sed but unsuitable for upstream 
+  because the line gets too long (Michael Gorse).
+  
+  (#194503) Don't spit versions when showing drivers to rebuild via qlist, 
+  and also provide a command for people to do it themselves later.
+
+  30 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4-r2.ebuild:
+  (#200731) Forgot to remove the blocker for ati-drivers (Sascha Beck).
+
+  29 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4-r2.ebuild:
+  Re-add binary ATI/AMD driver support for 8.433 and newer (Jory Pratt).
+
+  20 Nov 2007; Joshua Kinard <kumba@gentoo.org>
+  xorg-server-1.3.0.0-r2.ebuild:
+  Stable on mips, per #198525.
+
+  14 Nov 2007; Jeroen Roovers <jer@gentoo.org>
+  xorg-server-1.3.0.0-r2.ebuild:
+  Stable for HPPA (bug #198525).
+
+  09 Nov 2007; nixnut <nixnut@gentoo.org> xorg-server-1.3.0.0-r2.ebuild:
+  Stable on ppc wrt bug 198525
+
+  09 Nov 2007; Raúl Porcel <armin76@gentoo.org>
+  xorg-server-1.3.0.0-r2.ebuild:
+  alpha/ia64 stable wrt #198525
+
+  09 Nov 2007; Ferris McCormick <fmccor@gentoo.org>
+  xorg-server-1.3.0.0-r2.ebuild:
+  Sparc stable --- Bug #198525
+
+  09 Nov 2007; Markus Rothe <corsair@gentoo.org>
+  xorg-server-1.3.0.0-r2.ebuild:
+  Stable on ppc64; bug #198525
+
+  09 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.3.0.0-r2.ebuild:
+  (#198525) Stable on amd64, tested by hparker, approved by kingtaco.
+
+  09 Nov 2007; Dawid Węgliński <cla@gentoo.org>
+  xorg-server-1.3.0.0-r2.ebuild:
+  Stable on x86
+
+  07 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.3.0.0-fix-xkb-openoffice-hangs.patch,
+  xorg-server-1.3.0.0-r2.ebuild:
+  (#197104) Fix a 100% CPU hang on openoffice. (#196019) Don't create a
+  redundant file with USE=xprint.
+
+  05 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.2.0-r3.ebuild, xorg-server-1.3.0.0.ebuild,
+  xorg-server-1.3.0.0-r1.ebuild:
+  Require older libXrender here too (backport from 1.3.0.0-r2) (Martin MOKREJŠ).
+
+  29 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4-r2.ebuild:
+  (#197154, fd.o #12982) xorg-server thinks net-dialup/dtrace is Solaris
+  dtrace, thus dying during the build (Chad Simmons). Add a blocker for now,
+  until we have an upstream fix.
+
+  14 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4-r2.ebuild:
+  (#194503) Try adding some output to print the actual drivers that need to be
+  rebuilt. Use qlist from portage-utils, equery from gentoolkit, epm, and fall
+  back to internal portage best_version if all else fails.
+
+*xorg-server-1.3.0.0-r2 (13 Oct 2007)
+
+  13 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.3.0.0-fix-dual-head-screen-resolutions.patch,
+  +files/1.3.0.0-fix-randr-resizing.patch,
+  +files/1.3.0.0-fix-xephyr-amd64-segfault.patch,
+  +files/1.3.0.0-ramdac.patch, +xorg-server-1.3.0.0-r2.ebuild:
+  (#183721) Fix resizing with RandR. (#179545) Use correct screen resolutions
+  when there's multiple screens. (#191709) Require older libXrender too.
+  (#192312) Export ramdac symbols, so e.g. xf86-video-s3 compiles. (#193207)
+  Fix Xephyr segfault on amd64. (#194026) Set XKB output directory so this
+  works with xkeyboard-config 1.1.
+
+  09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  -xorg-server-1.4-r1.ebuild:
+  Clean out a broken ebuild.
+
+  09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.2.0-r3.ebuild, xorg-server-1.3.0.0.ebuild,
+  xorg-server-1.3.0.0-r1.ebuild, xorg-server-1.4-r1.ebuild:
+  Fix quoting issues caught by latest repoman.
+
+  02 Oct 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  xorg-server-1.3.0.0-r1.ebuild:
+  Stable on amd64 wrt bug #191964.
+
+  02 Oct 2007; Jeroen Roovers <jer@gentoo.org>
+  xorg-server-1.3.0.0-r1.ebuild:
+  Stable for HPPA (bug #191964).
+
+  01 Oct 2007; Doug Goldstein <cardoe@gentoo.org> xorg-server-1.4-r1.ebuild,
+  xorg-server-1.4-r2.ebuild:
+  add new nvidia-drivers to depend list support
+
+  01 Oct 2007; Raúl Porcel <armin76@gentoo.org>
+  xorg-server-1.3.0.0-r1.ebuild:
+  alpha/ia64/sparc stable wrt #191964
+
+  01 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4-r2.ebuild:
+  Fix variable quoting caught by my repoman patch.
+
+*xorg-server-1.4-r2 (01 Oct 2007)
+
+  01 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.4-ia64.patch, +xorg-server-1.4-r2.ebuild:
+  (#194026) Fix many keyboard-related issues, particularly special keys, by
+  setting the XKB output directory to one that actually exists -- /var/lib/xkb
+  -- instead of /usr/share/X11/xkb/compiled (illusion). (#193978) Fix build on
+  ia64 (Raúl Porcel). (#193735) Another xprint fix, to the init script this
+  time (Andy Crook).
+
+  01 Oct 2007; Joshua Kinard <kumba@gentoo.org>
+  xorg-server-1.3.0.0-r1.ebuild:
+  Stable on mips, per #191964.
+
+  30 Sep 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  xorg-server-1.3.0.0-r1.ebuild:
+  ppc stable, bug #191964
+
+  30 Sep 2007; Markus Rothe <corsair@gentoo.org>
+  xorg-server-1.3.0.0-r1.ebuild:
+  Stable on ppc64; bug #191964
+
+  30 Sep 2007; Markus Meier <maekke@gentoo.org>
+  xorg-server-1.3.0.0-r1.ebuild:
+  x86 stable, security bug #191964
+
+*xorg-server-1.3.0.0-r1 (30 Sep 2007)
+
+  30 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/use-composite-for-unequal-depths.patch,
+  +xorg-server-1.3.0.0-r1.ebuild:
+  (#191964) Security bump for local exploit in the Composite extension, which
+  is disabled by default.
+
+  28 Sep 2007; Joshua Kinard <kumba@gentoo.org> xorg-server-1.3.0.0.ebuild:
+  Stable on mips, per #191615.
+
+  19 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4-r1.ebuild:
+  Restore Nvidia binary driver support with today's release.
+
+  14 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4-r1.ebuild:
+  Require latest versions of some input drivers for compat with the new input
+  stuff.
+
+  11 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  -xorg-server-1.4.ebuild:
+  Drop a broken ebuild.
+
+  10 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4-r1.ebuild:
+  More minimal versions for 7.3 and even earlier releases.
+
+  10 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4-r1.ebuild:
+  Add minimal version dependencies for X.Org 7.3 release. Also remove blocker
+  on old keyboard drivers, because the minimal 1.2 dependency when
+  INPUT_DEVICES=keyboard should be good enough.
+
+*xorg-server-1.4-r1 (10 Sep 2007)
+
+  10 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xorg-server-1.4-r1.ebuild:
+  (#191822) Try to avoid a fatal DBUS-related error at startup time by
+  installing the DBUS file to /etc/dbus-1/system.d/xorg-server.conf rather
+  than /etc/X11/dbus-1/system.d/xorg-server.conf. Also add a tweak to stop
+  autoreconf from running twice. Both fixes courtesy of Elvis Pranskevichus.
+  This should be enough to get you a running X server, but input hotplugging
+  may not work yet. A couple of other changes on the bug need to be examined
+  in more detail.
+
+  10 Sep 2007; Jeroen Roovers <jer@gentoo.org> xorg-server-1.3.0.0.ebuild:
+  Stable for HPPA (bug #191615).
+
+  10 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4.ebuild:
+  (#191820) Fix xprint build when neither dmx or kdrive are enabled; forgot to
+  autoreconf.
+
+  09 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4.ebuild:
+  Block binary drivers: nvidia-drivers and ati-drivers -- seems that they
+  don't have releases built for 1.4 yet.
+
+  09 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.2.0-r3.ebuild, xorg-server-1.3.0.0.ebuild:
+  (#191709) Require older renderproto as a workaround to make this build again
+  until we get a proper fix.
+
+  09 Sep 2007; Raúl Porcel <armin76@gentoo.org> xorg-server-1.3.0.0.ebuild:
+  alpha/ia64 stable wrt #191615
+
+  09 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/01-no-move-damage.patch, -files/03-tfp-damage.patch,
+  -files/05-offscreen-pixmaps.patch, -files/1.1.1-fix_acpi_tokenize.patch,
+  -files/02-dont-backfill-bg-none.patch,
+  -files/04-mesa-copy-sub-buffer.patch,
+  -files/06-aiglx-happy-vt-switch.patch, -files/1.1.1-dbe-render.diff,
+  -files/1.1.1-fix-xrandr-zoom-keys.patch,
+  -files/1.1.1-fix_big_endian_glx.patch, -files/1.1.1-fixdualhead.patch,
+  -files/1.1.1-sparc-includes.patch, -files/1.1.1-sparc64-ati-lockups.patch,
+  -files/xorg-server-1.1.1-install-libxf86config-headers.patch,
+  -files/xorg-x11-server-1.1.1-mesa-6.5.1.patch,
+  -files/xorg-conf-example.patch, -xorg-server-1.1.1-r1.ebuild,
+  -xorg-server-1.1.1-r5.ebuild:
+  Drop 1.1, everyone's stable on 1.2 or 1.3.
+
+  09 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/1.2.99.0-fix-sysconfdir-references.patch,
+  -xorg-server-1.2.99.0.ebuild:
+  Drop early input-hotplug snapshot.
+
+*xorg-server-1.4 (09 Sep 2007)
+
+  09 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.4-document-new-font-catalogs.patch,
+  +files/1.4-fix-dmx-build.patch, +files/1.4-fix-dmx-link.patch,
+  +files/1.4-fix-xephyr-link.patch, +files/1.4-fix-xprint-build.patch,
+  +files/1.4-fix-xprint-link.patch, +files/1.4-fpic-libxf86config.patch,
+  +xorg-server-1.4.ebuild:
+  Bump. Contains input hotplugging, numerous EXA improvements, improvements to
+  RandR 1.2, and more. Adds a new dependency on pixman for rendering and an
+  optional dependency on hal/dbus for input hotplugging. A few of the
+  fix-*-{build,link} patches still need to go upstream.
+
+  09 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.1-r1.ebuild, xorg-server-1.1.1-r5.ebuild,
+  xorg-server-1.2.0-r3.ebuild, xorg-server-1.3.0.0.ebuild:
+  Fix keyboard driver dep because it doesn't work with 1.2 or newer.
+
+  08 Sep 2007; Joseph Jezak <josejx@gentoo.org> xorg-server-1.3.0.0.ebuild:
+  Marked ppc/ppc64 stable for bug #191615.
+
+  08 Sep 2007; Christoph Mende <angelos@gentoo.org>
+  xorg-server-1.3.0.0.ebuild:
+  Stable on amd64 wrt bug #191615
+
+  07 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  xorg-server-1.3.0.0.ebuild:
+  I am reverting the stabilization until a newer ati-drivers package is
+  stabilized. I apologize if anyone gets caught by this in the short time it
+  was stable.
+
+  07 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  xorg-server-1.3.0.0.ebuild:
+  Stable on x86 wrt bug #191615.
+
+  07 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  xorg-server-1.3.0.0.ebuild:
+  Stable on amd64 wrt bug #191615.
+
+  09 Aug 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.3.0.0.ebuild:
+  Need to regenerate autotools files for
+  xorg-x11-server-1.0.1-fpic-libxf86config.patch (Robert Buchholz).
+
+  07 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  xorg-server-1.3.0.0.ebuild:
+  Stable on sparc wrt #175465
+
+  02 Aug 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/xorg-x11-server-1.0.1-fpic-libxf86config.patch,
+  xorg-server-1.3.0.0.ebuild:
+  (#182516) Build libxf86config PIC for other packages that use it on 64-bit
+  systems.
+
+  02 Aug 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.3.0.0-xephyr_crash_at_exit.patch, xorg-server-1.3.0.0.ebuild:
+  (#185705) Stop Xephyr from crashing when applications quit.
+
+  01 Aug 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.2.0-fix-amd-cpu-detection.patch,
+  +files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch,
+  +files/1.2.0-typo-fix.patch,
+  +files/1.2.0-zero-out-client-devprivates-on-allocation.patch,
+  +files/1.3.0.0-use-proc-instead-of-sys.patch,
+  +files/1.3-alpha-build-fix.patch,
+  +files/avoid-crash-on-minimized-xv-window.patch,
+  +files/xorg-server-sam225bw-quirks.patch, xorg-server-1.3.0.0.ebuild:
+  Add patches for various issues. (#171396) Memleaks; (#167052) Fix
+  multi-domain systems like Sparc and Pegasos; (#181280) Minimized Xv window
+  crashes X; (#176746) Resolution fix for SyncMaster 225BW; (#164240) Fix
+  Alpha build with newer kernel headers.
+
+  31 Jul 2007; Doug Goldstein <doug@gentoo.org> xorg-server-1.1.1-r1.ebuild,
+  xorg-server-1.1.1-r5.ebuild, xorg-server-1.2.0-r3.ebuild,
+  xorg-server-1.2.99.0.ebuild, xorg-server-1.3.0.0.ebuild:
+  nvidia-legacy-drivers moved to nvidia-drivers
+
+  02 Jul 2007; Raúl Porcel <armin76@gentoo.org>
+  xorg-server-1.2.0-r3.ebuild:
+  alpha stable wrt #175465
+
+  02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
+  xorg-server-1.1.1-r1.ebuild, xorg-server-1.1.1-r5.ebuild,
+  xorg-server-1.2.0-r3.ebuild, xorg-server-1.2.99.0.ebuild,
+  xorg-server-1.3.0.0.ebuild:
+  (QA) RESTRICT clean up.
+
+  24 Jun 2007; Piotr Jaroszyński <peper@gentoo.org>
+  xorg-server-1.2.99.0.ebuild:
+  (QA) Don't use KEYWORDS="-*". bug #160519.
+
+  24 Jun 2007; Joshua Kinard <kumba@gentoo.org> xorg-server-1.2.0-r3.ebuild:
+  Stable on mips, per #175465.
+
+  04 Jun 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.3.0.0.ebuild:
+  (#180855) Fix ati-drivers support. My last commit never made it in because
+  of a conflict I didn't notice.
+
+  02 Jun 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.3.0.0.ebuild:
+  (#180611) Remove blocker on ati-drivers so the below change works.
+
+  20 May 2007; Jeroen Roovers <jer@gentoo.org> xorg-server-1.2.0-r3.ebuild:
+  Stable for HPPA (bug #175465).
+
+  12 May 2007; nixnut <nixnut@gentoo.org> xorg-server-1.2.0-r3.ebuild:
+  Stable on ppc wrt bug 175465
+
+  05 May 2007; Daniel Gryniewicz <dang@gentoo.org>
+  xorg-server-1.2.0-r3.ebuild:
+  Marked stable on amd64 for bug #175465
+
+  05 May 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.3.0.0.ebuild:
+  Add a dependency on libXfixes when building dmx.  Thanks to Hopeless of
+  bug #177173.
+
+  04 May 2007; Samuli Suominen <drac@gentoo.org> xorg-server-1.3.0.0.ebuild:
+  Allow also nvidia-drivers-8xxx series, and nvidia-legacy-drivers-7xxx for
+  bug 176648 as they are needed for older cards. Bug 175503 is only about
+  ati-drivers.
+
+  02 May 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  -xorg-server-1.1.1-r4.ebuild, -xorg-server-1.2.0.ebuild,
+  -xorg-server-1.2.0-r1.ebuild, -xorg-server-1.2.0-r2.ebuild:
+  Pull versions that will never go stable or are stale.
+
+  01 May 2007; Samuli Suominen <drac@gentoo.org> xorg-server-1.3.0.0.ebuild:
+  Allow also nvidia-drivers-1.0.9631-r1 which appears to be working and
+  required for older cards. Bug 176650.
+
+  01 May 2007; Samuli Suominen <drac@gentoo.org> xorg-server-1.3.0.0.ebuild:
+  Allow nvidia-drivers-1.0.9755-r1 with xorg-server-1.3.0.0 as it works and
+  blocking them is annoying for users.
+
+  01 May 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.3.0.0.ebuild:
+  Remove VIDEO_CARDS flags for binary drivers and block binary ati and nvidia
+  drivers, since none of them work yet with 1.3. Since we aren't yet sure
+  which versions will, block them unconditionally for now and add appropriate
+  dependencies later.
+
+  29 Apr 2007; Andrej Kacian <ticho@gentoo.org> xorg-server-1.2.0-r3.ebuild:
+  Stable on x86, bug #175465.
+
+  25 Apr 2007; Raúl Porcel <armin76@gentoo.org>
+  xorg-server-1.2.0-r3.ebuild:
+  Stable on ia64 wrt bug #175465
+
+  25 Apr 2007; Markus Rothe <corsair@gentoo.org>
+  xorg-server-1.2.0-r3.ebuild:
+  Stable on ppc64; bug #175465
+
+  22 Apr 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.3.0.0.ebuild:
+  Update randrproto dep to 1.2.1.  Fixes #175452.
+
+  21 Apr 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xorg-server-1.2.99.901.ebuild, -xorg-server-1.2.99.902.ebuild,
+  -xorg-server-1.2.99.903.ebuild, -xorg-server-1.2.99.903-r1.ebuild,
+  -xorg-server-1.2.99.905.ebuild:
+  Clean out 1.3 RCs.
+
+*xorg-server-1.3.0.0 (21 Apr 2007)
+
+  21 Apr 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-server-1.3.0.0.ebuild:
+  Bump to 1.3 final.
+
+*xorg-server-1.2.99.905 (06 Apr 2007)
+
+  06 Apr 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-server-1.2.99.905.ebuild:
+  Add 1.3RC5.  This includes the security patch from RC3-r1, as well as a server
+  respawn fix. Also, fix bug #172713 (steveb).
+
+*xorg-server-1.2.99.903-r1 (05 Apr 2007)
+*xorg-server-1.2.0-r3 (05 Apr 2007)
+*xorg-server-1.1.1-r5 (05 Apr 2007)
+
+  05 Apr 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/xorg-xserver-1.2.0-xcmisc.diff, +xorg-server-1.1.1-r5.ebuild,
+  +xorg-server-1.2.0-r3.ebuild, +xorg-server-1.2.99.903-r1.ebuild:
+  (#172575) Security bump. CVE 2007-1003: XC-MISC extension integer overflow.
+
+*xorg-server-1.2.99.903 (28 Mar 2007)
+
+  28 Mar 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-server-1.2.99.903.ebuild:
+  Bump to 1.3 RC3.
+
+*xorg-server-1.2.99.902 (20 Mar 2007)
+
+  20 Mar 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-server-1.2.99.902.ebuild:
+  Bump to 1.3RC2.
+
+*xorg-server-1.2.0-r2 (17 Mar 2007)
+
+  17 Mar 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/1.2.0-client-leak.patch, +xorg-server-1.2.0-r2.ebuild:
+  Fix a memory leak.  This fix is already in the 1.3 branch.  (Thanks to krtek
+  for the patch and ebuild - bug #166109)
+
+*xorg-server-1.2.99.901 (10 Mar 2007)
+
+  10 Mar 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xorg-server-1.2.99.901.ebuild:
+  Bump to 1.3 RC1. This contains RandR 1.2 for monitor hotplugging etc,
+  assuming you have a supported driver (only intel at present, radeon in the
+  works), and you also need the updated libXrandr and x11-apps/xrandr. It also
+  merges the damage-tracking work for EXA (the newer acceleration
+  architecture) as well as some other fixes. It does NOT contain input-device
+  hotplugging despite the higher version number than 1.2.99.0, because of a
+  change in release-versioning plans.
+
+*xorg-server-1.2.0-r1 (19 Feb 2007)
+
+  19 Feb 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/1.2.0-server-damage-version.patch,
+  +files/1.2.0-server-randr-version.patch, +xorg-server-1.2.0-r1.ebuild:
+  Fix several issues:
+
+  Bug #163613 - Server should report its damage implementation version rather
+  than the protocol header version.  (Todd Merrill)
+
+  Bug #164146 - Xprint file locations have changed since 1.1, so fix the ebuild
+  to find them correctly.  (Ed Catmur)
+
+  Bug #167651 - Server should report its randr implementation version rather
+  than the protocol header version.  (Me)
+
+  24 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/1.0.2-Xprint-xprintdir.patch, -files/1.0.2-dbe-render.diff,
+  -files/1.0.2-fix-readKernelMapping-overrun.patch,
+  -files/1.0.2-fix-rom-read-dualhead.patch,
+  -files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch,
+  -files/1.0.2-try-to-fix-xorgcfg.patch, -files/x11r7.0-setuid.diff,
+  -files/xorg-server-1.0.2-64bit-fix-for-glx.patch,
+  -files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch,
+  -files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch,
+  -files/xorg-server-1.0.2-Sbus.patch,
+  -files/xorg-server-1.0.2-Xprt-build.patch,
+  -files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch,
+  -files/xorg-server-1.0.2-xprint-init.patch,
+  -files/CVE-2006-1526-xrender-mitri.patch, -xorg-server-1.0.2-r8.ebuild:
+  Stop supporting Xorg 7.0.
+
+  24 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/1.0.99.901-Xprint-xprintdir.patch,
+  -files/xorg-server-1.1.99.901-GetDrawableAttributes.patch,
+  -files/1.1.99.903-sparc-includes.patch,
+  -files/xorg-server-1.1.0-setuid.diff, -files/1.1.99.903-mesa-6.5.2.patch,
+  -xorg-server-1.0.2-r7.ebuild, -xorg-server-1.1.0-r1.ebuild,
+  -xorg-server-1.1.1.ebuild, -xorg-server-1.1.1-r2.ebuild,
+  -xorg-server-1.1.1-r3.ebuild, -xorg-server-1.1.99.903-r1.ebuild:
+  Clean up.
+
+*xorg-server-1.2.0 (24 Jan 2007)
+
+  24 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xorg-server-1.2.0.ebuild:
+  Bump. Upstream incorporated some version of all of our patches, so no more
+  need for the aiglx USE flag.
+
+  22 Jan 2007; Steve Dibb <beandog@gentoo.org> xorg-server-1.0.2-r8.ebuild,
+  xorg-server-1.1.1-r4.ebuild:
+  amd64 stable, bug 157421
+
+  22 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.1.1-fixdualhead.patch, +files/1.1.99.903-sparc-includes.patch,
+  +files/1.1.1-sparc-includes.patch, xorg-server-1.1.1-r4.ebuild,
+  xorg-server-1.1.99.903-r1.ebuild:
+  (#159671) Fix sparc build with current kernel headers. (#159375) Fix dual
+  head when direct rendering is enabled. No revision bump because these affect
+  a minority of users.
+
+  15 Jan 2007; Tim Yamin <plasmaroo@gentoo.org> xorg-server-1.1.1-r4.ebuild:
+  Stable on IA64; bug #157421.
+
+  15 Jan 2007; Bryan Østergaard <kloeri@gentoo.org>
+  xorg-server-1.1.1-r4.ebuild:
+  Stable on Alpha, bug 157421.
+
+  14 Jan 2007; René Nussbaumer <killerfox@gentoo.org>
+  xorg-server-1.1.1-r4.ebuild:
+  Stable on hppa. See bug #157421.
+
+  14 Jan 2007; Markus Rothe <corsair@gentoo.org>
+  xorg-server-1.0.2-r8.ebuild, xorg-server-1.1.1-r4.ebuild:
+  Stable on ppc64; bug #157421
+
+  14 Jan 2007; Ferris McCormick <fmccor@gentoo.org>
+  xorg-server-1.1.1-r4.ebuild:
+  Stable on sparc --- Security Bug #157421 --- everything as expected.
+
+  13 Jan 2007; Andrej Kacian <ticho@gentoo.org> xorg-server-1.0.2-r8.ebuild,
+  xorg-server-1.1.1-r4.ebuild:
+  Stable on x86, bug #157421.
+
+  13 Jan 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  xorg-server-1.1.1-r4.ebuild:
+  Stable on ppc wrt bug #157421.
+
+*xorg-server-1.1.1-r4 (13 Jan 2007)
+*xorg-server-1.0.2-r8 (13 Jan 2007)
+
+  13 Jan 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/1.0.2-dbe-render.diff, +files/1.1.1-dbe-render.diff,
+  +xorg-server-1.0.2-r8.ebuild, +xorg-server-1.1.1-r4.ebuild:
+  Fix multiple vulnerabilities in Render and DBE extensions.  (Bug #157421)
+
+  07 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.1-r3.ebuild:
+  Only apply the GLX endianness fix if AIGLX is enabled, since it fixes one of
+  the AIGLX patches.  Thanks to Elisamuel Resto and Mike Auty for figuring out
+  what the problem was.  Closes bug #157401.
+
+  07 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.2.99.0.ebuild:
+  Build against the Mesa 6.5.2 release instead of the snapshot.
+
+*xorg-server-1.1.1-r3 (07 Dec 2006)
+
+  07 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/1.1.1-fix_big_endian_glx.patch, +xorg-server-1.1.1-r3.ebuild:
+  Fix GLX endianness on big endian systems.  This gets rid of the funky colours
+  on systems such as PPC when running Compiz/Beryl.  (Bug #156715, Rasmus Wiman)
+
+  05 Dec 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.99.903-r1.ebuild, xorg-server-1.2.99.0.ebuild:
+  Require kbproto 1.0.3.
+
+*xorg-server-1.1.99.903-r1 (04 Dec 2006)
+
+  04 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/1.1.99.903-mesa-6.5.2.patch, -xorg-server-1.1.99.903.ebuild,
+  +xorg-server-1.1.99.903-r1.ebuild:
+  Build the 7.2 server against Mesa 6.5.2.  Includes a patch from Hanno Böck.
+
+*xorg-server-1.1.99.903 (02 Dec 2006)
+
+  02 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/xorg-server-1.1.99.901-GetDrawableAttributes.patch,
+  -xorg-server-1.1.99.902.ebuild, +xorg-server-1.1.99.903.ebuild:
+  Version bump for 7.2RC3.  Includes several more bugfixes.
+
+  A patch has been added from upstream Bugzilla that fixes Compiz/AIGLX
+  operation on the server.  It's unknown if the patch has any negative
+  side-effects yet, so it's hidden behind USE="aiglx" again.
+
+  01 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  xorg-server-1.1.1-r1.ebuild:
+  Stable on hppa wrt #144549
+
+  14 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.99.902.ebuild:
+  xorgcfg appears to build OK again - re-enable it.
+
+*xorg-server-1.1.99.902 (13 Nov 2006)
+
+  13 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xorg-server-1.1.99.901.ebuild, +xorg-server-1.1.99.902.ebuild:
+  Bump for 7.2RC2.  Brings quite a few more bugfixes.
+
+*xorg-server-1.1.1-r2 (09 Nov 2006)
+
+  09 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/1.1.1-fix_acpi_tokenize.patch, +xorg-server-1.1.1-r2.ebuild:
+  Fix X crashes when opening/closing laptop lids on some laptops.  (Bug #152184,
+  Wendall Cada for the report)
+
+  05 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/1.2.99.0-fix-sysconfdir-references.patch:
+  Add missing patch.
+
+  04 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.2.99.0.ebuild:
+  SDL is also currently broken in 1.2.99.0 according to Daniel Stone.
+
+  04 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.2.99.0.ebuild:
+  1.2.99.0:
+  - xprint is broken (bug #154067, Cyrill Helg)
+  - fix install location of dbus configuration file
+
+  04 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.2.99.0.ebuild:
+  Add DBUS dependency.  Bump dependencies on evdev, keyboard and mouse drivers
+  to enforce input hotplug-compatible versions.
+
+  03 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.2.99.0.ebuild:
+  Add 'dbus' USE-flag and disable dmx correctly.
+
+  03 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.2.99.0.ebuild:
+  1.2.99 needs libdrm >= 2.2.  Thanks to steev again.
+
+  03 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.2.99.0.ebuild:
+  1.2.99 depends on inputproto >=1.4. Thanks to Steev for the catch.
+
+  03 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.2.99.0.ebuild:
+  Eradicate all references to the currently broken DMX. (Jakub Moc, bug #153928)
+
+*xorg-server-1.2.99.0 (03 Nov 2006)
+
+  03 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-server-1.2.99.0.ebuild:
+  Add initial input hotplug development release.
+
+*xorg-server-1.1.99.901 (30 Oct 2006)
+
+  30 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-server-1.1.99.901.ebuild:
+  Add 7.2RC1 server snapshot.  xorgcfg is broken (probably minorly), and compiz
+  compatibility patches are also broken.  Loads of fixes and changes since 7.1.
+
+  25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.1-r1.ebuild:
+  Unbreaking kdrive, part 4: Move all the kdrive setup code out to a separate
+  function kdrive_setup(). Make variables local to that function.
+
+  25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.1-r1.ebuild:
+  Unbreaking kdrive, part 3: Build fbdev and vesa for all cases in which other
+  servers require them. This replaces the existing fix for bug #136370 and
+  should also fix bug #152797.
+
+  25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.1-r1.ebuild:
+  Unbreaking kdrive, part 2: Instead of checking whether a certain VIDEO_CARDS
+  setting is in a long list of invalid cards for non-x86 systems, check
+  whether it's the single valid setting; Check whether VIDEO_CARDS settings
+  are valid kdrive servers before moving into the more complex processing.
+
+  25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.1-r1.ebuild:
+  Unbreaking kdrive, part 1: Fix logic and variable names when forcing
+  fbdev/vesa on for Xati; Don't skip binary drivers, it needlessly complicates
+  the code for no useful end result.
+
+  18 Oct 2006; Aron Griffis <agriffis@gentoo.org>
+  xorg-server-1.1.1-r1.ebuild:
+  Mark 1.1.1-r1 stable on alpha. #144549
+
+  17 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.1-r1.ebuild:
+  Don't try to install xorg.conf.example if the xorg server isn't built.  (Bug
+  #151670, Balint Dobai-Pataky)
+
+  15 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.1-r1.ebuild:
+  Don't try to install xorg.conf.example with USE="minimal". (Bug #151421,
+  George Kargiotakis)
+
+  14 Oct 2006; Aron Griffis <agriffis@gentoo.org>
+  xorg-server-1.1.1-r1.ebuild:
+  Mark 1.1.1-r1 stable on ia64. #144549
+
+  13 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.1-r1.ebuild:
+  AMD64/x86 stable for bug #144549 (X7.1).
+
+  13 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.1-r1.ebuild:
+  Hide AIGLX patches behind the "aiglx" USE flag, since the patches seem to
+  cause some EXA slowdowns (bug #147841, reported by Giacomo Perale).
+
+  12 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.1-r1.ebuild:
+  Really fix bug #150052.
+
+  12 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/xorg-conf-example.patch, xorg-server-1.1.1-r1.ebuild:
+  Install xorg.conf.example like 6.x did. (Bug #138623, requested by
+  Christopher Covington; patch written by Donnie and I) Don't build kdrive
+  servers that use vm86.h on non-x86 systems. (Bug #150052, Shvetsov Alex)
+
+  06 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild,
+  xorg-server-1.1.1-r1.ebuild:
+  Remove references to nvidia-glx now that it has been removed from the tree.
+
+  20 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  files/1.1.1-sparc64-ati-lockups.patch:
+  Base ifdef on __sparc__ rather than __sparc64__. The issue happens on 64-bit
+  kernel/32-bit userland, so sparc64 isn't defined when building the userland.
+
+  20 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.1-r1.ebuild:
+  Use new glproto for eye candy to work properly.
+
+  16 Sep 2006; Hanno Boeck <hanno@gentoo.org> xorg-server-1.1.1-r1.ebuild:
+  Fix download URLs.
+
+  16 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.1-r1.ebuild:
+  Use Mesa 6.5.1 instead of a random prerelease snapshot.
+
+  15 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/1.1.1-remove-altix.patch, +files/1.1.1-sparc64-ati-lockups.patch,
+  xorg-server-1.1.1.ebuild, xorg-server-1.1.1-r1.ebuild:
+  Use upstream's fix for sparc mach64 lockups. An 18-line patch instead of a
+  582-line patch is a good thing.
+
+  12 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild,
+  xorg-server-1.1.1-r1.ebuild:
+  Some comments got displaced to the wrong spot.
+
+  12 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  xorg-server-1.1.1.ebuild:
+  Stable on hppa
+
+  08 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.0.2-r7.ebuild, xorg-server-1.1.0-r1.ebuild,
+  xorg-server-1.1.1.ebuild, xorg-server-1.1.1-r1.ebuild:
+  (#128448) Depend on xplsprinters if USE=xprint, because it's used in profile
+  scripts.
+
+  06 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/xorg-x11-server-1.1.1-mesa-6.5.1.patch:
+  Forgot to cvs add the patch, thanks fmccor.
+
+*xorg-server-1.1.1-r1 (05 Sep 2006)
+
+  05 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/01-no-move-damage.patch, +files/02-dont-backfill-bg-none.patch,
+  +files/03-tfp-damage.patch, +files/04-mesa-copy-sub-buffer.patch,
+  +files/05-offscreen-pixmaps.patch, +files/06-aiglx-happy-vt-switch.patch,
+  +files/xorg-server-1.1.1-install-libxf86config-headers.patch,
+  +files/1.1.1-fix-xrandr-zoom-keys.patch, +xorg-server-1.1.1-r1.ebuild:
+  Bump. (#145797) Add patches for AIGLX+compiz. (#146197) Fix resolution
+  switching with ctrl-alt-+/-. Install libxf86config + headers for
+  pyxf86config, and extramodes and vesamodes for system-config-display. Do
+  correct bash substitution for nvidia kdrive server. This uses a mesa
+  snapshot in anticipation of the 6.5.1 release. Some changes will need to
+  happen to get it back to using a standard Mesa release tarball.
+
+  03 Sep 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild:
+  kdrive's VESA driver does not build on AMD64.  (Bruno Roggeri, bug #145274)
+
+  27 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild:
+  Remove trailing whitespace.
+
+  27 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild:
+  Allow 7.1-compatible nvidia-drivers and nvidia-legacy-drivers.
+
+  26 Aug 2006; Hanno Boeck <hanno@gentoo.org> xorg-server-1.1.0-r1.ebuild,
+  xorg-server-1.1.1.ebuild:
+  linuxwacom moved from x11-misc to x11-drivers.
+
+  22 Aug 2006; Ferris McCormick <fmccor@gentoo.org>
+  xorg-server-1.1.1.ebuild:
+  Stable on sparc, Bug #144549 --- Thanks to dberkholz for incorporating
+  remove-altix patch.
+
+  22 Aug 2006; Stephen P. Becker <geoman@gentoo.org>
+  xorg-server-1.1.1.ebuild:
+  stable on mips, bug 144549
+
+  21 Aug 2006; Markus Rothe <corsair@gentoo.org> xorg-server-1.1.1.ebuild:
+  Stable on ppc64; bug #144549
+
+  21 Aug 2006; Joseph Jezak <josejx@gentoo.org> xorg-server-1.1.1.ebuild:
+  Marked ppc stable for bug #144549.
+
+  20 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.1.1-remove-altix.patch, xorg-server-1.1.1.ebuild:
+  (fd.o #3914) Altix support breaks some sparc64 systems with Mach64 video, so
+  conditionally patch it out. This patch will be maintained and forward-ported
+  by the sparc team. This is the last stable blocker for modular X on sparc.
+
+  18 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.1.ebuild:
+  Move architecture-specific video driver defaults into profiles.
+
+  12 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild:
+  libdmx and dmxproto should be in USE=dmx dep, not USE=minimal.
+
+  02 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild:
+  Add VIDEO_CARDS=fglrx back in, now that there's a compatible driver.
+
+  19 Jul 2006; Guy Martin <gmsoft@gentoo.org> xorg-server-1.0.2-r7.ebuild:
+  Stable on hppa.
+
+  16 Jul 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.0-r1.ebuild:
+  Add the warning to this version too.
+
+  16 Jul 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.1.ebuild:
+  Add some warnings about the change in reduced blanking behaviour.  (Bug
+  #135544, Steffen Strobel)
+
+  11 Jul 2006; Aron Griffis <agriffis@gentoo.org>
+  xorg-server-1.1.0-r1.ebuild:
+  Mark 1.1.0-r1 stable on ia64
+
+  09 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.1.ebuild:
+  Also don't build xorgcfg on USE=minimal.
+
+  09 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  -xorg-server-1.0.2-r6.ebuild:
+  Pull old version.
+
+*xorg-server-1.1.1 (09 Jul 2006)
+
+  09 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xorg-server-1.1.1.ebuild:
+  Bump. Bunches of rendering and crasher fixes, incorporates security fix and
+  the 2 xprint patches, and more.
+
+  07 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog:
+  Update to my new email address.
+
+  06 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  xorg-server-1.1.0-r1.ebuild:
+  Added blocker on x11-drivers/nvidia-drivers and
+  x11-drivers/nvidia-legacy-drivers since they don't work on 1.1 yet.
+
+  01 Jul 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  files/x11r7.0-setuid.diff, files/xorg-server-1.1.0-setuid.diff:
+  Fix the setuid patches.  (Thanks to Rudo Thomas for the catch in bug #138688)
+
+  01 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.0-r1.ebuild:
+  ppc/sparc/mips/alpha/arm/sh stable
+
+  30 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.0-r1.ebuild:
+  sparc shouldn't pull in vesa and vga.
+
+  30 Jun 2006; Markus Rothe <corsair@gentoo.org>
+  xorg-server-1.1.0-r1.ebuild:
+  Stable on ppc64
+
+  30 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  xorg-server-1.0.2-r7.ebuild:
+  Stable on amd64.
+
+  30 Jun 2006; Markus Rothe <corsair@gentoo.org>
+  xorg-server-1.0.2-r7.ebuild:
+  Stable on ppc64
+
+  30 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.0.2-r7.ebuild:
+  x86 stable.
+
+*xorg-server-1.0.2-r7 (30 Jun 2006)
+
+  30 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.0.2-fix-rom-read-dualhead.patch, +xorg-server-1.0.2-r7.ebuild:
+  Fix dual-head.
+
+  30 Jun 2006; Stephen P. Becker <geoman@gentoo.org>
+  xorg-server-1.1.0-r1.ebuild:
+  added video_cards_impact to IUSE_VIDEO_CARDS, enable it for mips users
+
+  27 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.0-r1.ebuild:
+  Only pull in loadable drivers if the xorg USE-flag is set. (bug #135873)
+
+  28 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.0-r1.ebuild:
+  Fix typo video_cards_3dfx > video_cards_tdfx (Jakub Moc).
+
+  26 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.0-r1.ebuild:
+  Fix kdrive+ATI build.  (Priit Laes, bug #136370)
+
+  26 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.0-r1.ebuild:
+  Allow USE="-* minimal" for xorg-server so that Xvfb can be built by itself.
+  (Patch by Ed Catmur, bug #137991)
+
+  21 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.0-r1.ebuild:
+  Fix up VIDEO_CARDS for mips, they don't want ati, mga, sisusb.
+
+*xorg-server-1.1.0-r1 (20 Jun 2006)
+*xorg-server-1.0.2-r6 (20 Jun 2006)
+
+  20 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/xorg-server-1.1.0-setuid.diff, +files/x11r7.0-setuid.diff,
+  -xorg-server-1.0.2-r4.ebuild, -xorg-server-1.0.2-r5.ebuild,
+  +xorg-server-1.0.2-r6.ebuild, -xorg-server-1.1.0.ebuild,
+  +xorg-server-1.1.0-r1.ebuild:
+  Security bump. Failure to check the return value of setuid() in a privileged
+  process could be used by a local user for file overwriting and possible
+  privilege escalation in corner cases. See
+  http://lists.freedesktop.org/archives/xorg/2006-June/016146.html for more
+  information.
+
+  17 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.0.ebuild:
+  Drop nvidia and fglrx flags for now and block all nvidia-glx and ati-drivers
+  versions since neither of the binary drivers are supported currently.
+  (Jakub Moc, bug #136788)
+
+*xorg-server-1.0.2-r5 (11 Jun 2006)
+
+  11 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/1.0.2-fix-readKernelMapping-overrun.patch,
+  +xorg-server-1.0.2-r5.ebuild:
+  Fix an overrun that was causing various issues on VT switch.  This is already
+  fixed in 1.1.  (Matthias Dahl, bug #127608)
+
+  04 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.0.ebuild:
+  Ensure eautoreconf gets run when building xprint and kdrive.  (Walter Meinl,
+  bug #135263)
+
+  04 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.0.ebuild:
+  Have the ebuild fail if no server will be built, instead of appearing to
+  complete successfully but not installing enough binaries for a usable X.
+  (Bug #132140)
+
+*xorg-server-1.1.0 (23 May 2006)
+
+  23 May 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xorg-server-1.0.99.903.ebuild, +xorg-server-1.1.0.ebuild:
+  Bump for 7.1 final.  Includes various crash fixes, etc.
+
+  14 May 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.0.2-r4.ebuild:
+  Force on xorg-x11 opengl implem for compile, to ensure we have recent enough
+  glxtokens.h. Reported by johey on freenode.
+
+  14 May 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.0.99.903.ebuild:
+  (#133295) Fix kdrive build when s3 is on, because it also sedded out the s3
+  from the middle of sis300. Also a fix for turning off sis300 at all. Fixes
+  by Kent Fredric.
+
+  14 May 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.0.2-r4.ebuild, xorg-server-1.0.99.903.ebuild:
+  Add RESTRICT=stricter, because FEATURES=stricter dies on installing anything
+  suid with lazy bindings. The X server needs lazy bindings because of how its
+  module loading works. Hopefully at some point, upstream will change this.
+  Suggested by Kevin F. Quinn.
+
+  13 May 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.0.99.903.ebuild:
+  Move driver dependencies from the meta-ebuild to xorg-server as a
+  PDEPEND. (Michal Suchanek, bug #132696)
+
+*xorg-server-1.0.99.903 (13 May 2006)
+
+  13 May 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  -xorg-server-1.0.99.902-r1.ebuild, +xorg-server-1.0.99.903.ebuild:
+  Bump to 7.1RC3.
+
+  13 May 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.0.2-r4.ebuild, xorg-server-1.0.99.902-r1.ebuild:
+  Force update to libxkbui-1.0.2 per dberkholz' suggestion, hopefully fixing
+  _XkbStrCaseCmp-related issues.
+
+*xorg-server-1.0.99.902-r1 (02 May 2006)
+*xorg-server-1.0.2-r4 (02 May 2006)
+
+  02 May 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/CVE-2006-1526-xrender-mitri.patch, -xorg-server-1.0.2-r3.ebuild,
+  +xorg-server-1.0.2-r4.ebuild, -xorg-server-1.0.99.902.ebuild,
+  +xorg-server-1.0.99.902-r1.ebuild:
+  Security bump and remove all affected versions. Please see Bug #130979 for
+  details.
+
+  30 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/1.0.99.901-fix-kdrive-build.patch,
+  -files/1.0.99.901-wrap-sdk-headers.patch,
+  -xorg-server-1.0.99.901-r1.ebuild:
+  Pull old 7.1RC ebuild.
+
+  30 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.0.99.902.ebuild:
+  (#131817) Move the nptl diemsg out of an if, since we also use it in the else.
+
+*xorg-server-1.0.99.902 (29 Apr 2006)
+
+  29 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-server-1.0.99.902.ebuild:
+  Version bump.  Includes quite a few bugfixes.
+
+  24 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.0.99.901-r1.ebuild:
+  We don't need to apply the xf86Sbus.h creation patch anymore. It was
+  applying successfully by appending itself to the already-complete file in
+  the tarball.
+
+  23 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.0.99.901-r1.ebuild:
+  Fix the USE=-xorg build, can't do use_with() on mesa-source because it won't
+  accept the --without option.
+
+  23 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  files/digest-xorg-server-1.0.99.901-r1:
+  Fix digest.
+
+  23 Apr 2006; Donnie Berkholz <dberkholz@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)
+
+  21 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.0.99.901-fix-kdrive-build.patch,
+  +files/1.0.99.901-wrap-sdk-headers.patch, -xorg-server-1.0.99.901.ebuild,
+  +xorg-server-1.0.99.901-r1.ebuild:
+  Add option to build kdrive, tiny X servers; also add VIDEO_CARDS settings to
+  select kdrive servers to build. Add option to build AIGLX with TLS support
+  (USE=nptl) -- mesa and xorg-server must be in sync on this. Update some
+  deps: glproto, scrnsaverproto. Don't need to inherit flag-o-matic, x-modular
+  eclass does this for us. Make Xdmx build its own USE flag, instead of part
+  of minimal. Force xorg-x11 OpenGL to build, because it needs a newer
+  glxtokens.h than some binary drivers provide. Add a server_based_install()
+  function for any actions dependent on which servers get built. Add USE=xorg
+  to build the Xorg X server, which will be on by default.
+
+  17 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.0.2-r3.ebuild:
+  Drop the mesa version check since it shouldn't be required.
+
+  17 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.0.99.901.ebuild:
+  AIGLX defaults on, don't need to enable it.
+
+*xorg-server-1.0.99.901 (14 Apr 2006)
+
+  14 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.0.2-r3.ebuild, -xorg-server-1.0.99.2.ebuild,
+  +xorg-server-1.0.99.901.ebuild:
+  Bump xorg-server for 7.1RC1.  Change Mesa dependencies on all servers to
+  account for the changed paths in Mesa 6.5-r2.
+
+*xorg-server-1.0.99.2 (12 Apr 2006)
+
+  12 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-server-1.0.99.2.ebuild:
+  Add a xorg-server snapshot from upstream.  This snapshot compiles against Mesa
+  6.5 and has AIGLX enabled.
+
+  31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  xorg-server-1.0.2-r3.ebuild:
+  Add ~x86-fbsd keyword.
+
+  31 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog:
+  Only need that ChangeLog message once.
+
+*xorg-server-1.0.2-r3 (31 Mar 2006)
+
+  31 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/xorg-server-1.0.2-64bit-fix-for-glx.patch,
+  -xorg-server-1.0.2-r2.ebuild, +xorg-server-1.0.2-r3.ebuild:
+  Really fix 64-bit direct rendering. glcontextmodes.[ch] doesn't include
+  glheader.h, so it also needs to include dix-config.h.
+
+*xorg-server-1.0.2-r2 (28 Mar 2006)
+
+  28 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch,
+  +files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch,
+  -xorg-server-1.0.2-r1.ebuild, +xorg-server-1.0.2-r2.ebuild:
+  Re-add 64-bit direct rendering patches that got lost in the 1.0.2 bump.
+
+  24 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>; +files/xprint.init,
+  xorg-server-1.0.2-r1.ebuild:
+  (#127425) Install xprint init scripts and directories, patch by Ed Catmur.
+
+  24 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.0.2-r1.ebuild:
+  Re-add font-adobe-75dpi to RDEPEND, caught by Jonathan Adamczewski.
+
+  24 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.0.2-r1.ebuild:
+  Add deps on compositeproto 0.3 and fixesproto 4.0, otherwise build may break
+  with overlay window patch.
+
+*xorg-server-1.0.2-r1 (24 Mar 2006)
+
+  24 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  -xorg-server-1.0.2.ebuild, +xorg-server-1.0.2-r1.ebuild:
+  (#127333) Fix crashing of pretty much all gtk+-2 apps. We had the
+  client-side updates to composite and fixes extensions, but we didn't let the
+  server know about them, which resulted in lots of BadRequests.
+
+  23 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.0.2.ebuild:
+  Depends on media-fonts/font-adobe-75dpi for xorgcfg.
+
+  23 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch,
+  +files/1.0.2-try-to-fix-xorgcfg.patch, xorg-server-1.0.2.ebuild:
+  (#117299) Fix xorgconfig, which was producing an invalid RgbPath setting.
+  (#117071) Attempt to fix xorgcfg. I couldn't test without /etc/X11/xorg.conf
+  because it was producing invalid modes on my monitor, but it worked when
+  xorg.conf was present.
+
+*xorg-server-1.0.2 (21 Mar 2006)
+
+  21 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch,
+  -files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch,
+  -files/xorg-server-1.0.1-Sbus.patch,
+  -files/xorg-server-1.0.1-amd64-fix-for-glx.patch,
+  -files/xorg-server-1.0.1-backtrace.patch,
+  +files/xorg-server-1.0.2-Sbus.patch,
+  +files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch,
+  -xorg-server-1.0.1-r4.ebuild, +xorg-server-1.0.2.ebuild:
+  (#125803) Fix local root vulnerability present in 6.8.99.x and newer. This
+  does NOT affect 6.8.2.
+
+*xorg-server-1.0.1-r4 (19 Feb 2006)
+
+  19 Feb 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch,
+  +files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch,
+  -xorg-server-1.0.1-r3.ebuild, +xorg-server-1.0.1-r4.ebuild:
+  Really fix GLX on 64-bit systems.
+
+  14 Feb 2006; Markus Rothe <corsair@gentoo.org>
+  xorg-server-1.0.1-r3.ebuild:
+  Added ~ppc64
+
+*xorg-server-1.0.1-r3 (13 Feb 2006)
+
+  13 Feb 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/xorg-server-1.0.1-amd64-fix-for-glx.patch,
+  -xorg-server-1.0.1-r2.ebuild, +xorg-server-1.0.1-r3.ebuild:
+  (#122140) Add patch to fix OpenGL on amd64, thanks to Igor V. Kovalenko
+  <garrison@mail.ru>. Also update to Mesa 6.4.2 tarball so people only need to
+  download one version of it.
+
+  06 Feb 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.0.1-r2.ebuild:
+  Add an OR dependency with xkbdata for new x11-misc/xkeyboard-config, and
+  prefer it over xkbdata.
+
+  03 Feb 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.0.1-r2.ebuild:
+  (#121394) Filter -fweb, because it causes window corruption.
+
+  31 Jan 2006; Rene Nussbaumer <killerfox@gentoo.org>
+  xorg-server-1.0.1-r2.ebuild:
+  Unstable on hppa.
+
+*xorg-server-1.0.1-r2 (26 Jan 2006)
+
+  26 Jan 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/xorg-server-1.0.1-backtrace.patch, -xorg-server-1.0.1.ebuild,
+  -xorg-server-1.0.1-r1.ebuild, +xorg-server-1.0.1-r2.ebuild:
+  Fix the automatic backtraces at the bottom of /var/log/Xorg.*.log on segfaults.
+
+  19 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.0.1.ebuild, xorg-server-1.0.1-r1.ebuild:
+  Update the license.
+
+  04 Jan 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.0.1-r1.ebuild:
+  No need to specify configure options that are the default.
+
+  04 Jan 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.0.1-r1.ebuild:
+  No need to manually create Xorg -> X symlink anymore.
+
+*xorg-server-1.0.1-r1 (03 Jan 2006)
+
+  03 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-server-1.0.1-r1.ebuild:
+  Fix the libglx* relocation routine to look in the right place so that xorg-x11
+  will play nice with eselect. Bug #117100.
+
+  26 Dec 2005; Stefaan De Roeck <stefaan@gentoo.org>
+  xorg-server-1.0.1.ebuild:
+  Marked ~alpha
+
+*xorg-server-1.0.1 (23 Dec 2005)
+
+  23 Dec 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/xorg-server-1.0.1-Sbus.patch, -xorg-server-0.99.4-r2.ebuild,
+  -xorg-server-1.0.0.ebuild, +xorg-server-1.0.1.ebuild:
+  Bump for 7.0. (#111361) Add patch to fix sparc build.
+
+*xorg-server-1.0.0 (17 Dec 2005)
+
+  17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-server-1.0.0.ebuild:
+  Bump for 7.0RC4.
+
+  09 Dec 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/fix-xkb-compile-path-2.patch:
+  Unused file.
+
+  09 Dec 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  -xorg-server-0.99.2-r2.ebuild, -xorg-server-0.99.3.ebuild,
+  -xorg-server-0.99.3-r1.ebuild, -xorg-server-0.99.4.ebuild,
+  -xorg-server-0.99.4-r1.ebuild:
+  Pull old versions.
+
+*xorg-server-0.99.4-r2 (06 Dec 2005)
+
+  06 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-server-0.99.4-r2.ebuild:
+  Build against Mesa 6.4.1 instead of Mesa 6.4.  Caught by dagb.
+
+*xorg-server-0.99.4-r1 (05 Dec 2005)
+
+  05 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-server-0.99.4-r1.ebuild:
+  It would appear that libglx (silently) fails to build if libdrm is not >=
+  version 2.  Rev-bump so that anyone who has merged this already gets a forced
+  re-merge and thus gets a working glx extension.
+
+*xorg-server-0.99.4 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-server-0.99.4.ebuild:
+  Bump for 7.0RC3.
+
+  14 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/fix-xkb-compile-path-2.patch, -files/fix-xkb-compile-path.patch,
+  xorg-server-0.99.3-r1.ebuild:
+  Remove CVS tags from patch as they don't do anything but break installs.
+  Fixes bug #112476.
+
+*xorg-server-0.99.3-r1 (14 Nov 2005)
+
+  14 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/fix-xkb-compile-path.patch, +xorg-server-0.99.3-r1.ebuild:
+  Fix xkb issue spotted by dberkholz.
+
+*xorg-server-0.99.3 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xorg-server-0.99.3.ebuild:
+  Bump for 7.0RC2.
+
+*xorg-server-0.99.2-r2 (09 Nov 2005)
+
+  09 Nov 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  -xorg-server-0.99.2-r1.ebuild, +xorg-server-0.99.2-r2.ebuild:
+  Build against mesa 6.4 instead of 6.3.2.
+
+  31 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  -xorg-server-0.99.1_p20051013-r1.ebuild, -xorg-server-0.99.2.ebuild:
+  Pull old versions.
+
+  29 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.2-r1.ebuild:
+  Note that X->Xorg symlink will be taken care of for any new snapshots, so we
+  can remove the line from the ebuild.
+
+  20 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.2-r1.ebuild:
+  Use --enable-install-setuid instead of manually changing permissions.
+
+*xorg-server-0.99.2-r1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xorg-server-0.99.2-r1.ebuild:
+  (#109926) No need to specify xkb path anymore, it's wrong now as well.
+
+*xorg-server-0.99.2 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xorg-server-0.99.2.ebuild:
+  Bump for 7.0 RC1.
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org>
+  xorg-server-0.99.1_p20051013-r1.ebuild:
+  added ~mips keyword
+
+  17 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1_p20051013-r1.ebuild:
+  (#109354) In some mystical way all the dependency changes got reverted in
+  the new revision.
+
+  16 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/0.99.1-r10-check-for-glproto.patch,
+  -files/0.99.1-r10_CAN-2005-2495.patch, -files/fix-transparencies.patch,
+  -xorg-server-0.99.1-r10.ebuild, -xorg-server-0.99.1_p20051013.ebuild:
+  Pull old ebuilds.
+
+*xorg-server-0.99.1_p20051013-r1 (16 Oct 2005)
+
+  16 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xorg-server-0.99.1_p20051013-r1.ebuild:
+  (#109467) Set a non-broken default font path so things like Xvfb actually work.
+
+  15 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1_p20051013.ebuild:
+  Add x11-libs/libXtst for dmx.
+
+  15 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1_p20051013.ebuild:
+  (#109354) Add lots of deps -- libXaw, libXpm, libXxf86misc, libXxf86vm. Add
+  notes on which parts depend on them.
+
+  14 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1_p20051013.ebuild:
+  Also wrap dmxproto dep in minimal USE.
+
+  14 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1_p20051013.ebuild:
+  (#109124) Add dep on libdmx, within check for USE=minimal. Also move libXres
+  dep within there, because it's for dmx.
+
+  14 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-0.99.1_p20051013.ebuild:
+  Add missing deps (x11-libs/libXres and x11-libs/libxkbui).
+
+  14 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/0.99.1-r9_CAN-2005-2495.patch,
+  -files/0.99.1-r9-check-for-glproto.patch, -xorg-server-0.99.1-r9.ebuild:
+  Drop old revision.
+
+*xorg-server-0.99.1_p20051013 (14 Oct 2005)
+
+  14 Oct 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xorg-server-0.99.1_p20051013.ebuild:
+  Update to today's CVS. Enable xprint USE flag. Stop filtering
+  -fomit-frame-pointer, because it works now. Add dep on
+  >=x11-proto/glproto-1.4.1_pre20051013 to fix build breakage.
+
+  04 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/0.99.1-r10-check-for-glproto.patch,
+  +files/0.99.1-r10_CAN-2005-2495.patch:
+  Oops, forgot the version-dependent patches.
+
+*xorg-server-0.99.1-r10 (04 Oct 2005)
+
+  04 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/fix-transparencies.patch, +xorg-server-0.99.1-r10.ebuild:
+  Added fix for OO/wine transparencies from bug #96053.  Thanks to bartron for
+  both patches.
+
+  27 Sep 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1-r9.ebuild:
+  As of 20050927, xprint will require mkfontdir/mkfontscale for XpConfig.
+
+  13 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -files/0.99.1-r6-check-for-glproto.patch,
+  -files/0.99.1-r8-check-for-glproto.patch, -files/fix-xnest.patch,
+  -files/make-fbcompose-endian-safe.patch, -xorg-server-0.99.1-r7.ebuild,
+  -xorg-server-0.99.1-r8.ebuild:
+  Remove old versions and patches.
+
+*xorg-server-0.99.1-r9 (13 Sep 2005)
+
+  13 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/0.99.1-r9_CAN-2005-2495.patch,
+  +files/0.99.1-r9-check-for-glproto.patch, +xorg-server-0.99.1-r9.ebuild:
+  Bump to include security fix from bug #105688.
+
+  12 Sep 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1-r8.ebuild:
+  Add some deps so we get a server that actually runs after emerging it. In
+  specific: media-fonts/font-misc-misc media-fonts/font-cursor-misc
+  x11-misc/xbitmaps x11-misc/xkbdata x11-apps/iceauth x11-apps/rgb
+  x11-apps/xauth x11-apps/xinit.
+
+  09 Sep 2005; Donnie Berkholz <dberkholz@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+*xorg-server-0.99.1-r8 (08 Sep 2005)
+
+  08 Sep 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/0.99.1-r8-check-for-glproto.patch, +xorg-server-0.99.1-r8.ebuild:
+  Update to CVS HEAD as of 20050907. Update glproto patch to apply cleanly.
+
+  06 Sep 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1-r7.ebuild:
+  Make --enable-xcsecurity always on, remove nvidia USE.
+
+  03 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xorg-server-0.99.1-r7.ebuild:
+  Changed opengl-update envocation to use eselect instead.
+
+  03 Sep 2005; Doug Goldstein <cardoe@gentoo.org>
+  +xorg-server-0.99.1-r7.ebuild, -xorg-server-0.99.1-r6.ebuild:
+  Added support for the XCSecurity option, which is what's needed to make
+  binary Nvidia drivers work
+
+  02 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -files/0.99.1-r5-check-for-glproto.patch,
+  +files/0.99.1-r6-check-for-glproto.patch:
+  Apparently this patch has a package revision-based name.
+
+  02 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/make-fbcompose-endian-safe.patch, -xorg-server-0.99.1-r5.ebuild,
+  +xorg-server-0.99.1-r6.ebuild:
+  Makes certain draw code endian-safe. Should fix things for big-endian
+  arches. Thanks to Stanislaw Skowronek and geoman in bug #104318.
+
+*xorg-server-0.99.1-r6 (02 Sep 2005)
+
+  02 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/make-fbcompose-endian-safe.patch, -xorg-server-0.99.1-r5.ebuild,
+  +xorg-server-0.99.1-r6.ebuild:
+  Added fix to make colour calculations endian safe.  Thanks to Stanislaw
+  Skowronek for the patch and geoman for the heads-up.  Fixes bug #104318.
+
+  30 Aug 2005; Herbie Hopkins <herbs@gentoo.org>
+  xorg-server-0.99.1-r5.ebuild:
+  s/lib/$(get_libdir)
+
+  23 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/check-for-glproto.patch, -files/fix-xf86misc-typo.patch,
+  -files/xorg-server-0.99.1-x86_64-1.patch, -xorg-server-0.99.1-r4.ebuild:
+  Pull old version.
+
+  23 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/0.99.1-r5-check-for-glproto.patch, xorg-server-0.99.1-r5.ebuild:
+  (#fd.o 3990) Add 0.99.1-r5-check-for-glproto.patch. Pass
+  --with-xkb-path=/usr/lib/X11/xkb in attempt to get VT switching closer to
+  working. Update CVS patch to 20050822-1, which makes xprint almost work.
+
+*xorg-server-0.99.1-r5 (22 Aug 2005)
+
+  22 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/fix-xnest.patch, +xorg-server-0.99.1-r5.ebuild:
+  Update to CVS as of 20050822. This should make amd64 and sparc work. Update
+  included mesa to 6.3.2. Stop forcing glx on, it's on by default. Add
+  --disable-static so we don't build .a files for server modules. Add
+  fix-xnest.patch to fix breakage in the Xnest linking, caused by the
+  configure.ac reworking a couple of days ago.
+
+  21 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1-r4.ebuild:
+  xprint build is broken; force it off.
+
+  21 Aug 2005; Luca Barbato <lu_zero@gentoo.org>
+  xorg-server-0.99.1-r4.ebuild:
+  Marked ~ppc
+
+  21 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/xorg-composite.patch, -files/xorg-server-fbmmx-local.patch,
+  -xorg-server-0.99.1.ebuild, -xorg-server-0.99.1-r1.ebuild,
+  -xorg-server-0.99.1-r2.ebuild, -xorg-server-0.99.1-r3.ebuild:
+  Drop old versions.
+
+*xorg-server-0.99.1-r4 (21 Aug 2005)
+
+  21 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xorg-server-0.99.1-r4.ebuild:
+  Update to today's CVS. This adds a USE flag for xprint. Also, get rid of the
+  glx USE flag, because everybody should get it.
+
+  20 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1.ebuild, xorg-server-0.99.1-r1.ebuild,
+  xorg-server-0.99.1-r2.ebuild, xorg-server-0.99.1-r3.ebuild:
+  panoramixproto moved to xineramaproto.
+
+  17 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/xorg-server-fbmmx-local.patch, xorg-server-0.99.1-r3.ebuild:
+  (fd.o #4073) Fix compilation failures at fbmmx.c. Patch from Diego Pettenò
+  <flameeyes@gentoo.org>.
+
+  16 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1-r3.ebuild:
+  Wrap opengl things in `if use glx..`
+
+  15 Aug 2005; Herbie Hopkins <herbs@gentoo.org>
+  xorg-server-0.99.1-r3.ebuild:
+  Marked ~amd64.
+
+  14 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/xorg-server-0.99.1-x86_64-1.patch, xorg-server-0.99.1-r3.ebuild:
+  Add xorg-server-0.99.1-x86_64-1.patch to fix configure.ac on amd64.
+
+  14 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1-r3.ebuild:
+  Wrap pkg_postrm() module dir removal in ! has_version.
+
+  12 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1-r3.ebuild:
+  No longer necessary to force --enable-composite; it's on by default.
+
+  12 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1-r3.ebuild:
+  Update opengl-update dependency to 2.2.3 for proper handling of
+  /usr/libdir/modules/extensions/.
+
+  12 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1-r3.ebuild:
+  Remove xinerama USE flag; building without it causes major issues.
+
+  12 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1-r3.ebuild:
+  Add pkg_postrm() to get rid of /usr/lib/xorg/modules. This should make
+  things work better for people crazy enough to downgrade to monolithic.
+
+*xorg-server-0.99.1-r3 (12 Aug 2005)
+
+  12 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xorg-server-0.99.1-r3.ebuild:
+  Set /usr/bin/Xorg suid so it starts.
+
+  12 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1-r2.ebuild:
+  Fix the patch that mysteriously broke.
+
+  12 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/check-for-glproto.patch, +files/fix-xf86misc-typo.patch,
+  +xorg-server-0.99.1-r2.ebuild:
+  Re-add, this time with a huge patch on the mirror.
+
+  12 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/check-for-glproto.patch, -files/fix-xf86misc-typo.patch,
+  -files/xorg-server-0.99.1-update-to-CVS-HEAD-20050811.patch,
+  -xorg-server-0.99.1-r2.ebuild:
+  Removed 0.99.1-r2 version (3.3MB patch is not good).
+
+*xorg-server-0.99.1-r2 (12 Aug 2005)
+
+  12 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/check-for-glproto.patch, +files/fix-xf86misc-typo.patch,
+  +files/xorg-server-0.99.1-update-to-CVS-HEAD-20050811.patch,
+  +xorg-server-0.99.1-r2.ebuild:
+  Add xorg-server-0.99.1-update-to-CVS-HEAD-20050811.patch to fix big-endian
+  breakage, composite, some other stuff. Split out non-composite things from
+  xorg-composite.patch to check-for-glproto.patch and fix-xf86misc-typo.patch.
+
+  11 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1-r1.ebuild:
+  Make an X->Xorg symlink in here until upstream can make one.
+
+  11 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1-r1.ebuild:
+  Add more deps: inputproto, bigreqsproto, xcmiscproto. All reported by aaronf0.
+
+  10 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1-r1.ebuild:
+  Move confopts into pkg_setup(), and therefore also CONFIGURE_OPTIONS.
+
+*xorg-server-0.99.1-r1 (10 Aug 2005)
+
+  10 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xorg-server-0.99.1-r1.ebuild:
+  Rev bump to make sure people get working GL setup.
+
+  10 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1.ebuild:
+  Add GL handling, /usr/lib/opengl, opengl-update, etc.
+
+  10 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1.ebuild:
+  Add dep on x11-proto/kbproto, again from aaronf0.
+
+  10 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1.ebuild:
+  Add dep on fontsproto, reported by aaronf0 on irc.
+
+  09 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1.ebuild:
+  (#101883) Add trapproto and panoramixproto as deps.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org>
+  xorg-server-0.99.1.ebuild:
+  Add ~sparc keyword (prepare for X Modular testing).
+
+  08 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-0.99.1.ebuild:
+  (#101749) Add dependencies on videoproto, scrnsaverproto and evieext.
+  Reported by Georgi Georgiev <chutz@gg3.net>.
+
+*xorg-server-0.99.1 (08 Aug 2005)
+
+  08 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/xorg-composite.patch, +xorg-server-0.99.1.ebuild:
+  Initial commit for modular X.
+
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
new file mode 100644
index 0000000..f47310b
--- /dev/null
+++ b/x11-base/xorg-server/Manifest
@@ -0,0 +1,55 @@
+AUX 1.2.0-fix-amd-cpu-detection.patch 1715 SHA1 b749e5ac35fad295fd7a1f13cfee2e42a2a06035 SHA256 0126a880eb5f21eb8dbbd119a425e7412b37689e1321c2b9ff63c5dc8de47f6a
+AUX 1.2.0-properly-free-device-devprivates-memory-leak-fix.patch 1199 SHA1 98e07d5a542bc1e990921234f8f6399120ae5a63 SHA256 ba60d2fbb7944da45344f5ffc1431bf0e812ab861f4455522592ecb0c475138c
+AUX 1.2.0-typo-fix.patch 1321 SHA1 3a22190fde5487b84c0d9a8862421f102bf41c63 SHA256 9dbf526f9cb3bf2596ffdc1795eda16181384db33562daf4fd1ddb359b5a77bd
+AUX 1.2.0-zero-out-client-devprivates-on-allocation.patch 1284 SHA1 0cfd5dcb57c42197e39e5469032833ea932c0b4f SHA256 55cda19958996c484f4713ed022d6d9e80a4ab7e2f2f59ee26019d291a433a34
+AUX 1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch 7656 SHA1 1dfe79a470b64f9981982216a3ec52e7b46dddff SHA256 09eeefa3b891fc7d860fff1dce485cc73278eee07a8494751b75df6fbdd66482
+AUX 1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch 622 SHA1 3da82b9a81995b31ad84ccb376a619953837edb5 SHA256 ca0a6dca401ac9dd17d87866dc0d70ca02d8f9a18cfeafe7998af56b75148162
+AUX 1.3-alpha-build-fix.patch 1151 SHA1 210ef43db8ad8080db21a86c31f7744dbdb7e439 SHA256 4242b7679c24005c3a06ec1b37d98ce6b339724067876cf43ed05429f8f07186
+AUX 1.3.0.0-fix-dual-head-screen-resolutions.patch 1542 SHA1 eb416bed3c6eb8323a6305ca0576ca94b667205f SHA256 c944c684fe6cfb115f1c4ce1fb5b291ca82d6f44ce9a5381d711414c72c1ed70
+AUX 1.3.0.0-fix-randr-resizing.patch 1986 SHA1 6f8c41b3f25dbb58a050929d6af03778d0b15c26 SHA256 f9a489027004c9e62a76b431344a6f5936989b8161dc5a51018070e3d59e015e
+AUX 1.3.0.0-fix-xephyr-amd64-segfault.patch 1382 SHA1 693e64678100480135c3853590481b20342e9eae SHA256 32cd35d353ba2568d98125328574a0d2c021637a367dd3de616e02a2f8fdd4b9
+AUX 1.3.0.0-fix-xkb-openoffice-hangs.patch 1671 SHA1 34535d5dc17cf96a4605a82105ec41e27c97c94c SHA256 e9cbb4c9c58689116d09827a5a50f38a7e24e735277dd595d3ffa981c24e6c7d
+AUX 1.3.0.0-ramdac.patch 2736 SHA1 5da7c2caecd8c47e77d10c3967bcc22c481087fe SHA256 29dd3f3de269b1d9d24628dab293246f2deda4e8bd4018f20adf74584d2ca92f
+AUX 1.3.0.0-use-proc-instead-of-sys.patch 686 SHA1 44112c3643d026f318850f2b763f3ca3952bb686 SHA256 12a737b236e90f2ca2a1cdb86ac87caec4a5bc38441dd72bb3628ef950e53f54
+AUX 1.3.0.0-xephyr_crash_at_exit.patch 1039 SHA1 080a7dbd301851b26b2d94c051a4a80b4998c814 SHA256 ed552e77d763b12b7d495ccf3966b4e6982dbf94b9ee508e07a708904a97661d
+AUX 1.4-0001-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch 980 SHA1 5ffb6b3bcf5e40d3d51c466bf2c077673341793d SHA256 d8f41a4df64818fdc97db3f194e2fece32915f04b824efb96f577cdf31372a64
+AUX 1.4-0002-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch 747 SHA1 894bce69645b8353e0386b26f594e0e3ccda7c9c SHA256 4fec6a5b20c35ac7a8a34bf9851fc760bedc27e3e83b9de57f0ac6b3c2766e9e
+AUX 1.4-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch 7342 SHA1 e24460f9477072716083e6483deda46c0034ad8c SHA256 81538f7c1ebb3e002a5777e91aeff4befa51b5e659fcd91c9f23c68d62121336
+AUX 1.4-0004-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch 6830 SHA1 8634b48c7a655a3ccd61fda78deaa54090c82ce3 SHA256 7f38a704931f515a68a460abccfd0fed15d51915cbef9f8ed9d1e0ccdd2cf14d
+AUX 1.4-0005-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch 912 SHA1 e258c3f9c03fc92473daf8ae18ee0d0fa47e26ac SHA256 39ec99f6643b73951a5a5ed14c54c227885b7411da76ecec3c923fd8189c6364
+AUX 1.4-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch 870 SHA1 a9c8e1bb513073304d465ad0079c1dd452d053d6 SHA256 d1545329c64f492acc9935df68b31d513d3f1ddcfc5f821224a33761cf4b5c81
+AUX 1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch 2594 SHA1 d2d3666ac30bc5b541b8bf30fe5de157dbb79c9a SHA256 69c8eb09cbf978bbdaef1ae9537778bcf40c7c67bbfeab0b5753e5538147a4ce
+AUX 1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch 1332 SHA1 295bd873f26d01094b458449a99ffa708b5cc45d SHA256 f6c5949c3843f2cda8eb19ec2cd252ee53a3868ab0bc886272b5e95db81d39c2
+AUX 1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch 1353 SHA1 1a1c33a8097e301623d6ec7abebb23b3ac87c570 SHA256 2641e629e83cfa536cc7e765fdcc79bae217deddf892349bbde17a4fb6c76059
+AUX 1.4-document-new-font-catalogs.patch 4540 SHA1 6bf78fde99494b047658836adfa35b5d75224214 SHA256 8a73f0a01235c6cb1acefa09a726f68089fc10c1d68ffdf2e1b57091caafbbfd
+AUX 1.4-dont-hang-openoffice.patch 2235 SHA1 f82487057211b699bdca0874f5ec9bbec9ccdf40 SHA256 bbd05d1ff0e7f97b7ec11c7ebdd32cdcf8984b69d1dc87b46cc66133895e2644
+AUX 1.4-fix-dmx-build.patch 509 SHA1 0b627c0d98e50f0d29dacc3fa7e8e9d8b1ad3faf SHA256 4a01681656d09780dd15696804ce8210a4a5324bf63c33a7692e8971fbeb1843
+AUX 1.4-fix-dmx-link.patch 363 SHA1 41f686ef462e179f6c7e73a1babb7c0f2312d337 SHA256 50fbbe7391a354de2fa321944b921193e1097eaed4d775e343687f4a1a33a002
+AUX 1.4-fix-kdrive-automake.patch 382 SHA1 f21a54aed8eae1e718f2f0c262c37c36ccccd152 SHA256 126b67332c902802da506970acf253030004e4f7e17b3b6d2e68dd6b7bb0db81
+AUX 1.4-fix-xephyr-link.patch 850 SHA1 352c55be4b91b29c84b192d806a90834d887fc22 SHA256 89761f041d694db9891a5a72ff0ee1066d08c2d19a5cec448482fb2b427d2c10
+AUX 1.4-fix-xprint-build.patch 413 SHA1 e2611665d555d5dc93ede0ab4beb9acb16b6b5aa SHA256 183a6c7d6f506dcd637a10057421811901035ed802c27cdd6bc6869924337d40
+AUX 1.4-fix-xprint-link.patch 588 SHA1 67f057700577562b6260d07a8e82ab2dad117a4c SHA256 f6f7a67c93dce63a6f16ccb2182fbd861c7627d071225251df4a733412eda7f0
+AUX 1.4-fpic-libxf86config.patch 374 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237
+AUX 1.4-ia64.patch 1872 SHA1 b43aadafd7ce144790cf9eccf8a9840baf3205bd SHA256 950714ce230791ce9d54e21044961d9435e4eb774f82e5047f9adcd5fd4661ec
+AUX 1.4.0.90-clean-generated-files.patch 595 SHA1 9eaf182c435946596462106547e9d52f819cb397 SHA256 8a57ddae701218b425bbe59c2d387c81d65af2d29c67ea9f8550c8201841f9a7
+AUX 1.5.1/0001-only-build-dri2-when-DRI2-is-enabled.patch 718 SHA1 d8bdfdd36f4b69af6990e69947aa8d503f43b454 SHA256 58f511d956dcd801236f548bfe02162379a50698939fead338e4029aabdef30d
+AUX 1.5.2-fix-xvesa-with-new-kernels.patch 495 SHA1 8a26839ed6a321175205ac68b72572652d2b534a SHA256 08735edbf6fd336412dfee94e087946af1c6e02d2fc348fa1e5a655e704df9c0
+AUX 1.5.2-force-LC_ALL-C-when-running-awk.patch 1505 SHA1 0f9c03b749717842052a9832d42e3fcdd3fdedb2 SHA256 45891f8e29f5df2ef68124b21756cd3d58f766fd1913b3668518bd99fc4ef14e
+AUX 1.5.3-builtin-fonts.patch 646 SHA1 f1cf5a1b525e4165c57271d11edf10087b2aeb7e SHA256 614c214118be05452cb81b8959a372961a6a8e4474cb69bcee50614cc04e1f9d
+AUX avoid-crash-on-minimized-xv-window.patch 1970 SHA1 54447e96f4f10e2993e0e675091f6026e63b56b6 SHA256 6e1cbe4f588674d70d3564962a79b4b7d271162040f9a2390f29f03cfeac87bd
+AUX tslib-1.0-check.patch 7481 SHA1 226487e3761b35aee4eb571cf1d9eeae0d91c505 SHA256 70e2b0c1800864f65a58333bba27bc18f3938ef41caa3a92e958236f5e2fac8d
+AUX use-composite-for-unequal-depths.patch 3528 SHA1 1ade1846c1549c5a7eb3775d86973eb87bdb48ff SHA256 b38c079aaac0d8168cd4b45d2c1b8020338918c96855989dce89324c800622c0
+AUX xorg-server-1.4.0.90-automake-1.10.1-fixup.patch 357 SHA1 3bdd2a6faa808445b2b365b420a9ce5882501035 SHA256 afb9593b3cedfdc9c768436df64b4878504804e93984672a58d96660b2b87afc
+AUX xorg-server-sam225bw-quirks.patch 380 SHA1 20bae2bbe682b23feec54fdca23dde3598bab423 SHA256 7ad46b36407256b426a22b78f1646ffbc4f0197af49b068fdb5e56455cae2517
+AUX xorg-x11-server-1.0.1-fpic-libxf86config.patch 332 SHA1 594aa3d30b51f6789d848f819c13737baff442d1 SHA256 65cc7942a8c7357c138c9c19c39a835720b13348e96a82c8925ccda82c1bcfb6
+AUX xorg-xserver-1.4-cve-2008-1377.diff 2907 SHA1 2b75985081665b8d646b5810d411047c6c150576 SHA256 d901af6ab2884f9c5070a1e8d84bdf79d253356bc634dd3385341c363003b680
+AUX xorg-xserver-1.4-cve-2008-1379.diff 754 SHA1 1ca8b8417d805e0c233bda4b980cb168ec444abd SHA256 e21678777b4db84fc160ad69c1b5dcde357a4be2f978e120d0e46ac8bc03c97c
+AUX xorg-xserver-1.4-cve-2008-2360.diff 976 SHA1 2e8532fe737e702cb18160705cd75daed4141a4c SHA256 a7e14cd8543760a39b92af181a6014762b2c8fa9afbabbcc7bd1b08478a8e2b3
+AUX xorg-xserver-1.4-cve-2008-2361.diff 463 SHA1 950af2461d0bc5ff5b2b3cc40d517344a77e19f9 SHA256 7766be01619dd3d2e7794ef87460caa88093283e058b051eab0a66d90f3c5300
+AUX xorg-xserver-1.4-cve-2008-2362.diff 2259 SHA1 e773f720057785062958d0fa9f29a4cb441883c8 SHA256 051001768f5ecbe9d65cdae53318bcf84a7de6a4c814a53c3a61ae2b427bed3d
+AUX xprint.init 598 SHA1 1590a29e11f813bb1353b4cc815708e97bfbb96b SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13
+DIST xorg-server-1.5.3-gentoo-patches-08.tar.bz2 60521 SHA1 e269009caeb536e35f58e4a2ab7963eb9b5070ec SHA256 3ac1f99e5c9e21ddbcdd08ecd9687ad64dda8916282f951b74fadabb68e4badc
+DIST xorg-server-1.5.3.tar.bz2 5622625 SHA1 177529b6d7191a73df6abf2990cd7708398a8d81 SHA256 a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
+EBUILD xorg-server-1.5.3-r7.ebuild 17046 SHA1 b14876d9952a17b07ce632f801ffd3e213fa4131 SHA256 c472a589c1e9f316e231c1bcf344a330ec1705ec4c387a2b886fcdcbf4f6d98b
+MISC ChangeLog 93546 SHA1 48f57ebd8780838673081e610010cb466833a2f3 SHA256 a8b25c22bcd71d4db50a2236229137e2ba7bc8aa8de0b596868c597864640bea
+MISC metadata.xml 439 SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
diff --git a/x11-base/xorg-server/files/1.2.0-fix-amd-cpu-detection.patch b/x11-base/xorg-server/files/1.2.0-fix-amd-cpu-detection.patch
new file mode 100644
index 0000000..48775d3
--- /dev/null
+++ b/x11-base/xorg-server/files/1.2.0-fix-amd-cpu-detection.patch
@@ -0,0 +1,38 @@
+http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=876b806ec09d5ff0c6cd19df91006c4eefedfaa6
+Reapply patch to fix AMD CPU detection
+	author  Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+	Tue, 6 Feb 2007 22:16:23 +0000 (17:16 -0500)
+	committer  Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+	Tue, 6 Feb 2007 22:16:23 +0000 (17:16 -0500)
+	commit  876b806ec09d5ff0c6cd19df91006c4eefedfaa6
+	tree  0c30b71f2adbbea5641bc4611c6360e23a2e172d  tree
+	parent  13568d2aa43da4216bbcb46e1125ff28c323ac54  commit | commitdiff
+Reapply patch to fix AMD CPU detection
+
+--- xorg-server-1.2.0.orig/fb/fbpict.c	2007-03-18 21:43:21.000000000 +0100
++++ xorg-server-1.2.0/fb/fbpict.c	2007-03-19 00:30:44.000000000 +0100
+@@ -1470,21 +1470,23 @@
+     if (result) {
+         /* result now contains the standard feature bits */
+         if (result & (1 << 15))
+             features |= CMOV;
+         if (result & (1 << 23))
+             features |= MMX;
+         if (result & (1 << 25))
+             features |= SSE;
+         if (result & (1 << 26))
+             features |= SSE2;
+-        if ((result & MMX) && !(result & SSE) && (strcmp(vendor, "AuthenticAMD") == 0)) {
++        if ((features & MMX) && !(features & SSE) &&
++            (strcmp(vendor, "AuthenticAMD") == 0 ||
++             strcmp(vendor, "Geode by NSC") == 0)) {
+             /* check for AMD MMX extensions */
+ 
+             unsigned int result;            
+             __asm__("push %%ebx\n"
+                     "mov $0x80000000, %%eax\n"
+                     "cpuid\n"
+                     "xor %%edx, %%edx\n"
+                     "cmp $0x1, %%eax\n"
+                     "jge 2\n"
+                     "mov $0x80000001, %%eax\n"
diff --git a/x11-base/xorg-server/files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch b/x11-base/xorg-server/files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch
new file mode 100644
index 0000000..b4747c4
--- /dev/null
+++ b/x11-base/xorg-server/files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch
@@ -0,0 +1,38 @@
+http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=b5fde366e2e21234ac0b81222fd5c42ca3e49cba
+Properly free device devPrivates - memory leak fix.
+	author  Eamon Walsh <ewalsh@tycho.nsa.gov>
+	Wed, 7 Mar 2007 17:29:55 +0000 (12:29 -0500)
+	committer  Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil>
+	Wed, 7 Mar 2007 17:29:55 +0000 (12:29 -0500)
+	commit  b5fde366e2e21234ac0b81222fd5c42ca3e49cba
+	tree  21c4d64fc97f8a7b0ec39f7e7a408540dd78691e  tree
+	parent  a3d2c5d622d9ca36d6fa2966aff09524e3ea39ac  commit | commitdiff
+Properly free device devPrivates - memory leak fix.
+
+--- xorg-server-1.2.0.orig/dix/devices.c	2007-03-18 21:43:21.000000000 +0100
++++ xorg-server-1.2.0/dix/devices.c	2007-03-18 21:47:58.000000000 +0100
+@@ -268,20 +268,24 @@
+ 	if (l->xkb_sli)
+ 	    XkbFreeSrvLedInfo(l->xkb_sli);
+ #endif
+ 	xfree(l);
+     }
+ #ifdef XKB
+     while (dev->xkb_interest) {
+ 	XkbRemoveResourceClient((DevicePtr)dev,dev->xkb_interest->resource);
+     }
+ #endif
++
++    if (dev->devPrivates)
++        xfree(dev->devPrivates);
++
+     xfree(dev->sync.event);
+     xfree(dev);
+ }
+ 
+ void
+ CloseDownDevices()
+ {
+     register DeviceIntPtr dev, next;
+ 
+     for (dev = inputInfo.devices; dev; dev = next)
diff --git a/x11-base/xorg-server/files/1.2.0-typo-fix.patch b/x11-base/xorg-server/files/1.2.0-typo-fix.patch
new file mode 100644
index 0000000..0a15217
--- /dev/null
+++ b/x11-base/xorg-server/files/1.2.0-typo-fix.patch
@@ -0,0 +1,36 @@
+http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=a23b0b069cac8a48e2b306b2095515d75f647705
+Typo fix.
+	author  Adam Jackson <ajax@benzedrine.nwnk.net>
+	Mon, 12 Feb 2007 22:50:00 +0000 (17:50 -0500)
+	committer  Adam Jackson <ajax@benzedrine.nwnk.net>
+	Mon, 12 Feb 2007 22:50:00 +0000 (17:50 -0500)
+	commit  a23b0b069cac8a48e2b306b2095515d75f647705
+	tree  44d98fa9da8b879e4d610a9fc484804a418d217c  tree
+	parent  d21c95f80bdba2f29eedd57fb0b00e580391c08e  commit | commitdiff
+Typo fix.
+
+--- xorg-server-1.2.0.orig/hw/xfree86/os-support/xf86_libc.h	2007-03-18 21:43:21.000000000 +0100
++++ xorg-server-1.2.0/hw/xfree86/os-support/xf86_libc.h	2007-03-19 00:31:52.000000000 +0100
+@@ -421,21 +421,21 @@
+ #undef tan
+ #define tan(d)			xf86tan(d)
+ #undef tmpfile
+ #define tmpfile()		xf86tmpfile()
+ #undef tolower
+ #define tolower(i)		xf86tolower(i)
+ #undef toupper
+ #define toupper(i)		xf86toupper(i)
+ #undef ungetc
+ #define ungetc(i,FP)		xf86ungetc(i,FP)
+-#undef vfprinf
++#undef vfprintf
+ #define vfprintf(p,f,a)		xf86vfprintf(p,f,a)
+ #undef vsnprintf
+ #define vsnprintf(s,n,f,a)	xf86vsnprintf(s,n,f,a)
+ #undef vsprintf
+ #define vsprintf(s,f,a)		xf86vsprintf(s,f,a)
+ /* XXX Disable assert as if NDEBUG was defined */
+ /* Some X headers defined this away too */
+ #undef assert
+ #define assert(a)		((void)0)
+ #undef HUGE_VAL
\ No newline at end of file
diff --git a/x11-base/xorg-server/files/1.2.0-zero-out-client-devprivates-on-allocation.patch b/x11-base/xorg-server/files/1.2.0-zero-out-client-devprivates-on-allocation.patch
new file mode 100644
index 0000000..7c6144b
--- /dev/null
+++ b/x11-base/xorg-server/files/1.2.0-zero-out-client-devprivates-on-allocation.patch
@@ -0,0 +1,36 @@
+http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=d9e079d2a385203fdd18d958cfc19d759cab4ba8
+Zero out client devPrivates on allocation.
+	author  Eamon Walsh <ewalsh@tycho.nsa.gov>
+	Fri, 22 Dec 2006 18:07:09 +0000 (13:07 -0500)
+	committer  Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil>
+	Fri, 22 Dec 2006 18:07:09 +0000 (13:07 -0500)
+	commit  d9e079d2a385203fdd18d958cfc19d759cab4ba8
+	tree  20548a2b4ab268c5a32c5883f3d06816c9f5d43e  tree
+	parent  e437f357b6850a6c87ca6696870b3abd40e5b8ed  commit | commitdiff
+Zero out client devPrivates on allocation.
+
+--- xorg-server-1.2.0.orig/dix/dispatch.c	2007-03-18 21:43:21.000000000 +0100
++++ xorg-server-1.2.0/dix/dispatch.c	2007-03-18 22:00:24.000000000 +0100
+@@ -3683,20 +3683,22 @@
+ 	ppriv = (DevUnion *)(client + 1);
+     else
+     {
+ 	ppriv = (DevUnion *)xalloc(totalClientSize - sizeof(ClientRec));
+ 	if (!ppriv)
+ 	    return 0;
+     }
+     client->devPrivates = ppriv;
+     sizes = clientPrivateSizes;
+     ptr = (char *)(ppriv + clientPrivateLen);
++    if (ppriv)
++        bzero(ppriv, totalClientSize - sizeof(ClientRec));
+     for (i = clientPrivateLen; --i >= 0; ppriv++, sizes++)
+     {
+ 	if ( (size = *sizes) )
+ 	{
+ 	    ppriv->ptr = (pointer)ptr;
+ 	    ptr += size;
+ 	}
+ 	else
+ 	    ppriv->ptr = (pointer)NULL;
+     }
diff --git a/x11-base/xorg-server/files/1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch b/x11-base/xorg-server/files/1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch
new file mode 100644
index 0000000..18075a6
--- /dev/null
+++ b/x11-base/xorg-server/files/1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch
@@ -0,0 +1,244 @@
+Index: xorg-server-1.3.0.0/Xi/chgfctl.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/Xi/chgfctl.c
++++ xorg-server-1.3.0.0/Xi/chgfctl.c
+@@ -451,18 +451,13 @@ ChangeStringFeedback(ClientPtr client, D
+ 		     xStringFeedbackCtl * f)
+ {
+     register char n;
+-    register long *p;
+     int i, j;
+     KeySym *syms, *sup_syms;
+ 
+     syms = (KeySym *) (f + 1);
+     if (client->swapped) {
+ 	swaps(&f->length, n);	/* swapped num_keysyms in calling proc */
+-	p = (long *)(syms);
+-	for (i = 0; i < f->num_keysyms; i++) {
+-	    swapl(p, n);
+-	    p++;
+-	}
++	SwapLongs((CARD32 *) syms, f->num_keysyms);
+     }
+ 
+     if (f->num_keysyms > s->ctrl.max_symbols) {
+Index: xorg-server-1.3.0.0/Xi/chgkmap.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/Xi/chgkmap.c
++++ xorg-server-1.3.0.0/Xi/chgkmap.c
+@@ -79,18 +79,14 @@ int
+ SProcXChangeDeviceKeyMapping(register ClientPtr client)
+ {
+     register char n;
+-    register long *p;
+-    register int i, count;
++    register unsigned int count;
+ 
+     REQUEST(xChangeDeviceKeyMappingReq);
+     swaps(&stuff->length, n);
+     REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq);
+-    p = (long *)&stuff[1];
+     count = stuff->keyCodes * stuff->keySymsPerKeyCode;
+-    for (i = 0; i < count; i++) {
+-	swapl(p, n);
+-	p++;
+-    }
++    REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32));
++    SwapLongs((CARD32 *) (&stuff[1]), count);
+     return (ProcXChangeDeviceKeyMapping(client));
+ }
+ 
+@@ -106,10 +102,14 @@ ProcXChangeDeviceKeyMapping(register Cli
+     int ret;
+     unsigned len;
+     DeviceIntPtr dev;
++    unsigned int count;
+ 
+     REQUEST(xChangeDeviceKeyMappingReq);
+     REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq);
+ 
++    count = stuff->keyCodes * stuff->keySymsPerKeyCode;
++    REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32));
++
+     dev = LookupDeviceIntRec(stuff->deviceid);
+     if (dev == NULL) {
+ 	SendErrorToClient(client, IReqCode, X_ChangeDeviceKeyMapping, 0,
+Index: xorg-server-1.3.0.0/Xi/chgprop.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/Xi/chgprop.c
++++ xorg-server-1.3.0.0/Xi/chgprop.c
+@@ -81,19 +81,15 @@ int
+ SProcXChangeDeviceDontPropagateList(register ClientPtr client)
+ {
+     register char n;
+-    register long *p;
+-    register int i;
+ 
+     REQUEST(xChangeDeviceDontPropagateListReq);
+     swaps(&stuff->length, n);
+     REQUEST_AT_LEAST_SIZE(xChangeDeviceDontPropagateListReq);
+     swapl(&stuff->window, n);
+     swaps(&stuff->count, n);
+-    p = (long *)&stuff[1];
+-    for (i = 0; i < stuff->count; i++) {
+-	swapl(p, n);
+-	p++;
+-    }
++    REQUEST_FIXED_SIZE(xChangeDeviceDontPropagateListReq,
++                      stuff->count * sizeof(CARD32));
++    SwapLongs((CARD32 *) (&stuff[1]), stuff->count);
+     return (ProcXChangeDeviceDontPropagateList(client));
+ }
+ 
+Index: xorg-server-1.3.0.0/Xi/grabdev.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/Xi/grabdev.c
++++ xorg-server-1.3.0.0/Xi/grabdev.c
+@@ -82,8 +82,6 @@ int
+ SProcXGrabDevice(register ClientPtr client)
+ {
+     register char n;
+-    register long *p;
+-    register int i;
+ 
+     REQUEST(xGrabDeviceReq);
+     swaps(&stuff->length, n);
+@@ -91,11 +89,11 @@ SProcXGrabDevice(register ClientPtr clie
+     swapl(&stuff->grabWindow, n);
+     swapl(&stuff->time, n);
+     swaps(&stuff->event_count, n);
+-    p = (long *)&stuff[1];
+-    for (i = 0; i < stuff->event_count; i++) {
+-	swapl(p, n);
+-	p++;
+-    }
++
++    if (stuff->length != (sizeof(xGrabDeviceReq) >> 2) + stuff->event_count)
++       return BadLength;
++    
++    SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
+ 
+     return (ProcXGrabDevice(client));
+ }
+Index: xorg-server-1.3.0.0/Xi/grabdevb.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/Xi/grabdevb.c
++++ xorg-server-1.3.0.0/Xi/grabdevb.c
+@@ -80,8 +80,6 @@ int
+ SProcXGrabDeviceButton(register ClientPtr client)
+ {
+     register char n;
+-    register long *p;
+-    register int i;
+ 
+     REQUEST(xGrabDeviceButtonReq);
+     swaps(&stuff->length, n);
+@@ -89,11 +87,9 @@ SProcXGrabDeviceButton(register ClientPt
+     swapl(&stuff->grabWindow, n);
+     swaps(&stuff->modifiers, n);
+     swaps(&stuff->event_count, n);
+-    p = (long *)&stuff[1];
+-    for (i = 0; i < stuff->event_count; i++) {
+-	swapl(p, n);
+-	p++;
+-    }
++    REQUEST_FIXED_SIZE(xGrabDeviceButtonReq,
++                      stuff->event_count * sizeof(CARD32));
++    SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
+ 
+     return (ProcXGrabDeviceButton(client));
+ }
+Index: xorg-server-1.3.0.0/Xi/grabdevk.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/Xi/grabdevk.c
++++ xorg-server-1.3.0.0/Xi/grabdevk.c
+@@ -80,8 +80,6 @@ int
+ SProcXGrabDeviceKey(register ClientPtr client)
+ {
+     register char n;
+-    register long *p;
+-    register int i;
+ 
+     REQUEST(xGrabDeviceKeyReq);
+     swaps(&stuff->length, n);
+@@ -89,11 +87,8 @@ SProcXGrabDeviceKey(register ClientPtr c
+     swapl(&stuff->grabWindow, n);
+     swaps(&stuff->modifiers, n);
+     swaps(&stuff->event_count, n);
+-    p = (long *)&stuff[1];
+-    for (i = 0; i < stuff->event_count; i++) {
+-	swapl(p, n);
+-	p++;
+-    }
++    REQUEST_FIXED_SIZE(xGrabDeviceKeyReq, stuff->event_count * sizeof(CARD32));
++    SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
+     return (ProcXGrabDeviceKey(client));
+ }
+ 
+Index: xorg-server-1.3.0.0/Xi/selectev.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/Xi/selectev.c
++++ xorg-server-1.3.0.0/Xi/selectev.c
+@@ -84,19 +84,16 @@ int
+ SProcXSelectExtensionEvent(register ClientPtr client)
+ {
+     register char n;
+-    register long *p;
+-    register int i;
+ 
+     REQUEST(xSelectExtensionEventReq);
+     swaps(&stuff->length, n);
+     REQUEST_AT_LEAST_SIZE(xSelectExtensionEventReq);
+     swapl(&stuff->window, n);
+     swaps(&stuff->count, n);
+-    p = (long *)&stuff[1];
+-    for (i = 0; i < stuff->count; i++) {
+-	swapl(p, n);
+-	p++;
+-    }
++    REQUEST_FIXED_SIZE(xSelectExtensionEventReq,
++                      stuff->count * sizeof(CARD32));
++    SwapLongs((CARD32 *) (&stuff[1]), stuff->count);
++
+     return (ProcXSelectExtensionEvent(client));
+ }
+ 
+Index: xorg-server-1.3.0.0/Xi/sendexev.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/Xi/sendexev.c
++++ xorg-server-1.3.0.0/Xi/sendexev.c
+@@ -83,7 +83,7 @@ int
+ SProcXSendExtensionEvent(register ClientPtr client)
+ {
+     register char n;
+-    register long *p;
++    register CARD32 *p;
+     register int i;
+     xEvent eventT;
+     xEvent *eventP;
+@@ -94,6 +94,11 @@ SProcXSendExtensionEvent(register Client
+     REQUEST_AT_LEAST_SIZE(xSendExtensionEventReq);
+     swapl(&stuff->destination, n);
+     swaps(&stuff->count, n);
++
++    if (stuff->length != (sizeof(xSendExtensionEventReq) >> 2) + stuff->count +
++       (stuff->num_events * (sizeof(xEvent) >> 2)))
++       return BadLength;
++
+     eventP = (xEvent *) & stuff[1];
+     for (i = 0; i < stuff->num_events; i++, eventP++) {
+ 	proc = EventSwapVector[eventP->u.u.type & 0177];
+@@ -103,11 +108,8 @@ SProcXSendExtensionEvent(register Client
+ 	*eventP = eventT;
+     }
+ 
+-    p = (long *)(((xEvent *) & stuff[1]) + stuff->num_events);
+-    for (i = 0; i < stuff->count; i++) {
+-	swapl(p, n);
+-	p++;
+-    }
++    p = (CARD32 *)(((xEvent *) & stuff[1]) + stuff->num_events);
++    SwapLongs(p, stuff->count);
+     return (ProcXSendExtensionEvent(client));
+ }
+ 
diff --git a/x11-base/xorg-server/files/1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch b/x11-base/xorg-server/files/1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch
new file mode 100644
index 0000000..b8e5178
--- /dev/null
+++ b/x11-base/xorg-server/files/1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch
@@ -0,0 +1,22 @@
+Index: xorg-server-1.3.0.0/Xext/security.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/Xext/security.c
++++ xorg-server-1.3.0.0/Xext/security.c
+@@ -1567,7 +1567,7 @@ SecurityLoadPropertyAccessList(void)
+ 	return;
+ 
+ #ifndef __UNIXOS2__
+-    f = fopen(SecurityPolicyFile, "r");
++    f = Fopen(SecurityPolicyFile, "r");
+ #else
+     f = fopen((char*)__XOS2RedirRoot(SecurityPolicyFile), "r");
+ #endif    
+@@ -1653,7 +1653,7 @@ SecurityLoadPropertyAccessList(void)
+     }
+ #endif /* PROPDEBUG */
+ 
+-    fclose(f);
++    Fclose(f);
+ } /* SecurityLoadPropertyAccessList */
+ 
+ 
diff --git a/x11-base/xorg-server/files/1.3-alpha-build-fix.patch b/x11-base/xorg-server/files/1.3-alpha-build-fix.patch
new file mode 100644
index 0000000..481e4ad
--- /dev/null
+++ b/x11-base/xorg-server/files/1.3-alpha-build-fix.patch
@@ -0,0 +1,36 @@
+commit 0f91abd5c68eb044d09733d18ef0f6b8ed128200
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Thu Jul 19 20:37:26 2007 -0400
+
+    Fix alpha build failures
+    
+    Don't include <asm/pci.h> in os-support/linux/lnx_axp.c, use "lnx.h" and
+    <unistd.h> instead
+
+diff --git a/hw/xfree86/os-support/linux/lnx.h b/hw/xfree86/os-support/linux/lnx.h
+index 5aca9e9..085c942 100644
+--- a/hw/xfree86/os-support/linux/lnx.h
++++ b/hw/xfree86/os-support/linux/lnx.h
+@@ -11,7 +11,6 @@ extern int iopl __P ((int __level));
+ 
+ /* new pciconfig_iobase syscall added in 2.2.15 and 2.3.99 */
+ #  include <linux/unistd.h>
+-#  include <asm/pci.h>
+ extern long (*_iobase)(unsigned, int, int, int);
+ 
+ /*
+diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c
+index 0a76129..e255118 100644
+--- a/hw/xfree86/os-support/linux/lnx_axp.c
++++ b/hw/xfree86/os-support/linux/lnx_axp.c
+@@ -112,8 +112,8 @@ lnxGetAXP(void)
+ /*
+  * pciconfig_iobase wrappers and dynamic i/o selection
+  */
+-#include <linux/unistd.h>
+-#include <asm/pci.h>
++#include "lnx.h"
++#include <unistd.h>
+ #include <errno.h>
+ 
+ /* glibc versions (single hose only) */
diff --git a/x11-base/xorg-server/files/1.3.0.0-fix-dual-head-screen-resolutions.patch b/x11-base/xorg-server/files/1.3.0.0-fix-dual-head-screen-resolutions.patch
new file mode 100644
index 0000000..c5b9571
--- /dev/null
+++ b/x11-base/xorg-server/files/1.3.0.0-fix-dual-head-screen-resolutions.patch
@@ -0,0 +1,49 @@
+Title       : x11-base/xorg-server-1.3.0.0 uses wrong screen resolutions on a dual-head systems
+Assignee    : x11@gentoo.org
+Reported    : 2007-05-23 16:53 0000
+Updated     : 2007-10-02 19:39:28 0000
+Status      : NEW
+Severity    : normal
+Priority    : P2
+Reporter    : jouni.rinne@pp1.inet.fi
+Product     : Gentoo Linux
+Component   : Server
+Keywords    : Inclusion
+CC          : bas@lijer.nl
+CC          : daniel.pielmeier@googlemail.com
+CC          : frlinux@frlinux.net
+CC          : ml81@gmx.de
+Comments    : 14
+Attachments : 1
+URL         : http://bugs.gentoo.org/show_bug.cgi?id=179545
+
+commit 9c80eda826448822328bb678a7d284cc43fffb17
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date:   Wed Apr 25 16:35:04 2007 -0400
+
+    Disable RANDR's fake Xinerama protocol when there's more than one screen.
+
+    ... in the protocol sense.  Xinerama doesn't have any provision for more
+    than one protocol screen each with its own geometry.
+
+    Red Hat bug #231257.
+
+diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c
+index 1db27f1..2a57e4e 100644
+--- a/randr/rrxinerama.c
++++ b/randr/rrxinerama.c
+@@ -428,6 +428,14 @@ RRXineramaExtensionInit(void)
+ 	return;
+ #endif
+ 
++    /*
++     * Xinerama isn't capable enough to have multiple protocol screens each
++     * with their own output geometry.  So if there's more than one protocol
++     * screen, just don't even try.
++     */
++    if (screenInfo.numScreens > 1)
++	return;
++
+     (void) AddExtension(PANORAMIX_PROTOCOL_NAME, 0,0,
+ 			ProcRRXineramaDispatch,
+ 			SProcRRXineramaDispatch,
diff --git a/x11-base/xorg-server/files/1.3.0.0-fix-randr-resizing.patch b/x11-base/xorg-server/files/1.3.0.0-fix-randr-resizing.patch
new file mode 100644
index 0000000..4828699
--- /dev/null
+++ b/x11-base/xorg-server/files/1.3.0.0-fix-randr-resizing.patch
@@ -0,0 +1,58 @@
+Title       : xorg-server-1.3: desktop does not resize with RandR
+Assignee    : x11@gentoo.org
+Reported    : 2007-06-30 11:37 0000
+Updated     : 2007-10-06 08:32:58 0000
+Status      : ASSIGNED
+Severity    : normal
+Priority    : P2
+Reporter    : sascha.lucas@rus.uni-stuttgart.de
+Product     : Gentoo Linux
+Component   : KDE
+Keywords    : Inclusion
+CC          : caster@gentoo.org
+CC          : chrschmitt@gmail.com
+CC          : gentoo@chlhp.de
+CC          : kde@gentoo.org
+Comments    : 14
+Attachments : 0
+URL         : http://bugs.gentoo.org/show_bug.cgi?id=183721
+
+commit c10df5b967d4da4e11786520317e2917de5541fa
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Tue Apr 3 15:47:01 2007 -0700
+
+    Swap RRScreenChangeNotifyEvent dimensions when the screen has one crtc and it's rotated.
+
+    RandR 1.1 clients expect the size fields in this event to be the unrotated
+    dimensions of the screen.  This behavior is "weird", but that's the way the old
+    code worked so we need to be bug-compatible with it.
+
+diff --git a/randr/rrscreen.c b/randr/rrscreen.c
+index ad74ac3..f83fce3 100644
+--- a/randr/rrscreen.c
++++ b/randr/rrscreen.c
+@@ -116,11 +116,19 @@ RRDeliverScreenEvent (ClientPtr client, WindowPtr pWin, ScreenPtr pScreen)
+ 
+     se.sequenceNumber = client->sequence;
+     se.sizeID = RR10CurrentSizeID (pScreen);
+-    
+-    se.widthInPixels = pScreen->width;
+-    se.heightInPixels = pScreen->height;
+-    se.widthInMillimeters = pScreen->mmWidth;
+-    se.heightInMillimeters = pScreen->mmHeight;
++
++    if (se.rotation & (RR_Rotate_90 | RR_Rotate_270)) {
++	se.widthInPixels = pScreen->height;
++	se.heightInPixels = pScreen->width;
++	se.widthInMillimeters = pScreen->mmHeight;
++	se.heightInMillimeters = pScreen->mmWidth;
++    } else {
++	se.widthInPixels = pScreen->width;
++	se.heightInPixels = pScreen->height;
++	se.widthInMillimeters = pScreen->mmWidth;
++	se.heightInMillimeters = pScreen->mmHeight;
++    }
++
+     WriteEventsToClient (client, 1, (xEvent *) &se);
+ }
+ 
diff --git a/x11-base/xorg-server/files/1.3.0.0-fix-xephyr-amd64-segfault.patch b/x11-base/xorg-server/files/1.3.0.0-fix-xephyr-amd64-segfault.patch
new file mode 100644
index 0000000..c8fdfed
--- /dev/null
+++ b/x11-base/xorg-server/files/1.3.0.0-fix-xephyr-amd64-segfault.patch
@@ -0,0 +1,45 @@
+Title       : x11-base/xorg-server-1.3.0.0 Xephyr segfaults on startup on amd64
+Assignee    : x11@gentoo.org
+Reported    : 2007-09-20 17:22 0000
+Updated     : 2007-09-20 17:52:21 0000
+Status      : NEW
+URL         : https://bugs.freedesktop.org/show_bug.cgi?id=11582
+Severity    : normal
+Priority    : P2
+Reporter    : chithanh@cs.tu-berlin.de
+Product     : Gentoo Linux
+Component   : Server
+Keywords    : Inclusion
+Comments    : 2
+Attachments : 1
+URL         : http://bugs.gentoo.org/show_bug.cgi?id=193207
+
+commit dcc3de91d2b80be98e4488df29ec6b551c7ff6d1
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Sat Aug 18 11:50:33 2007 +0200
+
+    Xephyr: fix immediat segfault on amd64
+
+    This closes bug https://bugs.freedesktop.org/show_bug.cgi?id=11582
+
+diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
+index d0a2f2f..12118da 100644
+--- a/hw/kdrive/ephyr/hostx.c
++++ b/hw/kdrive/ephyr/hostx.c
+@@ -40,6 +40,7 @@
+ #include <X11/Xatom.h>
+ #include <X11/keysym.h>
+ #include <X11/extensions/XShm.h>
++#include <X11/Xmd.h>
+ 
+ /*  
+  * All xlib calls go here, which gets built as its own .a .
+@@ -79,7 +80,7 @@ static int            HostXWantDamageDebug = 0;
+ 
+ extern KeySym         EphyrKeymap[];
+ 
+-extern KeySym	      kdKeymap[];
++extern CARD32	      kdKeymap[];
+ extern int	      kdMinScanCode;
+ extern int	      kdMaxScanCode;
+ extern int	      kdMinKeyCode;
diff --git a/x11-base/xorg-server/files/1.3.0.0-fix-xkb-openoffice-hangs.patch b/x11-base/xorg-server/files/1.3.0.0-fix-xkb-openoffice-hangs.patch
new file mode 100644
index 0000000..88df93b
--- /dev/null
+++ b/x11-base/xorg-server/files/1.3.0.0-fix-xkb-openoffice-hangs.patch
@@ -0,0 +1,55 @@
+https://bugs.gentoo.org/show_bug.cgi?id=197104
+
+commit a5b8053606d6e786cdcf6734f271acc05f9cc588
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date:   Tue Sep 11 11:37:06 2007 -0400
+
+    Ignore - not just block - SIGALRM around Popen()/Pclose().
+
+    Because our "popen" implementation uses stdio, and because nobody's stdio
+    library is capable of surviving signals, we need to make absolutely sure
+    that we hide the SIGALRM from the smart scheduler.  Otherwise, when you
+    open a menu in openoffice, and it recompiles XKB to deal with the
+    accelerators, and you popen xkbcomp because we suck, then the scheduler
+    will tell you you're taking forever doing something stupid, and the
+    wait() code will get confused, and input will hang and your CPU usage
+    slams to 100%.  Down, not across.
+
+diff --git a/os/utils.c b/os/utils.c
+index 3bb7dbe..afcaae4 100644
+--- a/os/utils.c
++++ b/os/utils.c
+@@ -1720,6 +1720,8 @@ static struct pid {
+     int pid;
+ } *pidlist;
+ 
++static sighandler_t old_alarm = NULL; /* XXX horrible awful hack */
++
+ pointer
+ Popen(char *command, char *type)
+ {
+@@ -1741,11 +1743,15 @@ Popen(char *command, char *type)
+ 	return NULL;
+     }
+ 
++    /* Ignore the smart scheduler while this is going on */
++    old_alarm = signal(SIGALRM, SIG_IGN);
++
+     switch (pid = fork()) {
+     case -1: 	/* error */
+ 	close(pdes[0]);
+ 	close(pdes[1]);
+ 	xfree(cur);
++	signal(SIGALRM, old_alarm);
+ 	return NULL;
+     case 0:	/* child */
+ 	if (setgid(getgid()) == -1)
+@@ -1921,6 +1927,8 @@ Pclose(pointer iop)
+     /* allow EINTR again */
+     OsReleaseSignals ();
+     
++    signal(SIGALRM, old_alarm);
++
+     return pid == -1 ? -1 : pstat;
+ }
+ 
diff --git a/x11-base/xorg-server/files/1.3.0.0-ramdac.patch b/x11-base/xorg-server/files/1.3.0.0-ramdac.patch
new file mode 100644
index 0000000..37ab1b7
--- /dev/null
+++ b/x11-base/xorg-server/files/1.3.0.0-ramdac.patch
@@ -0,0 +1,91 @@
+Title       : xorg-server-1.3: xf86-video-s3 - s3_drv.so: undefined symbol: RamDacInit
+Assignee    : x11@gentoo.org
+Reported    : 2007-09-12 15:53 0000
+Updated     : 2007-10-06 08:34:19 0000
+Status      : NEW
+Severity    : normal
+Priority    : P2
+Reporter    : dpblnt@gmail.com
+Product     : Gentoo Linux
+Component   : Applications
+Keywords    : Inclusion
+Comments    : 3
+Attachments : 1
+URL         : http://bugs.gentoo.org/show_bug.cgi?id=192312
+
+commit 3c6f1428489c1f71acd41066ea73ef4ae7c60f17
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Tue May 29 22:01:30 2007 -0400
+
+    Make sure that the ramdac symbols are present in the server
+    
+    The former ramdac module is now built into the server, so its symbols need to
+    be explicitly exported to drivers (Debian #423129).
+
+diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
+index 5175f01..6535e4c 100644
+--- a/hw/xfree86/loader/xf86sym.c
++++ b/hw/xfree86/loader/xf86sym.c
+@@ -96,6 +96,11 @@
+ #endif
+ #include "xf86DDC.h"
+ #include "edid.h"
++#include "xf86Cursor.h"
++#include "xf86RamDac.h"
++#include "BT.h"
++#include "IBM.h"
++#include "TI.h"
+ 
+ #ifndef HAS_GLIBC_SIGSETJMP
+ #if defined(setjmp) && defined(__GNU_LIBRARY__) && \
+@@ -1255,4 +1260,50 @@ _X_HIDDEN void *xfree86LookupTab[] = {
+     SYMFUNC(xf86I2CWriteRead)
+     SYMFUNC(xf86I2CWriteVec)
+     SYMFUNC(xf86I2CWriteWord)
++
++    /* ramdac/xf86RamDac.c */
++    SYMFUNC(RamDacCreateInfoRec)
++    SYMFUNC(RamDacHelperCreateInfoRec)
++    SYMFUNC(RamDacDestroyInfoRec)
++    SYMFUNC(RamDacHelperDestroyInfoRec)
++    SYMFUNC(RamDacInit)
++    SYMFUNC(RamDacHandleColormaps)
++    SYMFUNC(RamDacFreeRec)
++    SYMFUNC(RamDacGetHWIndex)
++    SYMVAR(RamDacHWPrivateIndex)
++    SYMVAR(RamDacScreenPrivateIndex)
++
++    /* ramdac/xf86Cursor.c */
++    SYMFUNC(xf86InitCursor)
++    SYMFUNC(xf86CreateCursorInfoRec)
++    SYMFUNC(xf86DestroyCursorInfoRec)
++    SYMFUNC(xf86ForceHWCursor)
++
++    /* ramdac/BT.c */
++    SYMFUNC(BTramdacProbe)
++    SYMFUNC(BTramdacSave)
++    SYMFUNC(BTramdacRestore)
++    SYMFUNC(BTramdacSetBpp)
++
++    /* ramdac/IBM.c */
++    SYMFUNC(IBMramdacProbe)
++    SYMFUNC(IBMramdacSave)
++    SYMFUNC(IBMramdacRestore)
++    SYMFUNC(IBMramdac526SetBpp)
++    SYMFUNC(IBMramdac640SetBpp)
++    SYMFUNC(IBMramdac526CalculateMNPCForClock)
++    SYMFUNC(IBMramdac640CalculateMNPCForClock)
++    SYMFUNC(IBMramdac526HWCursorInit)
++    SYMFUNC(IBMramdac640HWCursorInit)
++    SYMFUNC(IBMramdac526SetBppWeak)
++
++    /* ramdac/TI.c */
++    SYMFUNC(TIramdacCalculateMNPForClock)
++    SYMFUNC(TIramdacProbe)
++    SYMFUNC(TIramdacSave)
++    SYMFUNC(TIramdacRestore)
++    SYMFUNC(TIramdac3026SetBpp)
++    SYMFUNC(TIramdac3030SetBpp)
++    SYMFUNC(TIramdacHWCursorInit)
++    SYMFUNC(TIramdacLoadPalette)
+ };
diff --git a/x11-base/xorg-server/files/1.3.0.0-use-proc-instead-of-sys.patch b/x11-base/xorg-server/files/1.3.0.0-use-proc-instead-of-sys.patch
new file mode 100644
index 0000000..600d0ba
--- /dev/null
+++ b/x11-base/xorg-server/files/1.3.0.0-use-proc-instead-of-sys.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/show_bug.cgi?id=167052 attachment #126176
+
+Fix multi-domain systems including sparc and pegasos ppc
+
+diff -Nura xorg-server-1.3.0.0/hw/xfree86/os-support/bus/linuxPci.c xorg-server-1.3.0.0-nosysfs/hw/xfree86/os-support/bus/linuxPci.c
+--- xorg-server-1.3.0.0/hw/xfree86/os-support/bus/linuxPci.c	2006-11-16 15:01:25.000000000 -0300
++++ xorg-server-1.3.0.0-nosysfs/hw/xfree86/os-support/bus/linuxPci.c	2007-07-27 13:48:58.000000000 -0300
+@@ -148,7 +148,7 @@
+ 	int		domain, bus, dev, func;
+ 	char		file[64];
+ 	struct stat	ignored;
+-	static int is26 = -1;
++	static int is26 = 0;
+ 
+ 	domain = PCI_DOM_FROM_TAG(tag);
+ 	bus  = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag));
diff --git a/x11-base/xorg-server/files/1.3.0.0-xephyr_crash_at_exit.patch b/x11-base/xorg-server/files/1.3.0.0-xephyr_crash_at_exit.patch
new file mode 100644
index 0000000..4e5b130
--- /dev/null
+++ b/x11-base/xorg-server/files/1.3.0.0-xephyr_crash_at_exit.patch
@@ -0,0 +1,30 @@
+* Tue Mar 13 2007 Adam Jackson <ajax@redhat.com> 1.2.99.901-2
+- xserver-1.2.99.901-xephyr-crash-at-exit.patch: Fix yet another GLX visual
+  mess. (#231425)
+
+https://bugs.freedesktop.org/show_bug.cgi?id=10713
+http://cvs.fedora.redhat.com/viewcvs/devel/xorg-x11-server/xserver-1.2.99.901-xephyr-crash-at-exit.patch?rev=1.1&view=log
+Debian bug #420421 (and maybe #424517)
+
+--- xorg-server-1.2.99.901/GL/mesa/X/xf86glx.c.jx	2007-03-07 14:15:25.000000000 -0500
++++ xorg-server-1.2.99.901/GL/mesa/X/xf86glx.c	2007-03-13 14:27:38.000000000 -0400
+@@ -281,12 +281,14 @@
+     __GLXMESAscreen *mesaScreen = (__GLXMESAscreen *) screen;
+     int i;
+ 
+-    for (i = 0; i < mesaScreen->num_vis; i++) {
+-	if (mesaScreen->xm_vis[i])
+-	    XMesaDestroyVisual(mesaScreen->xm_vis[i]);
+-    }
++    if (mesaScreen->xm_vis) {
++	for (i = 0; i < mesaScreen->num_vis; i++) {
++	    if (mesaScreen->xm_vis[i])
++		XMesaDestroyVisual(mesaScreen->xm_vis[i]);
++	}
+ 
+-    xfree(mesaScreen->xm_vis);
++	xfree(mesaScreen->xm_vis);
++    }
+ 
+     __glXScreenDestroy(screen);
+ 
diff --git a/x11-base/xorg-server/files/1.4-0001-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch b/x11-base/xorg-server/files/1.4-0001-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch
new file mode 100644
index 0000000..54dead0
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-0001-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch
@@ -0,0 +1,27 @@
+From 59a3b83922c810316a374a19484b24901c7437ae Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb <matthieu@bluenote.herrb.com>
+Date: Thu, 17 Jan 2008 15:26:41 +0100
+Subject: [PATCH] Fix for CVE-2007-5760 - XFree86 Misc extension out of bounds array index
+
+---
+ hw/xfree86/common/xf86MiscExt.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86MiscExt.c b/hw/xfree86/common/xf86MiscExt.c
+index c1b9c60..40c196a 100644
+--- a/hw/xfree86/common/xf86MiscExt.c
++++ b/hw/xfree86/common/xf86MiscExt.c
+@@ -548,6 +548,10 @@ MiscExtPassMessage(int scrnIndex, const char *msgtype, const char *msgval,
+ {
+     ScrnInfoPtr pScr = xf86Screens[scrnIndex];
+ 
++    /* should check this in the protocol, but xf86NumScreens isn't exported */
++    if (scrnIndex >= xf86NumScreens)
++	return BadValue;
++
+     if (*pScr->HandleMessage == NULL)
+ 	    return BadImplementation;
+     return (*pScr->HandleMessage)(scrnIndex, msgtype, msgval, retstr);
+-- 
+1.5.3.5
+
diff --git a/x11-base/xorg-server/files/1.4-0002-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch b/x11-base/xorg-server/files/1.4-0002-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch
new file mode 100644
index 0000000..a72ce3c
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-0002-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch
@@ -0,0 +1,26 @@
+From 4848d49d05a318559afe7a17a19ba055947ee1f5 Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb <matthieu@bluenote.herrb.com>
+Date: Thu, 17 Jan 2008 15:28:03 +0100
+Subject: [PATCH] Fix for CVE-2007-6428 - TOG-cup extension memory corruption.
+
+---
+ Xext/cup.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/Xext/cup.c b/Xext/cup.c
+index 6bfa278..781b9ce 100644
+--- a/Xext/cup.c
++++ b/Xext/cup.c
+@@ -196,6 +196,9 @@ int ProcGetReservedColormapEntries(
+ 
+     REQUEST_SIZE_MATCH (xXcupGetReservedColormapEntriesReq);
+ 
++    if (stuff->screen >= screenInfo.numScreens)
++	return BadValue;
++
+ #ifndef HAVE_SPECIAL_DESKTOP_COLORS
+     citems[CUP_BLACK_PIXEL].pixel = 
+ 	screenInfo.screens[stuff->screen]->blackPixel;
+-- 
+1.5.3.5
+
diff --git a/x11-base/xorg-server/files/1.4-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch b/x11-base/xorg-server/files/1.4-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch
new file mode 100644
index 0000000..ffbf8ac
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch
@@ -0,0 +1,262 @@
+From d244c8272e0ac47c41a9416e37293903b842a78b Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb <matthieu@bluenote.herrb.com>
+Date: Thu, 17 Jan 2008 15:27:34 +0100
+Subject: [PATCH] Fix for CVE-2007-6427 - Xinput extension memory corruption.
+
+---
+ Xi/chgfctl.c  |    7 +------
+ Xi/chgkmap.c  |   13 ++++++-------
+ Xi/chgprop.c  |   10 +++-------
+ Xi/grabdev.c  |   12 +++++-------
+ Xi/grabdevb.c |   10 +++-------
+ Xi/grabdevk.c |    9 ++-------
+ Xi/selectev.c |   11 ++++-------
+ Xi/sendexev.c |   14 ++++++++------
+ 8 files changed, 32 insertions(+), 54 deletions(-)
+
+diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c
+index 2e0e13c..235d659 100644
+--- a/Xi/chgfctl.c
++++ b/Xi/chgfctl.c
+@@ -327,18 +327,13 @@ ChangeStringFeedback(ClientPtr client, DeviceIntPtr dev,
+ 		     xStringFeedbackCtl * f)
+ {
+     char n;
+-    long *p;
+     int i, j;
+     KeySym *syms, *sup_syms;
+ 
+     syms = (KeySym *) (f + 1);
+     if (client->swapped) {
+ 	swaps(&f->length, n);	/* swapped num_keysyms in calling proc */
+-	p = (long *)(syms);
+-	for (i = 0; i < f->num_keysyms; i++) {
+-	    swapl(p, n);
+-	    p++;
+-	}
++	SwapLongs((CARD32 *) syms, f->num_keysyms);
+     }
+ 
+     if (f->num_keysyms > s->ctrl.max_symbols) {
+diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c
+index eac520f..f8f85bc 100644
+--- a/Xi/chgkmap.c
++++ b/Xi/chgkmap.c
+@@ -79,18 +79,14 @@ int
+ SProcXChangeDeviceKeyMapping(ClientPtr client)
+ {
+     char n;
+-    long *p;
+-    int i, count;
++    unsigned int count;
+ 
+     REQUEST(xChangeDeviceKeyMappingReq);
+     swaps(&stuff->length, n);
+     REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq);
+-    p = (long *)&stuff[1];
+     count = stuff->keyCodes * stuff->keySymsPerKeyCode;
+-    for (i = 0; i < count; i++) {
+-	swapl(p, n);
+-	p++;
+-    }
++    REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32));
++    SwapLongs((CARD32 *) (&stuff[1]), count);
+     return (ProcXChangeDeviceKeyMapping(client));
+ }
+ 
+@@ -106,10 +102,13 @@ ProcXChangeDeviceKeyMapping(ClientPtr client)
+     int ret;
+     unsigned len;
+     DeviceIntPtr dev;
++    unsigned int count;
+ 
+     REQUEST(xChangeDeviceKeyMappingReq);
+     REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq);
+ 
++    count = stuff->keyCodes * stuff->keySymsPerKeyCode;
++    REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32));
+     dev = LookupDeviceIntRec(stuff->deviceid);
+     if (dev == NULL) {
+ 	SendErrorToClient(client, IReqCode, X_ChangeDeviceKeyMapping, 0,
+diff --git a/Xi/chgprop.c b/Xi/chgprop.c
+index 59a93c6..21bda5b 100644
+--- a/Xi/chgprop.c
++++ b/Xi/chgprop.c
+@@ -81,19 +81,15 @@ int
+ SProcXChangeDeviceDontPropagateList(ClientPtr client)
+ {
+     char n;
+-    long *p;
+-    int i;
+ 
+     REQUEST(xChangeDeviceDontPropagateListReq);
+     swaps(&stuff->length, n);
+     REQUEST_AT_LEAST_SIZE(xChangeDeviceDontPropagateListReq);
+     swapl(&stuff->window, n);
+     swaps(&stuff->count, n);
+-    p = (long *)&stuff[1];
+-    for (i = 0; i < stuff->count; i++) {
+-	swapl(p, n);
+-	p++;
+-    }
++    REQUEST_FIXED_SIZE(xChangeDeviceDontPropagateListReq,
++                      stuff->count * sizeof(CARD32));
++    SwapLongs((CARD32 *) (&stuff[1]), stuff->count);
+     return (ProcXChangeDeviceDontPropagateList(client));
+ }
+ 
+diff --git a/Xi/grabdev.c b/Xi/grabdev.c
+index e2809ef..d0b4ae7 100644
+--- a/Xi/grabdev.c
++++ b/Xi/grabdev.c
+@@ -82,8 +82,6 @@ int
+ SProcXGrabDevice(ClientPtr client)
+ {
+     char n;
+-    long *p;
+-    int i;
+ 
+     REQUEST(xGrabDeviceReq);
+     swaps(&stuff->length, n);
+@@ -91,11 +89,11 @@ SProcXGrabDevice(ClientPtr client)
+     swapl(&stuff->grabWindow, n);
+     swapl(&stuff->time, n);
+     swaps(&stuff->event_count, n);
+-    p = (long *)&stuff[1];
+-    for (i = 0; i < stuff->event_count; i++) {
+-	swapl(p, n);
+-	p++;
+-    }
++
++    if (stuff->length != (sizeof(xGrabDeviceReq) >> 2) + stuff->event_count)
++       return BadLength;
++    
++    SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
+ 
+     return (ProcXGrabDevice(client));
+ }
+diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c
+index df62d0c..18db1f7 100644
+--- a/Xi/grabdevb.c
++++ b/Xi/grabdevb.c
+@@ -80,8 +80,6 @@ int
+ SProcXGrabDeviceButton(ClientPtr client)
+ {
+     char n;
+-    long *p;
+-    int i;
+ 
+     REQUEST(xGrabDeviceButtonReq);
+     swaps(&stuff->length, n);
+@@ -89,11 +87,9 @@ SProcXGrabDeviceButton(ClientPtr client)
+     swapl(&stuff->grabWindow, n);
+     swaps(&stuff->modifiers, n);
+     swaps(&stuff->event_count, n);
+-    p = (long *)&stuff[1];
+-    for (i = 0; i < stuff->event_count; i++) {
+-	swapl(p, n);
+-	p++;
+-    }
++    REQUEST_FIXED_SIZE(xGrabDeviceButtonReq,
++                      stuff->event_count * sizeof(CARD32));
++    SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
+ 
+     return (ProcXGrabDeviceButton(client));
+ }
+diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c
+index b74592f..429b2f7 100644
+--- a/Xi/grabdevk.c
++++ b/Xi/grabdevk.c
+@@ -80,8 +80,6 @@ int
+ SProcXGrabDeviceKey(ClientPtr client)
+ {
+     char n;
+-    long *p;
+-    int i;
+ 
+     REQUEST(xGrabDeviceKeyReq);
+     swaps(&stuff->length, n);
+@@ -89,11 +87,8 @@ SProcXGrabDeviceKey(ClientPtr client)
+     swapl(&stuff->grabWindow, n);
+     swaps(&stuff->modifiers, n);
+     swaps(&stuff->event_count, n);
+-    p = (long *)&stuff[1];
+-    for (i = 0; i < stuff->event_count; i++) {
+-	swapl(p, n);
+-	p++;
+-    }
++    REQUEST_FIXED_SIZE(xGrabDeviceKeyReq, stuff->event_count * sizeof(CARD32));
++    SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
+     return (ProcXGrabDeviceKey(client));
+ }
+ 
+diff --git a/Xi/selectev.c b/Xi/selectev.c
+index d52db1b..19415c5 100644
+--- a/Xi/selectev.c
++++ b/Xi/selectev.c
+@@ -131,19 +131,16 @@ int
+ SProcXSelectExtensionEvent(ClientPtr client)
+ {
+     char n;
+-    long *p;
+-    int i;
+ 
+     REQUEST(xSelectExtensionEventReq);
+     swaps(&stuff->length, n);
+     REQUEST_AT_LEAST_SIZE(xSelectExtensionEventReq);
+     swapl(&stuff->window, n);
+     swaps(&stuff->count, n);
+-    p = (long *)&stuff[1];
+-    for (i = 0; i < stuff->count; i++) {
+-	swapl(p, n);
+-	p++;
+-    }
++    REQUEST_FIXED_SIZE(xSelectExtensionEventReq,
++                      stuff->count * sizeof(CARD32));
++    SwapLongs((CARD32 *) (&stuff[1]), stuff->count);
++
+     return (ProcXSelectExtensionEvent(client));
+ }
+ 
+diff --git a/Xi/sendexev.c b/Xi/sendexev.c
+index eac9abe..9803cf3 100644
+--- a/Xi/sendexev.c
++++ b/Xi/sendexev.c
+@@ -83,7 +83,7 @@ int
+ SProcXSendExtensionEvent(ClientPtr client)
+ {
+     char n;
+-    long *p;
++    CARD32 *p;
+     int i;
+     xEvent eventT;
+     xEvent *eventP;
+@@ -94,6 +94,11 @@ SProcXSendExtensionEvent(ClientPtr client)
+     REQUEST_AT_LEAST_SIZE(xSendExtensionEventReq);
+     swapl(&stuff->destination, n);
+     swaps(&stuff->count, n);
++
++    if (stuff->length != (sizeof(xSendExtensionEventReq) >> 2) + stuff->count +
++       (stuff->num_events * (sizeof(xEvent) >> 2)))
++       return BadLength;
++
+     eventP = (xEvent *) & stuff[1];
+     for (i = 0; i < stuff->num_events; i++, eventP++) {
+ 	proc = EventSwapVector[eventP->u.u.type & 0177];
+@@ -103,11 +108,8 @@ SProcXSendExtensionEvent(ClientPtr client)
+ 	*eventP = eventT;
+     }
+ 
+-    p = (long *)(((xEvent *) & stuff[1]) + stuff->num_events);
+-    for (i = 0; i < stuff->count; i++) {
+-	swapl(p, n);
+-	p++;
+-    }
++    p = (CARD32 *)(((xEvent *) & stuff[1]) + stuff->num_events);
++    SwapLongs(p, stuff->count);
+     return (ProcXSendExtensionEvent(client));
+ }
+ 
+-- 
+1.5.3.5
+
diff --git a/x11-base/xorg-server/files/1.4-0004-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch b/x11-base/xorg-server/files/1.4-0004-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch
new file mode 100644
index 0000000..ac66b4d
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-0004-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch
@@ -0,0 +1,210 @@
+From 8b14f7b74284900b95a319ec80c4333e63af2296 Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb <matthieu@bluenote.herrb.com>
+Date: Thu, 17 Jan 2008 15:28:42 +0100
+Subject: [PATCH] Fix for CVE-2007-6429 - MIT-SHM and EVI extensions integer overflows.
+
+---
+ Xext/EVI.c       |   15 ++++++++++++++-
+ Xext/sampleEVI.c |   29 ++++++++++++++++++++++++-----
+ Xext/shm.c       |   46 ++++++++++++++++++++++++++++++++++++++--------
+ 3 files changed, 76 insertions(+), 14 deletions(-)
+
+diff --git a/Xext/EVI.c b/Xext/EVI.c
+index 8fe3481..13bd32a 100644
+--- a/Xext/EVI.c
++++ b/Xext/EVI.c
+@@ -34,6 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #include <X11/extensions/XEVIstr.h>
+ #include "EVIstruct.h"
+ #include "modinit.h"
++#include "scrnintstr.h"
+ 
+ #if 0
+ static unsigned char XEVIReqCode = 0;
+@@ -87,10 +88,22 @@ ProcEVIGetVisualInfo(ClientPtr client)
+ {
+     REQUEST(xEVIGetVisualInfoReq);
+     xEVIGetVisualInfoReply rep;
+-    int n, n_conflict, n_info, sz_info, sz_conflict;
++    int i, n, n_conflict, n_info, sz_info, sz_conflict;
+     VisualID32 *conflict;
++    unsigned int total_visuals = 0;
+     xExtendedVisualInfo *eviInfo;
+     int status;
++
++    /*
++     * do this first, otherwise REQUEST_FIXED_SIZE can overflow.  we assume
++     * here that you don't have more than 2^32 visuals over all your screens;
++     * this seems like a safe assumption.
++     */
++    for (i = 0; i < screenInfo.numScreens; i++)
++	total_visuals += screenInfo.screens[i]->numVisuals;
++    if (stuff->n_visual > total_visuals)
++	return BadValue;
++
+     REQUEST_FIXED_SIZE(xEVIGetVisualInfoReq, stuff->n_visual * sz_VisualID32);
+     status = eviPriv->getVisualInfo((VisualID32 *)&stuff[1], (int)stuff->n_visual,
+ 		&eviInfo, &n_info, &conflict, &n_conflict);
+diff --git a/Xext/sampleEVI.c b/Xext/sampleEVI.c
+index 7508aa7..b871bfd 100644
+--- a/Xext/sampleEVI.c
++++ b/Xext/sampleEVI.c
+@@ -34,6 +34,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #include <X11/extensions/XEVIstr.h>
+ #include "EVIstruct.h"
+ #include "scrnintstr.h"
++
++#if HAVE_STDINT_H
++#include <stdint.h>
++#elif !defined(UINT32_MAX)
++#define UINT32_MAX 0xffffffffU
++#endif
++
+ static int sampleGetVisualInfo(
+     VisualID32 *visual,
+     int n_visual,
+@@ -42,24 +49,36 @@ static int sampleGetVisualInfo(
+     VisualID32 **conflict_rn,
+     int *n_conflict_rn)
+ {
+-    int max_sz_evi = n_visual * sz_xExtendedVisualInfo * screenInfo.numScreens;
++    unsigned int max_sz_evi;
+     VisualID32 *temp_conflict;
+     xExtendedVisualInfo *evi;
+-    int max_visuals = 0, max_sz_conflict, sz_conflict = 0;
++    unsigned int max_visuals = 0, max_sz_conflict, sz_conflict = 0;
+     register int visualI, scrI, sz_evi = 0, conflictI, n_conflict;
+-    *evi_rn = evi = (xExtendedVisualInfo *)xalloc(max_sz_evi);
+-    if (!*evi_rn)
+-         return BadAlloc;
++
++    if (n_visual > UINT32_MAX/(sz_xExtendedVisualInfo * screenInfo.numScreens))
++	return BadAlloc;
++    max_sz_evi = n_visual * sz_xExtendedVisualInfo * screenInfo.numScreens;
++    
+     for (scrI = 0; scrI < screenInfo.numScreens; scrI++) {
+         if (screenInfo.screens[scrI]->numVisuals > max_visuals)
+             max_visuals = screenInfo.screens[scrI]->numVisuals;
+     }
++
++    if (n_visual > UINT32_MAX/(sz_VisualID32 * screenInfo.numScreens 
++			       * max_visuals)) 
++	return BadAlloc;
+     max_sz_conflict = n_visual * sz_VisualID32 * screenInfo.numScreens * max_visuals;
++
++    *evi_rn = evi = (xExtendedVisualInfo *)xalloc(max_sz_evi);
++    if (!*evi_rn)
++         return BadAlloc;
++
+     temp_conflict = (VisualID32 *)xalloc(max_sz_conflict);
+     if (!temp_conflict) {
+         xfree(*evi_rn);
+         return BadAlloc;
+     }
++
+     for (scrI = 0; scrI < screenInfo.numScreens; scrI++) {
+         for (visualI = 0; visualI < n_visual; visualI++) {
+ 	    evi[sz_evi].core_visual_id = visual[visualI];
+diff --git a/Xext/shm.c b/Xext/shm.c
+index ac587be..5633be9 100644
+--- a/Xext/shm.c
++++ b/Xext/shm.c
+@@ -711,6 +711,8 @@ ProcPanoramiXShmCreatePixmap(
+     int i, j, result, rc;
+     ShmDescPtr shmdesc;
+     REQUEST(xShmCreatePixmapReq);
++    unsigned int width, height, depth;
++    unsigned long size;
+     PanoramiXRes *newPix;
+ 
+     REQUEST_SIZE_MATCH(xShmCreatePixmapReq);
+@@ -724,11 +726,26 @@ ProcPanoramiXShmCreatePixmap(
+ 	return rc;
+ 
+     VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client);
+-    if (!stuff->width || !stuff->height)
++
++    width = stuff->width;
++    height = stuff->height;
++    depth = stuff->depth;
++    if (!width || !height || !depth)
+     {
+ 	client->errorValue = 0;
+         return BadValue;
+     }
++    if (width > 32767 || height > 32767)
++        return BadAlloc;
++    size = PixmapBytePad(width, depth) * height;
++    if (sizeof(size) == 4) {
++        if (size < width * height)
++            return BadAlloc;
++        /* thankfully, offset is unsigned */
++        if (stuff->offset + size < size)
++            return BadAlloc;
++    }
++
+     if (stuff->depth != 1)
+     {
+         pDepth = pDraw->pScreen->allowedDepths;
+@@ -739,9 +756,7 @@ ProcPanoramiXShmCreatePixmap(
+         return BadValue;
+     }
+ CreatePmap:
+-    VERIFY_SHMSIZE(shmdesc, stuff->offset,
+-		   PixmapBytePad(stuff->width, stuff->depth) * stuff->height,
+-		   client);
++    VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
+ 
+     if(!(newPix = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
+ 	return BadAlloc;
+@@ -1040,6 +1055,8 @@ ProcShmCreatePixmap(client)
+     register int i, rc;
+     ShmDescPtr shmdesc;
+     REQUEST(xShmCreatePixmapReq);
++    unsigned int width, height, depth;
++    unsigned long size;
+ 
+     REQUEST_SIZE_MATCH(xShmCreatePixmapReq);
+     client->errorValue = stuff->pid;
+@@ -1052,11 +1069,26 @@ ProcShmCreatePixmap(client)
+ 	return rc;
+ 
+     VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client);
+-    if (!stuff->width || !stuff->height)
++    
++    width = stuff->width;
++    height = stuff->height;
++    depth = stuff->depth;
++    if (!width || !height || !depth)
+     {
+ 	client->errorValue = 0;
+         return BadValue;
+     }
++    if (width > 32767 || height > 32767)
++	return BadAlloc;
++    size = PixmapBytePad(width, depth) * height;
++    if (sizeof(size) == 4) {
++	if (size < width * height)
++	    return BadAlloc;
++	/* thankfully, offset is unsigned */
++	if (stuff->offset + size < size)
++	    return BadAlloc;
++    }
++
+     if (stuff->depth != 1)
+     {
+         pDepth = pDraw->pScreen->allowedDepths;
+@@ -1067,9 +1099,7 @@ ProcShmCreatePixmap(client)
+         return BadValue;
+     }
+ CreatePmap:
+-    VERIFY_SHMSIZE(shmdesc, stuff->offset,
+-		   PixmapBytePad(stuff->width, stuff->depth) * stuff->height,
+-		   client);
++    VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
+     pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)(
+ 			    pDraw->pScreen, stuff->width,
+ 			    stuff->height, stuff->depth,
+-- 
+1.5.3.5
+
diff --git a/x11-base/xorg-server/files/1.4-0005-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch b/x11-base/xorg-server/files/1.4-0005-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch
new file mode 100644
index 0000000..bb09eb8
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-0005-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch
@@ -0,0 +1,30 @@
+From f09b8007e7f6e60e0b9c9665ec632b578ae08b6f Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb <matthieu@bluenote.herrb.com>
+Date: Thu, 17 Jan 2008 15:29:06 +0100
+Subject: [PATCH] Fix for CVE-2008-0006 - PCF Font parser buffer overflow.
+
+---
+ dix/dixfonts.c |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/dix/dixfonts.c b/dix/dixfonts.c
+index c21b3ec..7bb2404 100644
+--- a/dix/dixfonts.c
++++ b/dix/dixfonts.c
+@@ -325,6 +325,13 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
+ 	err = BadFontName;
+ 	goto bail;
+     }
++    /* check values for firstCol, lastCol, firstRow, and lastRow */
++    if (pfont->info.firstCol > pfont->info.lastCol ||
++       pfont->info.firstRow > pfont->info.lastRow ||
++       pfont->info.lastCol - pfont->info.firstCol > 255) {
++       err = AllocError;
++       goto bail;
++    }
+     if (!pfont->fpe)
+ 	pfont->fpe = fpe;
+     pfont->refcnt++;
+-- 
+1.5.3.5
+
diff --git a/x11-base/xorg-server/files/1.4-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch b/x11-base/xorg-server/files/1.4-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch
new file mode 100644
index 0000000..61cc4da
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch
@@ -0,0 +1,34 @@
+From 19b95cdd1d14a1e7d1abba1880ab023c96f19bf5 Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb <matthieu@bluenote.herrb.com>
+Date: Thu, 17 Jan 2008 17:03:39 +0100
+Subject: [PATCH] Fix for CVE-2007-5958 - File existence disclosure.
+
+---
+ Xext/security.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Xext/security.c b/Xext/security.c
+index ba057de..e9d48c9 100644
+--- a/Xext/security.c
++++ b/Xext/security.c
+@@ -1563,7 +1563,7 @@ SecurityLoadPropertyAccessList(void)
+     if (!SecurityPolicyFile)
+ 	return;
+ 
+-    f = fopen(SecurityPolicyFile, "r");
++    f = Fopen(SecurityPolicyFile, "r");
+     if (!f)
+     {
+ 	ErrorF("error opening security policy file %s\n",
+@@ -1646,7 +1646,7 @@ SecurityLoadPropertyAccessList(void)
+     }
+ #endif /* PROPDEBUG */
+ 
+-    fclose(f);
++    Fclose(f);
+ } /* SecurityLoadPropertyAccessList */
+ 
+ 
+-- 
+1.5.3.5
+
diff --git a/x11-base/xorg-server/files/1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch b/x11-base/xorg-server/files/1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch
new file mode 100644
index 0000000..903f2be
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch
@@ -0,0 +1,85 @@
+From e9fa7c1c88a8130a48f772c92b186b8b777986b5 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Fri, 18 Jan 2008 14:41:20 -0500
+Subject: [PATCH] CVE-2007-6429: Don't spuriously reject <8bpp shm pixmaps.
+
+Move size validation after depth validation, and only validate size if
+the bpp of the pixmap format is > 8.  If bpp < 8 then we're already
+protected from overflow by the width and height checks.
+---
+ Xext/shm.c |   36 ++++++++++++++++++++----------------
+ 1 files changed, 20 insertions(+), 16 deletions(-)
+
+diff --git a/Xext/shm.c b/Xext/shm.c
+index c545e49..e46f6fc 100644
+--- a/Xext/shm.c
++++ b/Xext/shm.c
+@@ -783,14 +783,6 @@ ProcPanoramiXShmCreatePixmap(
+     }
+     if (width > 32767 || height > 32767)
+         return BadAlloc;
+-    size = PixmapBytePad(width, depth) * height;
+-    if (sizeof(size) == 4) {
+-        if (size < width * height)
+-            return BadAlloc;
+-        /* thankfully, offset is unsigned */
+-        if (stuff->offset + size < size)
+-            return BadAlloc;
+-    }
+ 
+     if (stuff->depth != 1)
+     {
+@@ -801,7 +793,17 @@ ProcPanoramiXShmCreatePixmap(
+ 	client->errorValue = stuff->depth;
+         return BadValue;
+     }
++
+ CreatePmap:
++    size = PixmapBytePad(width, depth) * height;
++    if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) {
++        if (size < width * height)
++            return BadAlloc;
++        /* thankfully, offset is unsigned */
++        if (stuff->offset + size < size)
++            return BadAlloc;
++    }
++
+     VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
+ 
+     if(!(newPix = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
+@@ -1126,14 +1128,6 @@ ProcShmCreatePixmap(client)
+     }
+     if (width > 32767 || height > 32767)
+ 	return BadAlloc;
+-    size = PixmapBytePad(width, depth) * height;
+-    if (sizeof(size) == 4) {
+-	if (size < width * height)
+-	    return BadAlloc;
+-	/* thankfully, offset is unsigned */
+-	if (stuff->offset + size < size)
+-	    return BadAlloc;
+-    }
+ 
+     if (stuff->depth != 1)
+     {
+@@ -1144,7 +1138,17 @@ ProcShmCreatePixmap(client)
+ 	client->errorValue = stuff->depth;
+         return BadValue;
+     }
++
+ CreatePmap:
++    size = PixmapBytePad(width, depth) * height;
++    if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) {
++	if (size < width * height)
++	    return BadAlloc;
++	/* thankfully, offset is unsigned */
++	if (stuff->offset + size < size)
++	    return BadAlloc;
++    }
++
+     VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
+     pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)(
+ 			    pDraw->pScreen, stuff->width,
+-- 
+1.5.3.8
+
diff --git a/x11-base/xorg-server/files/1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch b/x11-base/xorg-server/files/1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch
new file mode 100644
index 0000000..6e5baf1
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch
@@ -0,0 +1,44 @@
+From be6c17fcf9efebc0bbcc3d9a25f8c5a2450c2161 Mon Sep 17 00:00:00 2001
+From: Matthias Hopf <mhopf@suse.de>
+Date: Mon, 21 Jan 2008 16:13:21 +0100
+Subject: [PATCH] CVE-2007-6429: Always test for size+offset wrapping.
+
+---
+ Xext/shm.c |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Xext/shm.c b/Xext/shm.c
+index e46f6fc..a7a1ecf 100644
+--- a/Xext/shm.c
++++ b/Xext/shm.c
+@@ -799,10 +799,10 @@ CreatePmap:
+     if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) {
+         if (size < width * height)
+             return BadAlloc;
+-        /* thankfully, offset is unsigned */
+-        if (stuff->offset + size < size)
+-            return BadAlloc;
+     }
++    /* thankfully, offset is unsigned */
++    if (stuff->offset + size < size)
++	return BadAlloc;
+ 
+     VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
+ 
+@@ -1144,10 +1144,10 @@ CreatePmap:
+     if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) {
+ 	if (size < width * height)
+ 	    return BadAlloc;
+-	/* thankfully, offset is unsigned */
+-	if (stuff->offset + size < size)
+-	    return BadAlloc;
+     }
++    /* thankfully, offset is unsigned */
++    if (stuff->offset + size < size)
++	return BadAlloc;
+ 
+     VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
+     pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)(
+-- 
+1.5.3.8
+
diff --git a/x11-base/xorg-server/files/1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch b/x11-base/xorg-server/files/1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch
new file mode 100644
index 0000000..3a8dbd9
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch
@@ -0,0 +1,40 @@
+From a6a7fadbb03ee99312dfb15ac478ab3c414c1c0b Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh@redhat.com>
+Date: Wed, 16 Jan 2008 20:24:11 -0500
+Subject: [PATCH] Don't break grab and focus state for a window when redirecting it.
+
+Composite uses an unmap/map cycle to trigger backing pixmap allocation
+and cliprect recomputation when a window is redirected or unredirected.
+To avoid protocol visible side effects, map and unmap events are
+disabled temporarily.  However, when a window is unmapped it is also
+removed from grabs and loses focus, but these state changes are not
+disabled.
+
+This change supresses the unmap side effects during the composite
+unmap/map cycle and fixes this bug:
+
+  http://bugzilla.gnome.org/show_bug.cgi?id=488264
+
+where compiz would cause gnome-screensaver to lose its grab when
+compiz unredirects the fullscreen lock window.
+---
+ dix/window.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/dix/window.c b/dix/window.c
+index 33cf76b..1ccf126 100644
+--- a/dix/window.c
++++ b/dix/window.c
+@@ -2993,7 +2993,8 @@ UnrealizeTree(
+ 	    } 
+ #endif
+ 	    (* Unrealize)(pChild);
+-	    DeleteWindowFromAnyEvents(pChild, FALSE);
++	    if (MapUnmapEventsEnabled(pWin))
++		DeleteWindowFromAnyEvents(pChild, FALSE);
+ 	    if (pChild->viewable)
+ 	    {
+ #ifdef DO_SAVE_UNDERS
+-- 
+1.5.3.8
+
diff --git a/x11-base/xorg-server/files/1.4-document-new-font-catalogs.patch b/x11-base/xorg-server/files/1.4-document-new-font-catalogs.patch
new file mode 100644
index 0000000..e9a6aad
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-document-new-font-catalogs.patch
@@ -0,0 +1,132 @@
+diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
+index aac3b51..c9ee019 100644
+--- a/doc/Xserver.man.pre
++++ b/doc/Xserver.man.pre
+@@ -508,8 +508,7 @@ its parent process after it has set up the various connection schemes.
+ \fIXdm\fP uses this feature to recognize when connecting to the server
+ is possible.
+ .SH FONTS
+-The X server
+-can obtain fonts from directories and/or from font servers.
++The X server can obtain fonts from directories and/or from font servers.
+ The list of directories and font servers
+ the X server uses when trying to open a font is controlled
+ by the \fIfont path\fP.  
+@@ -517,8 +516,45 @@ by the \fIfont path\fP.
+ The default font path is
+ __default_font_path__ .
+ .LP
++A special kind of directory can be specified using the the \fBcatalogue\fP:
++prefix. Directories specified this way can contain symlinks pointing to the
++real font directories. See the FONTPATH.D section for details.
++.LP
+ The font path can be set with the \fB\-fp\fP option or by \fIxset\fP(1)
+ after the server has started.
++.SH "FONTPATH.D"
++You can specify a special kind of font path in the form \fBcatalogue:<dir>\fR.
++The directory specified after the catalogue: prefix will be scanned for symlinks
++and each symlink destination will be added as a local fontfile FPE.
++.PP
++The symlink can be suffixed by attributes such as '\fBunscaled\fR', which
++will be passed through to the underlying fontfile FPE. The only exception is
++the newly introduced '\fBpri\fR' attribute, which will be used for ordering
++the font paths specified by the symlinks.
++
++An example configuration:
++
++.nf
++    75dpi:unscaled:pri=20 \-> /usr/share/X11/fonts/75dpi
++    ghostscript:pri=60 \-> /usr/share/fonts/default/ghostscript
++    misc:unscaled:pri=10 \-> /usr/share/X11/fonts/misc
++    type1:pri=40 \-> /usr/share/X11/fonts/Type1
++    type1:pri=50 \-> /usr/share/fonts/default/Type1
++.fi
++
++This will add /usr/share/X11/fonts/misc as the first FPE with the attribute
++'unscaled', second FPE will be /usr/share/X11/fonts/75dpi, also with
++the attribute unscaled etc. This is functionally equivalent to setting
++the following font path:
++
++.nf
++    /usr/share/X11/fonts/misc:unscaled,
++    /usr/share/X11/fonts/75dpi:unscaled,
++    /usr/share/X11/fonts/Type1,
++    /usr/share/fonts/default/Type1,
++    /usr/share/fonts/default/ghostscript
++.fi
++
+ .SH FILES
+ .TP 30
+ .I /etc/X\fBn\fP.hosts
+diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
+index ce54ea9..54d8eaa 100644
+--- a/hw/xfree86/doc/man/xorg.conf.man.pre
++++ b/hw/xfree86/doc/man/xorg.conf.man.pre
+@@ -293,15 +293,50 @@ server searches for font databases.
+ Multiple
+ .B FontPath
+ entries may be specified, and they will be concatenated to build up the
+-fontpath used by the server.  Font path elements may be either absolute
+-directory paths, or a font server identifier.
++fontpath used by the server.  Font path elements can be absolute
++directory paths, catalogue directories or a font server identifier. The
++formats of the later two are explained below:
++.PP
++.RS 7
++Catalogue directories:
++.PP
++.RS 4
++Catalogue directories can be specified using the prefix \fBcatalogue:\fR
++before the directory name. The directory can then be populated with
++symlinks pointing to the real font directories, using the following
++syntax in the symlink name:
++.PP
++.RS 4
++.IR <identifier> : [attribute]: pri= <priority>
++.RE
++.PP
++where
++.I <identifier>
++is an alphanumeric identifier,
++.I [attribute]
++is an attribute wich will be passed to the underlying FPE and
++.I <priority>
++is a number used to order the fontfile FPEs. Examples:
++.PP
++.RS 4
++.nf
++.I 75dpi:unscaled:pri=20  -> /usr/share/X11/fonts/75dpi
++.I gscript:pri=60 -> /usr/share/fonts/default/ghostscript
++.I misc:unscaled:pri=10 \-> /usr/share/X11/fonts/misc
++.fi
++.PP
++.RE .RE .RE
++.PP
++.RS 7
++Font server identifiers:
++.PP
++.RS 4
+ Font server identifiers have the form:
++.RS 4
+ .PP
+-.RS 11
+ .IR <trans> / <hostname> : <port\-number>
+ .RE
+ .PP
+-.RS 7
+ where
+ .I <trans>
+ is the transport type to use to connect to the font server (e.g.,
+@@ -313,10 +348,11 @@ for a TCP/IP connection),
+ is the hostname of the machine running the font server, and
+ .I <port\-number>
+ is the port number that the font server is listening on (usually 7100).
++.RE
+ .PP
+ When this entry is not specified in the config file, the server falls back
+ to the compiled\-in default font path, which contains the following
+-font path elements:
++font path elements (which can be set inside a catalogue directory):
+ .PP
+ .RS 4
+ .nf
diff --git a/x11-base/xorg-server/files/1.4-dont-hang-openoffice.patch b/x11-base/xorg-server/files/1.4-dont-hang-openoffice.patch
new file mode 100644
index 0000000..9ec79fd
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-dont-hang-openoffice.patch
@@ -0,0 +1,71 @@
+Title       : x11-base/xorg-server-1.3 and 1.4 consumes 100% CPU, locking the ke
+yboard, apparently triggered by opening an OpenOffice pulldown menu
+Assignee    : x11@gentoo.org
+Reported    : 2007-10-26 03:51 0000
+Updated     : 2007-11-07 07:21:56 0000
+Status      : NEW
+URL         : https://bugs.freedesktop.org/show_bug.cgi?id=10525
+Severity    : critical
+Priority    : P2
+Reporter    : smw@alcor.concordia.ca
+Product     : Gentoo Linux
+Component   : Server
+Keywords    : Inclusion
+CC          : tetromino@gmail.com
+Comments    : 3
+Attachments : 0
+URL         : http://bugs.gentoo.org/show_bug.cgi?id=197104
+
+commit a5b8053606d6e786cdcf6734f271acc05f9cc588
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date:   Tue Sep 11 11:37:06 2007 -0400
+
+    Ignore - not just block - SIGALRM around Popen()/Pclose().
+
+    Because our "popen" implementation uses stdio, and because nobody's stdio
+    library is capable of surviving signals, we need to make absolutely sure
+    that we hide the SIGALRM from the smart scheduler.  Otherwise, when you
+    open a menu in openoffice, and it recompiles XKB to deal with the
+    accelerators, and you popen xkbcomp because we suck, then the scheduler
+    will tell you you're taking forever doing something stupid, and the
+    wait() code will get confused, and input will hang and your CPU usage
+    slams to 100%.  Down, not across.
+
+diff --git a/os/utils.c b/os/utils.c
+index 3bb7dbe..afcaae4 100644
+--- a/os/utils.c
++++ b/os/utils.c
+@@ -1720,6 +1720,8 @@ static struct pid {
+     int pid;
+ } *pidlist;
+ 
++static sighandler_t old_alarm = NULL; /* XXX horrible awful hack */
++
+ pointer
+ Popen(char *command, char *type)
+ {
+@@ -1741,11 +1743,15 @@ Popen(char *command, char *type)
+ 	return NULL;
+     }
+ 
++    /* Ignore the smart scheduler while this is going on */
++    old_alarm = signal(SIGALRM, SIG_IGN);
++
+     switch (pid = fork()) {
+     case -1: 	/* error */
+ 	close(pdes[0]);
+ 	close(pdes[1]);
+ 	xfree(cur);
++	signal(SIGALRM, old_alarm);
+ 	return NULL;
+     case 0:	/* child */
+ 	if (setgid(getgid()) == -1)
+@@ -1921,6 +1927,8 @@ Pclose(pointer iop)
+     /* allow EINTR again */
+     OsReleaseSignals ();
+     
++    signal(SIGALRM, old_alarm);
++
+     return pid == -1 ? -1 : pstat;
+ }
+ 
diff --git a/x11-base/xorg-server/files/1.4-fix-dmx-build.patch b/x11-base/xorg-server/files/1.4-fix-dmx-build.patch
new file mode 100644
index 0000000..07f43ab
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-fix-dmx-build.patch
@@ -0,0 +1,19 @@
+diff --git a/hw/dmx/dmxinput.c b/hw/dmx/dmxinput.c
+index d644b5d..83f8a4a 100644
+--- a/hw/dmx/dmxinput.c
++++ b/hw/dmx/dmxinput.c
+@@ -105,3 +105,14 @@ void dmxUpdateWindowInfo(DMXUpdateType type, WindowPtr pWindow)
+         if (!dmxInput->detached && dmxInput->updateWindowInfo)
+             dmxInput->updateWindowInfo(dmxInput, type, pWindow);
+ }
++
++int
++NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev)
++{
++    return BadRequest;
++}
++
++void
++DeleteInputDeviceRequest(DeviceIntPtr pDev)
++{
++}
diff --git a/x11-base/xorg-server/files/1.4-fix-dmx-link.patch b/x11-base/xorg-server/files/1.4-fix-dmx-link.patch
new file mode 100644
index 0000000..909442d
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-fix-dmx-link.patch
@@ -0,0 +1,12 @@
+diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
+index 002ea11..15dc281 100644
+--- a/hw/dmx/Makefile.am
++++ b/hw/dmx/Makefile.am
+@@ -87,6 +87,7 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \
+              $(GLX_LIBS) \
+              input/libdmxinput.a \
+              config/libdmxconfig.a \
++             @XSERVER_LIBS@ \
+              @DMXMODULES_LIBS@
+ 
+ # Man page
diff --git a/x11-base/xorg-server/files/1.4-fix-kdrive-automake.patch b/x11-base/xorg-server/files/1.4-fix-kdrive-automake.patch
new file mode 100644
index 0000000..cdc436e
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-fix-kdrive-automake.patch
@@ -0,0 +1,12 @@
+diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
+index 5803644..71d3403 100644
+--- a/hw/kdrive/Makefile.am
++++ b/hw/kdrive/Makefile.am
+@@ -1,6 +1,5 @@
+ if KDRIVEVESA
+-VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga nvidia pm2 r128 \
+-               smi via
++VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga nvidia pm2 r128 smi via
+ endif
+ 
+ if BUILD_KDRIVEFBDEVLIB
diff --git a/x11-base/xorg-server/files/1.4-fix-xephyr-link.patch b/x11-base/xorg-server/files/1.4-fix-xephyr-link.patch
new file mode 100644
index 0000000..35ca029
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-fix-xephyr-link.patch
@@ -0,0 +1,25 @@
+diff --git a/configure.ac b/configure.ac
+index 62fdd78..7a37590 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1802,7 +1802,7 @@ if test "$KDRIVE" = yes; then
+        XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS"
+     fi
+ 
+-    PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
++    PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp $PIXMAN, [xephyr="yes"], [xephyr="no"])
+     if test "x$XEPHYR" = xauto; then
+         XEPHYR=$xephyr
+     fi
+diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
+index cc3019f..1738d0f 100644
+--- a/hw/kdrive/ephyr/Makefile.am
++++ b/hw/kdrive/ephyr/Makefile.am
+@@ -28,6 +28,7 @@ Xephyr_LDADD = 						\
+ 	libxephyr-hostx.a			        \
+ 	../../../exa/libexa.la				\
+ 	@KDRIVE_LIBS@					\
++	@XSERVER_LIBS@					\
+         @XEPHYR_LIBS@
+ 
+ Xephyr_DEPENDENCIES =	\
diff --git a/x11-base/xorg-server/files/1.4-fix-xprint-build.patch b/x11-base/xorg-server/files/1.4-fix-xprint-build.patch
new file mode 100644
index 0000000..98fbacf
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-fix-xprint-build.patch
@@ -0,0 +1,22 @@
+diff --git a/hw/xprint/ddxInit.c b/hw/xprint/ddxInit.c
+index a465c4c..1e7652e 100644
+--- a/hw/xprint/ddxInit.c
++++ b/hw/xprint/ddxInit.c
+@@ -310,6 +310,17 @@ ChangeDeviceControl (
+     return BadMatch;
+ }
+ 
++int
++NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev)
++{
++    return BadValue;
++}
++
++void
++DeleteInputDeviceRequest(DeviceIntPtr dev)
++{
++}
++
+ void
+ OpenInputDevice (
+     DeviceIntPtr dev,
diff --git a/x11-base/xorg-server/files/1.4-fix-xprint-link.patch b/x11-base/xorg-server/files/1.4-fix-xprint-link.patch
new file mode 100644
index 0000000..1cf7205
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-fix-xprint-link.patch
@@ -0,0 +1,13 @@
+diff --git a/hw/xprint/Makefile.am b/hw/xprint/Makefile.am
+index dc8764a..728e69d 100644
+--- a/hw/xprint/Makefile.am
++++ b/hw/xprint/Makefile.am
+@@ -12,7 +12,7 @@ Xprt_LDFLAGS = -L$(top_srcdir)
+ Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la  \
+ 	pcl/libpcl.la pcl-mono/libpcl.la $(top_builddir)/fb/libfb.la \
+ 	$(top_builddir)/render/librender.la $(top_builddir)/mi/libmi.la \
+-	$(top_builddir)/Xext/libXext.la  @FREETYPE_LIBS@
++	$(top_builddir)/Xext/libXext.la  @FREETYPE_LIBS@ @XSERVER_LIBS@
+ 
+ miinitext-wrapper.c:
+ 	echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@
diff --git a/x11-base/xorg-server/files/1.4-fpic-libxf86config.patch b/x11-base/xorg-server/files/1.4-fpic-libxf86config.patch
new file mode 100644
index 0000000..c3b9ebd
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-fpic-libxf86config.patch
@@ -0,0 +1,13 @@
+diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
+index 849ee8b..1b49d48 100644
+--- a/hw/xfree86/parser/Makefile.am
++++ b/hw/xfree86/parser/Makefile.am
+@@ -25,7 +25,7 @@ libxf86config_a_SOURCES = \
+ 	DRI.c \
+ 	Extensions.c
+ 
+-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
++AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -fPIC
+ 
+ EXTRA_DIST = \
+ 	Configint.h \
diff --git a/x11-base/xorg-server/files/1.4-ia64.patch b/x11-base/xorg-server/files/1.4-ia64.patch
new file mode 100644
index 0000000..13ffb5f
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4-ia64.patch
@@ -0,0 +1,49 @@
+--- /dev/null	1969-12-31 16:00:00.000000000 -0800
++++ hw/xfree86/os-support/shared/ia64Pci.h	2007-08-03 12:56:38.000000000 -0700
+@@ -0,0 +1,46 @@
++/*
++ * Copyright 2004, Egbert Eich
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to
++ * deal in the Software without restriction, including without limitation the
++ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++ * sell copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
++ * EGBERT EICH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
++ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
++ * NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ *
++ * Except as contained in this notice, the name of Egbert Eich shall not
++ * be used in advertising or otherwise to promote the sale, use or other deal-
++ *ings in this Software without prior written authorization from Egbert Eich.
++ *
++ */
++#ifdef HAVE_XORG_CONFIG_H
++#include <xorg-config.h>
++#endif
++
++#ifndef _IA64_PCI_H
++# define _IA64_PCI_H
++
++#include "Pci.h"
++
++typedef enum {
++    NONE_CHIPSET,
++    I460GX_CHIPSET,
++    E8870_CHIPSET,
++    ZX1_CHIPSET,
++    ALTIX_CHIPSET
++} IA64Chipset;
++
++# ifdef OS_PROBE_PCI_CHIPSET
++extern IA64Chipset OS_PROBE_PCI_CHIPSET(scanpciWrapperOpt flags);
++# endif
++#endif
diff --git a/x11-base/xorg-server/files/1.4.0.90-clean-generated-files.patch b/x11-base/xorg-server/files/1.4.0.90-clean-generated-files.patch
new file mode 100644
index 0000000..ece24eb
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.0.90-clean-generated-files.patch
@@ -0,0 +1,19 @@
+commit d988da6eee8422774dff364050bf431b843a714a
+Author: Arkadiusz Miskiewicz <arekm@maven.pl>
+Date:   Thu Dec 13 00:09:08 2007 +0200
+
+    Xprint: Clean up generated files
+
+    Remember to clean generated wrapper files.
+    (cherry picked from commit 977fcdea8198906936a64b8117e6a6d027c617e3)
+
+diff --git a/hw/xprint/Makefile.am b/hw/xprint/Makefile.am
+index dc8764a..f834966 100644
+--- a/hw/xprint/Makefile.am
++++ b/hw/xprint/Makefile.am
+@@ -41,3 +41,5 @@ Xprt_SOURCES =			\
+         $(top_srcdir)/fb/fbcmap_mi.c
+ 
+ EXTRA_DIST = ValTree.c
++
++CLEANFILES = miinitext-wrapper.c dpmsstubs-wrapper.c
diff --git a/x11-base/xorg-server/files/1.5.1/0001-only-build-dri2-when-DRI2-is-enabled.patch b/x11-base/xorg-server/files/1.5.1/0001-only-build-dri2-when-DRI2-is-enabled.patch
new file mode 100644
index 0000000..c230dd1
--- /dev/null
+++ b/x11-base/xorg-server/files/1.5.1/0001-only-build-dri2-when-DRI2-is-enabled.patch
@@ -0,0 +1,31 @@
+From af8cef461c4d107f7a03645568a635d0458da9b8 Mon Sep 17 00:00:00 2001
+From: Alan Hourihane <alanh@tungstengraphics.com>
+Date: Wed, 24 Sep 2008 14:24:36 +0100
+Subject: [PATCH] only build dri2 when DRI2 is enabled
+
+---
+ glx/Makefile.am |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/glx/Makefile.am b/glx/Makefile.am
+index 39b96d7..0214295 100644
+--- a/glx/Makefile.am
++++ b/glx/Makefile.am
+@@ -45,9 +45,13 @@ glapi_sources =					\
+ 	glthread.h				\
+ 	glprocs.h
+ 
++if DRI2
++GLXDRI_SOURCE = glxdri2.c
++endif
++
+ libglxdri_la_SOURCES = \
+         glxdri.c \
+-        glxdri2.c \
++	$(GLXDRI2_SOURCE) \
+ 	glxdricommon.h \
+         extension_string.c \
+         extension_string.h
+-- 
+1.6.0.1
+
diff --git a/x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch b/x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch
new file mode 100644
index 0000000..2d0f469
--- /dev/null
+++ b/x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch
@@ -0,0 +1,19 @@
+See https://bugs.gentoo.org/show_bug.cgi?id=235789
+2008-09-09 Martin von Gagern
+
+--- xorg-server-1.5.0.orig/hw/kdrive/vesa/vm86.h	2008-09-09 17:24:59.000000000 +0200
++++ xorg-server-1.5.0/hw/kdrive/vesa/vm86.h	2008-09-09 18:01:53.000000000 +0200
+@@ -67,6 +67,13 @@
+ #include "os.h"
+ #endif
+ 
++#ifndef IF_MASK
++#define IF_MASK X86_EFLAGS_IF
++#endif
++#ifndef IOPL_MASK
++#define IOPL_MASK X86_EFLAGS_IOPL
++#endif
++
+ typedef unsigned char	U8;
+ typedef unsigned short	U16;
+ typedef unsigned int	U32;
diff --git a/x11-base/xorg-server/files/1.5.2-force-LC_ALL-C-when-running-awk.patch b/x11-base/xorg-server/files/1.5.2-force-LC_ALL-C-when-running-awk.patch
new file mode 100644
index 0000000..ffb3e0d
--- /dev/null
+++ b/x11-base/xorg-server/files/1.5.2-force-LC_ALL-C-when-running-awk.patch
@@ -0,0 +1,38 @@
+From 8918c50440de301887af8006f2dc72d64adf9f9c Mon Sep 17 00:00:00 2001
+From: Remi Cardona <remi@gentoo.org>
+Date: Sat, 18 Oct 2008 12:23:51 +0200
+Subject: [PATCH] force LC_ALL=C when running awk
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+This bug was reported by a user trying to build the server with a
+Turkish locale (tr_TR). The problem is that the Turkish alphabet is
+latin-based, but not entirely similar. The bug comes from vesamodes
+which has "Interlaced", which is then converted to lowercase by
+modelines2c.awk. Execept that with a Turkish locale
+tolower("Interlaced") is not "interlaced" but "ınterlaced", which the
+rest of the script fails to understand.
+
+This patch forces LC_ALL=C when running the awk script to always get the
+intended latin en_US alphabet.
+---
+ hw/xfree86/common/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
+index 0f44075..723973a 100644
+--- a/hw/xfree86/common/Makefile.am
++++ b/hw/xfree86/common/Makefile.am
+@@ -24,7 +24,7 @@ BUSSOURCES = xf86isaBus.c xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUS_SOURCES)
+ MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes
+ 
+ xf86DefModeSet.c: $(srcdir)/modeline2c.awk $(MODEDEFSOURCES)
+-	cat $(MODEDEFSOURCES) | $(AWK) -f $(srcdir)/modeline2c.awk > $@
++	cat $(MODEDEFSOURCES) | LC_ALL=C $(AWK) -f $(srcdir)/modeline2c.awk > $@
+ 
+ BUILT_SOURCES = xf86DefModeSet.c
+ 
+-- 
+1.6.0.2
+
diff --git a/x11-base/xorg-server/files/1.5.3-builtin-fonts.patch b/x11-base/xorg-server/files/1.5.3-builtin-fonts.patch
new file mode 100644
index 0000000..50719ad
--- /dev/null
+++ b/x11-base/xorg-server/files/1.5.3-builtin-fonts.patch
@@ -0,0 +1,28 @@
+From fe82a1fe634a2e0ceb030de90309d26044c7b75e Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 1 Nov 2007 15:06:17 -0400
+Subject: [PATCH] Enable builtin font FPE.
+
+---
+ dix/dixfonts.c |    3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+diff --git a/dix/dixfonts.c b/dix/dixfonts.c
+index c21b3ec..c951b05 100644
+--- a/dix/dixfonts.c
++++ b/dix/dixfonts.c
+@@ -1890,11 +1890,8 @@ InitFonts (void)
+     } else 
+ #endif
+     {
+-#ifdef BUILTIN_FONTS
+         BuiltinRegisterFpeFunctions();
+-#else
+ 	FontFileRegisterFpeFunctions();
+-#endif
+ #ifndef NOFONTSERVERACCESS
+ 	fs_register_fpe_functions();
+ #endif
+-- 
+1.5.3.4
+
diff --git a/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch b/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch
new file mode 100644
index 0000000..23eeca1
--- /dev/null
+++ b/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch
@@ -0,0 +1,55 @@
+From: Michel Dänzer <michel@tungstengraphics.com>
+Date: Thu, 24 May 2007 10:10:05 +0000 (+0200)
+Subject: Consolidate portPriv->pDraw assignments into xf86XVEnlistPortInWindow.
+X-Git-Tag: xorg-server-1.3.99.0
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=649e7f82d8d4333443493056b81eb20d6cf022bc
+
+Consolidate portPriv->pDraw assignments into xf86XVEnlistPortInWindow.
+
+This avoids a crash in xf86XVReputVideo and also cleans up the code slightly.
+---
+
+--- a/hw/xfree86/common/xf86xv.c
++++ b/hw/xfree86/common/xf86xv.c
+@@ -979,6 +979,9 @@ xf86XVEnlistPortInWindow(WindowPtr pWin,
+ 	winPriv->next = PrivRoot;
+ 	pWin->devPrivates[XF86XVWindowIndex].ptr = (pointer)winPriv;
+    }
++
++   portPriv->pDraw = (DrawablePtr)pWin;
++
+    return Success;
+ }
+ 
+@@ -1375,7 +1378,6 @@ xf86XVPutVideo(
+   result =  xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
+   if(result != Success) return result;
+ 
+-  portPriv->pDraw = pDraw;
+   portPriv->type = XvInputMask;
+ 
+   /* save a copy of these parameters */
+@@ -1479,7 +1481,6 @@ xf86XVPutStill(
+ 
+      xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
+      portPriv->isOn = XV_ON;
+-     portPriv->pDraw = pDraw;
+      portPriv->drw_x = drw_x;  portPriv->drw_y = drw_y;
+      portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;
+      portPriv->type = 0;  /* no mask means it's transient and should
+@@ -1529,7 +1530,6 @@ xf86XVGetVideo(
+   result =  xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
+   if(result != Success) return result;
+ 
+-  portPriv->pDraw = pDraw;
+   portPriv->type = XvOutputMask;
+ 
+   /* save a copy of these parameters */
+@@ -1784,7 +1784,6 @@ xf86XVPutImage(
+ 	(portPriv->AdaptorRec->flags & VIDEO_OVERLAID_IMAGES)) {
+ 
+      portPriv->isOn = XV_ON;
+-     portPriv->pDraw = pDraw;
+      portPriv->drw_x = drw_x;  portPriv->drw_y = drw_y;
+      portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;
+      portPriv->type = 0;  /* no mask means it's transient and should
diff --git a/x11-base/xorg-server/files/tslib-1.0-check.patch b/x11-base/xorg-server/files/tslib-1.0-check.patch
new file mode 100644
index 0000000..57a361a
--- /dev/null
+++ b/x11-base/xorg-server/files/tslib-1.0-check.patch
@@ -0,0 +1,144 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  
+  
+
+
+  
+
+  <head>
+    <title>
+      Attachment –
+      gentoo
+    </title>
+        <link rel="search" href="/index.cgi/search" />
+        <link rel="help" href="/index.cgi/wiki/TracGuide" />
+        <link rel="alternate" href="/index.cgi/raw-attachment/ticket/114/tslib-1.0-check.patch" type="text/x-diff; charset=iso-8859-15" title="Original Format" />
+        <link rel="up" href="/index.cgi/ticket/114" title="Ticket #114" />
+        <link rel="start" href="/index.cgi/wiki" />
+        <link rel="stylesheet" href="/index.cgi/chrome/common/css/trac.css" type="text/css" /><link rel="stylesheet" href="/index.cgi/chrome/common/css/diff.css" type="text/css" /><link rel="stylesheet" href="/index.cgi/chrome/common/css/code.css" type="text/css" /><link rel="stylesheet" href="/index.cgi/chrome/notebox/css/notebox.css" type="text/css" />
+        <link rel="shortcut icon" href="/index.cgi/chrome/common/trac.ico" type="image/x-icon" />
+        <link rel="icon" href="/index.cgi/chrome/common/trac.ico" type="image/x-icon" />
+      <link type="application/opensearchdescription+xml" rel="search" href="/index.cgi/search/opensearch" title="Search gentoo" />
+    <script type="text/javascript" src="/index.cgi/chrome/common/js/jquery.js"></script><script type="text/javascript" src="/index.cgi/chrome/common/js/trac.js"></script><script type="text/javascript" src="/index.cgi/chrome/common/js/search.js"></script><script type="text/javascript" src="/index.cgi/chrome/common/js/diff.js"></script>
+    <!--[if lt IE 7]>
+    <script type="text/javascript" src="/index.cgi/chrome/common/js/ie_pre7_hacks.js"></script>
+    <![endif]-->
+  </head>
+  <body>
+    <div id="banner">
+      <div id="header">
+        <a id="logo" href="http://gentoo.mindzoo.de/"><img src="/index.cgi/chrome/site/gentoo.png" alt="OpenmokoGentoo" /></a>
+      </div>
+      <form id="search" action="/index.cgi/search" method="get">
+        <div>
+          <label for="proj-search">Search:</label>
+          <input type="text" id="proj-search" name="q" size="18" value="" />
+          <input type="submit" value="Search" />
+        </div>
+      </form>
+      <div id="metanav" class="nav">
+    <ul>
+      <li class="first"><a href="/index.cgi/login">Login</a></li><li><a href="/index.cgi/prefs">Preferences</a></li><li><a href="/index.cgi/wiki/TracGuide">Help/Guide</a></li><li><a href="/index.cgi/about">About Trac</a></li><li class="last"><a href="/index.cgi/register">Register</a></li>
+    </ul>
+  </div>
+    </div>
+    <div id="mainnav" class="nav">
+    <ul>
+      <li class="first"><a href="/index.cgi/wiki">Wiki</a></li><li><a href="/index.cgi/timeline">Timeline</a></li><li><a href="/index.cgi/roadmap">Roadmap</a></li><li><a href="/index.cgi/browser">Browse Source</a></li><li><a href="/index.cgi/report">View Tickets</a></li><li><a href="/index.cgi/search">Search</a></li><li class="last"><a href="/index.cgi/tags">Tags</a></li>
+    </ul>
+  </div>
+    <div id="main">
+      <div id="ctxtnav" class="nav">
+        <h2>Context Navigation</h2>
+          <ul>
+            <li class="first last"><a href="/index.cgi/ticket/114">Back to Ticket #114</a></li>
+          </ul>
+        <hr />
+      </div>
+    <div id="content" class="attachment">
+        <h1><a href="/index.cgi/ticket/114">Ticket #114</a>: tslib-1.0-check.patch</h1>
+        <table id="info" summary="Description">
+          <tbody>
+            <tr>
+              <th scope="col">
+                File tslib-1.0-check.patch, <span title="590 bytes">0.6 kB</span>
+                (added by tomboy64,  <a class="timeline" href="/index.cgi/timeline?from=2009-03-18T09%3A09%3A30Z%2B0100&amp;precision=second" title="2009-03-18T09:09:30Z+0100 in Timeline">8 weeks</a> ago)
+              </th>
+            </tr>
+            <tr>
+              <td class="message searchable">
+                
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        <div id="preview" class="searchable">
+    <div class="diff">
+  <ul class="entries">
+      <li class="entry">
+        <h2>
+          <a>configure.ac</a>
+        </h2>
+        <table class="inline" summary="Differences" cellspacing="0">
+              <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup>
+              <thead>
+                <tr>
+                  <th title="File configure.ac 2009-03-18 07:06:37.000000000 +0100">
+                      old
+                  </th>
+                  <th title="File configure.ac.new 2009-03-18 08:55:57.000000000 +0100">
+                      new
+                  </th>
+                  <th> </th>
+                </tr>
+              </thead>
+            <tbody class="unmod">
+                  <tr>
+                          <th>1930</th><th>1930</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; AC_CHECK_LIB([rt], [nanosleep], XEPHYR_LIBS="$XEPHYR_LIBS -lrt"))</span> </td>
+                  </tr><tr>
+                          <th>1931</th><th>1931</th><td class="l"><span>&nbsp; &nbsp; </span> </td>
+                  </tr><tr>
+                          <th>1932</th><th>1932</th><td class="l"><span>&nbsp; &nbsp; if test "x$TSLIB" = xyes; then</span> </td>
+                  </tr>
+            </tbody><tbody class="mod">
+                      <tr class="first">
+                        <th>1933</th><th> </th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; PKG_CHECK_MODULES([TSLIB], [tslib-<del>0</del>.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])</span> </td>
+                      </tr>
+                      <tr class="last">
+                        <th> </th><th>1933</th><td class="r"><span>&nbsp; &nbsp; &nbsp; &nbsp; PKG_CHECK_MODULES([TSLIB], [tslib-<ins>1</ins>.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])</span> </td>
+                      </tr>
+            </tbody><tbody class="unmod">
+                  <tr>
+                          <th>1934</th><th>1934</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; if test "x$HAVE_TSLIB" = xno; then</span> </td>
+                  </tr><tr>
+                          <th>1935</th><th>1935</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/])</span> </td>
+                  </tr><tr>
+                          <th>1936</th><th>1936</th><td class="l"><span>&nbsp; &nbsp; &nbsp; &nbsp; fi</span> </td>
+                  </tr>
+            </tbody>
+        </table>
+      </li>
+  </ul>
+</div>
+        </div>
+    </div>
+    <div id="altlinks">
+      <h3>Download in other formats:</h3>
+      <ul>
+        <li class="last first">
+          <a rel="nofollow" href="/index.cgi/raw-attachment/ticket/114/tslib-1.0-check.patch">Original Format</a>
+        </li>
+      </ul>
+    </div>
+    </div>
+    <div id="footer" lang="en" xml:lang="en"><hr />
+      <a id="tracpowered" href="http://trac.edgewall.org/"><img src="/index.cgi/chrome/common/trac_logo_mini.png" height="30" width="107" alt="Trac Powered" /></a>
+      <p class="left">
+        Powered by <a href="/index.cgi/about"><strong>Trac 0.11.1</strong></a><br />
+        By <a href="http://www.edgewall.org/">Edgewall Software</a>.
+      </p>
+      <p class="right">Visit the Trac open source project at<br /><a href="http://trac.edgewall.org/">http://trac.edgewall.org/</a></p>
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/x11-base/xorg-server/files/use-composite-for-unequal-depths.patch b/x11-base/xorg-server/files/use-composite-for-unequal-depths.patch
new file mode 100644
index 0000000..fd2c5ad
--- /dev/null
+++ b/x11-base/xorg-server/files/use-composite-for-unequal-depths.patch
@@ -0,0 +1,124 @@
+Gentoo bug #191964
+freedesktop.org bug #7447 attachment #11368
+Fixed in 1.4 and newer
+
+diff --git a/composite/compalloc.c b/composite/compalloc.c
+index f555411..006e808 100644
+--- a/composite/compalloc.c
++++ b/composite/compalloc.c
+@@ -461,7 +461,6 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)
+     ScreenPtr	    pScreen = pWin->drawable.pScreen;
+     WindowPtr	    pParent = pWin->parent;
+     PixmapPtr	    pPixmap;
+-    GCPtr	    pGC;
+ 
+     pPixmap = (*pScreen->CreatePixmap) (pScreen, w, h, pWin->drawable.depth);
+ 
+@@ -471,25 +470,63 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)
+     pPixmap->screen_x = x;
+     pPixmap->screen_y = y;
+     
+-    pGC = GetScratchGC (pWin->drawable.depth, pScreen);
+-    
+-    /*
+-     * Copy bits from the parent into the new pixmap so that it will
+-     * have "reasonable" contents in case for background None areas.
+-     */
+-    if (pGC)
++    if (pParent->drawable.depth == pWin->drawable.depth)
+     {
+-	XID val = IncludeInferiors;
++	GCPtr	pGC = GetScratchGC (pWin->drawable.depth, pScreen);
+ 	
+-	ValidateGC(&pPixmap->drawable, pGC);
+-	dixChangeGC (serverClient, pGC, GCSubwindowMode, &val, NULL);
+-	(*pGC->ops->CopyArea) (&pParent->drawable,
+-			       &pPixmap->drawable,
+-			       pGC,
+-			       x - pParent->drawable.x,
+-			       y - pParent->drawable.y,
+-			       w, h, 0, 0);
+-	FreeScratchGC (pGC);
++	/*
++	 * Copy bits from the parent into the new pixmap so that it will
++	 * have "reasonable" contents in case for background None areas.
++	 */
++	if (pGC)
++	{
++	    XID val = IncludeInferiors;
++	    
++	    ValidateGC(&pPixmap->drawable, pGC);
++	    dixChangeGC (serverClient, pGC, GCSubwindowMode, &val, NULL);
++	    (*pGC->ops->CopyArea) (&pParent->drawable,
++				   &pPixmap->drawable,
++				   pGC,
++				   x - pParent->drawable.x,
++				   y - pParent->drawable.y,
++				   w, h, 0, 0);
++	    FreeScratchGC (pGC);
++	}
++    }
++    else
++    {
++	PictFormatPtr	pSrcFormat = compWindowFormat (pParent);
++	PictFormatPtr	pDstFormat = compWindowFormat (pWin);
++	XID		inferiors = IncludeInferiors;
++	int		error;
++
++	PicturePtr	pSrcPicture = CreatePicture (None,
++						     &pParent->drawable,
++						     pSrcFormat,
++						     CPSubwindowMode,
++						     &inferiors,
++						     serverClient, &error);
++						    
++	PicturePtr	pDstPicture = CreatePicture (None,
++						     &pPixmap->drawable,
++						     pDstFormat,
++						     0, 0,
++						     serverClient, &error);
++
++	if (pSrcPicture && pDstPicture)
++	{
++	    CompositePicture (PictOpSrc,
++			      pSrcPicture,
++			      NULL,
++			      pDstPicture,
++			      x - pParent->drawable.x,
++			      y - pParent->drawable.y,
++			      0, 0, 0, 0, w, h);
++	}
++	if (pSrcPicture)
++	    FreePicture (pSrcPicture, 0);
++	if (pDstPicture)
++	    FreePicture (pDstPicture, 0);
+     }
+     return pPixmap;
+ }
+diff --git a/composite/compint.h b/composite/compint.h
+index 38b1777..f69595c 100644
+--- a/composite/compint.h
++++ b/composite/compint.h
+@@ -237,6 +237,9 @@ compCheckTree (ScreenPtr pScreen);
+ #define compCheckTree(s)
+ #endif
+ 
++PictFormatPtr
++compWindowFormat (WindowPtr pWin);
++
+ void
+ compSetPixmap (WindowPtr pWin, PixmapPtr pPixmap);
+ 
+diff --git a/composite/compwindow.c b/composite/compwindow.c
+index a4c4e6f..bfd2946 100644
+--- a/composite/compwindow.c
++++ b/composite/compwindow.c
+@@ -685,7 +685,7 @@ compGetWindowVisual (WindowPtr pWin)
+     return 0;
+ }
+ 
+-static PictFormatPtr
++PictFormatPtr
+ compWindowFormat (WindowPtr pWin)
+ {
+     ScreenPtr	pScreen = pWin->drawable.pScreen;
diff --git a/x11-base/xorg-server/files/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch b/x11-base/xorg-server/files/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch
new file mode 100644
index 0000000..3d34b34
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch
@@ -0,0 +1,13 @@
+--- configure.ac.orig	2008-04-17 16:53:09.000000000 -0500
++++ configure.ac	2008-04-17 16:53:29.000000000 -0500
+@@ -1962,7 +1962,9 @@
+ 
+ AC_SUBST([DIX_CFLAGS])
+ 
+-AC_SUBST([libdir exec_prefix prefix])
++AC_SUBST([libdir])
++AC_SUBST([exec_prefix])
++AC_SUBST([prefix])
+ 
+ # Man page sections - used in config utils & generating man pages
+ XORG_MANPAGE_SECTIONS
diff --git a/x11-base/xorg-server/files/xorg-server-sam225bw-quirks.patch b/x11-base/xorg-server/files/xorg-server-sam225bw-quirks.patch
new file mode 100644
index 0000000..ca5bbb4
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-sam225bw-quirks.patch
@@ -0,0 +1,14 @@
+--- hw/xfree86/modes/xf86EdidModes.c	2007-05-02 01:23:52.000000000 +0200
++++ hw/xfree86/modes/xf86EdidModes.c.new	2007-05-02 01:24:09.000000000 +0200
+@@ -92,6 +92,11 @@
+ 	DDC->vendor.prod_id == 638)
+ 	return TRUE;
+     
++    /* Samsung SyncMaster 225BW */
++    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
++	DDC->vendor.prod_id == 596)
++	return TRUE;
++
+     return FALSE;
+ }
+ 
diff --git a/x11-base/xorg-server/files/xorg-x11-server-1.0.1-fpic-libxf86config.patch b/x11-base/xorg-server/files/xorg-x11-server-1.0.1-fpic-libxf86config.patch
new file mode 100644
index 0000000..a6a35f9
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-x11-server-1.0.1-fpic-libxf86config.patch
@@ -0,0 +1,11 @@
+--- xorg-server-1.0.1/hw/xfree86/parser/Makefile.am.xf86configfpic	2006-03-06 13:57:45.000000000 -0500
++++ xorg-server-1.0.1/hw/xfree86/parser/Makefile.am	2006-03-06 13:59:11.000000000 -0500
+@@ -23,7 +23,7 @@
+ 	DRI.c \
+ 	Extensions.c
+ 
+-AM_CFLAGS = $(XORG_CFLAGS)
++AM_CFLAGS = $(XORG_CFLAGS) -fPIC
+ 
+ EXTRA_DIST = \
+ 	Configint.h \
diff --git a/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-1377.diff b/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-1377.diff
new file mode 100644
index 0000000..4eb7e1d
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-1377.diff
@@ -0,0 +1,88 @@
+diff --git a/Xext/security.c b/Xext/security.c
+index ba057de..f34c463 100644
+--- a/Xext/security.c
++++ b/Xext/security.c
+@@ -651,15 +651,19 @@ SProcSecurityGenerateAuthorization(
+     register char 	n;
+     CARD32 *values;
+     unsigned long nvalues;
++    int values_offset;
+ 
+     swaps(&stuff->length, n);
+     REQUEST_AT_LEAST_SIZE(xSecurityGenerateAuthorizationReq);
+     swaps(&stuff->nbytesAuthProto, n);
+     swaps(&stuff->nbytesAuthData, n);
+     swapl(&stuff->valueMask, n);
+-    values = (CARD32 *)(&stuff[1]) +
+-	((stuff->nbytesAuthProto + (unsigned)3) >> 2) +
+-	((stuff->nbytesAuthData + (unsigned)3) >> 2);
++    values_offset = ((stuff->nbytesAuthProto + (unsigned)3) >> 2) +
++		    ((stuff->nbytesAuthData + (unsigned)3) >> 2);
++    if (values_offset > 
++	stuff->length - (sz_xSecurityGenerateAuthorizationReq >> 2))
++	return BadLength;
++    values = (CARD32 *)(&stuff[1]) + values_offset;
+     nvalues = (((CARD32 *)stuff) + stuff->length) - values;
+     SwapLongs(values, nvalues);
+     return ProcSecurityGenerateAuthorization(client);
+diff --git a/record/record.c b/record/record.c
+index 0ed8f84..9a166d6 100644
+--- a/record/record.c
++++ b/record/record.c
+@@ -2656,7 +2656,7 @@ SProcRecordQueryVersion(ClientPtr client)
+ } /* SProcRecordQueryVersion */
+ 
+ 
+-static void
++static int
+ SwapCreateRegister(xRecordRegisterClientsReq *stuff)
+ {
+     register char n;
+@@ -2667,11 +2667,17 @@ SwapCreateRegister(xRecordRegisterClientsReq *stuff)
+     swapl(&stuff->nClients, n);
+     swapl(&stuff->nRanges, n);
+     pClientID = (XID *)&stuff[1];
++    if (stuff->nClients > stuff->length - (sz_xRecordRegisterClientsReq >> 2))
++	return BadLength;
+     for (i = 0; i < stuff->nClients; i++, pClientID++)
+     {
+ 	swapl(pClientID, n);
+     }
++    if (stuff->nRanges > stuff->length - (sz_xRecordRegisterClientsReq >> 2)
++	- stuff->nClients)
++	return BadLength;
+     RecordSwapRanges((xRecordRange *)pClientID, stuff->nRanges);
++    return Success;
+ } /* SwapCreateRegister */
+ 
+ 
+@@ -2679,11 +2685,13 @@ static int
+ SProcRecordCreateContext(ClientPtr client)
+ {
+     REQUEST(xRecordCreateContextReq);
++    int			status;
+     register char 	n;
+ 
+     swaps(&stuff->length, n);
+     REQUEST_AT_LEAST_SIZE(xRecordCreateContextReq);
+-    SwapCreateRegister((pointer)stuff);
++    if ((status = SwapCreateRegister((pointer)stuff)) != Success)
++	return status;
+     return ProcRecordCreateContext(client);
+ } /* SProcRecordCreateContext */
+ 
+@@ -2692,11 +2700,13 @@ static int
+ SProcRecordRegisterClients(ClientPtr client)
+ {
+     REQUEST(xRecordRegisterClientsReq);
++    int			status;
+     register char 	n;
+ 
+     swaps(&stuff->length, n);
+     REQUEST_AT_LEAST_SIZE(xRecordRegisterClientsReq);
+-    SwapCreateRegister((pointer)stuff);
++    if ((status = SwapCreateRegister((pointer)stuff)) != Success)
++	return status;
+     return ProcRecordRegisterClients(client);
+ } /* SProcRecordRegisterClients */
+ 
diff --git a/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-1379.diff b/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-1379.diff
new file mode 100644
index 0000000..180d126
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-1379.diff
@@ -0,0 +1,24 @@
+diff --git a/Xext/shm.c b/Xext/shm.c
+index ac587be..e08df36 100644
+--- a/Xext/shm.c
++++ b/Xext/shm.c
+@@ -831,8 +831,17 @@ ProcShmPutImage(client)
+         return BadValue;
+     }
+ 
+-    VERIFY_SHMSIZE(shmdesc, stuff->offset, length * stuff->totalHeight,
+-		   client);
++    /* 
++     * There's a potential integer overflow in this check:
++     * VERIFY_SHMSIZE(shmdesc, stuff->offset, length * stuff->totalHeight,
++     *                client);
++     * the version below ought to avoid it
++     */
++    if (stuff->totalHeight != 0 && 
++	length > (shmdesc->size - stuff->offset)/stuff->totalHeight) {
++	client->errorValue = stuff->totalWidth;
++	return BadValue;
++    }
+     if (stuff->srcX > stuff->totalWidth)
+     {
+ 	client->errorValue = stuff->srcX;
diff --git a/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-2360.diff b/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-2360.diff
new file mode 100644
index 0000000..f14afce
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-2360.diff
@@ -0,0 +1,32 @@
+diff --git a/render/glyph.c b/render/glyph.c
+index 583a52b..42ae65d 100644
+--- a/render/glyph.c
++++ b/render/glyph.c
+@@ -42,6 +42,12 @@
+ #include "picturestr.h"
+ #include "glyphstr.h"
+ 
++#if HAVE_STDINT_H
++#include <stdint.h>
++#elif !defined(UINT32_MAX)
++#define UINT32_MAX 0xffffffffU
++#endif
++
+ /*
+  * From Knuth -- a good choice for hash/rehash values is p, p-2 where
+  * p and p-2 are both prime.  These tables are sized to have an extra 10%
+@@ -626,8 +632,12 @@ AllocateGlyph (xGlyphInfo *gi, int fdepth)
+     int		     size;
+     GlyphPtr	     glyph;
+     int		     i;
+-
+-    size = gi->height * PixmapBytePad (gi->width, glyphDepths[fdepth]);
++    size_t	     padded_width;
++    
++    padded_width = PixmapBytePad (gi->width, glyphDepths[fdepth]);
++    if (gi->height && padded_width > (UINT32_MAX - sizeof(GlyphRec))/gi->height)
++	return 0;
++    size = gi->height * padded_width;
+     glyph = (GlyphPtr) xalloc (size + sizeof (GlyphRec));
+     if (!glyph)
+ 	return 0;
diff --git a/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-2361.diff b/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-2361.diff
new file mode 100644
index 0000000..0749331
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-2361.diff
@@ -0,0 +1,13 @@
+diff --git a/render/render.c b/render/render.c
+index caaa278..b53e878 100644
+--- a/render/render.c
++++ b/render/render.c
+@@ -1504,6 +1504,8 @@ ProcRenderCreateCursor (ClientPtr client)
+     pScreen = pSrc->pDrawable->pScreen;
+     width = pSrc->pDrawable->width;
+     height = pSrc->pDrawable->height;
++    if (height && width > UINT32_MAX/(height*sizeof(CARD32)))
++	return BadAlloc;
+     if ( stuff->x > width 
+       || stuff->y > height )
+ 	return (BadMatch);
diff --git a/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-2362.diff b/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-2362.diff
new file mode 100644
index 0000000..a254d7a
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-xserver-1.4-cve-2008-2362.diff
@@ -0,0 +1,63 @@
+diff --git a/render/render.c b/render/render.c
+index 74c5f63..b53e878 100644
+--- a/render/render.c
++++ b/render/render.c
+@@ -1920,6 +1920,8 @@ static int ProcRenderCreateLinearGradient (ClientPtr client)
+     LEGAL_NEW_RESOURCE(stuff->pid, client);
+ 
+     len = (client->req_len << 2) - sizeof(xRenderCreateLinearGradientReq);
++    if (stuff->nStops > UINT32_MAX/(sizeof(xFixed) + sizeof(xRenderColor)))
++	return BadLength;
+     if (len != stuff->nStops*(sizeof(xFixed) + sizeof(xRenderColor)))
+         return BadLength;
+ 
+@@ -2493,18 +2495,18 @@ SProcRenderCreateSolidFill(ClientPtr client)
+     return (*ProcRenderVector[stuff->renderReqType]) (client);
+ }
+ 
+-static void swapStops(void *stuff, int n)
++static void swapStops(void *stuff, int num)
+ {
+-    int i;
++    int i, n;
+     CARD32 *stops;
+     CARD16 *colors;
+     stops = (CARD32 *)(stuff);
+-    for (i = 0; i < n; ++i) {
++    for (i = 0; i < num; ++i) {
+         swapl(stops, n);
+         ++stops;
+     }
+     colors = (CARD16 *)(stops);
+-    for (i = 0; i < 4*n; ++i) {
++    for (i = 0; i < 4*num; ++i) {
+         swaps(stops, n);
+         ++stops;
+     }
+@@ -2527,6 +2529,8 @@ SProcRenderCreateLinearGradient (ClientPtr client)
+     swapl(&stuff->nStops, n);
+ 
+     len = (client->req_len << 2) - sizeof(xRenderCreateLinearGradientReq);
++    if (stuff->nStops > UINT32_MAX/(sizeof(xFixed) + sizeof(xRenderColor)))
++	return BadLength;
+     if (len != stuff->nStops*(sizeof(xFixed) + sizeof(xRenderColor)))
+         return BadLength;
+ 
+@@ -2554,6 +2558,8 @@ SProcRenderCreateRadialGradient (ClientPtr client)
+     swapl(&stuff->nStops, n);
+ 
+     len = (client->req_len << 2) - sizeof(xRenderCreateRadialGradientReq);
++    if (stuff->nStops > UINT32_MAX/(sizeof(xFixed) + sizeof(xRenderColor)))
++	return BadLength;
+     if (len != stuff->nStops*(sizeof(xFixed) + sizeof(xRenderColor)))
+         return BadLength;
+ 
+@@ -2578,6 +2584,8 @@ SProcRenderCreateConicalGradient (ClientPtr client)
+     swapl(&stuff->nStops, n);
+ 
+     len = (client->req_len << 2) - sizeof(xRenderCreateConicalGradientReq);
++    if (stuff->nStops > UINT32_MAX/(sizeof(xFixed) + sizeof(xRenderColor)))
++	return BadLength;
+     if (len != stuff->nStops*(sizeof(xFixed) + sizeof(xRenderColor)))
+         return BadLength;
+ 
diff --git a/x11-base/xorg-server/files/xprint.init b/x11-base/xorg-server/files/xprint.init
new file mode 100644
index 0000000..e5fed1b
--- /dev/null
+++ b/x11-base/xorg-server/files/xprint.init
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xprint.init,v 1.1 2006/03/24 18:45:00 spyderous Exp $
+
+opts="${opts} get_xpserverlist lsprinters"
+
+depend() {
+	use cupsd
+}
+
+start() {
+	ebegin "Starting xprint"
+	/usr/lib/misc/xprint start > /dev/null
+	eend $?
+}
+
+get_xpserverlist() {
+	/usr/lib/misc/xprint get_xpserverlist
+}
+
+lsprinters() {
+	/usr/lib/misc/xprint lsprinters
+}
+
+stop() {
+	ebegin "Stopping xprint"
+	/usr/lib/misc/xprint stop > /dev/null
+	eend $?
+}
diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml
new file mode 100644
index 0000000..a739bbd
--- /dev/null
+++ b/x11-base/xorg-server/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+<use>
+	<flag name='dmx'>Build the Distributed Multiheaded X server</flag>
+	<flag name='kdrive'>Build the kdrive X servers</flag>
+	<flag name='tslib'>Build with tslib support for touchscreen devices</flag>
+	<flag name='xorg'>Build the Xorg X server (HIGHLY RECOMMENDED)</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-base/xorg-server/xorg-server-1.5.3-r7.ebuild b/x11-base/xorg-server/xorg-server-1.5.3-r7.ebuild
new file mode 100644
index 0000000..d8d1ff0
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.5.3-r7.ebuild
@@ -0,0 +1,554 @@
+# Copyright 1999-2009 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.5.3-r6.ebuild,v 1.2 2009/05/10 22:18:05 remi Exp $
+
+# Must be before x-modular eclass is inherited
+SNAPSHOT="yes"
+
+inherit x-modular multilib
+
+OPENGL_DIR="xorg-x11"
+
+SRC_URI="${SRC_URI}
+	http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2
+	mirror://gentoo/${P}-gentoo-patches-08.tar.bz2"
+DESCRIPTION="X.Org X servers"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE_INPUT_DEVICES="
+	input_devices_acecad
+	input_devices_aiptek
+	input_devices_calcomp
+	input_devices_citron
+	input_devices_digitaledge
+	input_devices_dmc
+	input_devices_dynapro
+	input_devices_elo2300
+	input_devices_elographics
+	input_devices_evdev
+	input_devices_fpit
+	input_devices_hyperpen
+	input_devices_jamstudio
+	input_devices_joystick
+	input_devices_keyboard
+	input_devices_magellan
+	input_devices_microtouch
+	input_devices_mouse
+	input_devices_mutouch
+	input_devices_palmax
+	input_devices_penmount
+	input_devices_spaceorb
+	input_devices_summa
+	input_devices_tek4957
+	input_devices_tslib
+	input_devices_ur98
+	input_devices_virtualbox
+	input_devices_vmmouse
+	input_devices_void
+
+	input_devices_synaptics
+	input_devices_wacom"
+IUSE_VIDEO_CARDS="
+	video_cards_apm
+	video_cards_ark
+	video_cards_ast
+	video_cards_chips
+	video_cards_cirrus
+	video_cards_dummy
+	video_cards_epson
+	video_cards_fbdev
+	video_cards_geode
+	video_cards_glint
+	video_cards_i128
+	video_cards_i740
+	video_cards_intel
+	video_cards_impact
+	video_cards_imstt
+	video_cards_mach64
+	video_cards_mga
+	video_cards_neomagic
+	video_cards_newport
+	video_cards_nv
+	video_cards_r128
+	video_cards_radeon
+	video_cards_radeonhd
+	video_cards_rendition
+	video_cards_s3
+	video_cards_s3virge
+	video_cards_savage
+	video_cards_siliconmotion
+	video_cards_sis
+	video_cards_sisusb
+	video_cards_sunbw2
+	video_cards_suncg14
+	video_cards_suncg3
+	video_cards_suncg6
+	video_cards_sunffb
+	video_cards_sunleo
+	video_cards_suntcx
+	video_cards_tdfx
+	video_cards_tga
+	video_cards_trident
+	video_cards_tseng
+	video_cards_v4l
+	video_cards_vermilion
+	video_cards_vesa
+	video_cards_via
+	video_cards_virtualbox
+	video_cards_vmware
+	video_cards_voodoo
+	video_cards_xgi
+	video_cards_fglrx
+	video_cards_nvidia"
+IUSE_SERVERS="dmx kdrive xorg"
+IUSE="${IUSE_VIDEO_CARDS}
+	${IUSE_INPUT_DEVICES}
+	${IUSE_SERVERS}
+	3dfx tslib
+	hal ipv6 minimal nptl sdl"
+RDEPEND="hal? ( sys-apps/hal )
+	tslib? ( x11-libs/tslib x11-libs/libXCalibrate )
+	>=x11-libs/libXfont-1.3.3
+	>=x11-libs/xtrans-1.2.2
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXext-1.0.4
+	>=x11-libs/libX11-1.1.5
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXmu-1.0.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/pixman-0.12
+	media-libs/freetype
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-1.4
+	x11-apps/xkbcomp
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	>=x11-apps/xinit-1.0.8-r3
+	app-admin/eselect-opengl
+	>=x11-libs/libXaw-1.0.4
+	>=x11-libs/libXpm-3.5.7
+	>=x11-libs/libXxf86misc-1.0.1
+	>=x11-libs/libXxf86vm-1.0.2
+	>=x11-libs/libpciaccess-0.10.3
+	dmx? ( >=x11-libs/libdmx-1.0.2
+			>=x11-libs/libXfixes-4.0.3 )
+	!minimal? ( >=x11-libs/libXtst-1.0.3
+		>=x11-libs/libXres-1.0.3
+		>=media-libs/mesa-7.1
+		media-fonts/font-adobe-75dpi )
+	>=x11-libs/libxkbui-1.0.2
+	kdrive? ( sdl? ( media-libs/libsdl ) )"
+	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
+	# Xaw is dmx- and xorgcfg-dependent
+	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
+	# Xxf86misc and Xxf86vm are xorgcfg-dependent
+	# xkbcomp is launched at startup but not checked by ./configure
+DEPEND="${RDEPEND}
+	!net-dialup/dtrace
+	sys-devel/flex
+	>=x11-proto/randrproto-1.2.2
+	>=x11-proto/renderproto-0.9.3
+	>=x11-proto/fixesproto-4
+	>=x11-proto/damageproto-1.1
+	>=x11-proto/xextproto-7.0.3
+	>=x11-proto/xproto-7.0.13
+	>=x11-proto/xf86dgaproto-2.0.3
+	>=x11-proto/xf86miscproto-0.9.2
+	>=x11-proto/xf86rushproto-1.1.2
+	>=x11-proto/xf86vidmodeproto-2.2.2
+	>=x11-proto/xf86bigfontproto-1.1.2
+	>=x11-proto/compositeproto-0.4
+	>=x11-proto/recordproto-1.13.2
+	>=x11-proto/resourceproto-1.0.2
+	>=x11-proto/videoproto-2.2.2
+	>=x11-proto/scrnsaverproto-1.1.0
+	>=x11-proto/evieext-1.0.2
+	>=x11-proto/trapproto-3.4.3
+	>=x11-proto/xineramaproto-1.1.2
+	>=x11-proto/fontsproto-2.0.2
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/inputproto-1.4.4
+	>=x11-proto/bigreqsproto-1.0.2
+	>=x11-proto/xcmiscproto-1.1.2
+	>=x11-proto/glproto-1.4.9
+	dmx? ( >=x11-proto/dmxproto-2.2.2 )
+	!minimal? ( >=x11-proto/xf86driproto-2.0.4
+		>=x11-libs/libdrm-2.3 )"
+
+# Drivers
+PDEPEND="
+	xorg? (
+		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.2.2 )
+		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.1.1 )
+		input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.2 )
+		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 )
+		input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.1 )
+		input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.2 )
+		input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.2 )
+		input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.2 )
+		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.2.2 )
+		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.1.0 )
+		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.2.0 )
+		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.2.0 )
+		input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.2.0 )
+		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.3.2 )
+		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.3.1 )
+		input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.2.0 )
+		input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.2.0 )
+		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.3.0 )
+		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.2.1 )
+		input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.2.0 )
+		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.3.0 )
+		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 )
+		input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.2.0 )
+		input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.2.0 )
+		input_devices_tslib? ( x11-drivers/xf86-input-tslib x11-libs/libXCalibrate )
+		input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
+		input_devices_virtualbox? ( x11-drivers/xf86-input-virtualbox )
+		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.5.0 )
+		input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.1 )
+		input_devices_synaptics? ( >=x11-drivers/xf86-input-synaptics-0.15.0 )
+		input_devices_wacom? ( x11-drivers/linuxwacom )
+
+		video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.2.0  )
+		video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.7.0 )
+		video_cards_ast? ( >=x11-drivers/xf86-video-ast-0.85.0 )
+		video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.2.0 )
+		video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.2.1 )
+		video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.3.0 )
+		video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.4.0 )
+		video_cards_geode? ( >=x11-drivers/xf86-video-geode-2.9.0  )
+		video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.1 )
+		video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.3.1 )
+		video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.2.0 )
+		video_cards_intel? ( >=x11-drivers/xf86-video-intel-2.4.2-r1 )
+		video_cards_mach64? ( >=x11-drivers/xf86-video-mach64-6.8.0 )
+		video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.9 )
+		video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.2.1 )
+		video_cards_newport? ( x11-drivers/xf86-video-newport )
+		video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.12 )
+		video_cards_nvidia? ( x11-drivers/nvidia-drivers )
+		video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.552-r2 )
+		video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.8.0 )
+		video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.9.0 )
+		video_cards_radeonhd? ( >=x11-drivers/xf86-video-radeonhd-1.2.1 )
+		video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.2.0 )
+		video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.6.0 )
+		video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.10.1 )
+		video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.2.1 )
+		video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.6.0 )
+		video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.10.0 )
+		video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.9.0 )
+		video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.2.0 )
+		video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.2.0 )
+		video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.4.0 )
+		video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.2.0 )
+		video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.3.0 )
+		video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.2.0 )
+		video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.2.0 )
+		video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-2.0.0 )
+		video_cards_via? ( >=x11-drivers/xf86-video-openchrome-0.2.903 )
+		video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox )
+		video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.16.5 )
+		video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.2.0 )
+		video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 )
+
+		video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
+
+		!x11-drivers/xf86-video-impact
+		!x11-drivers/xf86-video-imstt
+		!x11-drivers/xf86-video-sunbw2
+		!x11-drivers/xf86-video-suncg14
+		!x11-drivers/xf86-video-suncg3
+		!x11-drivers/xf86-video-suncg6
+		!x11-drivers/xf86-video-suntcx
+		!x11-drivers/xf86-video-vermilion
+
+		!x11-drivers/xf86-video-cyrix
+		!x11-drivers/xf86-video-nsc
+		!x11-drivers/xf86-video-vga
+	)"
+LICENSE="${LICENSE} MIT"
+
+EPATCH_FORCE="yes"
+EPATCH_SUFFIX="patch"
+
+# Local customizations, unsuitable for upstream
+GENTOO_PATCHES=(
+	"${FILESDIR}/1.4-fpic-libxf86config.patch"
+	"${FILESDIR}/1.4-fix-kdrive-automake.patch"
+	"${FILESDIR}/tslib-1.0-check.patch"
+	)
+
+# These have been sent upstream
+UPSTREAMED_PATCHES=(
+	"${WORKDIR}/patches/"
+)
+
+PATCHES=(
+	"${GENTOO_PATCHES[@]}"
+	"${UPSTREAMED_PATCHES[@]}"
+	)
+
+pkg_setup() {
+	use minimal || ensure_a_server_is_building
+
+	# SDL only available in kdrive build
+	if use kdrive && use sdl; then
+		conf_opts="${conf_opts} --enable-xsdl"
+	else
+		conf_opts="${conf_opts} --disable-xsdl"
+	fi
+
+	# localstatedir is used for the log location; we need to override the default
+	# from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	# --enable-install-setuid needed because sparcs default off
+	CONFIGURE_OPTIONS="
+		$(use_enable ipv6)
+		$(use_enable dmx)
+		$(use_enable kdrive)
+		$(use_enable tslib)
+		$(use_enable tslib xcalibrate)
+		$(use_enable !minimal xvfb)
+		$(use_enable !minimal xnest)
+		$(use_enable !minimal xtrap)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal install-libxf86config)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal glx)
+		$(use_enable xorg)
+		$(use_enable nptl glx-tls)
+		$(use_enable !minimal xorgcfg)
+		$(use_enable hal config-dbus)
+		$(use_enable hal config-hal)
+		--disable-dri2
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--enable-install-setuid
+		--with-fontdir=/usr/share/fonts
+		--with-xkb-output=/var/lib/xkb
+		--without-dtrace
+		${conf_opts}"
+
+	local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
+	if ! use minimal; then
+		if built_with_use media-libs/mesa nptl; then
+			use nptl || die "${diemsg}"
+		else
+			use nptl && die "${diemsg}"
+		fi
+	fi
+
+	# (#121394) Causes window corruption
+	filter-flags -fweb
+
+	# Incompatible with GCC 3.x SSP on x86, bug #244352
+	if use x86 ; then
+		if [[ $(gcc-major-version) -lt 4 ]]; then
+			filter-flags -fstack-protector
+		fi
+	fi
+
+	# Nothing else provides new enough glxtokens.h
+	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
+	OLD_IMPLEM="$(eselect opengl show)"
+	eselect opengl set --impl-headers ${OPENGL_DIR}
+}
+
+src_unpack() {
+	x-modular_specs_check
+	x-modular_dri_check
+	x-modular_unpack_source
+	x-modular_patch_source
+
+	# Set up kdrive servers to build
+	if use kdrive; then
+		kdrive_setup
+	fi
+
+	# Make sure eautoreconf gets run if we need the autoconf/make
+	# changes.
+	if [[ ${SNAPSHOT} != "yes" ]]; then
+		if use kdrive || use dmx; then
+			SNAPSHOT="yes"
+		fi
+	fi
+
+	if use hal; then
+		sed -i \
+			-e "s:^\(dbusconfigdir = \).*\(dbus-1.*\):\1/etc/\2:g" \
+			"${S}"/config/Makefile.am \
+			|| die "failed to fix DBUS config directory"
+		SNAPSHOT="yes"
+	fi
+
+	x-modular_reconf_source
+}
+
+src_install() {
+	x-modular_src_install
+
+	dynamic_libgl_install
+
+	server_based_install
+
+	# Install video mode files for system-config-display
+	insinto /usr/share/xorg
+	doins hw/xfree86/common/{extra,vesa}modes \
+		|| die "couldn't install extra modes"
+
+	# Bug #151421 - this file is not built with USE="minimal"
+	# Bug #151670 - this file is also not build if USE="-xorg"
+	if ! use minimal &&	use xorg; then
+		# Install xorg.conf.example
+		insinto /etc/X11
+		doins hw/xfree86/xorg.conf.example \
+			|| die "couldn't install xorg.conf.example"
+	fi
+}
+
+pkg_postinst() {
+	switch_opengl_implem
+
+	# Bug #135544
+	ewarn "Users of reduced blanking now need:"
+	ewarn "   Option \"ReducedBlanking\""
+	ewarn "In the relevant Monitor section(s)."
+	ewarn "Make sure your reduced blanking modelines are safe!"
+
+	echo
+	ewarn "You must rebuild all drivers if upgrading from xorg-server 1.4.1"
+	ewarn "or earlier, because the ABI changed. If you cannot start X because"
+	ewarn "of module version mismatch errors, this is your problem."
+
+	echo
+	ewarn "You can generate a list of all installed packages in the x11-drivers"
+	ewarn "category using this command:"
+	ewarn "emerge portage-utils; qlist -I -C x11-drivers/"
+
+	ebeep 5
+	epause 10
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if ! has_version x11-base/xorg-server; then
+		if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+			rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
+		fi
+	fi
+}
+
+kdrive_setup() {
+	local card real_card disable_card kdrive_fbdev kdrive_vesa
+
+	einfo "Removing unused kdrive drivers ..."
+
+	# Some kdrive servers require fbdev and vesa
+	kdrive_fbdev="radeon neomagic sis siliconmotion"
+	# Some kdrive servers require just vesa
+	kdrive_vesa="chips mach64 mga nv glint r128 via"
+
+	for card in ${IUSE_VIDEO_CARDS}; do
+		real_card=${card#video_cards_}
+
+		# Differences between VIDEO_CARDS name and kdrive server name
+		real_card=${real_card/glint/pm2}
+		real_card=${real_card/radeon/ati}
+		real_card=${real_card/%nv/nvidia}
+		real_card=${real_card/siliconmotion/smi}
+		real_card=${real_card/%sis/sis300}
+
+		disable_card=0
+
+		# Check whether it's a valid kdrive server before we waste time
+		# on the rest of this
+		if ! grep -q -o "\b${real_card}\b" "${S}"/hw/kdrive/Makefile.am; then
+			continue
+		fi
+
+		if ! use ${card}; then
+			if use x86; then
+				# Some kdrive servers require fbdev and vesa
+				for i in ${kdrive_fbdev}; do
+					if use video_cards_${i}; then
+						if [[ ${real_card} = fbdev ]] \
+							|| [[ ${real_card} = vesa ]]; then
+							continue 2 # Don't disable
+						fi
+						fi
+				done
+
+				# Some kdrive servers require just vesa
+				for i in ${kdrive_vesa}; do
+					if use video_cards_${i}; then
+						if [[ ${real_card} = vesa ]]; then
+							continue 2 # Don't disable
+						fi
+					fi
+				done
+			fi
+			disable_card=1
+		# Bug #150052
+		# fbdev is the only VIDEO_CARDS setting that works on non-x86
+		elif ! use x86 \
+			&& [[ ${real_card} != fbdev ]]; then
+			ewarn "  $real_card does not work on your architecture; disabling."
+			disable_card=1
+		fi
+
+		if [[ $disable_card = 1 ]]; then
+			ebegin "  ${real_card}"
+			sed -i \
+				-e "s:\b${real_card}\b::g" \
+				"${S}"/hw/kdrive/Makefile.am \
+				|| die "sed of ${real_card} failed"
+			eend
+		fi
+
+	done
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving GL files for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+		local x=""
+		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+			fi
+		done
+	eend 0
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${D}"/usr/share/man/man1/Xserver.1x \
+			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${D}"/usr/share/man/man1/Xserver.1x
+	fi
+}
+
+switch_opengl_implem() {
+		# Switch to the xorg implementation.
+		# Use new opengl-update that will not reset user selected
+		# OpenGL interface ...
+		echo
+#		eselect opengl set --use-old ${OPENGL_DIR}
+		eselect opengl set ${OLD_IMPLEM}
+}
+
+ensure_a_server_is_building() {
+	for server in ${IUSE_SERVERS}; do
+		use ${server} && return;
+	done
+	eerror "You need to specify at least one server to build."
+	eerror "Valid servers are: ${IUSE_SERVERS}."
+	die "No servers were specified to build."
+}