Pull monolithic Xorg. It's moved to the (new) x11 overlay, accessible via layman. If anyone is interested in updating it for security patches etc, please contact x11@gentoo.org and we can work on getting you commit access.

Package-Manager: portage-2.1.2

9 files changed, 4 insertions, 5271 deletions

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 2655117390a7..99dd5fccc291 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,37 +1,3 @@
-AUX 6.9.0-fix-rom-read-dualhead.patch 3245 RMD160 1cd7036604715b8d0caaeef0d77516fe244d02ef SHA1 ebececdee80fde617c80b26207dfc270185851a3 SHA256 e97d3cb6791caeb8538dfbacb2df39e236e1747c308e1322edd9c48f667a0ea9
-MD5 1a0bb4c5b887105f3232ab9a7706e7b4 files/6.9.0-fix-rom-read-dualhead.patch 3245
-RMD160 1cd7036604715b8d0caaeef0d77516fe244d02ef files/6.9.0-fix-rom-read-dualhead.patch 3245
-SHA256 e97d3cb6791caeb8538dfbacb2df39e236e1747c308e1322edd9c48f667a0ea9 files/6.9.0-fix-rom-read-dualhead.patch 3245
-AUX CVE-2006-1526-xrender-mitri.patch 833 RMD160 a7ac6f0b9925ffee95fcac0549e1e68f29b5e783 SHA1 40b6500d5b947c093837dcc708b5630fb3f178fc SHA256 7a5f115be88411ed28d1098a79be021440c57fef3200cabfec48c943d3b0df01
-MD5 daeec68d1c01357b57daa15ff859ddc5 files/CVE-2006-1526-xrender-mitri.patch 833
-RMD160 a7ac6f0b9925ffee95fcac0549e1e68f29b5e783 files/CVE-2006-1526-xrender-mitri.patch 833
-SHA256 7a5f115be88411ed28d1098a79be021440c57fef3200cabfec48c943d3b0df01 files/CVE-2006-1526-xrender-mitri.patch 833
-AUX x11r6.9.0-setuid.diff 12759 RMD160 42c9b60d770756e8f2003c8fd5771130bc4636b2 SHA1 918cf9d893f445d653b6872075503be23d7e9e72 SHA256 20ef7602113fef90b61c748801b1fb970496e53ec5ccfcb81e96fb005b092670
-MD5 ab62c18f015f3831228973e04b2aeac5 files/x11r6.9.0-setuid.diff 12759
-RMD160 42c9b60d770756e8f2003c8fd5771130bc4636b2 files/x11r6.9.0-setuid.diff 12759
-SHA256 20ef7602113fef90b61c748801b1fb970496e53ec5ccfcb81e96fb005b092670 files/x11r6.9.0-setuid.diff 12759
-AUX xorg-68x-setuid.patch 12869 RMD160 8d69e406fdff0b103103091a00ec683c9277728e SHA1 e3c0fcfd5f9c2f4867403f8855eaec4851066e05 SHA256 c259abd6261b03f5e7d6345e518c4eea6d0cb4099f4763dc971c202615b24558
-MD5 7e467c0981922e58eedae06f34465905 files/xorg-68x-setuid.patch 12869
-RMD160 8d69e406fdff0b103103091a00ec683c9277728e files/xorg-68x-setuid.patch 12869
-SHA256 c259abd6261b03f5e7d6345e518c4eea6d0cb4099f4763dc971c202615b24558 files/xorg-68x-setuid.patch 12869
-DIST X11R6.8.2-src.tar.bz2 44371402 RMD160 80efdaf74a25e43c77aab1d83e817f03f344d105 SHA1 632e25a202bc41bb9b1c5dbc8bbb0d775c6593b0 SHA256 f02e3c85572dc9ad7cb77c2a638e3be24cc1b5bea9fdbb0b0299c9668475c534
-DIST X11R6.9.0-src.tar.bz2 46220125 RMD160 5c830d43607c4550ad44936d77b5adc56f67dbf5 SHA1 45a5dd78398ab499b05ad6feadf05415ff382703 SHA256 6509e5bee489ab7c8d0c255c12f6ceb8f06be74b57b060b6e9a61497710a3f4c
-DIST eurofonts-X11.tar.bz2 8811 RMD160 d3f54324dcfd961dc128a257917a90a5bc9560da SHA1 ca04f550186cc152db342759ac79ba2eef053ea8 SHA256 6028bda00ecf403f1723ca66d24ed3f609bf6d7eaef46e0facb04fb322aac3e3
-DIST gemini-koi8-u.tar.bz2 439173 RMD160 861e7048f0ec5136c898976b092b96da8772d70c SHA1 7b8fe99e5515cfaed01a606676a118ac9c7980ac SHA256 df70d795be2cfbac04647365495e70c84b3a2119db2297a9deca7f939c135811
-DIST gentoo-cursors-tad-0.3.1.tar.bz2 1196991 RMD160 cd10e8ffbfd8879e096ba5d31fd16d613c780660 SHA1 9f197684907bf21508d1c0091f19a283cab9f585 SHA256 90c6775fcd194153b79e06e4232c74054ebf11227a83c5762e6aa539d46ef847
-DIST xfsft-encodings-0.1.tar.bz2 11892 RMD160 d51d2110764484dd49cba393510f2f143a7eb0a2 SHA1 958f7cd913496e8e57a55bb9a6fc3b4fdb2e81ac SHA256 a13acec68d913f42cf49c97113da86a90d15867f799fcaa7e9892759c6b37645
-DIST xorg-x11-6.8.2-files-0.8.tar.bz2 9920 RMD160 cacc6ebb392dce9b1274b13c3a87ac62f42e2828 SHA1 f6cf8bb31668c8bda0bc06e8b9cc47e2e4fd0dcf SHA256 51b8f9af14a25ba90e61f61f8a8531b8075a59ac41d4f7d0a1812bcaf9623f02
-DIST xorg-x11-6.8.2-patches-0.1.13.tar.bz2 191763 RMD160 d0d363afcf26f78005e380a49ff7c7be4301f6cd SHA1 21a08218ddaa52a4598ea7d05b690822ecde5c88 SHA256 aebc58cd8e85a50c39f33ca9a1dbb300e972ca8fa50bd1527c71d52864dcc09f
-DIST xorg-x11-6.9.0-files-0.1.tar.bz2 9930 RMD160 0bf43b280db86b28f4ee93b1c47959f4372d71fc SHA1 2b559b2285304c0462e8731104270bbfc9337ab7 SHA256 207f366cd69ae1b828206f227bd600d5ec9e9dfddb0cab8e418f222f4b787755
-DIST xorg-x11-6.9.0-patches-0.1.1.tar.bz2 114332 RMD160 ff9b0f2cd969ccfb1078c5b6f3b2d4a7e5085b10 SHA1 9ab1b5a1d9eaee1f403d5d3c3ae43441a5aa9745 SHA256 fb6a652fcbf6c8416b675766960850ed104fbd44b71440dcd335f0d3a2f069d3
-EBUILD xorg-x11-6.8.2-r8.ebuild 62778 RMD160 72376134e1b1cffd4694c69069c0364c5b8aeba1 SHA1 b7d6902405845eca977d31ac4651d2471a98cd53 SHA256 5ad475a3b2d89d02f7c418efa7c184921c8d0e67006f4f9a9d3446d35d9d4169
-MD5 8cf86f5a6f0a2ae021584506edfad087 xorg-x11-6.8.2-r8.ebuild 62778
-RMD160 72376134e1b1cffd4694c69069c0364c5b8aeba1 xorg-x11-6.8.2-r8.ebuild 62778
-SHA256 5ad475a3b2d89d02f7c418efa7c184921c8d0e67006f4f9a9d3446d35d9d4169 xorg-x11-6.8.2-r8.ebuild 62778
-EBUILD xorg-x11-6.9.0-r3.ebuild 61218 RMD160 a8a1e32069b972680d17333af3a2ac853192aeaa SHA1 1c5fa54adc9b51e88952f390dc8749abe7aa09b6 SHA256 768968066a6ed8e1110d28610144dbae28f82f4b2262ddf8f6dbed256ad605f9
-MD5 7858f704812383425b0fec24c6e8a041 xorg-x11-6.9.0-r3.ebuild 61218
-RMD160 a8a1e32069b972680d17333af3a2ac853192aeaa xorg-x11-6.9.0-r3.ebuild 61218
-SHA256 768968066a6ed8e1110d28610144dbae28f82f4b2262ddf8f6dbed256ad605f9 xorg-x11-6.9.0-r3.ebuild 61218
 EBUILD xorg-x11-7.1.ebuild 3839 RMD160 10fad8db34ec5dd3b05cd3674ebec6cd54be662a SHA1 20431a4e72a070633dd3fc5bc39a1a7f215166ec SHA256 fbaa02356fe8b86455a91dee98c98f3b8a9838c3d421a8a16d9bbc6dc4b5e0e7
 MD5 403830badf415ead887a0933ad19fedd xorg-x11-7.1.ebuild 3839
 RMD160 10fad8db34ec5dd3b05cd3674ebec6cd54be662a xorg-x11-7.1.ebuild 3839
@@ -40,20 +6,14 @@ EBUILD xorg-x11-7.2.ebuild 3854 RMD160 4ac18c1e14a99bb5288a3e789028a8e680bb3da7
 MD5 5ca121d9405e70a539b5078946f3da75 xorg-x11-7.2.ebuild 3854
 RMD160 4ac18c1e14a99bb5288a3e789028a8e680bb3da7 xorg-x11-7.2.ebuild 3854
 SHA256 b1b88bbb858fd8d02287f0ed07897903ae073757e04d0d29be5c5bf4ba7fb8a2 xorg-x11-7.2.ebuild 3854
-MISC ChangeLog 125120 RMD160 8d580e8e4b5a00dbe6f18ce8c757107e600ecf26 SHA1 cac29327cbe5aeb326961b425b0d62f587b67224 SHA256 e22d881f39e8a95222f74f049e43e90877bb7e1aa0b6cecb5668e366363c9e99
-MD5 7d624fa6d2d612f182c04df5b1ca5c82 ChangeLog 125120
-RMD160 8d580e8e4b5a00dbe6f18ce8c757107e600ecf26 ChangeLog 125120
-SHA256 e22d881f39e8a95222f74f049e43e90877bb7e1aa0b6cecb5668e366363c9e99 ChangeLog 125120
+MISC ChangeLog 125605 RMD160 998740f0a00d9bb0b89829542b2a69ea8e8a4479 SHA1 8822d20c3022caaa90938f8725639e407470a1ba SHA256 faffe38e936ba33a915fb80353b83da73c1f1999dec8139642e5f846c602f743
+MD5 f5210b8199c7b7f4c8ab18e9fc0eee66 ChangeLog 125605
+RMD160 998740f0a00d9bb0b89829542b2a69ea8e8a4479 ChangeLog 125605
+SHA256 faffe38e936ba33a915fb80353b83da73c1f1999dec8139642e5f846c602f743 ChangeLog 125605
 MISC metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e SHA1 c54cfbf65124c6abed943e76d0e3e6c976fc4f12 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 RMD160 a293db25b0a2b203eb1b788ee62601190618066e metadata.xml 230
 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0 metadata.xml 230
-MD5 d62de174f95a61691209aac0a2ff39a6 files/digest-xorg-x11-6.8.2-r8 1834
-RMD160 78eb6ba124ec564a437ac0f8bbea5917495e5596 files/digest-xorg-x11-6.8.2-r8 1834
-SHA256 36f92eea9fd6b4345001fc67164120bcd885267f5ad1dbe81547ffe7230f2f28 files/digest-xorg-x11-6.8.2-r8 1834
-MD5 c3e8a36e06412232a60c8ea285357ece files/digest-xorg-x11-6.9.0-r3 1831
-RMD160 ab84a1d96a2f006310190681c711f8951c46db3c files/digest-xorg-x11-6.9.0-r3 1831
-SHA256 96bcf76fba399a75d943495aabed45e2c7ac7b5ccf511b5a1b4b7897e9928711 files/digest-xorg-x11-6.9.0-r3 1831
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.1 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-xorg-x11-7.1 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-xorg-x11-7.1 0
diff --git a/x11-base/xorg-x11/files/6.9.0-fix-rom-read-dualhead.patch b/x11-base/xorg-x11/files/6.9.0-fix-rom-read-dualhead.patch
deleted file mode 100644
index d1407e7eccdc..000000000000
--- a/x11-base/xorg-x11/files/6.9.0-fix-rom-read-dualhead.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c	2005-11-08 11:04:56.000000000 -0800
-+++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c	2006-06-29 15:48:37.000000000 -0700
-@@ -233,6 +233,8 @@
- 
- static pciConfigPtr pci_devp[MAX_PCI_DEVICES + 1] = {NULL, };
- 
-+static int (*pciOSHandleBIOS)(PCITAG Tag, int basereg, unsigned char *buf, int len);
-+
- /*
-  * Platform specific PCI function pointers.
-  *
-@@ -266,6 +268,11 @@
- #endif
- }
- 
-+void pciSetOSBIOSPtr(int (*bios_fn)(PCITAG Tag, int basereg, unsigned char * buf, int len))
-+{
-+	pciOSHandleBIOS = bios_fn;
-+}
-+
- PCITAG
- pciFindFirst(CARD32 id, CARD32 mask)
- {
-@@ -1347,6 +1354,13 @@
-   PCITAG *pTag;
-   int i;
- 
-+  /* fall back to the old code if the OS code fails */
-+  if (pciOSHandleBIOS) {
-+	n = pciOSHandleBIOS(Tag, basereg, func, ptr);
-+   if (n)
-+      		return n;
-+  }
-+
-   n = handlePciBIOS(Tag,basereg,func,ptr);
-   if (n)
-       return n;
---- xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h	2005-11-08 11:04:56.000000000 -0800
-+++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h	2006-06-29 15:43:50.000000000 -0700
-@@ -431,6 +431,7 @@
- Bool          pciMfDev(int, int);
- ADDRESS       pciAddrNOOP(PCITAG tag, PciAddrType type, ADDRESS);
- 
-+extern void pciSetOSBIOSPtr(int (*bios_fn)(PCITAG Tag, int basereg, unsigned char * buf, int len));
- extern PCITAG (*pciFindFirstFP)(void);
- extern PCITAG (*pciFindNextFP)(void);
- 
---- xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c	2005-11-08 11:04:56.000000000 -0800
-+++ xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c	2006-06-29 15:43:50.000000000 -0700
-@@ -73,6 +73,7 @@
- static void linuxPciCfgWriteByte(PCITAG tag, int off, CARD8 val);
- static CARD16 linuxPciCfgReadWord(PCITAG tag, int off);
- static void linuxPciCfgWriteWord(PCITAG tag, int off, CARD16 val);
-+static int linuxPciHandleBIOS(PCITAG Tag, int basereg, unsigned char *buf, int len);
- 
- static pciBusFuncs_t linuxFuncs0 = {
- /* pciReadLong      */	linuxPciCfgRead,
-@@ -125,6 +126,7 @@
- 	pciBusInfo[0]  = &linuxPci0;
- 	pciFindFirstFP = pciGenFindFirst;
- 	pciFindNextFP  = pciGenFindNext;
-+	pciSetOSBIOSPtr(linuxPciHandleBIOS);
- }
- 
- static int
-@@ -892,3 +894,44 @@
- }
- 
- #endif /* !INCLUDE_XF86_NO_DOMAIN */
-+
-+int linuxPciHandleBIOS(PCITAG Tag, int basereg, unsigned char *buf, int len)
-+{
-+  unsigned int dom, bus, dev, func;
-+  unsigned int fd;
-+  char file[256];
-+  struct stat st;
-+  int ret;
-+  int sofar = 0;
-+
-+  dom  = PCI_DOM_FROM_TAG(Tag);
-+  bus  = PCI_BUS_FROM_TAG(Tag);
-+  dev  = PCI_DEV_FROM_TAG(Tag);
-+  func = PCI_FUNC_FROM_TAG(Tag);
-+  sprintf(file, "/sys/bus/pci/devices/%04x:%02x:%02x.%1x/rom",
-+	  dom, bus, dev, func);
-+
-+  if (stat(file, &st) == 0)
-+  {
-+    if ((fd = open(file, O_RDWR)))
-+      basereg = 0x0;
-+    
-+    /* enable the ROM first */
-+    write(fd, "1", 2);
-+    lseek(fd, 0, SEEK_SET);
-+    do {
-+        /* copy the ROM until we hit Len, EOF or read error */
-+    	ret = read(fd, buf+sofar, len-sofar);
-+    	if (ret <= 0)
-+		break;
-+	sofar += ret;
-+    } while (sofar < len);
-+    
-+    write(fd, "0", 2);
-+    close(fd);
-+    if (sofar < len)
-+    	xf86MsgVerb(X_INFO, 3, "Attempted to read BIOS %dKB from %s: got %dKB\n", len/1024, file, sofar/1024);
-+    return sofar;
-+  }
-+  return 0;
-+}
diff --git a/x11-base/xorg-x11/files/CVE-2006-1526-xrender-mitri.patch b/x11-base/xorg-x11/files/CVE-2006-1526-xrender-mitri.patch
deleted file mode 100644
index 2d2a104cb902..000000000000
--- a/x11-base/xorg-x11/files/CVE-2006-1526-xrender-mitri.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: render/mitri.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/render/mitri.c,v
-retrieving revision 1.5
-diff -u -r1.5 mitri.c
---- xc/programs/Xserver/render/mitri.c	3 Jul 2005 07:02:08 -0000	1.5
-+++ xc/programs/Xserver/render/mitri.c	18 Apr 2006 22:34:08 -0000
-@@ -145,7 +145,7 @@
-     if (npoint < 3)
- 	return;
-     ntri = npoint - 2;
--    tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
-+    tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
-     if (!tris)
- 	return;
-     for (tri = tris; npoint >= 3; npoint--, points++, tri++)
-@@ -177,7 +177,7 @@
-     if (npoint < 3)
- 	return;
-     ntri = npoint - 2;
--    tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
-+    tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
-     if (!tris)
- 	return;
-     first = points++;
-
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r8 b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r8
deleted file mode 100644
index 3eea5ce674a7..000000000000
--- a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r8
+++ /dev/null
@@ -1,21 +0,0 @@
-MD5 8131cd7ea1e4566e6e05c438a93fcfe1 X11R6.8.2-src.tar.bz2 44371402
-RMD160 80efdaf74a25e43c77aab1d83e817f03f344d105 X11R6.8.2-src.tar.bz2 44371402
-SHA256 f02e3c85572dc9ad7cb77c2a638e3be24cc1b5bea9fdbb0b0299c9668475c534 X11R6.8.2-src.tar.bz2 44371402
-MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811
-RMD160 d3f54324dcfd961dc128a257917a90a5bc9560da eurofonts-X11.tar.bz2 8811
-SHA256 6028bda00ecf403f1723ca66d24ed3f609bf6d7eaef46e0facb04fb322aac3e3 eurofonts-X11.tar.bz2 8811
-MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
-RMD160 861e7048f0ec5136c898976b092b96da8772d70c gemini-koi8-u.tar.bz2 439173
-SHA256 df70d795be2cfbac04647365495e70c84b3a2119db2297a9deca7f939c135811 gemini-koi8-u.tar.bz2 439173
-MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991
-RMD160 cd10e8ffbfd8879e096ba5d31fd16d613c780660 gentoo-cursors-tad-0.3.1.tar.bz2 1196991
-SHA256 90c6775fcd194153b79e06e4232c74054ebf11227a83c5762e6aa539d46ef847 gentoo-cursors-tad-0.3.1.tar.bz2 1196991
-MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892
-RMD160 d51d2110764484dd49cba393510f2f143a7eb0a2 xfsft-encodings-0.1.tar.bz2 11892
-SHA256 a13acec68d913f42cf49c97113da86a90d15867f799fcaa7e9892759c6b37645 xfsft-encodings-0.1.tar.bz2 11892
-MD5 3558cdcca5bdd1d17d468408c794aea6 xorg-x11-6.8.2-files-0.8.tar.bz2 9920
-RMD160 cacc6ebb392dce9b1274b13c3a87ac62f42e2828 xorg-x11-6.8.2-files-0.8.tar.bz2 9920
-SHA256 51b8f9af14a25ba90e61f61f8a8531b8075a59ac41d4f7d0a1812bcaf9623f02 xorg-x11-6.8.2-files-0.8.tar.bz2 9920
-MD5 3f9b8411dc49d38d03d75928e2b42e78 xorg-x11-6.8.2-patches-0.1.13.tar.bz2 191763
-RMD160 d0d363afcf26f78005e380a49ff7c7be4301f6cd xorg-x11-6.8.2-patches-0.1.13.tar.bz2 191763
-SHA256 aebc58cd8e85a50c39f33ca9a1dbb300e972ca8fa50bd1527c71d52864dcc09f xorg-x11-6.8.2-patches-0.1.13.tar.bz2 191763
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.9.0-r3 b/x11-base/xorg-x11/files/digest-xorg-x11-6.9.0-r3
deleted file mode 100644
index c861623df332..000000000000
--- a/x11-base/xorg-x11/files/digest-xorg-x11-6.9.0-r3
+++ /dev/null
@@ -1,21 +0,0 @@
-MD5 52ad69832db5c36c7041f90625ed4598 X11R6.9.0-src.tar.bz2 46220125
-RMD160 5c830d43607c4550ad44936d77b5adc56f67dbf5 X11R6.9.0-src.tar.bz2 46220125
-SHA256 6509e5bee489ab7c8d0c255c12f6ceb8f06be74b57b060b6e9a61497710a3f4c X11R6.9.0-src.tar.bz2 46220125
-MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811
-RMD160 d3f54324dcfd961dc128a257917a90a5bc9560da eurofonts-X11.tar.bz2 8811
-SHA256 6028bda00ecf403f1723ca66d24ed3f609bf6d7eaef46e0facb04fb322aac3e3 eurofonts-X11.tar.bz2 8811
-MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
-RMD160 861e7048f0ec5136c898976b092b96da8772d70c gemini-koi8-u.tar.bz2 439173
-SHA256 df70d795be2cfbac04647365495e70c84b3a2119db2297a9deca7f939c135811 gemini-koi8-u.tar.bz2 439173
-MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991
-RMD160 cd10e8ffbfd8879e096ba5d31fd16d613c780660 gentoo-cursors-tad-0.3.1.tar.bz2 1196991
-SHA256 90c6775fcd194153b79e06e4232c74054ebf11227a83c5762e6aa539d46ef847 gentoo-cursors-tad-0.3.1.tar.bz2 1196991
-MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892
-RMD160 d51d2110764484dd49cba393510f2f143a7eb0a2 xfsft-encodings-0.1.tar.bz2 11892
-SHA256 a13acec68d913f42cf49c97113da86a90d15867f799fcaa7e9892759c6b37645 xfsft-encodings-0.1.tar.bz2 11892
-MD5 087850f509a70708466d0f2d91a02f01 xorg-x11-6.9.0-files-0.1.tar.bz2 9930
-RMD160 0bf43b280db86b28f4ee93b1c47959f4372d71fc xorg-x11-6.9.0-files-0.1.tar.bz2 9930
-SHA256 207f366cd69ae1b828206f227bd600d5ec9e9dfddb0cab8e418f222f4b787755 xorg-x11-6.9.0-files-0.1.tar.bz2 9930
-MD5 e3e382e5f2fb849224550963fa4bd0ee xorg-x11-6.9.0-patches-0.1.1.tar.bz2 114332
-RMD160 ff9b0f2cd969ccfb1078c5b6f3b2d4a7e5085b10 xorg-x11-6.9.0-patches-0.1.1.tar.bz2 114332
-SHA256 fb6a652fcbf6c8416b675766960850ed104fbd44b71440dcd335f0d3a2f069d3 xorg-x11-6.9.0-patches-0.1.1.tar.bz2 114332
diff --git a/x11-base/xorg-x11/files/x11r6.9.0-setuid.diff b/x11-base/xorg-x11/files/x11r6.9.0-setuid.diff
deleted file mode 100644
index 9bdb1fa740e6..000000000000
--- a/x11-base/xorg-x11/files/x11r6.9.0-setuid.diff
+++ /dev/null
@@ -1,411 +0,0 @@
-Index: xc/config/util/chownxterm.c
-===================================================================
-RCS file: /cvs/xorg/xc/config/util/chownxterm.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 chownxterm.c
---- xc/config/util/chownxterm.c	14 Nov 2003 16:48:20 -0000	1.1.1.1
-+++ xc/config/util/chownxterm.c	5 Jun 2006 10:35:10 -0000
-@@ -41,8 +41,10 @@
- 
- void help()
- {
--    setgid(getgid());
--    setuid(getuid());
-+    if (setgid(getgid()) == -1) 
-+	exit(1);
-+    if (setuid(getuid()) == -1)
-+	exit(1);
-     printf("chown-xterm makes %s suid root\n", XTERM_PATH);
-     printf("This is necessary on Ultrix for /dev/tty operation.\n");
-     exit(0);
-@@ -51,8 +53,10 @@
- void print_error(err_string)
-     char *err_string;
- {
--    setgid(getgid());
--    setuid(getuid());
-+    if (setgid(getgid()) == -1)
-+	exit(1);
-+    if (setuid(getuid()) == -1)
-+	exit(1);
-     fprintf(stderr, "%s: \"%s\"", prog_name, err_string);
-     perror(" failed");
-     exit(1);
-Index: xc/lib/X11/lcFile.c
-===================================================================
-RCS file: /cvs/xorg/xc/lib/X11/lcFile.c,v
-retrieving revision 1.6
-diff -u -r1.6 lcFile.c
---- xc/lib/X11/lcFile.c	13 May 2005 22:53:44 -0000	1.6
-+++ xc/lib/X11/lcFile.c	5 Jun 2006 10:35:14 -0000
-@@ -269,7 +269,11 @@
- 	    if (seteuid(0) != 0) {
- 		priv = 0;
- 	    } else {
--		seteuid(oldeuid);
-+		if (seteuid(oldeuid) == -1) {
-+		    /* XXX ouch, coudn't get back to original uid 
-+		     what can we do ??? */
-+		    _exit(127);
-+		}
- 		priv = 1;
- 	    }
- #endif
-Index: xc/lib/xtrans/Xtranslcl.c
-===================================================================
-RCS file: /cvs/xorg/xc/lib/xtrans/Xtranslcl.c,v
-retrieving revision 1.4
-diff -u -r1.4 Xtranslcl.c
---- xc/lib/xtrans/Xtranslcl.c	8 Nov 2005 06:33:26 -0000	1.4
-+++ xc/lib/xtrans/Xtranslcl.c	5 Jun 2006 10:35:15 -0000
-@@ -360,7 +360,10 @@
- 	uid_t       saved_euid;
- 
- 	saved_euid = geteuid();
--	setuid( getuid() ); /** sets the euid to the actual/real uid **/
-+	/** sets the euid to the actual/real uid **/
-+	if (setuid( getuid() ) == -1) {
-+		exit(1);
-+	}
- 	if( chown( slave, saved_euid, -1 ) < 0 ) {
- 		exit( 1 );
- 		}
-@@ -369,7 +372,13 @@
-     }
- 
-     waitpid(saved_pid, &exitval, 0);
--
-+    if (WIFEXITED(exitval) && WEXITSTATUS(exitval) != 0) {
-+	close(fd);
-+	close(server);
-+	PRMSG(1, "PTSOpenClient: cannot set the owner of %s\n",
-+	      slave, 0, 0);
-+	return(-1);
-+    }
-     if (chmod(slave, 0666) < 0) {
- 	close(fd);
- 	close(server);
-Index: xc/programs/Xserver/hw/xfree86/common/xf86Init.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v
-retrieving revision 1.29
-diff -u -r1.29 xf86Init.c
---- xc/programs/Xserver/hw/xfree86/common/xf86Init.c	14 Dec 2005 20:12:00 -0000	1.29
-+++ xc/programs/Xserver/hw/xfree86/common/xf86Init.c	5 Jun 2006 10:35:19 -0000
-@@ -1905,7 +1905,11 @@
-           FatalError("xf86RunVtInit: fork failed (%s)\n", strerror(errno));
-           break;
-       case 0:  /* child */
--          setuid(getuid());
-+	  if (setuid(getuid()) == -1) {
-+	      xf86Msg(X_ERROR, "xf86RunVtInit: setuid failed (%s)\n",
-+			 strerror(errno));
-+	      exit(255);
-+	  }
-           /* set stdin, stdout to the consoleFd */
-           for (i = 0; i < 2; i++) {
-             if (xf86Info.consoleFd != i) {
-Index: xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c,v
-retrieving revision 1.9
-diff -u -r1.9 libc_wrapper.c
---- xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c	3 Jul 2005 08:53:48 -0000	1.9
-+++ xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c	5 Jun 2006 10:35:19 -0000
-@@ -1270,7 +1270,10 @@
- #ifndef SELF_CONTAINED_WRAPPER
- 	xf86DisableIO();
- #endif
--        setuid(getuid());
-+        if (setuid(getuid()) == -1) {
-+		ErrorF("xf86Execl: setuid() failed: %s\n", strerror(errno));
-+		exit(255);
-+	}
- #if !defined(SELF_CONTAINED_WRAPPER)
-         /* set stdin, stdout to the consoleFD, and leave stderr alone */
-         for (i = 0; i < 2; i++)
-Index: xc/programs/Xserver/hw/xfree86/parser/write.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/parser/write.c,v
-retrieving revision 1.3
-diff -u -r1.3 write.c
---- xc/programs/Xserver/hw/xfree86/parser/write.c	3 Jul 2005 07:01:37 -0000	1.3
-+++ xc/programs/Xserver/hw/xfree86/parser/write.c	5 Jun 2006 10:35:19 -0000
-@@ -170,7 +170,10 @@
- 					strerror(errno));
- 			return 0;
- 		case 0: /* child */
--			setuid(getuid());
-+			if (setuid(getuid()) == -1) 
-+			    FatalError("xf86writeConfigFile(): "
-+				"setuid failed(%s)\n", 
-+				strerror(errno));
- 			ret = doWriteConfigFile(filename, cptr);
- 			exit(ret);
- 			break;
-Index: xc/programs/Xserver/os/utils.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/os/utils.c,v
-retrieving revision 1.21
-diff -u -r1.21 utils.c
---- xc/programs/Xserver/os/utils.c	8 Nov 2005 06:33:30 -0000	1.21
-+++ xc/programs/Xserver/os/utils.c	5 Jun 2006 10:35:20 -0000
-@@ -1718,8 +1718,10 @@
-     case -1:	/* error */
- 	p = -1;
-     case 0:	/* child */
--	setgid(getgid());
--	setuid(getuid());
-+	if (setgid(getgid()) == -1)
-+	    _exit(127);
-+	if (setuid(getuid()) == -1)
-+	    _exit(127);
- 	execl("/bin/sh", "sh", "-c", command, (char *)NULL);
- 	_exit(127);
-     default:	/* parent */
-@@ -1770,8 +1772,10 @@
- 	xfree(cur);
- 	return NULL;
-     case 0:	/* child */
--	setgid(getgid());
--	setuid(getuid());
-+	if (setgid(getgid()) == -1)
-+	    _exit(127);
-+	if (setuid(getuid()) == -1)
-+	    _exit(127);
- 	if (*type == 'r') {
- 	    if (pdes[1] != 1) {
- 		/* stdout */
-@@ -1845,8 +1849,10 @@
- 	xfree(cur);
- 	return NULL;
-     case 0:	/* child */
--	setgid(getgid());
--	setuid(getuid());
-+	if (setgid(getgid()) == -1)
-+	    _exit(127);
-+	if (setuid(getuid()) == -1)
-+	    _exit(127);
- 	if (*type == 'r') {
- 	    if (pdes[1] != 1) {
- 		/* stdout */
-Index: xc/programs/xdm/session.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xdm/session.c,v
-retrieving revision 1.3
-diff -u -r1.3 session.c
---- xc/programs/xdm/session.c	8 Nov 2005 06:33:31 -0000	1.3
-+++ xc/programs/xdm/session.c	5 Jun 2006 10:35:21 -0000
-@@ -488,8 +488,14 @@
-     else
- 	ResetServer (d);
-     if (removeAuth) {
--	setgid (verify.gid);
--	setuid (verify.uid);
-+	if (setgid (verify.gid) == -1) {
-+	    LogError( "SessionExit: setgid: %s\n", strerror(errno));
-+	    exit(status);
-+	}
-+	if (setuid (verify.uid) == -1) {
-+	    LogError( "SessionExit: setuid: %s\n", strerror(errno));
-+	    exit(status);
-+	}
- 	RemoveUserAuthorization (d, &verify);
- #ifdef K5AUTH
- 	/* do like "kdestroy" program */
-Index: xc/programs/xdm/xdmshell.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xdm/xdmshell.c,v
-retrieving revision 1.3
-diff -u -r1.3 xdmshell.c
---- xc/programs/xdm/xdmshell.c	14 Jul 2005 22:58:25 -0000	1.3
-+++ xc/programs/xdm/xdmshell.c	5 Jun 2006 10:35:21 -0000
-@@ -183,7 +183,11 @@
- #endif
- 
-     /* make xdm run in a non-setuid environment */
--    setuid (geteuid());
-+    if (setuid (geteuid()) == -1) {
-+	fprintf(stderr, "%s: cannot setuid (error %d, %s)\r\n",
-+		ProgramName, errno, strerror(errno));
-+	exit(1);
-+    }
- 
-     /*
-      * exec /usr/bin/X11/xdm -nodaemon -udpPort 0
-Index: xc/programs/xf86dga/dga.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xf86dga/dga.c,v
-retrieving revision 1.2
-diff -u -r1.2 dga.c
---- xc/programs/xf86dga/dga.c	23 Apr 2004 19:54:47 -0000	1.2
-+++ xc/programs/xf86dga/dga.c	5 Jun 2006 10:35:21 -0000
-@@ -16,6 +16,7 @@
- #include <X11/Xmd.h>
- #include <X11/extensions/xf86dga.h>
- #include <ctype.h>
-+#include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <signal.h>
-@@ -141,7 +142,10 @@
- 
- #ifndef __UNIXOS2__
-    /* Give up root privs */
--   setuid(getuid());
-+   if (setuid(getuid()) == -1) {
-+      fprintf(stderr, "Unable to change uid: %s\n", strerror(errno));
-+      exit(2);
-+   }
- #endif
- 
-    XF86DGASetViewPort(dis, DefaultScreen(dis), 0, 0);
-Index: xc/programs/xinit/xinit.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xinit/xinit.c,v
-retrieving revision 1.4
-diff -u -r1.4 xinit.c
---- xc/programs/xinit/xinit.c	4 Oct 2005 01:27:34 -0000	1.4
-+++ xc/programs/xinit/xinit.c	5 Jun 2006 10:35:21 -0000
-@@ -692,7 +692,10 @@
- startClient(char *client[])
- {
- 	if ((clientpid = vfork()) == 0) {
--		setuid(getuid());
-+		if (setuid(getuid()) == -1) {
-+			Error("cannot change uid: %s\n", strerror(errno));
-+			_exit(ERR_EXIT);
-+		}
- 		setpgrp(0, getpid());
- 		environ = newenviron;
- #ifdef __UNIXOS2__
-Index: xc/programs/xload/xload.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xload/xload.c,v
-retrieving revision 1.2
-diff -u -r1.2 xload.c
---- xc/programs/xload/xload.c	23 Apr 2004 19:54:57 -0000	1.2
-+++ xc/programs/xload/xload.c	5 Jun 2006 10:35:21 -0000
-@@ -34,7 +34,7 @@
-  * xload - display system load average in a window
-  */
- 
--
-+#include <errno.h>
- #include <stdio.h> 
- #include <stdlib.h>
- #include <unistd.h>
-@@ -162,8 +162,17 @@
-     /* For security reasons, we reset our uid/gid after doing the necessary
-        system initialization and before calling any X routines. */
-     InitLoadPoint();
--    setgid(getgid());		/* reset gid first while still (maybe) root */
--    setuid(getuid());
-+    /* reset gid first while still (maybe) root */
-+    if (setgid(getgid()) == -1) {
-+	    fprintf(stderr, "%s: setgid failed: %s\n", 
-+		ProgramName, strerror(errno));
-+	    exit(1);
-+    }
-+    if (setuid(getuid()) == -1) {
-+	    fprintf(stderr, "%s: setuid failed: %s\n", 
-+		ProgramName, strerror(errno));
-+	    exit(1);
-+    }
- 
-     XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL);
- 
-Index: xc/programs/xterm/main.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xterm/main.c,v
-retrieving revision 1.8
-diff -u -r1.8 main.c
---- xc/programs/xterm/main.c	14 Dec 2005 23:28:27 -0000	1.8
-+++ xc/programs/xterm/main.c	5 Jun 2006 10:35:22 -0000
-@@ -1592,8 +1592,10 @@
-     Window winToEmbedInto = None;
- 
- #ifdef DISABLE_SETUID
--    seteuid(getuid());
--    setuid(getuid());
-+    if (seteuid(getuid()) == -1)
-+	    exit(2);
-+    if (setuid(getuid()) == -1)
-+	    exit(2);
- #endif
- 
-     ProgramName = argv[0];
-@@ -1619,8 +1621,16 @@
- 
- #if defined(USE_UTMP_SETGID)
-     get_pty(NULL, NULL);
--    seteuid(getuid());
--    setuid(getuid());
-+    if (seteuid(getuid()) == -1) {
-+           fprintf(stderr,
-+               "%s: unable to change back euid\n", ProgramName);
-+           exit(1);
-+    }
-+    if (setuid(getuid()) == -1) {
-+           fprintf(stderr,
-+               "%s: unable to change back uid\n", ProgramName);
-+           exit(1);
-+    }
- #define get_pty(pty, from) really_get_pty(pty, from)
- #endif
- 
-Index: xc/programs/xterm/misc.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xterm/misc.c,v
-retrieving revision 1.6
-diff -u -r1.6 misc.c
---- xc/programs/xterm/misc.c	14 Dec 2005 23:28:27 -0000	1.6
-+++ xc/programs/xterm/misc.c	5 Jun 2006 10:35:22 -0000
-@@ -1094,8 +1094,10 @@
-     pid = fork();
-     switch (pid) {
-     case 0:			/* child */
--	setgid(gid);
--	setuid(uid);
-+	if (setgid(gid) == -1)
-+	    _exit(ERROR_SETUID);
-+	if (setuid(uid) == -1) 
-+	    _exit(ERROR_SETUID);
- 	fd = open(pathname,
- 		  O_WRONLY | O_CREAT | (append ? O_APPEND : O_EXCL),
- 		  mode);
-@@ -1262,8 +1264,10 @@
- 	    signal(SIGCHLD, SIG_DFL);
- 
- 	    /* (this is redundant) */
--	    setgid(screen->gid);
--	    setuid(screen->uid);
-+	    if (setgid(screen->gid) == -1)
-+		exit(ERROR_SETUID);
-+	    if (setuid(screen->uid) == -1)
-+		exit(ERROR_SETUID);
- 
- 	    execl(shell, shell, "-c", &screen->logfile[1], (void *) 0);
- 
-Index: xc/programs/xterm/print.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xterm/print.c,v
-retrieving revision 1.5
-diff -u -r1.5 print.c
---- xc/programs/xterm/print.c	5 Aug 2005 16:13:04 -0000	1.5
-+++ xc/programs/xterm/print.c	5 Jun 2006 10:35:22 -0000
-@@ -387,9 +387,11 @@
- 		dup2(fileno(stderr), 2);
- 		close(fileno(stderr));
- 	    }
--
--	    setgid(screen->gid);	/* don't want privileges! */
--	    setuid(screen->uid);
-+	    /* don't want privileges! */
-+	    if (setgid(screen->gid) == -1)
-+		    exit(2);
-+	    if (setuid(screen->uid) == -1)
-+		    exit(2);
- 
- 	    Printer = popen(screen->printer_command, "w");
- 	    input = fdopen(my_pipe[0], "r");
diff --git a/x11-base/xorg-x11/files/xorg-68x-setuid.patch b/x11-base/xorg-x11/files/xorg-68x-setuid.patch
deleted file mode 100644
index 09eaf45cfdf8..000000000000
--- a/x11-base/xorg-x11/files/xorg-68x-setuid.patch
+++ /dev/null
@@ -1,404 +0,0 @@
-Index: xc/config/util/chownxterm.c
-===================================================================
-RCS file: /cvs/xorg/xc/config/util/chownxterm.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 chownxterm.c
---- xc/config/util/chownxterm.c	14 Nov 2003 16:48:20 -0000	1.1.1.1
-+++ xc/config/util/chownxterm.c	19 Jun 2006 20:15:19 -0000
-@@ -41,8 +41,10 @@
- 
- void help()
- {
--    setgid(getgid());
--    setuid(getuid());
-+    if (setgid(getgid()) == -1) 
-+	exit(1);
-+    if (setuid(getuid()) == -1)
-+	exit(1);
-     printf("chown-xterm makes %s suid root\n", XTERM_PATH);
-     printf("This is necessary on Ultrix for /dev/tty operation.\n");
-     exit(0);
-@@ -51,8 +53,10 @@
- void print_error(err_string)
-     char *err_string;
- {
--    setgid(getgid());
--    setuid(getuid());
-+    if (setgid(getgid()) == -1)
-+	exit(1);
-+    if (setuid(getuid()) == -1)
-+	exit(1);
-     fprintf(stderr, "%s: \"%s\"", prog_name, err_string);
-     perror(" failed");
-     exit(1);
-Index: xc/lib/X11/lcFile.c
-===================================================================
-RCS file: /cvs/xorg/xc/lib/X11/lcFile.c,v
-retrieving revision 1.2
-diff -u -r1.2 lcFile.c
---- xc/lib/X11/lcFile.c	23 Apr 2004 18:43:24 -0000	1.2
-+++ xc/lib/X11/lcFile.c	19 Jun 2006 20:15:22 -0000
-@@ -230,7 +230,11 @@
- 	    if (seteuid(0) != 0) {
- 		priv = 0;
- 	    } else {
--		seteuid(oldeuid);
-+		if (seteuid(oldeuid) == -1) {
-+		    /* XXX ouch, coudn't get back to original uid 
-+		     what can we do ??? */
-+		    _exit(127);
-+		}
- 		priv = 1;
- 	    }
- #endif
-Index: xc/lib/xtrans/Xtranslcl.c
-===================================================================
-RCS file: /cvs/xorg/xc/lib/xtrans/Xtranslcl.c,v
-retrieving revision 1.2
-diff -u -r1.2 Xtranslcl.c
---- xc/lib/xtrans/Xtranslcl.c	23 Apr 2004 18:44:27 -0000	1.2
-+++ xc/lib/xtrans/Xtranslcl.c	19 Jun 2006 20:15:24 -0000
-@@ -348,7 +348,10 @@
- 	uid_t       saved_euid;
- 
- 	saved_euid = geteuid();
--	setuid( getuid() ); /** sets the euid to the actual/real uid **/
-+	/** sets the euid to the actual/real uid **/
-+	if (setuid( getuid() ) == -1) {
-+		exit(1);
-+	}
- 	if( chown( slave, saved_euid, -1 ) < 0 ) {
- 		exit( 1 );
- 		}
-@@ -357,7 +360,13 @@
-     }
- 
-     waitpid(saved_pid, &exitval, 0);
--
-+    if (WIFEXITED(exitval) && WEXITSTATUS(exitval) != 0) {
-+	close(fd);
-+	close(server);
-+	PRMSG(1, "PTSOpenClient: cannot set the owner of %s\n",
-+	      slave, 0, 0);
-+	return(-1);
-+    }
-     if (chmod(slave, 0666) < 0) {
- 	close(fd);
- 	close(server);
-Index: xc/programs/Xserver/hw/xfree86/common/xf86Init.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v
-retrieving revision 1.12.2.2
-diff -u -r1.12.2.2 xf86Init.c
---- xc/programs/Xserver/hw/xfree86/common/xf86Init.c	17 Dec 2004 02:01:21 -0000	1.12.2.2
-+++ xc/programs/Xserver/hw/xfree86/common/xf86Init.c	19 Jun 2006 20:15:25 -0000
-@@ -1861,7 +1861,11 @@
-           FatalError("xf86RunVtInit: fork failed (%s)\n", strerror(errno));
-           break;
-       case 0:  /* child */
--          setuid(getuid());
-+	  if (setuid(getuid()) == -1) {
-+	      xf86Msg(X_ERROR, "xf86RunVtInit: setuid failed (%s)\n",
-+			 strerror(errno));
-+	      exit(255);
-+	  }
-           /* set stdin, stdout to the consoleFd */
-           for (i = 0; i < 2; i++) {
-             if (xf86Info.consoleFd != i) {
-Index: xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c,v
-retrieving revision 1.3
-diff -u -r1.3 libc_wrapper.c
---- xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c	30 Jul 2004 20:51:08 -0000	1.3
-+++ xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c	19 Jun 2006 20:15:26 -0000
-@@ -1226,7 +1226,10 @@
- #ifndef SELF_CONTAINED_WRAPPER
- 	xf86DisableIO();
- #endif
--        setuid(getuid());
-+        if (setuid(getuid()) == -1) {
-+		ErrorF("xf86Execl: setuid() failed: %s\n", strerror(errno));
-+		exit(255);
-+	}
- #if !defined(SELF_CONTAINED_WRAPPER)
-         /* set stdin, stdout to the consoleFD, and leave stderr alone */
-         for (i = 0; i < 2; i++)
-Index: xc/programs/Xserver/hw/xfree86/parser/write.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/parser/write.c,v
-retrieving revision 1.2
-diff -u -r1.2 write.c
---- xc/programs/Xserver/hw/xfree86/parser/write.c	31 Jul 2004 09:14:06 -0000	1.2
-+++ xc/programs/Xserver/hw/xfree86/parser/write.c	19 Jun 2006 20:15:26 -0000
-@@ -166,7 +166,10 @@
- 					strerror(errno));
- 			return 0;
- 		case 0: /* child */
--			setuid(getuid());
-+			if (setuid(getuid()) == -1) 
-+			    FatalError("xf86writeConfigFile(): "
-+				"setuid failed(%s)\n", 
-+				strerror(errno));
- 			ret = doWriteConfigFile(filename, cptr);
- 			exit(ret);
- 			break;
-Index: xc/programs/Xserver/os/utils.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/os/utils.c,v
-retrieving revision 1.6.2.3
-diff -u -r1.6.2.3 utils.c
---- xc/programs/Xserver/os/utils.c	8 Dec 2004 06:34:31 -0000	1.6.2.3
-+++ xc/programs/Xserver/os/utils.c	19 Jun 2006 20:15:26 -0000
-@@ -1,4 +1,4 @@
--/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.6.2.3 2004/12/08 06:34:31 gisburn Exp $ */
-+/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.21 2005/11/08 06:33:30 jkj Exp $ */
- /* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */
- /*
- 
-@@ -1707,8 +1707,10 @@
-     case -1:	/* error */
- 	p = -1;
-     case 0:	/* child */
--	setgid(getgid());
--	setuid(getuid());
-+	if (setgid(getgid()) == -1)
-+	    _exit(127);
-+	if (setuid(getuid()) == -1)
-+	    _exit(127);
- 	execl("/bin/sh", "sh", "-c", command, (char *)NULL);
- 	_exit(127);
-     default:	/* parent */
-@@ -1759,8 +1761,10 @@
- 	xfree(cur);
- 	return NULL;
-     case 0:	/* child */
--	setgid(getgid());
--	setuid(getuid());
-+	if (setgid(getgid()) == -1)
-+	    _exit(127);
-+	if (setuid(getuid()) == -1)
-+	    _exit(127);
- 	if (*type == 'r') {
- 	    if (pdes[1] != 1) {
- 		/* stdout */
-@@ -1834,8 +1838,10 @@
- 	xfree(cur);
- 	return NULL;
-     case 0:	/* child */
--	setgid(getgid());
--	setuid(getuid());
-+	if (setgid(getgid()) == -1)
-+	    _exit(127);
-+	if (setuid(getuid()) == -1)
-+	    _exit(127);
- 	if (*type == 'r') {
- 	    if (pdes[1] != 1) {
- 		/* stdout */
-Index: xc/programs/xdm/session.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xdm/session.c,v
-retrieving revision 1.2
-diff -u -r1.2 session.c
---- xc/programs/xdm/session.c	23 Apr 2004 19:54:42 -0000	1.2
-+++ xc/programs/xdm/session.c	19 Jun 2006 20:15:26 -0000
-@@ -1,4 +1,4 @@
--/* $XdotOrg: xc/programs/xdm/session.c,v 1.2 2004/04/23 19:54:42 eich Exp $ */
-+/* $XdotOrg: xc/programs/xdm/session.c,v 1.3 2005/11/08 06:33:31 jkj Exp $ */
- /* $Xorg: session.c,v 1.8 2001/02/09 02:05:40 xorgcvs Exp $ */
- /*
- 
-@@ -484,8 +484,14 @@
-     else
- 	ResetServer (d);
-     if (removeAuth) {
--	setgid (verify.gid);
--	setuid (verify.uid);
-+	if (setgid (verify.gid) == -1) {
-+	    LogError( "SessionExit: setgid: %s\n", strerror(errno));
-+	    exit(status);
-+	}
-+	if (setuid (verify.uid) == -1) {
-+	    LogError( "SessionExit: setuid: %s\n", strerror(errno));
-+	    exit(status);
-+	}
- 	RemoveUserAuthorization (d, &verify);
- #ifdef K5AUTH
- 	/* do like "kdestroy" program */
-Index: xc/programs/xdm/xdmshell.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xdm/xdmshell.c,v
-retrieving revision 1.2
-diff -u -r1.2 xdmshell.c
---- xc/programs/xdm/xdmshell.c	23 Apr 2004 19:54:42 -0000	1.2
-+++ xc/programs/xdm/xdmshell.c	19 Jun 2006 20:15:26 -0000
-@@ -179,7 +179,11 @@
- #endif
- 
-     /* make xdm run in a non-setuid environment */
--    setuid (geteuid());
-+    if (setuid (geteuid()) == -1) {
-+	fprintf(stderr, "%s: cannot setuid (error %d, %s)\r\n",
-+		ProgramName, errno, strerror(errno));
-+	exit(1);
-+    }
- 
-     /*
-      * exec /usr/bin/X11/xdm -nodaemon -udpPort 0
-Index: xc/programs/xf86dga/dga.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xf86dga/dga.c,v
-retrieving revision 1.2
-diff -u -r1.2 dga.c
---- xc/programs/xf86dga/dga.c	23 Apr 2004 19:54:47 -0000	1.2
-+++ xc/programs/xf86dga/dga.c	19 Jun 2006 20:15:27 -0000
-@@ -16,6 +16,7 @@
- #include <X11/Xmd.h>
- #include <X11/extensions/xf86dga.h>
- #include <ctype.h>
-+#include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <signal.h>
-@@ -141,7 +142,10 @@
- 
- #ifndef __UNIXOS2__
-    /* Give up root privs */
--   setuid(getuid());
-+   if (setuid(getuid()) == -1) {
-+      fprintf(stderr, "Unable to change uid: %s\n", strerror(errno));
-+      exit(2);
-+   }
- #endif
- 
-    XF86DGASetViewPort(dis, DefaultScreen(dis), 0, 0);
-Index: xc/programs/xinit/xinit.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xinit/xinit.c,v
-retrieving revision 1.2
-diff -u -r1.2 xinit.c
---- xc/programs/xinit/xinit.c	23 Apr 2004 19:54:49 -0000	1.2
-+++ xc/programs/xinit/xinit.c	19 Jun 2006 20:15:27 -0000
-@@ -678,7 +678,10 @@
- startClient(char *client[])
- {
- 	if ((clientpid = vfork()) == 0) {
--		setuid(getuid());
-+		if (setuid(getuid()) == -1) {
-+			Error("cannot change uid: %s\n", strerror(errno));
-+			_exit(ERR_EXIT);
-+		}
- 		setpgrp(0, getpid());
- 		environ = newenviron;
- #ifdef __UNIXOS2__
-Index: xc/programs/xload/xload.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xload/xload.c,v
-retrieving revision 1.2
-diff -u -r1.2 xload.c
---- xc/programs/xload/xload.c	23 Apr 2004 19:54:57 -0000	1.2
-+++ xc/programs/xload/xload.c	19 Jun 2006 20:15:27 -0000
-@@ -34,7 +34,7 @@
-  * xload - display system load average in a window
-  */
- 
--
-+#include <errno.h>
- #include <stdio.h> 
- #include <stdlib.h>
- #include <unistd.h>
-@@ -162,8 +162,17 @@
-     /* For security reasons, we reset our uid/gid after doing the necessary
-        system initialization and before calling any X routines. */
-     InitLoadPoint();
--    setgid(getgid());		/* reset gid first while still (maybe) root */
--    setuid(getuid());
-+    /* reset gid first while still (maybe) root */
-+    if (setgid(getgid()) == -1) {
-+	    fprintf(stderr, "%s: setgid failed: %s\n", 
-+		ProgramName, strerror(errno));
-+	    exit(1);
-+    }
-+    if (setuid(getuid()) == -1) {
-+	    fprintf(stderr, "%s: setuid failed: %s\n", 
-+		ProgramName, strerror(errno));
-+	    exit(1);
-+    }
- 
-     XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL);
- 
-Index: xc/programs/xterm/main.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xterm/main.c,v
-retrieving revision 1.4.2.1
-diff -u -r1.4.2.1 main.c
---- xc/programs/xterm/main.c	12 Jan 2005 21:45:10 -0000	1.4.2.1
-+++ xc/programs/xterm/main.c	19 Jun 2006 20:15:28 -0000
-@@ -2789,8 +2789,10 @@
- #ifdef USE_PTY_DEVICE
- 	set_pty_id(ptydev, passedPty);
- #endif
--	setgid(screen->gid);
--	setuid(screen->uid);
-+	if (setgid(screen->gid) == -1) 
-+	    SysError(ERROR_SETUID);
-+	if (setuid(screen->uid) == -1)
-+	    SysError(ERROR_SETUID);
-     } else {
- 	Bool tty_got_hung;
- 
-Index: xc/programs/xterm/misc.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xterm/misc.c,v
-retrieving revision 1.3.2.1
-diff -u -r1.3.2.1 misc.c
---- xc/programs/xterm/misc.c	12 Jan 2005 21:45:10 -0000	1.3.2.1
-+++ xc/programs/xterm/misc.c	19 Jun 2006 20:15:28 -0000
-@@ -1045,8 +1045,10 @@
-     pid = fork();
-     switch (pid) {
-     case 0:			/* child */
--	setgid(gid);
--	setuid(uid);
-+	if (setgid(gid) == -1)
-+	    _exit(ERROR_SETUID);
-+	if (setuid(uid) == -1) 
-+	    _exit(ERROR_SETUID);
- 	fd = open(pathname,
- 		  O_WRONLY | O_CREAT | (append ? O_APPEND : O_EXCL),
- 		  mode);
-@@ -1212,8 +1214,10 @@
- 	    signal(SIGCHLD, SIG_DFL);
- 
- 	    /* (this is redundant) */
--	    setgid(screen->gid);
--	    setuid(screen->uid);
-+	    if (setgid(screen->gid) == -1)
-+		exit(ERROR_SETUID);
-+	    if (setuid(screen->uid) == -1)
-+		exit(ERROR_SETUID);
- 
- 	    execl(shell, shell, "-c", &screen->logfile[1], (void *) 0);
- 
-Index: xc/programs/xterm/print.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xterm/print.c,v
-retrieving revision 1.3.2.1
-diff -u -r1.3.2.1 print.c
---- xc/programs/xterm/print.c	12 Jan 2005 21:45:10 -0000	1.3.2.1
-+++ xc/programs/xterm/print.c	19 Jun 2006 20:15:28 -0000
-@@ -381,9 +381,11 @@
- 		dup2(fileno(stderr), 2);
- 		close(fileno(stderr));
- 	    }
--
--	    setgid(screen->gid);	/* don't want privileges! */
--	    setuid(screen->uid);
-+	    /* don't want privileges! */
-+	    if (setgid(screen->gid) == -1)
-+		    exit(2);
-+	    if (setuid(screen->uid) == -1)
-+		    exit(2);
- 
- 	    Printer = popen(screen->printer_command, "w");
- 	    input = fdopen(my_pipe[0], "r");
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r8.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r8.ebuild
deleted file mode 100644
index a11cc9aee440..000000000000
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r8.ebuild
+++ /dev/null
@@ -1,2140 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r8.ebuild,v 1.13 2006/09/12 20:47:40 dberkholz Exp $
-
-# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
-# voodoo3 cards.
-
-# Libraries which are now supplied in shared form that were not in the past
-# include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
-# libXinerama.so, libXss.so, libXvMC.so, libXxf86rush.so, libfontenc.so,
-# libxkbfile.so, libxkbui.so
-
-# TODO
-# 1 June 2005 <spyderous@gentoo.org>
-#   TARGET: none
-#		Consider building shared libraries only, when both are provided
-#		Combine find loops for "Creating fonts.scale files," "Generating
-#			fonts.dir files and "Generating Xft cache"
-#		<Mr_Bones_> the loop in pkg_postinst for removing Compose can probably
-#			be one line of bash expansion like rm -f ${ROOT}/usr/$(get_libdir)/
-#			X11/locale/{ja*|ko*|zh*}/Compose
-#		Clean up migration function
-#			- loop through lib* instead of repetition
-#		Fix direction of lib -> libdir symlink
-#		Generalize any functions that make sense to generalize (i.e., anything
-#			that might realistically see use elsewhere, or repetitively here)
-inherit eutils flag-o-matic toolchain-funcs x11 linux-info multilib
-
-
-# Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
-# that only we only strip stuff that are safe to strip ...
-RESTRICT="nostrip"
-
-# IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004)
-IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server
-	insecure-drivers ipv6 minimal mmx nls nocxx opengl pam sdk sse static
-	truetype-fonts type1-fonts uclibc xprint xv
-	GAPING_SECURITY_HOLE"
-# IUSE_INPUT_DEVICES="synaptics wacom"
-
-FILES_VER="0.8"
-PATCH_VER="0.1.13"
-XCUR_VER="0.3.1"
-XFSFT_ENC_VER="0.1"
-
-S=${WORKDIR}/xc
-
-HOMEPAGE="http://xorg.freedesktop.org/"
-
-# Misc patches we may need to fetch ..
-X_PATCHES="http://dev.gentoo.org/~joshuabaergen/distfiles/${P}-patches-${PATCH_VER}.tar.bz2
-	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
-
-GENTOO_FILES="http://dev.gentoo.org/~seemant/distfiles/${P}-files-${FILES_VER}.tar.bz2
-	mirror://gentoo/${P}-files-${FILES_VER}.tar.bz2"
-
-SRC_URI="!minimal? ( mirror://gentoo/eurofonts-X11.tar.bz2 )
-	font-server? ( http://dev.gentoo.org/~cyfred/xorg/${PN}/patchsets/${PV}/xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 )
-	!minimal? ( mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2 )
-	nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 )
-	${GENTOO_FILES}
-	${X_PATCHES}
-	http://xorg.freedesktop.org/X11R${PV}/src-single/X11R${PV}-src.tar.bz2"
-#	http://xorg.freedesktop.org/X11R${PV}/src/X11R${PV}-src1.tar.gz
-#	http://xorg.freedesktop.org/X11R${PV}/src//X11R${PV}-src2.tar.gz
-#	http://xorg.freedesktop.org/X11R${PV}/src//X11R${PV}-src3.tar.gz
-#	http://xorg.freedesktop.org/X11R${PV}/src//X11R${PV}-src4.tar.gz
-#	http://xorg.freedesktop.org/X11R${PV}/src//X11R${PV}-src5.tar.gz
-#	doc? (
-#		http://xorg.freedesktop.org/X11R${PV}/src//X11R${PV}-src6.tar.gz
-#		http://xorg.freedesktop.org/X11R${PV}/src//X11R${PV}-src7.tar.gz
-#	)"
-
-LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2
-	bigelow-holmes-urw-gmbh-luxi christopher-g-demetriou national-semiconductor
-	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
-	MIT SGI-B BSD || ( FTL GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sh sparc x86"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	>=sys-libs/zlib-1.1.3-r2
-	>=sys-devel/flex-2.5.4a-r5
-	sys-apps/groff
-	>=dev-libs/expat-1.95.3
-	>=media-libs/freetype-2.1.8
-	>=media-libs/fontconfig-2.1-r1
-	opengl? ( >=x11-base/opengl-update-2.2.0 )
-	!nocxx? ( >=x11-apps/ttmkfdir-3.0.9-r2 )
-	>=sys-apps/sed-4
-	userland_GNU? ( sys-apps/util-linux )
-	dev-lang/perl
-	media-libs/libpng
-	!<=app-emulation/emul-linux-x86-xlibs-1.2-r3"
-# FBSDTODO: need to check that X is not pulled in before freebsd-ubin for 'col' presence
-
-RDEPEND="
-		>=sys-libs/zlib-1.1.3-r2
-		>=sys-devel/flex-2.5.4a-r5
-		>=dev-libs/expat-1.95.3
-		>=media-libs/freetype-2.1.8
-		>=media-libs/fontconfig-2.1-r1
-		opengl? ( >=x11-base/opengl-update-2.2.0 )
-		!nocxx? ( >=x11-apps/ttmkfdir-3.0.9-r2 )
-		media-libs/libpng
-		>=sys-libs/ncurses-5.1
-		!<=app-emulation/emul-linux-x86-xlibs-1.2-r3
-		!app-doc/opengl-manpages
-		!app-doc/xorg-docs
-		!app-doc/xorg-sgml-doctools
-		!media-fonts/encodings
-		!media-fonts/font-adobe-100dpi
-		!media-fonts/font-adobe-75dpi
-		!media-fonts/font-adobe-utopia-100dpi
-		!media-fonts/font-adobe-utopia-75dpi
-		!media-fonts/font-adobe-utopia-type1
-		!media-fonts/font-alias
-		!media-fonts/font-arabic-misc
-		!media-fonts/font-bh-100dpi
-		!media-fonts/font-bh-75dpi
-		!media-fonts/font-bh-lucidatypewriter-100dpi
-		!media-fonts/font-bh-lucidatypewriter-75dpi
-		!media-fonts/font-bh-ttf
-		!media-fonts/font-bh-type1
-		!media-fonts/font-bitstream-100dpi
-		!media-fonts/font-bitstream-75dpi
-		!media-fonts/font-bitstream-speedo
-		!media-fonts/font-bitstream-type1
-		!media-fonts/font-cronyx-cyrillic
-		!media-fonts/font-cursor-misc
-		!media-fonts/font-daewoo-misc
-		!media-fonts/font-dec-misc
-		!media-fonts/font-ibm-type1
-		!media-fonts/font-isas-misc
-		!media-fonts/font-jis-misc
-		!media-fonts/font-micro-misc
-		!media-fonts/font-misc-cyrillic
-		!media-fonts/font-misc-ethiopic
-		!media-fonts/font-misc-meltho
-		!media-fonts/font-misc-misc
-		!media-fonts/font-mutt-misc
-		!media-fonts/font-schumacher-misc
-		!media-fonts/font-screen-cyrillic
-		!media-fonts/font-sony-misc
-		!media-fonts/font-sun-misc
-		!media-fonts/font-util
-		!media-fonts/font-winitzki-cyrillic
-		!media-fonts/font-xfree86-type1
-		!media-libs/mesa
-		!x11-apps/appres
-		!x11-apps/bdftopcf
-		!x11-apps/beforelight
-		!x11-apps/bitmap
-		!x11-apps/editres
-		!x11-apps/fonttosfnt
-		!x11-apps/fslsfonts
-		!x11-apps/fstobdf
-		!x11-apps/iceauth
-		!x11-apps/ico
-		!x11-apps/lbxproxy
-		!x11-apps/listres
-		!x11-apps/luit
-		!x11-apps/mesa-progs
-		!x11-apps/mkcfm
-		!x11-apps/mkfontdir
-		!x11-apps/mkfontscale
-		!x11-apps/oclock
-		!x11-apps/proxymngr
-		!x11-apps/rgb
-		!x11-apps/rstart
-		!x11-apps/scripts
-		!x11-apps/sessreg
-		!x11-apps/setxkbmap
-		!x11-apps/showfont
-		!x11-apps/smproxy
-		!x11-wm/twm
-		!x11-apps/viewres
-		!x11-apps/x11perf
-		!x11-apps/xauth
-		!x11-apps/xbiff
-		!x11-apps/xcalc
-		!x11-apps/xclipboard
-		!x11-apps/xclock
-		!x11-apps/xcmsdb
-		!x11-apps/xconsole
-		!x11-apps/xcursorgen
-		!x11-apps/xdbedizzy
-		!x11-apps/xditview
-		!x11-apps/xdm
-		!x11-apps/xdpyinfo
-		!x11-apps/xdriinfo
-		!x11-apps/xedit
-		!x11-apps/xev
-		!x11-apps/xeyes
-		!x11-apps/xf86dga
-		!x11-apps/xfd
-		!x11-apps/xfindproxy
-		!x11-apps/xfontsel
-		!x11-apps/xfs
-		!x11-apps/xfsinfo
-		!x11-apps/xfwp
-		!x11-apps/xgamma
-		!x11-apps/xgc
-		!x11-apps/xhost
-		!x11-apps/xinit
-		!x11-apps/xkbcomp
-		!x11-apps/xkbevd
-		!x11-apps/xkbprint
-		!x11-apps/xkbutils
-		!x11-apps/xkill
-		!x11-apps/xload
-		!x11-apps/xlogo
-		!x11-apps/xlsatoms
-		!x11-apps/xlsclients
-		!x11-apps/xlsfonts
-		!x11-apps/xmag
-		!x11-apps/xman
-		!x11-apps/xmessage
-		!x11-apps/xmh
-		!x11-apps/xmodmap
-		!x11-apps/xmore
-		!x11-apps/xphelloworld
-		!x11-apps/xplsprinters
-		!x11-apps/xpr
-		!x11-apps/xprehashprinterlist
-		!x11-apps/xprop
-		!x11-apps/xrandr
-		!x11-apps/xrdb
-		!x11-apps/xrefresh
-		!x11-apps/xrx
-		!x11-apps/xset
-		!x11-apps/xsetmode
-		!x11-apps/xsetpointer
-		!x11-apps/xsetroot
-		!x11-apps/xsm
-		!x11-apps/xstdcmap
-		!x11-apps/xtrap
-		!x11-apps/xvidtune
-		!x11-apps/xvinfo
-		!x11-apps/xwd
-		!x11-apps/xwininfo
-		!x11-apps/xwud
-		!x11-base/xorg-server
-		!x11-drivers/xf86-input-acecad
-		!x11-drivers/xf86-input-aiptek
-		!x11-drivers/xf86-input-calcomp
-		!x11-drivers/xf86-input-citron
-		!x11-drivers/xf86-input-digitaledge
-		!x11-drivers/xf86-input-dmc
-		!x11-drivers/xf86-input-dynapro
-		!x11-drivers/xf86-input-elo2300
-		!x11-drivers/xf86-input-elographics
-		!x11-drivers/xf86-input-evdev
-		!x11-drivers/xf86-input-fpit
-		!x11-drivers/xf86-input-hyperpen
-		!x11-drivers/xf86-input-jamstudio
-		!x11-drivers/xf86-input-joystick
-		!x11-drivers/xf86-input-keyboard
-		!x11-drivers/xf86-input-magellan
-		!x11-drivers/xf86-input-magictouch
-		!x11-drivers/xf86-input-microtouch
-		!x11-drivers/xf86-input-mouse
-		!x11-drivers/xf86-input-mutouch
-		!x11-drivers/xf86-input-palmax
-		!x11-drivers/xf86-input-penmount
-		!x11-drivers/xf86-input-spaceorb
-		!x11-drivers/xf86-input-summa
-		!x11-drivers/xf86-input-tek4957
-		!x11-drivers/xf86-input-ur98
-		!x11-drivers/xf86-input-vmmouse
-		!x11-drivers/xf86-input-void
-		!x11-drivers/xf86-video-apm
-		!x11-drivers/xf86-video-ark
-		!x11-drivers/xf86-video-ati
-		!x11-drivers/xf86-video-chips
-		!x11-drivers/xf86-video-cirrus
-		!x11-drivers/xf86-video-cyrix
-		!x11-drivers/xf86-video-dummy
-		!x11-drivers/xf86-video-fbdev
-		!x11-drivers/xf86-video-glint
-		!x11-drivers/xf86-video-i128
-		!x11-drivers/xf86-video-i740
-		!x11-drivers/xf86-video-i810
-		!x11-drivers/xf86-video-imstt
-		!x11-drivers/xf86-video-mga
-		!x11-drivers/xf86-video-neomagic
-		!x11-drivers/xf86-video-newport
-		!x11-drivers/xf86-video-nsc
-		!x11-drivers/xf86-video-nv
-		!x11-drivers/xf86-video-rendition
-		!x11-drivers/xf86-video-s3
-		!x11-drivers/xf86-video-s3virge
-		!x11-drivers/xf86-video-savage
-		!x11-drivers/xf86-video-siliconmotion
-		!x11-drivers/xf86-video-sis
-		!x11-drivers/xf86-video-sisusb
-		!x11-drivers/xf86-video-sunbw2
-		!x11-drivers/xf86-video-suncg14
-		!x11-drivers/xf86-video-suncg3
-		!x11-drivers/xf86-video-suncg6
-		!x11-drivers/xf86-video-sunffb
-		!x11-drivers/xf86-video-sunleo
-		!x11-drivers/xf86-video-suntcx
-		!x11-drivers/xf86-video-tdfx
-		!x11-drivers/xf86-video-tga
-		!x11-drivers/xf86-video-trident
-		!x11-drivers/xf86-video-tseng
-		!x11-drivers/xf86-video-v4l
-		!x11-drivers/xf86-video-vesa
-		!x11-drivers/xf86-video-vga
-		!x11-drivers/xf86-video-via
-		!x11-drivers/xf86-video-vmware
-		!x11-drivers/xf86-video-voodoo
-		!x11-libs/libdmx
-		!x11-libs/libdrm
-		!x11-libs/libfontenc
-		!x11-libs/libFS
-		!x11-libs/libICE
-		!x11-libs/liblbxutil
-		!x11-libs/liboldX
-		!x11-libs/libSM
-		!x11-libs/libX11
-		!x11-libs/libXau
-		!x11-libs/libXaw
-		!x11-libs/libXcomposite
-		!x11-libs/libXcursor
-		!x11-libs/libXdamage
-		!x11-libs/libXdmcp
-		!x11-libs/libXevie
-		!x11-libs/libXext
-		!x11-libs/libXfixes
-		!x11-libs/libXfont
-		!x11-libs/libXfontcache
-		!x11-libs/libXft
-		!x11-libs/libXi
-		!x11-libs/libXinerama
-		!x11-libs/libxkbfile
-		!x11-libs/libxkbui
-		!x11-libs/libXmu
-		!x11-libs/libXp
-		!x11-libs/libXpm
-		!x11-libs/libXprintAppUtil
-		!x11-libs/libXprintUtil
-		!x11-libs/libXrandr
-		!x11-libs/libXrender
-		!x11-libs/libXres
-		!x11-libs/libXScrnSaver
-		!x11-libs/libXt
-		!x11-libs/libXTrap
-		!x11-libs/libXtst
-		!x11-libs/libXv
-		!x11-libs/libXvMC
-		!x11-libs/libXxf86dga
-		!x11-libs/libXxf86misc
-		!x11-libs/libXxf86vm
-		!x11-libs/xtrans
-		!x11-misc/gccmakedep
-		!x11-misc/imake
-		!x11-misc/lndir
-		!x11-misc/makedepend
-		!x11-misc/util-macros
-		!x11-misc/xbitmaps
-		!x11-misc/xkbdata
-		!x11-misc/xkeyboard-config
-		!x11-misc/xorg-cf-files
-		!x11-proto/bigreqsproto
-		!x11-proto/compositeproto
-		!x11-proto/damageproto
-		!x11-proto/dmxproto
-		!x11-proto/evieext
-		!x11-proto/fixesproto
-		!x11-proto/fontcacheproto
-		!x11-proto/fontsproto
-		!x11-proto/glproto
-		!x11-proto/inputproto
-		!x11-proto/kbproto
-		!x11-proto/printproto
-		!x11-proto/randrproto
-		!x11-proto/recordproto
-		!x11-proto/renderproto
-		!x11-proto/resourceproto
-		!x11-proto/scrnsaverproto
-		!x11-proto/trapproto
-		!x11-proto/videoproto
-		!x11-proto/xcmiscproto
-		!x11-proto/xextproto
-		!x11-proto/xf86bigfontproto
-		!x11-proto/xf86dgaproto
-		!x11-proto/xf86driproto
-		!x11-proto/xf86miscproto
-		!x11-proto/xf86rushproto
-		!x11-proto/xf86vidmodeproto
-		!x11-proto/xineramaproto
-		!x11-proto/xproto
-		!x11-proto/xproxymanagementprotocol
-		!x11-themes/gentoo-xcursors
-		!x11-themes/xcursor-themes"
-
-PDEPEND="x86? (
-			input_devices_synaptics? ( x11-drivers/synaptics )
-			input_devices_wacom? ( x11-drivers/linuxwacom )
-		)
-		3dfx? ( >=media-libs/glide-v3-3.10 )
-		x11-terms/xterm"
-
-DESCRIPTION="An X11 implementation maintained by the X.Org Foundation"
-
-pkg_setup() {
-	FILES_DIR="${WORKDIR}/files"
-	PATCHDIR="${WORKDIR}/patch"
-	EXCLUDED="${PATCHDIR}/excluded"
-
-	if ! use GAPING_SECURITY_HOLE; then
-		local msg="Set USE=GAPING_SECURITY_HOLE to install."
-		eerror "$msg"
-		eerror "This package is subject to at least one local root vulnerability."
-		die "$msg"
-	fi
-
-	# Set up CFLAG-related things
-	cflag_setup
-
-	# See bug #35468, circular pam-X11 dep
-	check_pam
-
-	# Look for invalid/dangerous USE flags and combinations
-	check_use_combos
-
-	setup_multilib
-
-	# xfs user
-	if use font-server; then
-		enewgroup xfs 33
-		enewuser xfs 33 -1 /etc/X11/fs xfs
-	fi
-}
-
-src_unpack() {
-	unpack_all
-
-	patch_setup
-
-	do_patch
-
-	host_def_setup
-
-	use_specific_hacks
-}
-
-src_compile() {
-	build
-}
-
-src_install() {
-	install_everything
-
-	backward_compat_install
-
-	fix_permissions
-
-	# We zap our CFLAGS in the host.def file, as hardcoded CFLAGS can
-	# mess up other things that use xmkmf
-	zap_host_def_cflags
-
-	# EURO support
-	if ! use minimal; then
-		add_euro_support
-	fi
-
-	setup_standard_symlinks
-
-	if use opengl; then
-		fix_opengl_symlinks
-	fi
-
-	libtool_archive_install
-
-	compose_files_install
-
-	if use font-server; then
-		encode_xfsft_files
-	fi
-
-	if use nls; then
-		koi8_fonts_install
-	fi
-
-	etc_files_install
-
-	if use opengl; then
-		dynamic_libgl_install
-	fi
-
-	fix_libtool_libdir_paths "$(find ${D} -name *.la)"
-
-	cursor_install
-
-	strip_execs
-
-	if use minimal; then
-		minimal_install
-	fi
-
-	# TEMPORARY hack: should be patched in, if it's not already
-	# For Battoussai's gatos stuffs:
-	if use sdk; then
-		insinto /usr/$(get_libdir)/Server/include
-		doins ${S}/extras/drm/shared/drm.h
-	fi
-
-	xprint_install
-
-	config_files_install
-}
-
-pkg_preinst() {
-	# Do migration before anything else, so we do all the rest inside the
-	# symlink
-
-	# Get rid of "standard" symlinks
-	# We can't overwrite symlink with directory w/ $(mv -f)
-	[ -L ${ROOT}usr/$(get_libdir)/X11 ] \
-		&& rm ${ROOT}usr/$(get_libdir)/X11
-	[ -L ${ROOT}usr/include/X11 ] \
-		&& rm ${ROOT}usr/include/X11
-	[ -L ${ROOT}usr/include/GL ] \
-		&& rm ${ROOT}usr/include/GL
-	[ -L ${ROOT}usr/bin/X11 ] \
-		&& rm ${ROOT}usr/bin/X11
-	# Get rid of some apparent artifacts of migration
-	[ -L ${ROOT}usr/include/GL/GL ] \
-		&& rm ${ROOT}usr/include/GL/GL
-	[ -L ${ROOT}usr/include/X11/X11 ] \
-		&& rm ${ROOT}usr/include/X11/X11
-	[ -d ${ROOT}usr/share/fonts/fonts ] \
-		&& rm -rf ${ROOT}usr/share/fonts/fonts
-
-	# No need to do this, if it's already been done
-	# Also, it'll overwrite a ton of stuff because it won't realize /usr/X11R6
-	# is a symlink.
-	if [ ! -L "/usr/X11R6" ]; then
-		# Migrate stuff in /usr/X11R6 to /usr
-		local DIR DIRS
-		DIRS="bin include lib"
-		if [ "lib" != "$(get_libdir)" ]; then
-			DIRS="${DIRS} $(get_libdir)"
-		fi
-		for DIR in ${DIRS}; do
-			migrate /usr/X11R6/${DIR} /usr/${DIR}
-		done
-		# Can't do this in the other loop because of different start and end
-		migrate /usr/X11R6/man /usr/share/man
-	fi
-
-	update_config_files
-
-	cleanup_fonts
-
-	# See above comment for the same test
-	if [ ! -L "/usr/X11R6" ]; then
-		# Needs to happen after cleanup_fonts()
-		migrate /usr/X11R6/$(get_libdir)/X11/fonts /usr/share/fonts
-
-		# Get rid of symlinks so we can migrate /usr/X11R6 without dying when a
-		# symlink tries to copy to a dir
-		einfo "Preparing for /usr/X11R6 -> /usr migration..."
-		local LINK LINKS
-		LINKS="bin include lib man share/info"
-		if [ "lib" != "$(get_libdir)" ]; then
-			LINKS="${LINKS} $(get_libdir)"
-		fi
-		for LINK in ${LINKS}; do
-			if [ -L "${ROOT}/usr/X11R6/${LINK}" ]; then
-				rm -fv ${ROOT}/usr/X11R6/${LINK}
-			fi
-		done
-		einfo "Remaining symlinks in /usr/X11R6:"
-		find ${ROOT}/usr/X11R6/ -type l
-
-		# Woohoo, nothing in /usr/X11R6 after this
-		migrate /usr/X11R6 /usr
-	fi
-
-	move_app_defaults_to_etc
-
-	move_xkb_to_usr
-
-	# Run this even for USE=-opengl, to clean out old stuff from possible
-	# USE=opengl build
-	dynamic_libgl_preinst
-}
-
-pkg_postinst() {
-	env-update
-
-	if [ "${ROOT}" = "/" ]; then
-		font_setup
-
-		if use opengl; then
-			switch_opengl_implem
-		fi
-	fi
-
-	remove_old_compose_files
-
-	setup_tmp_files
-
-	print_info
-}
-
-pkg_postrm() {
-	fix_links
-}
-
-###############
-# pkg_setup() #
-###############
-
-cflag_setup() {
-	# Set up CFLAGS
-	filter-flags "-funroll-loops"
-
-	ALLOWED_FLAGS="-fstack-protector -march -mcpu -mtune -O -O0 -O1 -O2 -O3 -Os"
-	ALLOWED_FLAGS="${ALLOWED_FLAGS} -pipe -fomit-frame-pointer"
-	ALLOWED_FLAGS="${ALLOWED_FLAGS} -momit-leaf-frame-pointer"
-	ALLOWED_FLAGS="${ALLOWED_FLAGS} -g -g0 -g1 -g2 -g3"
-	ALLOWED_FLAGS="${ALLOWED_FLAGS} -ggdb -ggdb0 -ggdb1 -ggdb2 -ggdb3"
-	# arch-specific section added by popular demand
-	case "${ARCH}" in
-		mips)	ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mabi"
-			;;
-		# -fomit-frame-pointer known to break things and is pointless
-		# according to ciaranm
-		# And hardened compiler must be softened. -- fmccor, 20.viii.04
-		sparc)	filter-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
-			if has_hardened && ! use dlloader; then
-				einfo "Softening gcc for sparc."
-				ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-PIE"
-				append-flags -fno-pie -fno-PIE
-			fi
-
-			if [[ ${ABI} == "sparc64" ]]; then
-				ALLOWED_FLAGS="${ALLOWED_FLAGS} -D__sparc_v9__ -D__linux_sparc_64__"
-				append-flags -D__sparc_v9__ -D__linux_sparc_64__
-			fi
-			;;
-		# gcc-3.3.2 causes invalid insn error
-		hppa ) replace-cpu-flags 2.0 1.0
-			;;
-	esac
-
-	# Recently there has been a lot of stability problem in Gentoo-land.  Many
-	# things can be the cause to this, but I believe that it is due to gcc3
-	# still having issues with optimizations, or with it not filtering bad
-	# combinations (protecting the user maybe from themselves) yet.
-	#
-	# This can clearly be seen in large builds like glibc, where too aggressive
-	# CFLAGS cause the tests to fail miserbly.
-	#
-	# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion
-	# knows what he is talking about:
-	#
-	#   People really shouldn't force code-specific options on... It's a
-	#   bad idea. The -march options aren't just to look pretty. They enable
-	#   options that are sensible (and include sse,mmx,3dnow when appropriate).
-	#
-	# The next command strips CFLAGS and CXXFLAGS from nearly all flags.  If
-	# you do not like it, comment it, but do not bugreport if you run into
-	# problems.
-	#
-	# <azarah@gentoo.org> (13 Oct 2002)
-	strip-flags
-}
-
-check_pam() {
-	if use pam && has_version x11-base/${PN}; then
-		einfo "Previous ${PN} installation detected."
-		einfo "Enabling PAM features in ${PN}."
-	else
-		einfo "Previous ${PN} installation NOT detected."
-		einfo "Disabling PAM features in ${PN}."
-		einfo "You must remerge ${PN} to enable pam."
-		einfo "See http://bugs.gentoo.org/show_bug.cgi?id=35468."
-	fi
-}
-
-check_use_combos() {
-	if use static; then
-		# A static build disallows building the SDK.
-		# See config/xf86.rules.
-		if use sdk; then
-			die "The static USE flag is incompatible with the sdk USE flag."
-		fi
-	fi
-
-	if use dmx && use doc; then
-		die "The dmx and doc USE flags are temporarily incompatible and result in a dead build."
-	fi
-
-	# (#77949)
-	if use minimal && use doc; then
-		die "The minimal and doc USE flags are temporarily incompatible and result in a dead build."
-	fi
-
-	if use xv && ! use opengl; then
-		eerror "See http://bugs.gentoo.org/show_bug.cgi?id=67996"
-		eerror "The xv USE flag currently requires the opengl flag."
-		die "This is a known bug. Do not report it."
-	fi
-
-	if use opengl && ! use xv; then
-		eerror "See http://bugs.gentoo.org/show_bug.cgi?id=76936"
-		eerror "The opengl USE flag currently requires the xv flag."
-		die "This is a known bug. Do not report it."
-	fi
-
-	# Echo a message to the user about bitmap-fonts
-	if ! use bitmap-fonts; then
-		ewarn "Please emerge this with USE=\"bitmap-fonts\" to enable"
-		ewarn "75dpi and 100dpi fonts.  Your GTK+-1.2 fonts may look"
-		ewarn "screwy otherwise"
-
-		ebeep 5
-		epause 10
-	fi
-}
-
-setup_multilib() {
-	# on amd64 we need /usr/lib64/X11/locale/lib to be a symlink
-	# created by the emul lib ebuild in order for adobe acrobat, staroffice,
-	# and a few other apps to work.
-	if ! has_multilib_profile; then
-		use amd64 && get_libdir_override lib64
-	fi
-}
-
-################
-# src_unpack() #
-################
-
-unpack_all() {
-	# Unpack source and patches
-	ebegin "Unpacking ${PV} source"
-		unpack X11R${PV}-src.tar.bz2 > /dev/null
-#		unpack X11R${PV}-src{1,2,3,4,5}.tar.gz > /dev/null
-	eend 0
-
-#	if use doc; then
-#		ebegin "Unpacking documentation"
-#			unpack X11R${PV}-src{6,7}.tar.gz > /dev/null
-#		eend 0
-#	fi
-
-	ebegin "Unpacking Gentoo files and patches"
-		unpack ${P}-files-${FILES_VER}.tar.bz2 > /dev/null
-		unpack ${P}-patches-${PATCH_VER}.tar.bz2 > /dev/null
-	eend 0
-
-	if ! use minimal; then
-		# Unpack TaD's gentoo cursors
-		ebegin "Unpacking Gentoo cursors"
-			unpack gentoo-cursors-tad-${XCUR_VER}.tar.bz2 > /dev/null
-		eend 0
-	fi
-
-	# Unpack extra fonts stuff from Mandrake
-	ebegin "Unpacking fonts"
-		if use nls; then
-			unpack gemini-koi8-u.tar.bz2 > /dev/null
-		fi
-		if ! use minimal; then
-			unpack eurofonts-X11.tar.bz2 > /dev/null
-		fi
-		if use font-server; then
-			unpack xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 > /dev/null
-		fi
-	eend 0
-
-	# Remove bum encoding
-	rm -f ${WORKDIR}/usr/share/fonts/encodings/urdunaqsh-0.enc
-}
-
-do_patch() {
-	# Bulk patching - based on patch name
-	# Will create excluded stuff once it's needed
-	cd ${WORKDIR}
-	EPATCH_SUFFIX="patch" \
-	epatch ${PATCHDIR}
-	cd ${S}
-
-	# Security patches
-	epatch ${FILESDIR}/CVE-2006-1526-xrender-mitri.patch
-	epatch ${FILESDIR}/xorg-68x-setuid.patch
-}
-
-host_def_setup() {
-	HOSTCONF="config/cf/host.def"
-
-	ebegin "Setting up ${HOSTCONF}"
-		cd ${S}; cp ${FILES_DIR}/site.def ${HOSTCONF} \
-			|| die "host.def copy failed"
-		echo "#define XVendorString \"Gentoo (The X.Org Foundation ${PV}, revision ${PR}-${PATCH_VER})\"" \
-			>> ${HOSTCONF}
-
-		# Pending http://bugs.gentoo.org/show_bug.cgi?id=49038 and
-		# http://freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=600
-		#
-		# Makes ld bail at link time on undefined symbols
-		# Suggested by Mike Harris <mharris@redhat.com>
-		#echo "#define SharedLibraryLoadFlags  -shared -Wl,-z,defs" \
-		#	>> ${HOSTCONF}
-
-		# Enable i810 on x86_64 (RH #126687)
-		if use amd64; then
-			echo "#define XF86ExtraCardDrivers i810" >> ${HOSTCONF}
-		fi
-
-		# FHS install locations
-		echo "#define ManDirectoryRoot /usr/share/man" >> ${HOSTCONF}
-		echo "#define DocDir /usr/share/doc/${PF}" >> ${HOSTCONF}
-		echo "#define FontDir /usr/share/fonts" >> ${HOSTCONF}
-		echo "#define BinDir /usr/bin" >> ${HOSTCONF}
-		echo "#define IncRoot /usr/include" >> ${HOSTCONF}
-		# This breaks the case when $(SYSTEMUSRINCDIR) = $(INCDIR)
-		# See xc/include/Imakefile
-		echo "#define LinkGLToUsrInclude NO" >> ${HOSTCONF}
-		# /usr/X11R6/lib/X11
-		echo "#define LibDir /usr/$(get_libdir)/X11" >> ${HOSTCONF}
-		# /usr/X11R6/lib with exception of /usr/X11R6/lib/X11
-		echo "#define UsrLibDir /usr/$(get_libdir)" >> ${HOSTCONF}
-
-		# Make man4 and man7 stuff get 'x' suffix like everything else
-		# Necessary so we can install to /usr/share/man without overwriting
-		echo "#define DriverManDir \$(MANSOURCEPATH)4" >> ${HOSTCONF}
-		echo "#define DriverManSuffix 4x /* use just one tab or cpp will die */" \
-			>> ${HOSTCONF}
-		echo "#define MiscManDir \$(MANSOURCEPATH)7" >> ${HOSTCONF}
-		echo "#define MiscManSuffix 7x /* use just one tab or cpp will die */" \
-			>> ${HOSTCONF}
-
-		# Don't build xterm -- use external (#54051)
-		echo "#define BuildXterm NO" >> ${HOSTCONF}
-
-		# Xwrapper has been removed so we now need to use the set uid server
-		# again, this mustve happened somewhere after 4.3.0 in the development.
-		echo "#define InstallXserverSetUID YES" >> ${HOSTCONF}
-		echo "#define BuildServersOnly NO" >> ${HOSTCONF}
-
-		# Don't use /lib64 if $(get_libdir) != lib64
-		# Replaces 0181_all_4.3.0-amd64-nolib64.patch
-		if [ "$(get_libdir)" == "lib64" ]; then
-			echo "#define HaveLib64 YES" >> ${HOSTCONF}
-			sed -i '/^#define Freetype2LibDir/s:^.*$:#define Freetype2LibDir /usr/lib64:' ${HOSTCONF}
-		else
-			echo "#define HaveLib64 NO" >> ${HOSTCONF}
-		fi
-
-		# Set location of DRM source to be installed
-		echo "#define InstSrcDir ${ROOT}/usr/src/${PF}" >> ${HOSTCONF}
-
-		if [ "$(gcc-major-version)" -eq "3" ]; then
-			if use x86; then
-				# Should fix bug #4189.  gcc 3.x have problems with
-				# -march=pentium4 and -march=athlon-tbird
-				# Seems fixed on 3.3 and higher
-				if [ "$(gcc-minor-version)" -le "2" ]; then
-					replace-cpu-flags pentium4 pentium3
-					replace-cpu-flags athlon athlon-tbird
-				fi
-
-				if [ "$(gcc-minor-version)" -eq "4" ]; then
-					if [ "$(gcc-micro-version)" -lt "4" ]; then
-						#to fix #57602 for now, thanks Spanky (broken sse2)
-						if test_flag -mno-sse2; then
-							append-flags -mno-sse2
-						fi
-						# (#75067) broken sse3
-						if test_flag -mno-sse3; then
-							append-flags -mno-sse3
-						fi
-					fi
-				fi
-
-				# Try a fix for #49310, see #50931 for more info. <spyderous>
-				if [ "$(is-flag -fomit-frame-pointer)" ]; then
-					replace-cpu-flags k6 k6-2 k6-3 i586
-				fi
-			fi
-
-			# Without this, modules breaks with gcc3
-			if [ "$(gcc-minor-version)" -eq "1" ]; then
-				append-flags "-fno-merge-constants"
-				append-flags "-fno-merge-constants"
-			fi
-
-			if [ "$(gcc-minor-version)" -eq "2" ]; then
-				if [ "$(gcc-micro-version)" -lt "2" ]; then
-					# Bug #12775 .. fails with -Os.
-					replace-flags "-Os" "-O2"
-				fi
-			elif [ "$(gcc-minor-version)" -lt "2" ]; then
-				# Bug #12775 .. fails with -Os.
-				replace-flags "-Os" "-O2"
-			fi
-		elif [ "$(gcc-major-version)" -lt "3" ]; then
-			# Bug #12775 .. fails with -Os.
-			replace-flags "-Os" "-O2"
-		fi
-
-		echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
-		echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-		echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-
-		if use static; then
-			echo "#define DoLoadableServer	NO" >>${HOSTCONF}
-		else
-			einfo "Setting DoLoadableServer to YES."
-			echo "#define DoLoadableServer  YES" >> ${HOSTCONF}
-
-			if use dlloader; then
-				einfo "Setting MakeDllModules to YES."
-				echo "#define MakeDllModules    YES" >> ${HOSTCONF}
-				if has_hardened; then
-					echo "#define HardenedGccSpecs YES" >> ${HOSTCONF}
-				fi
-			else
-				einfo "Setting MakeDllModules to NO."
-				echo "#define MakeDllModules    NO" >> ${HOSTCONF}
-			fi
-		fi
-
-		use_build debug XFree86Devel
-		use_build debug BuildDebug
-		use_build debug DebuggableLibraries
-
-		if ! use debug; then
-			# use less ram .. got this from Spider's makeedit.eclass :)
-			echo "#define GccWarningOptions -Wno-return-type -w" \
-				>> ${HOSTCONF}
-		fi
-
-		# Remove circular dep between pam and X11, bug #35468
-		# If pam is in USE and we have X11, then we can enable PAM
-#		if use pam && has_version x11-base/xorg-x11
-		if has_version x11-base/xorg-x11; then
-			# If you want to have optional pam support, do it properly ...
-			use_build pam HasPam
-			use_build pam HasPamMisc
-		fi
-
-		if use x86 || use alpha; then
-			# build with glide3 support? (build the tdfx_dri.o module)
-			if use 3dfx; then
-				echo "#define HasGlide3 YES" >> ${HOSTCONF}
-			fi
-# 			This won't work unless we can disable building the tdfx stuff
-# 			entirely :/
-#			use_build 3dfx HasGlide3
-		fi
-
-		if use x86; then
-			# optimize Mesa for architecture
-			use_build mmx HasMMXSupport
-			use_build 3dnow Has3DNowSupport
-			use_build sse HasSSESupport
-		fi
-
-		# optimize Mesa for architecture
-		if use amd64; then
-			use_build amd64 HasMMXSupport
-			use_build amd64 Has3DNowSupport
-			use_build amd64 HasSSESupport
-		fi
-
-		# Do we want the glx extension? This will turn off XF86DRI if it's off.
-		# DRI can't build if glx isn't built, so keep this below DRI define.
-		# Do this before hppa so they can turn DRI off
-		use_build opengl BuildGlxExt
-		use_build opengl BuildGLXLibrary
-		use_build opengl BuildXF86DRI
-		# Needs GL headers
-		use_build opengl BuildGLULibrary
-
-
-
-		if use mips; then
-			echo "#define XF86CardDrivers fbdev newport" >> ${HOSTCONF}
-		fi
-
-		# Make xv optional for more minimal builds
-		use_build xv BuildXvLibrary
-		use_build xv BuildXvExt
-		# Depends on X11/extensions/Xv.h
-		use_build xv BuildXF86RushExt
-		use_build xv BuildXF86RushLibrary
-
-		if use hppa; then
-			echo "#define DoLoadableServer NO" >> ${HOSTCONF}
-			echo "#define BuildXF86DRI NO" >> config/cf/host.def
-			echo "#undef DriDrivers" >> config/cf/host.def
-			echo "#define XF86CardDrivers fbdev" >> config/cf/host.def
-			echo "#define BuildXvExt YES" >> config/cf/host.def
-		fi
-
-
-		if use alpha; then
-			echo "#define XF86CardDrivers mga nv tga s3virge sis rendition \
-				i740 tdfx cirrus tseng fbdev \
-				ati vga v4l glint s3 vesa" >> ${HOSTCONF}
-		fi
-
-		if use ppc; then
-			echo "#define XF86CardDrivers mga glint s3virge sis savage trident \
-				chips tdfx fbdev ati DevelDrivers vga nv imstt \
-				XF86OSCardDrivers XF86ExtraCardDrivers" >> ${HOSTCONF}
-		fi
-
-		if use ppc64; then
-			echo "#define MakeDllModules YES" >> ${HOSTCONF}
-			echo "#define XF86VgaHw YES" >> ${HOSTCONF}
-			echo "#define XF86FBDevHw YES" >> ${HOSTCONF}
-			echo "#define XF86CardDrivers mga fbdev v4l ati vga nv" >> ${HOSTCONF}
-		fi
-
-		if use sparc; then
-			echo "#define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 \
-			suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \
-			XF86OSCardDrivers XF86ExtraCardDrivers \
-			DevelDrivers" >> ${HOSTCONF}
-			if has_hardened && ! use dlloader; then
-				einfo "Softening the assembler so cfb modules will play nice with sunffb."
-				echo "#define AsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
-				echo "#define ModuleAsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
-			fi
-			if ( [ -e "${ROOT}/usr/src/linux" ] \
-				&& ! kernel_is "2" "6" ) \
-				|| [ "$(uname -r | cut -d. -f1,2)" != "2.6" ]; then
-				# Commented out next two lines due to patch from bug #61940
-				# Joshua Baergen, Sept 19, 2005
-#				einfo "Building for kernels less than 2.6 requires special treatment."
-#				echo "#define UseDeprecatedKeyboardDriver YES" >> ${HOSTCONF}
-				einfo "Avoid bug #46593 for sparc32-SMP with kernel 2.4.xx."
-				echo "/* Add a line to avoid bug #56593 on sparc32 */" >> \
-				  programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c
-			fi
-		fi
-
-		# The definitions for fontconfig
-		echo "#define UseFontconfig YES" >> ${HOSTCONF}
-		echo "#define HasFontconfig YES" >> ${HOSTCONF}
-
-		# Use the xorg Xft2 lib
-		echo "#define SharedLibXft YES" >> ${HOSTCONF}
-
-		# with USE="X doc' circular dep w/ virtual/ghostscript
-		# echo "#define HasGhostScript ${DOC}" >> ${HOSTCONF}
-		# Caused issues, basic docs aren't installed
-		use_build doc BuildLinuxDocPS
-		use_build doc BuildSpecsDocs
-		use_build doc BuildHtmlManPages
-		use_build doc InstallHardcopyDocs
-
-		# enable Japanese docs, optionally
-		use doc && use_build cjk InstallJapaneseDocs
-
-		# Native Language Support Fonts
-		use_build nls BuildCyrillicFonts
-		use_build nls BuildArabicFonts
-		use_build nls BuildGreekFonts
-		use_build nls BuildHebrewFonts
-		use_build nls BuildThaiFonts
-
-		if use nls; then
-			use_build cjk BuildCIDFonts
-			use_build cjk BuildJapaneseFonts
-			use_build cjk BuildKoreanFonts
-			use_build cjk BuildChineseFonts
-		fi
-
-		# Crappy bitmap fonts
-		use_build bitmap-fonts Build75DpiFonts
-		use_build bitmap-fonts Build100DpiFonts
-
-		# Type1 fonts
-		use_build type1-fonts BuildType1Fonts
-
-		# TrueType fonts
-		use_build truetype-fonts BuildTrueTypeFonts
-
-		# X Font Server
-		use_build font-server BuildFontServer
-
-		# Distributed Multiheaded X
-		use_build dmx BuildDmx
-
-		use_build insecure-drivers BuildDevelDRIDrivers
-
-		if use ipv6; then
-			# In case Gentoo ever works on a system with IPv6 sockets that don't
-			# also listen on IPv4 (see config/cf/X11.tmpl)
-			echo "#define PreferXdmcpIPv6 YES" >> ${HOSTCONF}
-		fi
-
-		use_build ipv6 BuildIPv6
-
-		if use minimal; then
-			# Don't build static libs
-			echo "#define ForceNormalLib NO" >> ${HOSTCONF}
-			# Turn back on needed ones
-			echo "#define NormalLibXau YES" >> ${HOSTCONF}
-
-			echo "#define BuildDPSLibraries NO" >> ${HOSTCONF}
-			echo "#define BuildClients NO" >> ${HOSTCONF}
-			# BuildClients doesn't catch things in xc/programs/Xserver
-			# Also had to add
-			# 9250_all_6.8.1.904-respect-xfree86configtools-setting.patch
-			echo "#define BuildXFree86ConfigTools NO" >> ${HOSTCONF}
-			echo "#define BuildLBX NO" >> ${HOSTCONF}
-
-			# Weird crap we don't need
-			echo "#define XF8_32Wid NO" >> ${HOSTCONF}
-			echo "#define XF8_32Bpp NO" >> ${HOSTCONF}
-			echo "#define XF8_16Bpp NO" >> ${HOSTCONF}
-			echo "#define XF24_32Bpp NO" >> ${HOSTCONF}
-
-			# Without nls, truetype-fonts, type1-fonts, we only build misc
-			# Now let's try to reduce what gets built in misc
-			# iso8859-1 has the "fixed" font
-			echo "#define BuildISO8859_2Fonts NO" >> ${HOSTCONF}
-			echo "#define BuildISO8859_3Fonts NO" >> ${HOSTCONF}
-			echo "#define BuildISO8859_4Fonts NO" >> ${HOSTCONF}
-			# 5 is cyrillic, 6 isn't in misc, 7 is greek, 8 is hebrew
-			echo "#define BuildISO8859_9Fonts NO" >> ${HOSTCONF}
-			echo "#define BuildISO8859_10Fonts NO" >> ${HOSTCONF}
-			# 11 is thai, 12 isn't in misc
-			echo "#define BuildISO8859_13Fonts NO" >> ${HOSTCONF}
-			echo "#define BuildISO8859_14Fonts NO" >> ${HOSTCONF}
-			echo "#define BuildISO8859_15Fonts NO" >> ${HOSTCONF}
-			echo "#define BuildISO8859_16Fonts NO" >> ${HOSTCONF}
-
-			echo "#define XnestServer NO" >> ${HOSTCONF}
-			echo "#define XVirtualFramebufferServer NO" >> ${HOSTCONF}
-			echo "#define XInputDrivers mouse keyboard" >> ${HOSTCONF}
-
-			# If you want more drivers built with minimal, file a bug
-			# -Donnie Berkholz <spyderous@gentoo.org>
-			if use x86; then
-				# Remove glint, tga, s3, s3virge, rendition, neomagic, i740,
-				# cirrus, tseng, trident, chips, apm, ark, cyrix, siliconmotion
-				# mga, nv, sis, tdfx, savage, GlideDriver, i386Drivers
-				# (nsc, i810), ati, DevelDrivers, via
-				# Leave vmware driver for testing minimal setups using VMWare
-				# XF86OSCardDrivers includes v4l and fbdev on linux
-				# DevelDrivers includes imstt and newport on x86
-				echo "#define XF86CardDrivers vmware vesa vga dummy \
-					XF86OSCardDrivers XF86ExtraCardDrivers" >> ${HOSTCONF}
-			# (#93339)
-			elif use sparc; then
-				echo "#define XF86CardDrivers vesa vga fbdev sunffb suncg6 \
-					sunleo" >> ${HOSTCONF}
-			fi
-		fi
-
-		# Ajax is the man for getting this going for us
-		echo "#define ProPoliceSupport YES" >> ${HOSTCONF}
-
-		# Make xprint optional
-		use_build xprint BuildXprint
-		use_build xprint BuildXprintClients
-		# Build libXp even when xprint is off. It's just for clients, server
-		if ! use xprint; then
-			echo "#define BuildXprintLib YES" >> ${HOSTCONF}
-		fi
-
-	# End the host.def definitions here
-	eend 0
-}
-
-patch_setup() {
-	einfo "Excluding patches..."
-
-		# This patch is just plain broken. Results in random failures.
-		patch_exclude 0120*parallel-make
-
-		# Hardened patches (both broken)
-		patch_exclude 9960_all_4.3.0-exec-shield-GNU
-		patch_exclude 9961_all_4.3.0-libGL-exec-shield
-
-		# Xbox nvidia driver, patch is a total hack, tears apart xc/config/cf
-		# (#68726). Only apply when necessary so we don't screw other stuff up.
-		# 9990 is the driver, 9991 is xbox pci scanning (potentially useful)
-		if [ ! "${PROFILE_ARCH}" = "xbox" ]; then
-			patch_exclude 9990 9991
-		fi
-
-		# this patch comments out the Xserver line in xdm's config
-		# We only want it here
-		if ! use s390; then
-			patch_exclude 7500
-		fi
-
-	#	if ! use gatos; then
-	#		patch_exclude 9841_all_4.3.0-gatos-mesa
-	#	fi
-
-		if use debug; then
-			patch_exclude 5901*acecad-debug
-		fi
-
-		# TDFX_RISKY - 16-bit, 1024x768 or higher on low-memory voodoo3's
-		if use 3dfx && [ "${TDFX_RISKY}" = "yes" ]; then
-			patch_exclude 5850
-		else
-			patch_exclude 5851
-		fi
-
-		# Glibc-specific patches to exclude for non-glibc systems
-		if use elibc_FreeBSD || use elibc_OpenBSD; then
-			patch_exclude 0700
-		fi
-	einfo "Done excluding patches."
-}
-
-use_specific_hacks() {
-	# uclibc lacks sinf and cosf
-	if use uclibc; then
-		sed -i -e 's:GLXCLIENTDIRS = glxinfo glxgears:GLXCLIENTDIRS = :' \
-			${S}/programs/Imakefile
-	fi
-
-	# Get rid of cursor sets other than core and handhelds, saves ~4MB
-	if use minimal; then
-		 sed -i -e 's:SUBDIRS = redglass whiteglass handhelds:SUBDIRS = handhelds:' \
-			${S}/programs/xcursorgen/Imakefile
-	fi
-
-	cd ${S}
-	if use doc; then
-		# These are not included anymore as they are obsolete
-		local x
-		for x in ${S}/programs/Xserver/hw/xfree86/{XF98Conf.cpp,XF98Config}; do
-			if [ -f ${x} ]; then
-				sed -i '/Load[[:space:]]*"\(pex5\|xie\)"/d' ${x}
-			fi
-		done
-	fi
-}
-
-#################
-# src_compile() #
-#################
-
-build() {
-	# If a user defines the MAKE_OPTS variable in /etc/make.conf instead of
-	# MAKEOPTS, they'll redefine an internal xorg Makefile variable and the
-	# xorg build will silently die. This is tricky to track down, so I'm
-	# adding a preemptive fix for this issue by making sure that MAKE_OPTS is
-	# unset. (drobbins, 08 Mar 2003)
-	unset MAKE_OPTS
-
-	einfo "Building xorg-x11..."
-	if use debug; then
-		chmod u+x ${S}/config/util/makeg.sh
-		FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" MAKE="make" \
-			|| die "debug make World failed"
-	else
-		FAST=1 emake -j1 World WORLDOPTS="" MAKE="make" || die "make World failed"
-	fi
-
-	if use nls; then
-		emake -j1 -C ${S}/nls MAKE="make" || die "nls build failed"
-	fi
-}
-
-#################
-# src_install() #
-#################
-
-install_everything() {
-	unset MAKE_OPTS
-
-	einfo "Installing X.org X11..."
-	# gcc3 related fix.  Do this during install, so that our
-	# whole build will not be compiled without mmx instructions.
-	if [ "$(gcc-version)" != "2.95" ] && use x86; then
-		make install MAKE="make" DESTDIR=${D} \
-		|| make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \
-			CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \
-			install MAKE="make" DESTDIR=${D} || die "install failed"
-	else
-		make install MAKE="make" DESTDIR=${D} || die "install failed"
-	fi
-
-	if use sdk; then
-		einfo "Installing X.org X11 SDK..."
-		make install.sdk MAKE="make" DESTDIR=${D} || die "sdk install failed"
-	fi
-
-	if ! use minimal; then
-		einfo "Installing man pages..."
-		make install.man MAKE="make" DESTDIR=${D} || die "man page install failed"
-		einfo "Compressing man pages..."
-		prepman /usr
-	fi
-
-	if use nls; then
-		cd ${S}/nls
-		make MAKE="make" DESTDIR=${D} install || die "nls install failed"
-	fi
-	dodoc ${S}/RELNOTES
-}
-
-backward_compat_install() {
-	# Backwards compatibility for /usr/share move
-	dosym ../../share/fonts /usr/$(get_libdir)/X11/fonts
-
-	# Have the top-level libdir symlink made first, so real dirs don't get created
-	local DIR DIRS
-	if [ "lib" != "$(get_libdir)" ]; then
-		DIRS="${DIRS} $(get_libdir)"
-	fi
-	for DIR in ${DIRS}; do
-		dosym ../${DIR} /usr/X11R6/${DIR}
-	done
-
-	dosym ../../../share/doc/${PF} /usr/X11R6/$(get_libdir)/X11/doc
-}
-
-fix_permissions() {
-	# Fix permissions on locale/common/*.so
-	local x
-	for x in ${D}/usr/$(get_libdir)/X11/locale/$(get_libdir)/common/*.so*; do
-		if [ -f ${x} ]; then
-			fperms 0755 ${x/${D}}
-		fi
-	done
-
-	# Fix permissions on modules ...
-	for x in $(find ${D}/usr/$(get_libdir)/modules -name '*.o' -o -name '*.so'); do
-		if [ -f ${x} ]; then
-			fperms 0755 ${x/${D}}
-		fi
-	done
-
-	# Fix perms
-	if ! use minimal; then
-		fperms 755 /usr/$(get_libdir)/X11/xkb/geometry/sgi /usr/bin/dga
-	fi
-}
-
-zap_host_def_cflags() {
-	ebegin "Fixing $(get_libdir)/X11/config/host.def"
-		cp ${D}/usr/$(get_libdir)/X11/config/host.def ${T}
-		awk '!/OptimizedCDebugFlags|OptimizedCplusplusDebugFlags|GccWarningOptions/ {print $0}' \
-			${T}/host.def > ${D}/usr/$(get_libdir)/X11/config/host.def \
-			|| eerror "Munging host.def failed"
-		# theoretically, /usr/lib/X11/config is a possible candidate for
-		# config file management. If we find that people really worry about imake
-		# stuff, we may add it.  But for now, we leave the dir unprotected.
-	eend 0
-}
-
-add_euro_support() {
-	ebegin "Adding Euro support"
-		LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir)" \
-		${D}/usr/bin/bdftopcf -t ${WORKDIR}/Xlat9-8x14.bdf | \
-			gzip -9 > ${D}/usr/share/fonts/misc/Xlat9-8x14-lat9.pcf.gz
-		LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir)" \
-		${D}/usr/bin/bdftopcf -t ${WORKDIR}/Xlat9-9x16.bdf | \
-			gzip -9 > ${D}/usr/share/fonts/misc/Xlat9-9x16-lat9.pcf.gz
-		LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir)" \
-		${D}/usr/bin/bdftopcf -t ${WORKDIR}/Xlat9-10x20.bdf | \
-			gzip -9 > ${D}/usr/share/fonts/misc/Xlat9-10x20-lat9.pcf.gz
-	eend 0
-}
-
-setup_standard_symlinks() {
-	# Standard symlinks
-	dodir /usr/{bin,include,$(get_libdir)}
-	dosym ../bin /usr/bin/X11
-	# Stop complains about "file or directory not existing"
-	dodir /usr/X11R6
-	dosym ../include /usr/X11R6/include
-	dosym ../../usr/$(get_libdir)/X11/xkb /etc/X11/xkb
-
-	# Some critical directories
-	if ! use minimal; then
-		keepdir /var/lib/xdm
-		dosym ../../../var/lib/xdm /etc/X11/xdm/authdir
-	fi
-
-	# Backwards compat, FHS, etc.
-	dosym ../../usr/X11R6/bin/Xorg /etc/X11/X
-}
-
-libtool_archive_install() {
-	if use opengl; then
-		# .la files for libtool support
-		insinto /usr/$(get_libdir)
-		# (#67729) Needs to be lib, not $(get_libdir)
-		doins ${FILES_DIR}/lib/*.la
-	fi
-}
-
-fix_libtool_libdir_paths() {
-	local dirpath
-	for archive in ${*} ; do
-		dirpath=$(dirname ${archive} | sed -e "s:^${D}::")
-		[[ ${dirpath::1} == "/" ]] || dirpath="/"${dirpath}
-		sed -i ${archive} -e "s:^libdir.*:libdir=\'${dirpath}\':"
-	done
-}
-
-compose_files_install() {
-	# Hack from Mandrake (update ours that just created Compose files for
-	# all locales)
-	local x
-	for x in $(find ${D}/usr/$(get_libdir)/X11/locale/ -mindepth 1 -type d); do
-		# make empty Compose files for some locales
-		# CJK must not have that file (otherwise XIM don't works some times)
-		case $(basename ${x}) in
-			C|microsoft-*|iso8859-*|koi8-*)
-				if [ ! -f ${x}/Compose ]; then
-					touch ${x}/Compose
-				fi
-				;;
-			ja*|ko*|zh*)
-				if [ -r ${x}/Compose ]; then
-					rm -f ${x}/Compose
-				fi
-				;;
-		esac
-	done
-
-	# Another hack from Mandrake -- to fix dead + space for the us
-	# international keyboard
-	local i
-	for i in ${D}/usr/$(get_libdir)/X11/locale/*/Compose; do
-		sed -i \
-			-e 's/\(<dead_diaeresis> <space>\).*$/\1 : "\\"" quotedbl/' \
-			-e "s/\(<dead_acute> <space>\).*$/\1 : \"'\" apostrophe/" ${i} \
-			|| eerror "sed ${i} failed"
-	done
-}
-
-encode_xfsft_files() {
-	# Yet more Mandrake
-	ebegin "Encoding files for xfsft font server"
-		dodir /usr/share/fonts/encodings
-		cp -pPR ${WORKDIR}/usr/share/fonts/encodings/* \
-			${D}/usr/share/fonts/encodings
-
-		for x in ${D}/usr/share/fonts/encodings/{.,large}/*.enc; do
-			if [ -f "${x}" ]; then
-				gzip -9 -f ${x} \
-					|| eerror "gzipping ${x} failed"
-			fi
-		done
-	eend 0
-}
-
-koi8_fonts_install() {
-	ebegin "Adding gemini-koi8 fonts"
-		cd ${WORKDIR}/ukr
-		gunzip *.Z || eerror "gunzipping gemini-koi8 fonts failed"
-		gzip -9 *.pcf || eerror "gzipping gemini-koi8 fonts failed"
-		cd ${S}
-		cp -pPR ${WORKDIR}/ukr ${D}/usr/share/fonts \
-			|| eerror "copying gemini-koi8 fonts failed"
-	eend 0
-}
-
-etc_files_install() {
-	insinto /etc/X11
-
-	# Install example config file
-	newins ${S}/programs/Xserver/hw/xfree86/xorg.conf xorg.conf.example
-
-	exeinto /etc/X11
-	# new session management script
-	doexe ${FILES_DIR}/chooser.sh
-	# new display manager script
-	doexe ${FILES_DIR}/startDM.sh
-	exeinto /etc/X11/Sessions
-	# doexe skips directories, so this should be safe
-	doexe ${FILES_DIR}/Sessions/*
-	insinto /etc/env.d
-	doins ${FILES_DIR}/10xorg
-	insinto /etc/X11/xinit
-	doins ${FILES_DIR}/xinitrc
-	if ! use minimal; then
-		exeinto /etc/X11/xdm
-		doexe ${FILES_DIR}/Xsession
-		exeinto /etc/init.d
-		newexe ${FILES_DIR}/xdm.start xdm
-	fi
-	if use font-server; then
-		insinto /etc/X11/fs
-		newins ${FILES_DIR}/xfs.config config
-	fi
-	if use pam; then
-		insinto /etc/pam.d
-		newins ${FILES_DIR}/xdm.pamd xdm
-		# Need to fix console permissions first
-		newins ${FILES_DIR}/xserver.pamd xserver
-	fi
-	if use font-server; then
-		newexe ${FILES_DIR}/xfs.start xfs
-		insinto /etc/conf.d
-		newins ${FILES_DIR}/xfs.conf.d xfs
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving libGL and friends for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${PN}/{lib,extensions,include}
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/libGL.so* \
-			${D}/usr/$(get_libdir)/libGL.la \
-			${D}/usr/$(get_libdir)/libGL.a; do
-			if [ -f ${x} -o -L ${x} ]; then
-				# libGL.a cause problems with tuxracer, etc
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/lib
-			fi
-		done
-			for x in ${D}/usr/$(get_libdir)/modules/extensions/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/extensions
-			fi
-		done
-		# glext.h added for #54984
-		for x in ${D}/usr/include/GL/{gl.h,glx.h,glxtokens.h,glext.h,glxext.h,glxmd.h,glxproto.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/include
-			fi
-		done
-	eend 0
-}
-
-cursor_install() {
-	# Make the core cursor the default.  People seem not to like whiteglass
-	# for some reason.
-	dosed 's:whiteglass:core:' /usr/share/cursors/${PN}/default/index.theme
-
-	if ! use minimal; then
-		install_extra_cursors
-	fi
-}
-
-strip_execs() {
-	if use debug || has nostrip ${FEATURES}; then
-		ewarn "Debug build turned on by USE=debug or FEATURES=nostrip"
-		ewarn "NOT stripping binaries and libraries"
-	else
-		local STRIP
-		if [ ! -z "${CBUILD}" ] && [ "${CBUILD}" != "${CHOST}" ]; then
-			STRIP=${CHOST}-strip
-		else
-			STRIP=strip
-		fi
-		einfo "Stripping binaries and libraries..."
-		# This bit I got from Redhat ... strip binaries and drivers ..
-		# NOTE:  We do NOT want to strip the drivers, modules or DRI modules!
-		local x
-		for x in $(find ${D}/ -type f -perm +0111 -exec file {} \; | \
-		           grep -v ' shared object,' | \
-		           sed -n -e 's/^\(.*\):[  ]*ELF.*, not stripped/\1/p'); do
-			if [ -f ${x} ]; then
-				# Dont do the modules ...
-				if [ "${x/\/usr\/$(get_libdir)\/modules}" = "${x}" ]; then
-					echo "$(echo ${x/${D}})"
-					${STRIP} ${x} || :
-				fi
-			fi
-		done
-		# Now do the libraries ...
-		for x in ${D}/usr/{$(get_libdir),$(get_libdir)/opengl/${PN}/lib}/*.so.* \
-			$(get_libdir)/X11/locale/$(get_libdir)/common}/*.so.*; do
-			if [ -f ${x} ]; then
-				echo "$(echo ${x/${D}})"
-				${STRIP} --strip-debug ${x} || :
-			fi
-		done
-	fi
-}
-
-install_extra_cursors() {
-	# Install TaD's gentoo cursors
-	insinto /usr/share/cursors/${PN}/gentoo/cursors
-	doins ${WORKDIR}/cursors/gentoo/cursors/*
-	insinto /usr/share/cursors/${PN}/gentoo-blue/cursors
-	doins ${WORKDIR}/cursors/gentoo-blue/cursors/*
-	insinto /usr/share/cursors/${PN}/gentoo-silver/cursors
-	doins ${WORKDIR}/cursors/gentoo-silver/cursors/*
-}
-
-minimal_install() {
-		# Get rid of all unnecessary fonts (saves ~5.5 MB)
-		find ${D}/usr/share/fonts/misc/ -name '*.pcf.gz' \
-			-not -name '*6x13*' -not -name 'cursor.pcf.gz' -exec rm {} \;
-		# Woohoo, another 772K
-		rm -rf ${D}/usr/share/doc
-}
-
-xprint_install() {
-	# If we want xprint, save the init script before deleting /etc/rc.d/
-	# Requested on #68316
-	if use xprint; then
-		xprint_init_install
-	else
-		# delete xprint stuff
-		rm -f ${D}/etc/{init,profile}.d/xprint*
-		rmdir --ignore-fail-on-non-empty ${D}/etc/{init,profile}.d
-	fi
-
-	# Remove the /etc/rc.d nonsense -- not everyone is RedHat
-	rm -rf ${D}/etc/rc.d
-}
-
-xprint_init_install() {
-	# RH-style init script, we provide a wrapper
-	exeinto /usr/$(get_libdir)/misc
-	doexe ${D}/etc/init.d/xprint
-	rm -f ${D}/etc/init.d/xprint
-	# Install the wrapper
-	newinitd ${FILES_DIR}/xprint.init xprint
-	# patch profile scripts
-	sed -i -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint get_xpserverlist:g" ${D}/etc/profile.d/xprint*
-	# move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc ${D}/etc/profile.d/xprint*
-	rm -f ${D}/etc/profile.d/xprint*
-}
-
-config_files_install() {
-
-	# Fix default config files after installing fonts to /usr/share/fonts
-	sed -i -e "s:/usr/X11R6/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \
-		-e "s:/usr/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \
-		-e "s:/usr/$(get_libdir)/fonts:/usr/share/fonts:g" \
-		${D}/etc/X11/xorg.conf.example
-	if use font-server; then
-		sed -i "s:/usr/X11R6/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \
-			${D}/etc/X11/fs/config
-	fi
-
-	# Work around upgrade problem where people have
-	# Option "XkbRules" "xfree86" in their config file
-	sed -i "s:^.*Option.*"XkbRules".*$::g" ${D}/etc/X11/xorg.conf.example
-}
-
-fix_opengl_symlinks() {
-	# Remove invalid symlinks
-	local LINK
-	for LINK in $(find ${D}/usr/$(get_libdir) \
-		-name libGL.* -type l); do
-		rm -f ${LINK}
-	done
-	# Create required symlinks
-	dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so
-	dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1
-}
-
-#################
-# pkg_preinst() #
-#################
-
-# We need a symlink /usr/X11R6/dir -> /usr/dir so all the packages
-# whose files we move don't lose track of them. As such, we need
-# _absolutely nothing_ in /usr/X11R6/dir so we can make such a symlink.
-# Donnie Berkholz <spyderous@gentoo.org> 20 October 2004
-#
-# Takes two arguments -- starting location and ending location
-migrate() {
-	einfo "Migrating from ${1} to ${2}..."
-
-	# Strip trailing slash
-	if [ -z "${1##*/}" ]; then
-		set -- ${1%/} ${2}
-	fi
-
-	if [ -e ${ROOT}${1} ]; then
-		# If it's not a symlink (in other words, it should be a directory)
-		if [ ! -L ${ROOT}${1} ]; then
-			einfo "  ${1} isn't a symlink, migrating..."
-			# Move everything
-					rsync \
-						--archive \
-						--update \
-						--links \
-						--hard-links \
-						--ignore-existing \
-						--stats \
-						--progress \
-						--verbose \
-						${ROOT}${1}/ ${ROOT}${2} > ${T}/migrate-${1//\//-}.log 2>&1
-
-					check_migrate_return
-					remove_migrated_files ${1}
-
-			if [ -e "${ROOT}${1}" ]; then
-				# Remove any floating .keep files so we can run rmdir
-				find ${ROOT}${1} -name '\.keep' -exec rm -f {} \;
-				# Get rid of the directory
-				rmdir ${ROOT}${1}
-			fi
-
-			make_symlinks ${1}
-		else
-			ewarn "    ${1} is a symlink, not migrating"
-		fi
-	else
-		ewarn "  ${1} doesn't exist, not migrating"
-		make_symlinks ${1}
-	fi
-}
-
-check_migrate_return() {
-	MIGRATE_RETURN="$?"
-	if [ "${MIGRATE_RETURN}" -eq "0" ]; then
-		einfo "rsync successful!"
-	else
-		eerror "rsync failed."
-		eerror "Check for migrate-* files in ${T}."
-		die "rsync failed. Exit code: ${MIGRATE_RETURN}."
-	fi
-
-	# Migration fubars lib symlinks -- eradicator
-	if use amd64; then
-		if [[ -L ${ROOT}usr/lib64 ]]; then
-			rm ${ROOT}usr/lib64
-			ln -s lib ${ROOT}usr/lib64
-		elif [[ -L ${ROOT}usr/lib ]]; then
-			rm -f ${ROOT}usr/lib
-			ln -s lib64 ${ROOT}usr/lib
-		elif [[ -L ${ROOT}usr/lib32 ]]; then
-			if has_multilib_profile; then
-			ln -s lib ${ROOT}usr/lib32
-			else
-				ln -s ../emul/linux/x86/usr/lib ${ROOT}usr/lib32
-			fi
-		fi
-	fi
-}
-
-remove_migrated_files() {
-	# This is a copy instead of a move, so we need to get rid of what
-	# we copied. This is a little risky if it fails, so just do it on
-	# success.
-
-	# DO NOT proceed if we don't have an argument, or we kill root filesystem
-	if [ -z "${1}" ]; then
-		die "No argument to remove_migrated_files(). Want to `rm -rf ${ROOT}`?"
-	fi
-
-	if [ "${MIGRATE_RETURN}" -eq "0" ]; then
-#		rm -rfv ${ROOT}${1} > ${T}/migrate-remove-${1//\//-}.log 2>&1
-		rm -rfv ${ROOT}${1}
-	fi
-}
-
-make_symlinks() {
-			# Put a symlink in its place
-
-			# Special case: lib != libdir
-			if [ "${1##*/}" = "$(get_libdir)" -a "$(get_libdir)" != "lib" ]; then
-				einfo "    Symlinking ${ROOT}usr/X11R6/lib -> $(get_libdir)"
-				ln -s $(get_libdir) ${ROOT}usr/X11R6/lib
-			# Special case: fonts
-			elif [ "${1##*/}" = "fonts" ]; then
-				einfo "    Symlinking ${ROOT}${1} -> ../../share/fonts"
-				ln -s ../../share/fonts ${ROOT}${1}
-			# Special case: X11R6
-			elif [ "${1##*/}" = "X11R6" ]; then
-				einfo "    Symlinking ${ROOT}${1} -> ../usr"
-				ln -s ../usr ${ROOT}${1}
-			else
-				einfo "    Symlinking ${ROOT}${1} -> ../${1##*/}"
-				ln -s ../${1##*/} ${ROOT}${1}
-			fi
-}
-
-update_config_files() {
-	# Fix any installed config files for installing fonts to /usr/share/fonts
-	# This *needs* to be after all other installation so files aren't
-	# overwritten.
-
-	if [ "${ROOT}" = "/" ]; then
-		einfo "Preparing any installed configuration files for font move..."
-		FILES="/etc/X11/xorg.conf
-			/etc/X11/XF86Config-4
-			/etc/X11/XF86Config"
-		if use font-server; then
-			FILES="${FILES} /etc/X11/fs/config"
-		fi
-		#	/etc/fonts/fonts.conf
-		#	/etc/fonts/local.conf
-
-		local FILE
-		for FILE in ${FILES}; do
-			if [ -e ${FILE} ]; then
-				# New font paths
-				sed "s,/usr/X11R6/$(get_libdir)/X11/fonts,/usr/share/fonts,g" \
-					${ROOT}${FILE} > ${IMAGE}${FILE}
-
-				if [ "${FILE}" = "/etc/X11/xorg.conf" ] \
-					|| [ "${FILE}" = "/etc/X11/XF86Config" ] \
-					|| [ "${FILE}" = "/etc/X11/XF86Config-4" ]; then
-					# "keyboard" driver is deprecated and will be removed,
-					# switch to "kbd"
-					sed -i 's~^\([ \t]*Driver[ \t]\+\)"[kK]eyboard"~\1"kbd"~' \
-						${IMAGE}${FILE}
-
-					# This moved in the /usr/X11R6/libdir -> /usr/libdir change
-					sed -i \
-						-e 's~^\([ \t]*RgbPath[ \t]\+\)"/usr/X11R6/$(get_libdir)/X11/rgb"~\1"/usr/$(get_libdir)/X11/rgb"~' \
-						-e 's~^\([ \t]*RgbPath[ \t]\+\)"/usr/X11R6/lib/X11/rgb"~\1"/usr/lib/X11/rgb"~' \
-						${IMAGE}${FILE}
-
-					# Work around upgrade problem where people have
-					# Option "XkbRules" "xfree86" in their config file
-					sed -i "s:^.*Option.*\"XkbRules\".*$::g" \
-						${IMAGE}${FILE}
-				fi
-			fi
-		done
-	fi
-}
-
-cleanup_fonts() {
-	local G_FONTDIRS
-	G_FONTDIRS="Speedo encodings local misc util"
-	if use truetype-fonts; then
-		G_FONTDIRS="${G_FONTDIRS} TTF"
-	fi
-	if use type1-fonts; then
-		G_FONTDIRS="${G_FONTDIRS} Type1"
-	fi
-	if use cjk; then
-		G_FONTDIRS="${G_FONTDIRS} CID"
-	fi
-	if use bitmap-fonts; then
-		G_FONTDIRS="${G_FONTDIRS} 75dpi 100dpi"
-	fi
-	if use nls; then
-		G_FONTDIRS="${G_FONTDIRS} cyrillic ukr"
-	fi
-
-	for G_FONTDIR in ${G_FONTDIRS}; do
-		# clean out old fonts.* and encodings.dir files, as we
-		# will regenerate them
-		# Not Speedo or CID, as their fonts.scale files are "real"
-		if [ "${G_FONTDIR}" != "CID" -a "${G_FONTDIR}" != "Speedo" ]; then
-			find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'fonts.*' \
-				-o -name 'encodings.dir' -exec rm -fv {} \;
-		fi
-	done
-
-	# Get rid of deprecated directories so our symlinks in the same location
-	# work -- users shouldn't be placing fonts here so that should be fine,
-	# they should be using ~/.fonts or /usr/share/fonts. <spyderous>
-	remove_font_dirs
-}
-
-remove_font_dirs() {
-	if [ -e ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts ]; then
-		if [ ! -L ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts ]; then
-			local G_FONTDIR
-			for G_FONTDIR in ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts/*; do
-				if [ -L "${G_FONTDIR}" ]; then
-					einfo "Removing ${G_FONTDIR} symlink."
-					rm -rfv ${G_FONTDIR}
-				else
-					ewarn "${G_FONTDIR} not a symlink, moving to /usr/share/fonts"
-					if [ -d ${G_FONTDIR} ]; then
-						if [ ! -e /usr/share/fonts/${G_FONTDIR##*/} ]; then
-							einfo "Moving ${G_FONTDIR} to /usr/share/fonts/."
-							mv ${G_FONTDIR} /usr/share/fonts/
-						else
-							ewarn "/usr/share/fonts/${G_FONTDIR##*/} exists. Remove it and try again."
-						fi
-					else
-						ewarn "${G_FONTDIR} does not exist."
-					fi
-				fi
-			done
-		fi
-	else
-		ewarn "${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts does not exist."
-	fi
-}
-
-move_app_defaults_to_etc() {
-	if [ -L ${ROOT}/etc/X11/app-defaults ]; then
-		rm -f ${ROOT}/etc/X11/app-defaults
-	fi
-
-	if [ ! -L ${ROOT}/usr/$(get_libdir)/app-defaults ] \
-		&& [ -d ${ROOT}/usr/$(get_libdir)/app-defaults ]; then
-		if [ ! -d ${ROOT}/etc/X11/app-defaults ]; then
-			mkdir -p ${ROOT}/etc/X11/app-defaults
-		fi
-
-		mv -f ${ROOT}/usr/$(get_libdir)/app-defaults ${ROOT}/etc/X11
-	fi
-}
-
-move_xkb_to_usr() {
-	if [ -L ${ROOT}/usr/$(get_libdir)/xkb ]; then
-		rm -f ${ROOT}/usr/$(get_libdir)/xkb
-	fi
-
-	if [ ! -L ${ROOT}/etc/X11/xkb ] \
-		&& [ -d ${ROOT}/etc/X11/xkb ]; then
-		if [ ! -d ${ROOT}/usr/$(get_libdir)/xkb ]; then
-			mkdir -p ${ROOT}/usr/$(get_libdir)
-		fi
-
-	    mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/$(get_libdir)
-	fi
-}
-
-dynamic_libgl_preinst() {
-	# clean the dynamic libGL stuff's home to ensure
-	# we don't have stale libs floating around
-	if [ -d ${ROOT}/usr/$(get_libdir)/opengl/${PN} ]; then
-		rm -rf ${ROOT}/usr/$(get_libdir)/opengl/${PN}/*
-	fi
-
-	# make sure we do not have any stale files lying around
-	# that could break things. Check old and new locations.
-	rm -f ${ROOT}/usr/X11R6/$(get_libdir)/libGL\.* \
-		${ROOT}/usr/$(get_libdir)/libGL\.*
-}
-
-##################
-# pkg_postinst() #
-##################
-
-font_setup() {
-	umask 022
-
-	# These cause ttmkfdir to segfault :/
-	rm -f ${ROOT}/usr/share/fonts/encodings/iso8859-6.8x.enc.gz
-	rm -f ${ROOT}/usr/share/fonts/encodings/iso8859-6.16.enc.gz
-#	rm -f ${ROOT}/usr/share/fonts/encodings/large/cns11643-1.enc
-#	rm -f ${ROOT}/usr/share/fonts/encodings/large/cns11643-2.enc
-#	rm -f ${ROOT}/usr/share/fonts/encodings/large/cns11643-3.enc
-#	rm -f ${ROOT}/usr/share/fonts/encodings/suneu-greek.enc
-
-	# ********************************************************************
-	#  A note about fonts and needed files:
-	#
-	#  1)  Create /usr/share/fonts/encodings/encodings.dir
-	#
-	#  2)  Create fonts.scale for TrueType fonts (need to do this before
-	#      we create fonts.dir files, else fonts.dir files will be
-	#      invalid for TrueType fonts...)
-	#
-	#  3)  Now Generate fonts.dir files.
-	#
-	#  CID fonts is a bit more involved, but as we do not install any,
-	#  thus I am not going to bother.
-	#
-	#  <azarah@gentoo.org> (20 Oct 2002)
-	#
-	# ********************************************************************
-
-	ebegin "Generating encodings.dir"
-		# Create the encodings.dir in /usr/share/fonts/encodings
-		LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
-		${ROOT}/usr/bin/mkfontdir -n \
-			-e ${ROOT}/usr/share/fonts/encodings \
-			-e ${ROOT}/usr/share/fonts/encodings/large \
-			-- ${ROOT}/usr/share/fonts/encodings
-
-	eend 0
-
-	ebegin "Creating fonts.scale files"
-		local x
-		for x in $(find ${ROOT}/usr/share/fonts/* -maxdepth 1 -type d); do
-			[ -z "$(ls ${x}/)" ] && continue
-			[ "$(ls ${x}/)" = "fonts.cache-1" ] && continue
-
-			# Only generate .scale files if truetype, opentype or type1
-			# fonts are present ...
-
-			# First truetype (ttf,ttc)
-			# NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
-			# Also, there is no way to regenerate Speedo/CID fonts.scale
-			# <spyderous@gentoo.org> 2 August 2004
-			if [ "${x/encodings}" = "${x}" -a \
-				-n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then
-				if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then
-					LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
-					${ROOT}/usr/bin/ttmkfdir -x 2 \
-						-e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
-						-o ${x}/fonts.scale -d ${x}
-					# ttmkfdir fails on some stuff, so try mkfontscale if it does
-					local ttmkfdir_return=$?
-				else
-					# We didn't use ttmkfdir at all
-					local ttmkfdir_return=2
-				fi
-				if [ ${ttmkfdir_return} -ne 0 ]; then
-					LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
-					${ROOT}/usr/bin/mkfontscale \
-						-a /usr/share/fonts/encodings/encodings.dir \
-						-- ${x}
-				fi
-			# Next type1 and opentype (pfa,pfb,otf,otc)
-			elif [ "${x/encodings}" = "${x}" -a \
-				-n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then
-				LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
-				${ROOT}/usr/bin/mkfontscale \
-					-a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
-					-- ${x}
-			fi
-		done
-	eend 0
-
-	ebegin "Generating fonts.dir files"
-		for x in $(find ${ROOT}/usr/share/fonts/* -maxdepth 1 -type d); do
-			[ -z "$(ls ${x}/)" ] && continue
-			[ "$(ls ${x}/)" = "fonts.cache-1" ] && continue
-
-			if [ "${x/encodings}" = "${x}" ]; then
-				LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
-				${ROOT}/usr/bin/mkfontdir \
-					-e ${ROOT}/usr/share/fonts/encodings \
-					-e ${ROOT}/usr/share/fonts/encodings/large \
-					-- ${x}
-			fi
-		done
-	eend 0
-
-	ebegin "Generating Xft cache"
-		for x in $(find ${ROOT}/usr/share/fonts/* -maxdepth 1 -type d); do
-			[ -z "$(ls ${x}/)" ] && continue
-			[ "$(ls ${x}/)" = "fonts.cache-1" ] && continue
-
-			# Only generate XftCache files if there are truetype
-			# fonts present ...
-			if [ "${x/encodings}" = "${x}" -a \
-			     -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ]; then
-				LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
-				${ROOT}/usr/bin/xftcache ${x} &> /dev/null
-			fi
-		done
-	eend 0
-
-	ebegin "Fixing permissions"
-		find ${ROOT}/usr/share/fonts/ -type f -name 'font.*' \
-			-exec chmod 0644 {} \;
-	eend 0
-
-	# danarmak found out that fc-cache should be run AFTER all the above
-	# stuff, as otherwise the cache is invalid, and has to be run again
-	# as root anyway
-	if [ -x ${ROOT}/usr/bin/fc-cache ]; then
-		ebegin "Creating FC font cache"
-			HOME="/root" ${ROOT}/usr/bin/fc-cache
-		eend 0
-	fi
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-		local opengl_implem="$(${ROOT}/usr/sbin/opengl-update --get-implementation)"
-		${ROOT}/usr/sbin/opengl-update --use-old ${PN}
-}
-
-remove_old_compose_files() {
-	for x in $(find ${ROOT}/usr/$(get_libdir)/X11/locale/ -mindepth 1 -type d); do
-		# Remove old compose files we might have created incorrectly
-		# CJK must not have that file (otherwise XIM don't works some times)
-		case $(basename ${x}) in
-			ja*|ko*|zh*)
-				if [ -r "${x}/Compose" ]; then
-					rm -f ${x}/Compose
-				fi
-				;;
-		esac
-	done
-}
-
-setup_tmp_files() {
-	# These need to be owned by root and the correct permissions
-	# (bug #8281)
-	local x=""
-	for x in ${ROOT}/tmp/.{ICE,X11}-unix; do
-		if [ ! -d ${x} ]; then
-			mkdir -p ${x}
-		fi
-
-		chown root:wheel ${x}
-		chmod 1777 ${x}
-	done
-}
-
-print_info() {
-	echo
-	einfo "Please note that the xcursors are in /usr/share/cursors/${PN}."
-	einfo "Any custom cursor sets should be placed in that directory."
-	echo
-	einfo "If you wish to set system-wide default cursors, please create"
-	einfo "/usr/local/share/cursors/${PN}/default/index.theme"
-	einfo "with content: \"Inherits=theme_name\" so that future"
-	einfo "emerges will not overwrite those settings."
-	echo
-	einfo "Listening on TCP is disabled by default with startx."
-	einfo "To enable it, edit /usr/bin/startx."
-	echo
-
-	echo
-	ewarn "BEWARE:"
-	ewarn "/usr/X11R6/$(get_libdir) has MOVED"
-	ewarn "to /usr/$(get_libdir)"
-	ewarn "Run etc-update to update your config files."
-	ewarn "Old locations for anything in /usr/X11R6/$(get_libdir)"
-	ewarn "are deprecated."
-	echo
-	# (#76985)
-	einfo "Visit http://www.gentoo.org/doc/en/index.xml?catid=desktop"
-	einfo "for more information on configuring X."
-
-	# Try to get people to read /usr/X11R6/libdir move
-	ebeep 5
-	epause 10
-}
-
-fix_links() {
-	# Fix problematic links
-	if [ -x ${ROOT}/usr/bin/Xorg ]; then
-		ln -snf ../bin ${ROOT}/usr/bin/X11
-	fi
-}
diff --git a/x11-base/xorg-x11/xorg-x11-6.9.0-r3.ebuild b/x11-base/xorg-x11/xorg-x11-6.9.0-r3.ebuild
deleted file mode 100644
index 0f5374278c2e..000000000000
--- a/x11-base/xorg-x11/xorg-x11-6.9.0-r3.ebuild
+++ /dev/null
@@ -1,2094 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.9.0-r3.ebuild,v 1.5 2006/09/12 20:47:40 dberkholz Exp $
-
-# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
-# voodoo3 cards.
-
-# Libraries which are now supplied in shared form that were not in the past
-# include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
-# libXinerama.so, libXss.so, libXvMC.so, libXxf86rush.so, libfontenc.so,
-# libxkbfile.so, libxkbui.so
-
-# TODO
-# 1 June 2005 <spyderous@gentoo.org>
-#   TARGET: none
-#		Consider building shared libraries only, when both are provided
-#		Combine find loops for "Creating fonts.scale files," "Generating
-#			fonts.dir files and "Generating Xft cache"
-#		<Mr_Bones_> the loop in pkg_postinst for removing Compose can probably
-#			be one line of bash expansion like rm -f ${ROOT}/usr/$(get_libdir)/
-#			X11/locale/{ja*|ko*|zh*}/Compose
-#		Clean up migration function
-#			- loop through lib* instead of repetition
-#		Fix direction of lib -> libdir symlink
-#		Generalize any functions that make sense to generalize (i.e., anything
-#			that might realistically see use elsewhere, or repetitively here)
-inherit eutils flag-o-matic toolchain-funcs x11 linux-info multilib
-
-
-# Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
-# that only we only strip stuff that are safe to strip ...
-RESTRICT="nostrip"
-
-# IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004)
-IUSE="3dfx bitmap-fonts cjk debug doc font-server insecure-drivers ipv6 minimal
-	nls nocxx opengl pam sdk static truetype-fonts type1-fonts uclibc xprint xv
-	GAPING_SECURITY_HOLE"
-# IUSE_INPUT_DEVICES="synaptics wacom"
-
-FILES_VER="0.1"
-PATCH_VER="0.1.1"
-XCUR_VER="0.3.1"
-XFSFT_ENC_VER="0.1"
-
-S=${WORKDIR}/xc
-
-HOMEPAGE="http://xorg.freedesktop.org/"
-
-# Misc patches we may need to fetch ..
-X_PATCHES="http://dev.gentoo.org/~spyderous/${PN}/patchsets/${PV}/${P}-patches-${PATCH_VER}.tar.bz2
-	http://dev.gentoo.org/~joshuabaergen/distfiles/${P}-patches-${PATCH_VER}.tar.bz2
-	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
-
-GENTOO_FILES="http://dev.gentoo.org/~spyderous/${PN}/patchsets/${PV}/${P}-files-${FILES_VER}.tar.bz2
-	http://dev.gentoo.org/~cyfred/distfiles/${P}-files-${FILES_VER}.tar.bz2
-	mirror://gentoo/${P}-files-${FILES_VER}.tar.bz2"
-
-SRC_URI="!minimal? ( mirror://gentoo/eurofonts-X11.tar.bz2 )
-	font-server? ( http://dev.gentoo.org/~cyfred/xorg/${PN}/patchsets/${PV}/xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 )
-	!minimal? ( mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2 )
-	nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 )
-	${GENTOO_FILES}
-	${X_PATCHES}
-	http://xorg.freedesktop.org/releases/X11R${PV}/src-single/X11R${PV}-src.tar.bz2"
-
-LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2
-	bigelow-holmes-urw-gmbh-luxi christopher-g-demetriou national-semiconductor
-	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
-	MIT SGI-B BSD || ( FTL GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	>=sys-libs/zlib-1.1.3-r2
-	>=sys-devel/flex-2.5.4a-r5
-	sys-apps/groff
-	>=dev-libs/expat-1.95.3
-	>=media-libs/freetype-2.1.8
-	>=media-libs/fontconfig-2.1-r1
-	opengl? ( >=x11-base/opengl-update-2.2.0 )
-	!nocxx? ( >=x11-apps/ttmkfdir-3.0.9-r2 )
-	>=sys-apps/sed-4
-	userland_GNU? ( sys-apps/util-linux )
-	dev-lang/perl
-	media-libs/libpng
-	!<=app-emulation/emul-linux-x86-xlibs-1.2-r3"
-# FBSDTODO: need to check that X is not pulled in before freebsd-ubin for 'col' presence
-
-RDEPEND="
-		>=sys-libs/zlib-1.1.3-r2
-		>=sys-devel/flex-2.5.4a-r5
-		>=dev-libs/expat-1.95.3
-		>=media-libs/freetype-2.1.8
-		>=media-libs/fontconfig-2.1-r1
-		opengl? ( >=x11-base/opengl-update-2.2.0 )
-		!nocxx? ( >=x11-apps/ttmkfdir-3.0.9-r2 )
-		media-libs/libpng
-		>=sys-libs/ncurses-5.1
-		!<=app-emulation/emul-linux-x86-xlibs-1.2-r3
-		!app-doc/opengl-manpages
-		!app-doc/xorg-docs
-		!app-doc/xorg-sgml-doctools
-		!media-fonts/encodings
-		!media-fonts/font-adobe-100dpi
-		!media-fonts/font-adobe-75dpi
-		!media-fonts/font-adobe-utopia-100dpi
-		!media-fonts/font-adobe-utopia-75dpi
-		!media-fonts/font-adobe-utopia-type1
-		!media-fonts/font-alias
-		!media-fonts/font-arabic-misc
-		!media-fonts/font-bh-100dpi
-		!media-fonts/font-bh-75dpi
-		!media-fonts/font-bh-lucidatypewriter-100dpi
-		!media-fonts/font-bh-lucidatypewriter-75dpi
-		!media-fonts/font-bh-ttf
-		!media-fonts/font-bh-type1
-		!media-fonts/font-bitstream-100dpi
-		!media-fonts/font-bitstream-75dpi
-		!media-fonts/font-bitstream-speedo
-		!media-fonts/font-bitstream-type1
-		!media-fonts/font-cronyx-cyrillic
-		!media-fonts/font-cursor-misc
-		!media-fonts/font-daewoo-misc
-		!media-fonts/font-dec-misc
-		!media-fonts/font-ibm-type1
-		!media-fonts/font-isas-misc
-		!media-fonts/font-jis-misc
-		!media-fonts/font-micro-misc
-		!media-fonts/font-misc-cyrillic
-		!media-fonts/font-misc-ethiopic
-		!media-fonts/font-misc-meltho
-		!media-fonts/font-misc-misc
-		!media-fonts/font-mutt-misc
-		!media-fonts/font-schumacher-misc
-		!media-fonts/font-screen-cyrillic
-		!media-fonts/font-sony-misc
-		!media-fonts/font-sun-misc
-		!media-fonts/font-util
-		!media-fonts/font-winitzki-cyrillic
-		!media-fonts/font-xfree86-type1
-		!media-libs/mesa
-		!x11-apps/appres
-		!x11-apps/bdftopcf
-		!x11-apps/beforelight
-		!x11-apps/bitmap
-		!x11-apps/editres
-		!x11-apps/fonttosfnt
-		!x11-apps/fslsfonts
-		!x11-apps/fstobdf
-		!x11-apps/iceauth
-		!x11-apps/ico
-		!x11-apps/lbxproxy
-		!x11-apps/listres
-		!x11-apps/luit
-		!x11-apps/mesa-progs
-		!x11-apps/mkcfm
-		!x11-apps/mkfontdir
-		!x11-apps/mkfontscale
-		!x11-apps/oclock
-		!x11-apps/proxymngr
-		!x11-apps/rgb
-		!x11-apps/rstart
-		!x11-apps/scripts
-		!x11-apps/sessreg
-		!x11-apps/setxkbmap
-		!x11-apps/showfont
-		!x11-apps/smproxy
-		!x11-wm/twm
-		!x11-apps/viewres
-		!x11-apps/x11perf
-		!x11-apps/xauth
-		!x11-apps/xbiff
-		!x11-apps/xcalc
-		!x11-apps/xclipboard
-		!x11-apps/xclock
-		!x11-apps/xcmsdb
-		!x11-apps/xconsole
-		!x11-apps/xcursorgen
-		!x11-apps/xdbedizzy
-		!x11-apps/xditview
-		!x11-apps/xdm
-		!x11-apps/xdpyinfo
-		!x11-apps/xdriinfo
-		!x11-apps/xedit
-		!x11-apps/xev
-		!x11-apps/xeyes
-		!x11-apps/xf86dga
-		!x11-apps/xfd
-		!x11-apps/xfindproxy
-		!x11-apps/xfontsel
-		!x11-apps/xfs
-		!x11-apps/xfsinfo
-		!x11-apps/xfwp
-		!x11-apps/xgamma
-		!x11-apps/xgc
-		!x11-apps/xhost
-		!x11-apps/xinit
-		!x11-apps/xkbcomp
-		!x11-apps/xkbevd
-		!x11-apps/xkbprint
-		!x11-apps/xkbutils
-		!x11-apps/xkill
-		!x11-apps/xload
-		!x11-apps/xlogo
-		!x11-apps/xlsatoms
-		!x11-apps/xlsclients
-		!x11-apps/xlsfonts
-		!x11-apps/xmag
-		!x11-apps/xman
-		!x11-apps/xmessage
-		!x11-apps/xmh
-		!x11-apps/xmodmap
-		!x11-apps/xmore
-		!x11-apps/xphelloworld
-		!x11-apps/xplsprinters
-		!x11-apps/xpr
-		!x11-apps/xprehashprinterlist
-		!x11-apps/xprop
-		!x11-apps/xrandr
-		!x11-apps/xrdb
-		!x11-apps/xrefresh
-		!x11-apps/xrx
-		!x11-apps/xset
-		!x11-apps/xsetmode
-		!x11-apps/xsetpointer
-		!x11-apps/xsetroot
-		!x11-apps/xsm
-		!x11-apps/xstdcmap
-		!x11-apps/xtrap
-		!x11-apps/xvidtune
-		!x11-apps/xvinfo
-		!x11-apps/xwd
-		!x11-apps/xwininfo
-		!x11-apps/xwud
-		!x11-base/xorg-server
-		!x11-drivers/xf86-input-acecad
-		!x11-drivers/xf86-input-aiptek
-		!x11-drivers/xf86-input-calcomp
-		!x11-drivers/xf86-input-citron
-		!x11-drivers/xf86-input-digitaledge
-		!x11-drivers/xf86-input-dmc
-		!x11-drivers/xf86-input-dynapro
-		!x11-drivers/xf86-input-elo2300
-		!x11-drivers/xf86-input-elographics
-		!x11-drivers/xf86-input-evdev
-		!x11-drivers/xf86-input-fpit
-		!x11-drivers/xf86-input-hyperpen
-		!x11-drivers/xf86-input-jamstudio
-		!x11-drivers/xf86-input-joystick
-		!x11-drivers/xf86-input-keyboard
-		!x11-drivers/xf86-input-magellan
-		!x11-drivers/xf86-input-magictouch
-		!x11-drivers/xf86-input-microtouch
-		!x11-drivers/xf86-input-mouse
-		!x11-drivers/xf86-input-mutouch
-		!x11-drivers/xf86-input-palmax
-		!x11-drivers/xf86-input-penmount
-		!x11-drivers/xf86-input-spaceorb
-		!x11-drivers/xf86-input-summa
-		!x11-drivers/xf86-input-tek4957
-		!x11-drivers/xf86-input-ur98
-		!x11-drivers/xf86-input-vmmouse
-		!x11-drivers/xf86-input-void
-		!x11-drivers/xf86-video-apm
-		!x11-drivers/xf86-video-ark
-		!x11-drivers/xf86-video-ati
-		!x11-drivers/xf86-video-chips
-		!x11-drivers/xf86-video-cirrus
-		!x11-drivers/xf86-video-cyrix
-		!x11-drivers/xf86-video-dummy
-		!x11-drivers/xf86-video-fbdev
-		!x11-drivers/xf86-video-glint
-		!x11-drivers/xf86-video-i128
-		!x11-drivers/xf86-video-i740
-		!x11-drivers/xf86-video-i810
-		!x11-drivers/xf86-video-imstt
-		!x11-drivers/xf86-video-mga
-		!x11-drivers/xf86-video-neomagic
-		!x11-drivers/xf86-video-newport
-		!x11-drivers/xf86-video-nsc
-		!x11-drivers/xf86-video-nv
-		!x11-drivers/xf86-video-rendition
-		!x11-drivers/xf86-video-s3
-		!x11-drivers/xf86-video-s3virge
-		!x11-drivers/xf86-video-savage
-		!x11-drivers/xf86-video-siliconmotion
-		!x11-drivers/xf86-video-sis
-		!x11-drivers/xf86-video-sisusb
-		!x11-drivers/xf86-video-sunbw2
-		!x11-drivers/xf86-video-suncg14
-		!x11-drivers/xf86-video-suncg3
-		!x11-drivers/xf86-video-suncg6
-		!x11-drivers/xf86-video-sunffb
-		!x11-drivers/xf86-video-sunleo
-		!x11-drivers/xf86-video-suntcx
-		!x11-drivers/xf86-video-tdfx
-		!x11-drivers/xf86-video-tga
-		!x11-drivers/xf86-video-trident
-		!x11-drivers/xf86-video-tseng
-		!x11-drivers/xf86-video-v4l
-		!x11-drivers/xf86-video-vesa
-		!x11-drivers/xf86-video-vga
-		!x11-drivers/xf86-video-via
-		!x11-drivers/xf86-video-vmware
-		!x11-drivers/xf86-video-voodoo
-		!x11-libs/libdmx
-		!x11-libs/libdrm
-		!x11-libs/libfontenc
-		!x11-libs/libFS
-		!x11-libs/libICE
-		!x11-libs/liblbxutil
-		!x11-libs/liboldX
-		!x11-libs/libSM
-		!x11-libs/libX11
-		!x11-libs/libXau
-		!x11-libs/libXaw
-		!x11-libs/libXcomposite
-		!x11-libs/libXcursor
-		!x11-libs/libXdamage
-		!x11-libs/libXdmcp
-		!x11-libs/libXevie
-		!x11-libs/libXext
-		!x11-libs/libXfixes
-		!x11-libs/libXfont
-		!x11-libs/libXfontcache
-		!x11-libs/libXft
-		!x11-libs/libXi
-		!x11-libs/libXinerama
-		!x11-libs/libxkbfile
-		!x11-libs/libxkbui
-		!x11-libs/libXmu
-		!x11-libs/libXp
-		!x11-libs/libXpm
-		!x11-libs/libXprintAppUtil
-		!x11-libs/libXprintUtil
-		!x11-libs/libXrandr
-		!x11-libs/libXrender
-		!x11-libs/libXres
-		!x11-libs/libXScrnSaver
-		!x11-libs/libXt
-		!x11-libs/libXTrap
-		!x11-libs/libXtst
-		!x11-libs/libXv
-		!x11-libs/libXvMC
-		!x11-libs/libXxf86dga
-		!x11-libs/libXxf86misc
-		!x11-libs/libXxf86vm
-		!x11-libs/xtrans
-		!x11-misc/gccmakedep
-		!x11-misc/imake
-		!x11-misc/lndir
-		!x11-misc/makedepend
-		!x11-misc/util-macros
-		!x11-misc/xbitmaps
-		!x11-misc/xkbdata
-		!x11-misc/xkeyboard-config
-		!x11-misc/xorg-cf-files
-		!x11-proto/bigreqsproto
-		!x11-proto/compositeproto
-		!x11-proto/damageproto
-		!x11-proto/dmxproto
-		!x11-proto/evieext
-		!x11-proto/fixesproto
-		!x11-proto/fontcacheproto
-		!x11-proto/fontsproto
-		!x11-proto/glproto
-		!x11-proto/inputproto
-		!x11-proto/kbproto
-		!x11-proto/printproto
-		!x11-proto/randrproto
-		!x11-proto/recordproto
-		!x11-proto/renderproto
-		!x11-proto/resourceproto
-		!x11-proto/scrnsaverproto
-		!x11-proto/trapproto
-		!x11-proto/videoproto
-		!x11-proto/xcmiscproto
-		!x11-proto/xextproto
-		!x11-proto/xf86bigfontproto
-		!x11-proto/xf86dgaproto
-		!x11-proto/xf86driproto
-		!x11-proto/xf86miscproto
-		!x11-proto/xf86rushproto
-		!x11-proto/xf86vidmodeproto
-		!x11-proto/xineramaproto
-		!x11-proto/xproto
-		!x11-proto/xproxymanagementprotocol
-		!x11-themes/gentoo-xcursors
-		!x11-themes/xcursor-themes"
-
-PDEPEND="x86? (
-			input_devices_synaptics? ( x11-drivers/synaptics )
-			input_devices_wacom? ( x11-drivers/linuxwacom )
-		)
-		3dfx? ( >=media-libs/glide-v3-3.10 )
-		x11-terms/xterm"
-
-DESCRIPTION="An X11 implementation maintained by the X.Org Foundation"
-
-pkg_setup() {
-	FILES_DIR="${WORKDIR}/files"
-	PATCHDIR="${WORKDIR}/patch"
-	EXCLUDED="${PATCHDIR}/excluded"
-
-	if ! use GAPING_SECURITY_HOLE; then
-		local msg="Set USE=GAPING_SECURITY_HOLE to install."
-		eerror "$msg"
-		eerror "This package is subject to at least one local root vulnerability."
-		die "$msg"
-	fi
-
-	# Set up CFLAG-related things
-	cflag_setup
-
-	# See bug #35468, circular pam-X11 dep
-	check_pam
-
-	# Look for invalid/dangerous USE flags and combinations
-	check_use_combos
-
-	setup_multilib
-
-	# xfs user
-	if use font-server; then
-		enewgroup xfs 33
-		enewuser xfs 33 -1 /etc/X11/fs xfs
-	fi
-}
-
-src_unpack() {
-	unpack_all
-
-	patch_setup
-
-	do_patch
-
-	host_def_setup
-
-	use_specific_hacks
-}
-
-src_compile() {
-	build
-}
-
-src_install() {
-	install_everything
-
-	backward_compat_install
-
-	fix_permissions
-
-	# We zap our CFLAGS in the host.def file, as hardcoded CFLAGS can
-	# mess up other things that use xmkmf
-	zap_host_def_cflags
-
-	# EURO support
-	if ! use minimal; then
-		add_euro_support
-	fi
-
-	setup_standard_symlinks
-
-	if use opengl; then
-		fix_opengl_symlinks
-	fi
-
-	libtool_archive_install
-
-	compose_files_install
-
-	if use font-server; then
-		encode_xfsft_files
-	fi
-
-	if use nls; then
-		koi8_fonts_install
-	fi
-
-	etc_files_install
-
-	if use opengl; then
-		dynamic_libgl_install
-	fi
-
-	fix_libtool_libdir_paths "$(find ${D} -name *.la)"
-
-	cursor_install
-
-	strip_execs
-
-	if use minimal; then
-		minimal_install
-	fi
-
-	# TEMPORARY hack: should be patched in, if it's not already
-	# For Battoussai's gatos stuffs:
-	if use sdk; then
-		insinto /usr/$(get_libdir)/Server/include
-		doins ${S}/extras/drm/shared/drm.h
-	fi
-
-	xprint_install
-
-	config_files_install
-}
-
-pkg_preinst() {
-	# Do migration before anything else, so we do all the rest inside the
-	# symlink
-
-	# Get rid of "standard" symlinks
-	# We can't overwrite symlink with directory w/ $(mv -f)
-	[ -L ${ROOT}usr/$(get_libdir)/X11 ] \
-		&& rm ${ROOT}usr/$(get_libdir)/X11
-	[ -L ${ROOT}usr/include/X11 ] \
-		&& rm ${ROOT}usr/include/X11
-	[ -L ${ROOT}usr/include/GL ] \
-		&& rm ${ROOT}usr/include/GL
-	[ -L ${ROOT}usr/bin/X11 ] \
-		&& rm ${ROOT}usr/bin/X11
-	# Get rid of some apparent artifacts of migration
-	[ -L ${ROOT}usr/include/GL/GL ] \
-		&& rm ${ROOT}usr/include/GL/GL
-	[ -L ${ROOT}usr/include/X11/X11 ] \
-		&& rm ${ROOT}usr/include/X11/X11
-	[ -d ${ROOT}usr/share/fonts/fonts ] \
-		&& rm -rf ${ROOT}usr/share/fonts/fonts
-
-	# No need to do this, if it's already been done
-	# Also, it'll overwrite a ton of stuff because it won't realize /usr/X11R6
-	# is a symlink.
-	if [ ! -L "/usr/X11R6" ]; then
-		# Migrate stuff in /usr/X11R6 to /usr
-		local DIR DIRS
-		DIRS="bin include lib"
-		if [ "lib" != "$(get_libdir)" ]; then
-			DIRS="${DIRS} $(get_libdir)"
-		fi
-		for DIR in ${DIRS}; do
-			migrate /usr/X11R6/${DIR} /usr/${DIR}
-		done
-		# Can't do this in the other loop because of different start and end
-		migrate /usr/X11R6/man /usr/share/man
-	fi
-
-	update_config_files
-
-	cleanup_fonts
-
-	# See above comment for the same test
-	if [ ! -L "/usr/X11R6" ]; then
-		# Needs to happen after cleanup_fonts()
-		migrate /usr/X11R6/$(get_libdir)/X11/fonts /usr/share/fonts
-
-		# Get rid of symlinks so we can migrate /usr/X11R6 without dying when a
-		# symlink tries to copy to a dir
-		einfo "Preparing for /usr/X11R6 -> /usr migration..."
-		local LINK LINKS
-		LINKS="bin include lib man share/info"
-		if [ "lib" != "$(get_libdir)" ]; then
-			LINKS="${LINKS} $(get_libdir)"
-		fi
-		for LINK in ${LINKS}; do
-			if [ -L "${ROOT}/usr/X11R6/${LINK}" ]; then
-				rm -fv ${ROOT}/usr/X11R6/${LINK}
-			fi
-		done
-		einfo "Remaining symlinks in /usr/X11R6:"
-		find ${ROOT}/usr/X11R6/ -type l
-
-		# Woohoo, nothing in /usr/X11R6 after this
-		migrate /usr/X11R6 /usr
-	fi
-
-	move_app_defaults_to_etc
-
-	move_xkb_to_usr
-
-	# Run this even for USE=-opengl, to clean out old stuff from possible
-	# USE=opengl build
-	dynamic_libgl_preinst
-}
-
-pkg_postinst() {
-	env-update
-
-	if [ "${ROOT}" = "/" ]; then
-		font_setup
-
-		if use opengl; then
-			switch_opengl_implem
-		fi
-	fi
-
-	remove_old_compose_files
-
-	setup_tmp_files
-
-	print_info
-}
-
-pkg_postrm() {
-	fix_links
-}
-
-###############
-# pkg_setup() #
-###############
-
-cflag_setup() {
-	# Set up CFLAGS
-	filter-flags "-funroll-loops"
-
-	ALLOWED_FLAGS="-fstack-protector -march -mcpu -mtune -O -O0 -O1 -O2 -O3 -Os"
-	ALLOWED_FLAGS="${ALLOWED_FLAGS} -pipe -fomit-frame-pointer"
-	ALLOWED_FLAGS="${ALLOWED_FLAGS} -momit-leaf-frame-pointer"
-	ALLOWED_FLAGS="${ALLOWED_FLAGS} -g -g0 -g1 -g2 -g3"
-	ALLOWED_FLAGS="${ALLOWED_FLAGS} -ggdb -ggdb0 -ggdb1 -ggdb2 -ggdb3"
-	# arch-specific section added by popular demand
-	case "${ARCH}" in
-		mips)	ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mabi"
-			;;
-		# -fomit-frame-pointer known to break things and is pointless
-		# according to ciaranm
-		# And hardened compiler must be softened. -- fmccor, 20.viii.04
-		sparc)	filter-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
-			if [[ ${ABI} == "sparc64" ]]; then
-				ALLOWED_FLAGS="${ALLOWED_FLAGS} -D__sparc_v9__ -D__linux_sparc_64__"
-				append-flags -D__sparc_v9__ -D__linux_sparc_64__
-			fi
-			;;
-		# gcc-3.3.2 causes invalid insn error
-		hppa ) replace-cpu-flags 2.0 1.0
-			;;
-	esac
-
-	# Recently there has been a lot of stability problem in Gentoo-land.  Many
-	# things can be the cause to this, but I believe that it is due to gcc3
-	# still having issues with optimizations, or with it not filtering bad
-	# combinations (protecting the user maybe from themselves) yet.
-	#
-	# This can clearly be seen in large builds like glibc, where too aggressive
-	# CFLAGS cause the tests to fail miserbly.
-	#
-	# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion
-	# knows what he is talking about:
-	#
-	#   People really shouldn't force code-specific options on... It's a
-	#   bad idea. The -march options aren't just to look pretty. They enable
-	#   options that are sensible (and include sse,mmx,3dnow when appropriate).
-	#
-	# The next command strips CFLAGS and CXXFLAGS from nearly all flags.  If
-	# you do not like it, comment it, but do not bugreport if you run into
-	# problems.
-	#
-	# <azarah@gentoo.org> (13 Oct 2002)
-	strip-flags
-}
-
-check_pam() {
-	if use pam && has_version x11-base/${PN}; then
-		einfo "Previous ${PN} installation detected."
-		einfo "Enabling PAM features in ${PN}."
-	else
-		einfo "Previous ${PN} installation NOT detected."
-		einfo "Disabling PAM features in ${PN}."
-		einfo "You must remerge ${PN} to enable pam."
-		einfo "See http://bugs.gentoo.org/show_bug.cgi?id=35468."
-	fi
-}
-
-check_use_combos() {
-	if use static; then
-		# A static build disallows building the SDK.
-		# See config/xf86.rules.
-		if use sdk; then
-			die "The static USE flag is incompatible with the sdk USE flag."
-		fi
-	fi
-
-	# (#77949)
-	if use minimal && use doc; then
-		die "The minimal and doc USE flags are incompatible and result in a dead build."
-	fi
-
-	if use xv && ! use opengl; then
-		eerror "See http://bugs.gentoo.org/show_bug.cgi?id=67996"
-		eerror "The xv USE flag currently requires the opengl flag."
-		die "This is a known bug. Do not report it."
-	fi
-
-	if use opengl && ! use xv; then
-		eerror "See http://bugs.gentoo.org/show_bug.cgi?id=76936"
-		eerror "The opengl USE flag currently requires the xv flag."
-		die "This is a known bug. Do not report it."
-	fi
-
-	# Echo a message to the user about bitmap-fonts
-	if ! use bitmap-fonts; then
-		ewarn "Please emerge this with USE=\"bitmap-fonts\" to enable"
-		ewarn "75dpi and 100dpi fonts.  Your GTK+-1.2 fonts may look"
-		ewarn "screwy otherwise"
-
-		ebeep 5
-		epause 10
-	fi
-}
-
-setup_multilib() {
-	# on amd64 we need /usr/lib64/X11/locale/lib to be a symlink
-	# created by the emul lib ebuild in order for adobe acrobat, staroffice,
-	# and a few other apps to work.
-	if ! has_multilib_profile; then
-		use amd64 && get_libdir_override lib64
-	fi
-}
-
-################
-# src_unpack() #
-################
-
-unpack_all() {
-	# Unpack source and patches
-	ebegin "Unpacking ${PV} source"
-		unpack X11R${PV}-src.tar.bz2 > /dev/null
-	eend 0
-
-	ebegin "Unpacking Gentoo files and patches"
-		unpack ${P}-files-${FILES_VER}.tar.bz2 > /dev/null
-		unpack ${P}-patches-${PATCH_VER}.tar.bz2 > /dev/null
-	eend 0
-
-	if ! use minimal; then
-		# Unpack TaD's gentoo cursors
-		ebegin "Unpacking Gentoo cursors"
-			unpack gentoo-cursors-tad-${XCUR_VER}.tar.bz2 > /dev/null
-		eend 0
-	fi
-
-	# Unpack extra fonts stuff from Mandrake
-	ebegin "Unpacking fonts"
-		if use nls; then
-			unpack gemini-koi8-u.tar.bz2 > /dev/null
-		fi
-		if ! use minimal; then
-			unpack eurofonts-X11.tar.bz2 > /dev/null
-		fi
-		if use font-server; then
-			unpack xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 > /dev/null
-		fi
-	eend 0
-
-	# Remove bum encoding
-	rm -f ${WORKDIR}/usr/share/fonts/encodings/urdunaqsh-0.enc
-}
-
-do_patch() {
-	# Bulk patching - based on patch name
-	# Will create excluded stuff once it's needed
-	cd ${WORKDIR}
-	EPATCH_SUFFIX="patch" \
-	epatch ${PATCHDIR}
-	cd ${S}
-
-	# Security patches
-	epatch ${FILESDIR}/CVE-2006-1526-xrender-mitri.patch
-	epatch ${FILESDIR}/x11r6.9.0-setuid.diff
-
-	# Fix dual-head
-	epatch ${FILESDIR}/${PV}-fix-rom-read-dualhead.patch
-}
-
-host_def_setup() {
-	HOSTCONF="config/cf/host.def"
-
-	ebegin "Setting up ${HOSTCONF}"
-		cd ${S}; cp ${FILES_DIR}/site.def ${HOSTCONF} \
-			|| die "host.def copy failed"
-		echo "#define XVendorString \"Gentoo (The X.Org Foundation ${PV}, revision ${PR}-${PATCH_VER})\"" \
-			>> ${HOSTCONF}
-
-		# Pending http://bugs.gentoo.org/show_bug.cgi?id=49038 and
-		# http://freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=600
-		#
-		# Makes ld bail at link time on undefined symbols
-		# Suggested by Mike Harris <mharris@redhat.com>
-		#echo "#define SharedLibraryLoadFlags  -shared -Wl,-z,defs" \
-		#	>> ${HOSTCONF}
-
-		# Enable i810 on x86_64 (RH #126687)
-		if use amd64; then
-			echo "#define XF86ExtraCardDrivers i810" >> ${HOSTCONF}
-		fi
-
-		# FHS install locations
-		echo "#define ManDirectoryRoot /usr/share/man" >> ${HOSTCONF}
-		echo "#define DocDir /usr/share/doc/${PF}" >> ${HOSTCONF}
-		echo "#define FontDir /usr/share/fonts" >> ${HOSTCONF}
-		# Single quotes so FONTDIR doesn't get run
-		echo '#define FontEncDir $(FONTDIR)/encodings' >> ${HOSTCONF}
-		echo "#define BinDir /usr/bin" >> ${HOSTCONF}
-		echo "#define IncRoot /usr/include" >> ${HOSTCONF}
-		# This breaks the case when $(SYSTEMUSRINCDIR) = $(INCDIR)
-		# See xc/include/Imakefile
-		echo "#define LinkGLToUsrInclude NO" >> ${HOSTCONF}
-		# /usr/X11R6/lib/X11
-		echo "#define LibDir /usr/$(get_libdir)/X11" >> ${HOSTCONF}
-		# /usr/X11R6/lib with exception of /usr/X11R6/lib/X11
-		echo "#define UsrLibDir /usr/$(get_libdir)" >> ${HOSTCONF}
-
-		# Make man4 and man7 stuff get 'x' suffix like everything else
-		# Necessary so we can install to /usr/share/man without overwriting
-		echo "#define DriverManDir \$(MANSOURCEPATH)4" >> ${HOSTCONF}
-		echo "#define DriverManSuffix 4x /* use just one tab or cpp will die */" \
-			>> ${HOSTCONF}
-		echo "#define MiscManDir \$(MANSOURCEPATH)7" >> ${HOSTCONF}
-		echo "#define MiscManSuffix 7x /* use just one tab or cpp will die */" \
-			>> ${HOSTCONF}
-
-		# Don't build xterm -- use external (#54051)
-		echo "#define BuildXterm NO" >> ${HOSTCONF}
-
-		# Xwrapper has been removed so we now need to use the set uid server
-		# again, this mustve happened somewhere after 4.3.0 in the development.
-		echo "#define InstallXserverSetUID YES" >> ${HOSTCONF}
-		echo "#define BuildServersOnly NO" >> ${HOSTCONF}
-
-		# Don't use /lib64 if $(get_libdir) != lib64
-		# Replaces 0181_all_4.3.0-amd64-nolib64.patch
-		if [ "$(get_libdir)" == "lib64" ]; then
-			echo "#define HaveLib64 YES" >> ${HOSTCONF}
-			sed -i '/^#define Freetype2LibDir/s:^.*$:#define Freetype2LibDir /usr/lib64:' ${HOSTCONF}
-		else
-			echo "#define HaveLib64 NO" >> ${HOSTCONF}
-		fi
-
-		# Set location of DRM source to be installed
-		echo "#define InstSrcDir ${ROOT}/usr/src/${PF}" >> ${HOSTCONF}
-
-		if [ "$(gcc-major-version)" -eq "3" ]; then
-			if use x86; then
-				# Should fix bug #4189.  gcc 3.x have problems with
-				# -march=pentium4 and -march=athlon-tbird
-				# Seems fixed on 3.3 and higher
-				if [ "$(gcc-minor-version)" -le "2" ]; then
-					replace-cpu-flags pentium4 pentium3
-					replace-cpu-flags athlon athlon-tbird
-				fi
-
-				if [ "$(gcc-minor-version)" -eq "4" ]; then
-					if [ "$(gcc-micro-version)" -lt "4" ]; then
-						#to fix #57602 for now, thanks Spanky (broken sse2)
-						if test_flag -mno-sse2; then
-							append-flags -mno-sse2
-						fi
-						# (#75067) broken sse3
-						if test_flag -mno-sse3; then
-							append-flags -mno-sse3
-						fi
-					fi
-				fi
-
-				# Try a fix for #49310, see #50931 for more info. <spyderous>
-				if [ "$(is-flag -fomit-frame-pointer)" ]; then
-					replace-cpu-flags k6 k6-2 k6-3 i586
-				fi
-			fi
-
-			# Without this, modules breaks with gcc3
-			if [ "$(gcc-minor-version)" -eq "1" ]; then
-				append-flags "-fno-merge-constants"
-				append-flags "-fno-merge-constants"
-			fi
-
-			if [ "$(gcc-minor-version)" -eq "2" ]; then
-				if [ "$(gcc-micro-version)" -lt "2" ]; then
-					# Bug #12775 .. fails with -Os.
-					replace-flags "-Os" "-O2"
-				fi
-			elif [ "$(gcc-minor-version)" -lt "2" ]; then
-				# Bug #12775 .. fails with -Os.
-				replace-flags "-Os" "-O2"
-			fi
-		elif [ "$(gcc-major-version)" -lt "3" ]; then
-			# Bug #12775 .. fails with -Os.
-			replace-flags "-Os" "-O2"
-		fi
-
-		echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
-		echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-		echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-
-		if use static; then
-			echo "#define DoLoadableServer	NO" >>${HOSTCONF}
-		else
-			einfo "Setting DoLoadableServer to YES."
-			echo "#define DoLoadableServer  YES" >> ${HOSTCONF}
-
-			if has_hardened; then
-				echo "#define HardenedGccSpecs YES" >> ${HOSTCONF}
-			fi
-		fi
-
-		use_build debug XFree86Devel
-		use_build debug BuildDebug
-		use_build debug DebuggableLibraries
-
-		if ! use debug; then
-			# use less ram .. got this from Spider's makeedit.eclass :)
-			echo "#define GccWarningOptions -Wno-return-type -w" \
-				>> ${HOSTCONF}
-		fi
-
-		# Remove circular dep between pam and X11, bug #35468
-		# If pam is in USE and we have X11, then we can enable PAM
-#		if use pam && has_version x11-base/xorg-x11
-		if has_version x11-base/xorg-x11; then
-			# If you want to have optional pam support, do it properly ...
-			use_build pam HasPam
-			use_build pam HasPamMisc
-		fi
-
-		if use x86 || use alpha; then
-			# build with glide3 support? (build the tdfx_dri.o module)
-			if use 3dfx; then
-				echo "#define HasGlide3 YES" >> ${HOSTCONF}
-			fi
-# 			This won't work unless we can disable building the tdfx stuff
-# 			entirely :/
-#			use_build 3dfx HasGlide3
-		fi
-
-		# Do we want the glx extension? This will turn off XF86DRI if it's off.
-		# DRI can't build if glx isn't built, so keep this below DRI define.
-		# Do this before hppa so they can turn DRI off
-		use_build opengl BuildGlxExt
-		use_build opengl BuildGLXLibrary
-		use_build opengl BuildXF86DRI
-		# Needs GL headers
-		use_build opengl BuildGLULibrary
-
-
-
-		if use mips; then
-			echo "#define XF86CardDrivers fbdev newport" >> ${HOSTCONF}
-		fi
-
-		# Make xv optional for more minimal builds
-		use_build xv BuildXvLibrary
-		use_build xv BuildXvExt
-		# Depends on X11/extensions/Xv.h
-		use_build xv BuildXF86RushExt
-		use_build xv BuildXF86RushLibrary
-
-		if use hppa; then
-			echo "#define DoLoadableServer NO" >> ${HOSTCONF}
-			echo "#define BuildXF86DRI NO" >> config/cf/host.def
-			echo "#undef DriDrivers" >> config/cf/host.def
-			echo "#define XF86CardDrivers fbdev" >> config/cf/host.def
-			echo "#define BuildXvExt YES" >> config/cf/host.def
-		fi
-
-
-		if use alpha; then
-			echo "#define XF86CardDrivers mga nv tga s3virge sis rendition \
-				i740 tdfx cirrus tseng fbdev \
-				ati vga v4l glint s3 vesa" >> ${HOSTCONF}
-		fi
-
-		if use ppc; then
-			echo "#define XF86CardDrivers mga glint s3virge sis savage trident \
-				chips tdfx fbdev ati DevelDrivers vga nv imstt \
-				XF86OSCardDrivers XF86ExtraCardDrivers" >> ${HOSTCONF}
-		fi
-
-		if use ppc64; then
-			echo "#define MakeDllModules YES" >> ${HOSTCONF}
-			echo "#define XF86VgaHw YES" >> ${HOSTCONF}
-			echo "#define XF86FBDevHw YES" >> ${HOSTCONF}
-			echo "#define XF86CardDrivers mga fbdev v4l ati vga nv" >> ${HOSTCONF}
-		fi
-
-		if use sparc; then
-			echo "#define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 \
-			suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \
-			XF86OSCardDrivers XF86ExtraCardDrivers \
-			DevelDrivers" >> ${HOSTCONF}
-			if ( [ -e "${ROOT}/usr/src/linux" ] \
-				&& ! kernel_is "2" "6" ) \
-				|| [ "$(uname -r | cut -d. -f1,2)" != "2.6" ]; then
-				einfo "Avoid bug #46593 for sparc32-SMP with kernel 2.4.xx."
-				echo "/* Add a line to avoid bug #56593 on sparc32 */" >> \
-				  programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c
-			fi
-		fi
-
-		# The definitions for fontconfig
-		echo "#define UseFontconfig YES" >> ${HOSTCONF}
-		echo "#define HasFontconfig YES" >> ${HOSTCONF}
-
-		# Use the xorg Xft2 lib
-		echo "#define SharedLibXft YES" >> ${HOSTCONF}
-
-		# with USE="X doc' circular dep w/ virtual/ghostscript
-		# echo "#define HasGhostScript ${DOC}" >> ${HOSTCONF}
-		# Caused issues, basic docs aren't installed
-		use_build doc BuildLinuxDocPS
-		use_build doc BuildSpecsDocs
-		use_build doc BuildHtmlManPages
-		use_build doc InstallHardcopyDocs
-
-		# enable Japanese docs, optionally
-		use doc && use_build cjk InstallJapaneseDocs
-
-		# Native Language Support Fonts
-		use_build nls BuildCyrillicFonts
-		use_build nls BuildArabicFonts
-		use_build nls BuildGreekFonts
-		use_build nls BuildHebrewFonts
-		use_build nls BuildThaiFonts
-
-		if use nls; then
-			use_build cjk BuildCIDFonts
-			use_build cjk BuildJapaneseFonts
-			use_build cjk BuildKoreanFonts
-			use_build cjk BuildChineseFonts
-		fi
-
-		# Crappy bitmap fonts
-		use_build bitmap-fonts Build75DpiFonts
-		use_build bitmap-fonts Build100DpiFonts
-
-		# Type1 fonts
-		use_build type1-fonts BuildType1Fonts
-
-		# TrueType fonts
-		use_build truetype-fonts BuildTrueTypeFonts
-
-		# X Font Server
-		use_build font-server BuildFontServer
-
-		use_build insecure-drivers BuildDevelDRIDrivers
-
-		# (#134604) sunffb compile broken
-		use insecure-drivers \
-			&& echo "#define DevelDRIDrivers mach64 unichrome" \
-			>> ${HOSTCONF}
-
-		if use ipv6; then
-			# In case Gentoo ever works on a system with IPv6 sockets that don't
-			# also listen on IPv4 (see config/cf/X11.tmpl)
-			echo "#define PreferXdmcpIPv6 YES" >> ${HOSTCONF}
-		fi
-
-		use_build ipv6 BuildIPv6
-
-		if use minimal; then
-			# Don't build static libs
-			echo "#define ForceNormalLib NO" >> ${HOSTCONF}
-			# Turn back on needed ones
-			echo "#define NormalLibXau YES" >> ${HOSTCONF}
-
-			echo "#define BuildDPSLibraries NO" >> ${HOSTCONF}
-			echo "#define BuildClients NO" >> ${HOSTCONF}
-
-			# BuildClients doesn't catch things in xc/programs/Xserver
-			# Also had to add
-			# 9250_all_6.8.1.904-respect-xfree86configtools-setting.patch
-			echo "#define BuildXFree86ConfigTools NO" >> ${HOSTCONF}
-			echo "#define BuildLBX NO" >> ${HOSTCONF}
-
-			# Weird crap we don't need
-			echo "#define XF8_32Wid NO" >> ${HOSTCONF}
-			echo "#define XF8_32Bpp NO" >> ${HOSTCONF}
-			echo "#define XF8_16Bpp NO" >> ${HOSTCONF}
-			echo "#define XF24_32Bpp NO" >> ${HOSTCONF}
-
-			# Without nls, truetype-fonts, type1-fonts, we only build misc
-			# Now let's try to reduce what gets built in misc
-			# iso8859-1 has the "fixed" font
-			echo "#define BuildISO8859_2Fonts NO" >> ${HOSTCONF}
-			echo "#define BuildISO8859_3Fonts NO" >> ${HOSTCONF}
-			echo "#define BuildISO8859_4Fonts NO" >> ${HOSTCONF}
-			# 5 is cyrillic, 6 isn't in misc, 7 is greek, 8 is hebrew
-			echo "#define BuildISO8859_9Fonts NO" >> ${HOSTCONF}
-			echo "#define BuildISO8859_10Fonts NO" >> ${HOSTCONF}
-			# 11 is thai, 12 isn't in misc
-			echo "#define BuildISO8859_13Fonts NO" >> ${HOSTCONF}
-			echo "#define BuildISO8859_14Fonts NO" >> ${HOSTCONF}
-			echo "#define BuildISO8859_15Fonts NO" >> ${HOSTCONF}
-			echo "#define BuildISO8859_16Fonts NO" >> ${HOSTCONF}
-
-			echo "#define BuildDmx NO" >> ${HOSTCONF}
-			echo "#define XnestServer NO" >> ${HOSTCONF}
-			echo "#define XVirtualFramebufferServer NO" >> ${HOSTCONF}
-			echo "#define XInputDrivers mouse keyboard" >> ${HOSTCONF}
-
-				# If you want more drivers built with minimal, file a bug
-				# -Donnie Berkholz <spyderous@gentoo.org>
-			if use x86; then
-				# Remove glint, tga, s3, s3virge, rendition, neomagic, i740,
-				# cirrus, tseng, trident, chips, apm, ark, cyrix, siliconmotion
-				# mga, nv, sis, tdfx, savage, GlideDriver, i386Drivers
-				# (nsc, i810), ati, DevelDrivers, via
-				# Leave vmware driver for testing minimal setups using VMWare
-				# XF86OSCardDrivers includes v4l and fbdev on linux
-				# DevelDrivers includes imstt and newport on x86
-				echo "#define XF86CardDrivers vmware vesa vga dummy \
-					XF86OSCardDrivers XF86ExtraCardDrivers" >> ${HOSTCONF}
-			# (#93339)
-			elif use sparc; then
-				echo "#define XF86CardDrivers vesa vga fbdev sunffb suncg6 \
-					sunleo" >> ${HOSTCONF}
-			fi
-		fi
-
-		# Ajax is the man for getting this going for us
-		echo "#define ProPoliceSupport YES" >> ${HOSTCONF}
-
-		# Make xprint optional
-		use_build xprint BuildXprint
-		use_build xprint BuildXprintClients
-		# Build libXp even when xprint is off. It's just for clients, server
-		if ! use xprint; then
-			echo "#define BuildXprintLib YES" >> ${HOSTCONF}
-		fi
-
-	# End the host.def definitions here
-	eend 0
-}
-
-patch_setup() {
-	einfo "Excluding patches..."
-
-		patch_exclude 9020 9030
-		patch_exclude 9913 9914 9915 9920
-
-		# This patch is just plain broken. Results in random failures.
-		patch_exclude 0120*parallel-make
-
-		# Hardened patches (both broken)
-		patch_exclude 9960_all_4.3.0-exec-shield-GNU
-		patch_exclude 9961_all_4.3.0-libGL-exec-shield
-
-		# Xbox nvidia driver, patch is a total hack, tears apart xc/config/cf
-		# (#68726). Only apply when necessary so we don't screw other stuff up.
-		# 9990 is the driver, 9991 is xbox pci scanning (potentially useful)
-		if [ ! "${PROFILE_ARCH}" = "xbox" ]; then
-			patch_exclude 9990 9991
-		fi
-
-		# this patch comments out the Xserver line in xdm's config
-		# We only want it here
-		if ! use s390; then
-			patch_exclude 7500
-		fi
-
-	#	if ! use gatos; then
-	#		patch_exclude 9841_all_4.3.0-gatos-mesa
-	#	fi
-
-		if use debug; then
-			patch_exclude 5901*acecad-debug
-		fi
-
-		# TDFX_RISKY - 16-bit, 1024x768 or higher on low-memory voodoo3's
-		if use 3dfx && [ "${TDFX_RISKY}" = "yes" ]; then
-			patch_exclude 5850
-		else
-			patch_exclude 5851
-		fi
-
-		# Glibc-specific patches to exclude for non-glibc systems
-		if use elibc_FreeBSD || use elibc_OpenBSD; then
-			patch_exclude 0700
-		fi
-	einfo "Done excluding patches."
-}
-
-use_specific_hacks() {
-	# uclibc lacks sinf and cosf
-	if use uclibc; then
-		sed -i -e 's:GLXCLIENTDIRS = glxinfo glxgears:GLXCLIENTDIRS = :' \
-			${S}/programs/Imakefile
-	fi
-
-	# Get rid of cursor sets other than core and handhelds, saves ~4MB
-	if use minimal; then
-		 sed -i -e 's:SUBDIRS = redglass whiteglass handhelds:SUBDIRS = handhelds:' \
-			${S}/programs/xcursorgen/Imakefile
-	fi
-
-	cd ${S}
-	if use doc; then
-		# These are not included anymore as they are obsolete
-		local x
-		for x in ${S}/programs/Xserver/hw/xfree86/{XF98Conf.cpp,XF98Config}; do
-			if [ -f ${x} ]; then
-				sed -i '/Load[[:space:]]*"\(pex5\|xie\)"/d' ${x}
-			fi
-		done
-	fi
-}
-
-#################
-# src_compile() #
-#################
-
-build() {
-	# If a user defines the MAKE_OPTS variable in /etc/make.conf instead of
-	# MAKEOPTS, they'll redefine an internal xorg Makefile variable and the
-	# xorg build will silently die. This is tricky to track down, so I'm
-	# adding a preemptive fix for this issue by making sure that MAKE_OPTS is
-	# unset. (drobbins, 08 Mar 2003)
-	unset MAKE_OPTS
-
-	einfo "Building xorg-x11..."
-	if use debug; then
-		chmod u+x ${S}/config/util/makeg.sh
-		FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" MAKE="make" \
-			|| die "debug make World failed"
-	else
-		FAST=1 emake -j1 World WORLDOPTS="" MAKE="make" || die "make World failed"
-	fi
-
-	if use nls; then
-		emake -j1 -C ${S}/nls MAKE="make" || die "nls build failed"
-	fi
-}
-
-#################
-# src_install() #
-#################
-
-install_everything() {
-	unset MAKE_OPTS
-
-	einfo "Installing X.org X11..."
-	# gcc3 related fix.  Do this during install, so that our
-	# whole build will not be compiled without mmx instructions.
-	if [ "$(gcc-version)" != "2.95" ] && use x86; then
-		make install MAKE="make" DESTDIR=${D} \
-		|| make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \
-			CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \
-			install MAKE="make" DESTDIR=${D} || die "install failed"
-	else
-		make install MAKE="make" DESTDIR=${D} || die "install failed"
-	fi
-
-	if use sdk; then
-		einfo "Installing X.org X11 SDK..."
-		make install.sdk MAKE="make" DESTDIR=${D} || die "sdk install failed"
-	fi
-
-	if ! use minimal; then
-		einfo "Installing man pages..."
-		make install.man MAKE="make" DESTDIR=${D} || die "man page install failed"
-		einfo "Compressing man pages..."
-		prepman /usr
-	fi
-
-	if use nls; then
-		cd ${S}/nls
-		make MAKE="make" DESTDIR=${D} install || die "nls install failed"
-	fi
-	dodoc ${S}/RELNOTES
-}
-
-backward_compat_install() {
-	# Backwards compatibility for /usr/share move
-	dosym ../../share/fonts /usr/$(get_libdir)/X11/fonts
-
-	# Have the top-level libdir symlink made first, so real dirs don't get created
-	local DIR DIRS
-	if [ "lib" != "$(get_libdir)" ]; then
-		DIRS="${DIRS} $(get_libdir)"
-	fi
-	for DIR in ${DIRS}; do
-		dosym ../${DIR} /usr/X11R6/${DIR}
-	done
-
-	dosym ../../../share/doc/${PF} /usr/X11R6/$(get_libdir)/X11/doc
-}
-
-fix_permissions() {
-	# Fix permissions on locale/common/*.so
-	local x
-	for x in ${D}/usr/$(get_libdir)/X11/locale/$(get_libdir)/common/*.so*; do
-		if [ -f ${x} ]; then
-			fperms 0755 ${x/${D}}
-		fi
-	done
-
-	# Fix permissions on modules ...
-	for x in $(find ${D}/usr/$(get_libdir)/modules -name '*.o' -o -name '*.so'); do
-		if [ -f ${x} ]; then
-			fperms 0755 ${x/${D}}
-		fi
-	done
-
-	# Fix perms
-	if ! use minimal; then
-		fperms 755 /usr/$(get_libdir)/X11/xkb/geometry/sgi /usr/bin/dga
-	fi
-}
-
-zap_host_def_cflags() {
-	ebegin "Fixing $(get_libdir)/X11/config/host.def"
-		cp ${D}/usr/$(get_libdir)/X11/config/host.def ${T}
-		awk '!/OptimizedCDebugFlags|OptimizedCplusplusDebugFlags|GccWarningOptions/ {print $0}' \
-			${T}/host.def > ${D}/usr/$(get_libdir)/X11/config/host.def \
-			|| eerror "Munging host.def failed"
-		# theoretically, /usr/lib/X11/config is a possible candidate for
-		# config file management. If we find that people really worry about imake
-		# stuff, we may add it.  But for now, we leave the dir unprotected.
-	eend 0
-}
-
-add_euro_support() {
-	ebegin "Adding Euro support"
-		LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir)" \
-		${D}/usr/bin/bdftopcf -t ${WORKDIR}/Xlat9-8x14.bdf | \
-			gzip -9 > ${D}/usr/share/fonts/misc/Xlat9-8x14-lat9.pcf.gz
-		LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir)" \
-		${D}/usr/bin/bdftopcf -t ${WORKDIR}/Xlat9-9x16.bdf | \
-			gzip -9 > ${D}/usr/share/fonts/misc/Xlat9-9x16-lat9.pcf.gz
-		LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir)" \
-		${D}/usr/bin/bdftopcf -t ${WORKDIR}/Xlat9-10x20.bdf | \
-			gzip -9 > ${D}/usr/share/fonts/misc/Xlat9-10x20-lat9.pcf.gz
-	eend 0
-}
-
-setup_standard_symlinks() {
-	# Standard symlinks
-	dodir /usr/{bin,include,$(get_libdir)}
-	dosym ../bin /usr/bin/X11
-	# Stop complains about "file or directory not existing"
-	dodir /usr/X11R6
-	dosym ../include /usr/X11R6/include
-	dosym ../../usr/$(get_libdir)/X11/xkb /etc/X11/xkb
-
-	# Some critical directories
-	if ! use minimal; then
-		keepdir /var/lib/xdm
-		dosym ../../../var/lib/xdm /etc/X11/xdm/authdir
-	fi
-
-	# Backwards compat, FHS, etc.
-	dosym ../../usr/X11R6/bin/Xorg /etc/X11/X
-}
-
-libtool_archive_install() {
-	if use opengl; then
-		# .la files for libtool support
-		insinto /usr/$(get_libdir)
-		# (#67729) Needs to be lib, not $(get_libdir)
-		doins ${FILES_DIR}/lib/*.la
-	fi
-}
-
-fix_libtool_libdir_paths() {
-	local dirpath
-	for archive in ${*} ; do
-		dirpath=$(dirname ${archive} | sed -e "s:^${D}::")
-		[[ ${dirpath::1} == "/" ]] || dirpath="/"${dirpath}
-		sed -i ${archive} -e "s:^libdir.*:libdir=\'${dirpath}\':"
-	done
-}
-
-compose_files_install() {
-	# Hack from Mandrake (update ours that just created Compose files for
-	# all locales)
-	local x
-	for x in $(find ${D}/usr/$(get_libdir)/X11/locale/ -mindepth 1 -type d); do
-		# make empty Compose files for some locales
-		# CJK must not have that file (otherwise XIM don't works some times)
-		case $(basename ${x}) in
-			C|microsoft-*|iso8859-*|koi8-*)
-				if [ ! -f ${x}/Compose ]; then
-					touch ${x}/Compose
-				fi
-				;;
-			ja*|ko*|zh*)
-				if [ -r ${x}/Compose ]; then
-					rm -f ${x}/Compose
-				fi
-				;;
-		esac
-	done
-
-	# Another hack from Mandrake -- to fix dead + space for the us
-	# international keyboard
-	local i
-	for i in ${D}/usr/$(get_libdir)/X11/locale/*/Compose; do
-		sed -i \
-			-e 's/\(<dead_diaeresis> <space>\).*$/\1 : "\\"" quotedbl/' \
-			-e "s/\(<dead_acute> <space>\).*$/\1 : \"'\" apostrophe/" ${i} \
-			|| eerror "sed ${i} failed"
-	done
-}
-
-encode_xfsft_files() {
-	# Yet more Mandrake
-	ebegin "Encoding files for xfsft font server"
-		dodir /usr/share/fonts/encodings
-		cp -pPR ${WORKDIR}/usr/share/fonts/encodings/* \
-			${D}/usr/share/fonts/encodings
-
-		for x in ${D}/usr/share/fonts/encodings/{.,large}/*.enc; do
-			if [ -f "${x}" ]; then
-				gzip -9 -f ${x} \
-					|| eerror "gzipping ${x} failed"
-			fi
-		done
-	eend 0
-}
-
-koi8_fonts_install() {
-	ebegin "Adding gemini-koi8 fonts"
-		cd ${WORKDIR}/ukr
-		gunzip *.Z || eerror "gunzipping gemini-koi8 fonts failed"
-		gzip -9 *.pcf || eerror "gzipping gemini-koi8 fonts failed"
-		cd ${S}
-		cp -pPR ${WORKDIR}/ukr ${D}/usr/share/fonts \
-			|| eerror "copying gemini-koi8 fonts failed"
-	eend 0
-}
-
-etc_files_install() {
-	insinto /etc/X11
-
-	# Install example config file
-	newins ${S}/programs/Xserver/hw/xfree86/xorg.conf xorg.conf.example
-
-	exeinto /etc/X11
-	# new session management script
-	doexe ${FILES_DIR}/chooser.sh
-	# new display manager script
-	doexe ${FILES_DIR}/startDM.sh
-	exeinto /etc/X11/Sessions
-	# doexe skips directories, so this should be safe
-	doexe ${FILES_DIR}/Sessions/*
-	insinto /etc/env.d
-	doins ${FILES_DIR}/10xorg
-	insinto /etc/X11/xinit
-	doins ${FILES_DIR}/xinitrc
-	if ! use minimal; then
-		exeinto /etc/X11/xdm
-		doexe ${FILES_DIR}/Xsession
-		exeinto /etc/init.d
-		newexe ${FILES_DIR}/xdm.start xdm
-	fi
-	if use font-server; then
-		insinto /etc/X11/fs
-		newins ${FILES_DIR}/xfs.config config
-	fi
-	if use pam; then
-		insinto /etc/pam.d
-		newins ${FILES_DIR}/xdm.pamd xdm
-		# Need to fix console permissions first
-		newins ${FILES_DIR}/xserver.pamd xserver
-	fi
-	if use font-server; then
-		newexe ${FILES_DIR}/xfs.start xfs
-		insinto /etc/conf.d
-		newins ${FILES_DIR}/xfs.conf.d xfs
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving libGL and friends for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${PN}/{lib,extensions,include}
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/libGL.so* \
-			${D}/usr/$(get_libdir)/libGL.la \
-			${D}/usr/$(get_libdir)/libGL.a; do
-			if [ -f ${x} -o -L ${x} ]; then
-				# libGL.a cause problems with tuxracer, etc
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/lib
-			fi
-		done
-			for x in ${D}/usr/$(get_libdir)/modules/extensions/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/extensions
-			fi
-		done
-		# glext.h added for #54984
-		for x in ${D}/usr/include/GL/{gl.h,glx.h,glxtokens.h,glext.h,glxext.h,glxmd.h,glxproto.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/include
-			fi
-		done
-	eend 0
-}
-
-cursor_install() {
-	# Make the core cursor the default.  People seem not to like whiteglass
-	# for some reason.
-	dosed 's:whiteglass:core:' /usr/share/cursors/${PN}/default/index.theme
-
-	if ! use minimal; then
-		install_extra_cursors
-	fi
-}
-
-strip_execs() {
-	if use debug || has nostrip ${FEATURES}; then
-		ewarn "Debug build turned on by USE=debug or FEATURES=nostrip"
-		ewarn "NOT stripping binaries and libraries"
-	else
-		local STRIP
-		if [ ! -z "${CBUILD}" ] && [ "${CBUILD}" != "${CHOST}" ]; then
-			STRIP=${CHOST}-strip
-		else
-			STRIP=strip
-		fi
-		einfo "Stripping binaries and libraries..."
-		# This bit I got from Redhat ... strip binaries and drivers ..
-		# NOTE:  We do NOT want to strip the drivers, modules or DRI modules!
-		local x
-		for x in $(find ${D}/ -type f -perm +0111 -exec file {} \; | \
-		           grep -v ' shared object,' | \
-		           sed -n -e 's/^\(.*\):[  ]*ELF.*, not stripped/\1/p'); do
-			if [ -f ${x} ]; then
-				# Dont do the modules ...
-				if [ "${x/\/usr\/$(get_libdir)\/modules}" = "${x}" ]; then
-					echo "$(echo ${x/${D}})"
-					${STRIP} ${x} || :
-				fi
-			fi
-		done
-		# Now do the libraries ...
-		for x in ${D}/usr/{$(get_libdir),$(get_libdir)/opengl/${PN}/lib}/*.so.* \
-			$(get_libdir)/X11/locale/$(get_libdir)/common}/*.so.*; do
-			if [ -f ${x} ]; then
-				echo "$(echo ${x/${D}})"
-				${STRIP} --strip-debug ${x} || :
-			fi
-		done
-	fi
-}
-
-install_extra_cursors() {
-	# Install TaD's gentoo cursors
-	insinto /usr/share/cursors/${PN}/gentoo/cursors
-	doins ${WORKDIR}/cursors/gentoo/cursors/*
-	insinto /usr/share/cursors/${PN}/gentoo-blue/cursors
-	doins ${WORKDIR}/cursors/gentoo-blue/cursors/*
-	insinto /usr/share/cursors/${PN}/gentoo-silver/cursors
-	doins ${WORKDIR}/cursors/gentoo-silver/cursors/*
-}
-
-minimal_install() {
-		# Get rid of all unnecessary fonts (saves ~5.5 MB)
-		find ${D}/usr/share/fonts/misc/ -name '*.pcf.gz' \
-			-not -name '*6x13*' -not -name 'cursor.pcf.gz' -exec rm {} \;
-		# Woohoo, another 772K
-		rm -rf ${D}/usr/share/doc
-}
-
-xprint_install() {
-	# If we want xprint, save the init script before deleting /etc/rc.d/
-	# Requested on #68316
-	if use xprint; then
-		xprint_init_install
-	else
-		# delete xprint stuff
-		rm -f ${D}/etc/{init,profile}.d/xprint*
-		rmdir --ignore-fail-on-non-empty ${D}/etc/{init,profile}.d
-	fi
-
-	# Remove the /etc/rc.d nonsense -- not everyone is RedHat
-	rm -rf ${D}/etc/rc.d
-}
-
-xprint_init_install() {
-	# RH-style init script, we provide a wrapper
-	exeinto /usr/$(get_libdir)/misc
-	doexe ${D}/etc/init.d/xprint
-	rm -f ${D}/etc/init.d/xprint
-	# Install the wrapper
-	newinitd ${FILES_DIR}/xprint.init xprint
-	# patch profile scripts
-	sed -i -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint get_xpserverlist:g" ${D}/etc/profile.d/xprint*
-	# move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc ${D}/etc/profile.d/xprint*
-	rm -f ${D}/etc/profile.d/xprint*
-}
-
-config_files_install() {
-
-	# Fix default config files after installing fonts to /usr/share/fonts
-	sed -i -e "s:/usr/X11R6/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \
-		-e "s:/usr/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \
-		-e "s:/usr/$(get_libdir)/fonts:/usr/share/fonts:g" \
-		${D}/etc/X11/xorg.conf.example
-	if use font-server; then
-		sed -i "s:/usr/X11R6/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \
-			${D}/etc/X11/fs/config
-	fi
-
-	# Work around upgrade problem where people have
-	# Option "XkbRules" "xfree86" in their config file
-	sed -i "s:^.*Option.*"XkbRules".*$::g" ${D}/etc/X11/xorg.conf.example
-}
-
-fix_opengl_symlinks() {
-	# Remove invalid symlinks
-	local LINK
-	for LINK in $(find ${D}/usr/$(get_libdir) \
-		-name libGL.* -type l); do
-		rm -f ${LINK}
-	done
-	# Create required symlinks
-	dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so
-	dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1
-}
-
-#################
-# pkg_preinst() #
-#################
-
-# We need a symlink /usr/X11R6/dir -> /usr/dir so all the packages
-# whose files we move don't lose track of them. As such, we need
-# _absolutely nothing_ in /usr/X11R6/dir so we can make such a symlink.
-# Donnie Berkholz <spyderous@gentoo.org> 20 October 2004
-#
-# Takes two arguments -- starting location and ending location
-migrate() {
-	einfo "Migrating from ${1} to ${2}..."
-
-	# Strip trailing slash
-	if [ -z "${1##*/}" ]; then
-		set -- ${1%/} ${2}
-	fi
-
-	if [ -e ${ROOT}${1} ]; then
-		# If it's not a symlink (in other words, it should be a directory)
-		if [ ! -L ${ROOT}${1} ]; then
-			einfo "  ${1} isn't a symlink, migrating..."
-			# Move everything
-				rsync \
-					--archive \
-					--update \
-					--links \
-					--hard-links \
-					--ignore-existing \
-					--stats \
-					--progress \
-					--verbose \
-					${ROOT}${1}/ ${ROOT}${2} > ${T}/migrate-${1//\//-}.log 2>&1
-
-				check_migrate_return
-				remove_migrated_files ${1}
-
-			if [ -e "${ROOT}${1}" ]; then
-				# Remove any floating .keep files so we can run rmdir
-				find ${ROOT}${1} -name '\.keep' -exec rm -f {} \;
-				# Get rid of the directory
-				rmdir ${ROOT}${1}
-			fi
-
-			make_symlinks ${1}
-		else
-			ewarn "    ${1} is a symlink, not migrating"
-		fi
-	else
-		ewarn "  ${1} doesn't exist, not migrating"
-		make_symlinks ${1}
-	fi
-}
-
-check_migrate_return() {
-	MIGRATE_RETURN="$?"
-	if [ "${MIGRATE_RETURN}" -eq "0" ]; then
-		einfo "rsync successful!"
-	else
-		die "rsync failed. Exit code: ${MIGRATE_RETURN}."
-	fi
-
-	# Migration fubars lib symlinks -- eradicator
-	if use amd64; then
-		if [[ -L ${ROOT}usr/lib64 ]]; then
-			rm ${ROOT}usr/lib64
-			ln -s lib ${ROOT}usr/lib64
-		elif [[ -L ${ROOT}usr/lib ]]; then
-			rm -f ${ROOT}usr/lib
-			ln -s lib64 ${ROOT}usr/lib
-		elif [[ -L ${ROOT}usr/lib32 ]]; then
-			if has_multilib_profile; then
-			ln -s lib ${ROOT}usr/lib32
-			else
-				ln -s ../emul/linux/x86/usr/lib ${ROOT}usr/lib32
-			fi
-		fi
-	fi
-}
-
-remove_migrated_files() {
-	# This is a copy instead of a move, so we need to get rid of what
-	# we copied. This is a little risky if it fails, so just do it on
-	# success.
-
-	# DO NOT proceed if we don't have an argument, or we kill root filesystem
-	if [ -z "${1}" ]; then
-		die "No argument to remove_migrated_files(). Want to `rm -rf ${ROOT}`?"
-	fi
-
-	if [ "${MIGRATE_RETURN}" -eq "0" ]; then
-#		rm -rfv ${ROOT}${1} > ${T}/migrate-remove-${1//\//-}.log 2>&1
-		rm -rfv ${ROOT}${1}
-	fi
-}
-
-make_symlinks() {
-			# Put a symlink in its place
-
-			# Special case: lib != libdir
-			if [ "${1##*/}" = "$(get_libdir)" -a "$(get_libdir)" != "lib" ]; then
-				einfo "    Symlinking ${ROOT}usr/X11R6/lib -> $(get_libdir)"
-				ln -s $(get_libdir) ${ROOT}usr/X11R6/lib
-			# Special case: fonts
-			elif [ "${1##*/}" = "fonts" ]; then
-				einfo "    Symlinking ${ROOT}${1} -> ../../share/fonts"
-				ln -s ../../share/fonts ${ROOT}${1}
-			# Special case: X11R6
-			elif [ "${1##*/}" = "X11R6" ]; then
-				einfo "    Symlinking ${ROOT}${1} -> ../usr"
-				ln -s ../usr ${ROOT}${1}
-			else
-				einfo "    Symlinking ${ROOT}${1} -> ../${1##*/}"
-				ln -s ../${1##*/} ${ROOT}${1}
-			fi
-}
-
-update_config_files() {
-	# Fix any installed config files for installing fonts to /usr/share/fonts
-	# This *needs* to be after all other installation so files aren't
-	# overwritten.
-
-	if [ "${ROOT}" = "/" ]; then
-		einfo "Preparing any installed configuration files for font move..."
-		FILES="/etc/X11/xorg.conf
-			/etc/X11/XF86Config-4
-			/etc/X11/XF86Config"
-		if use font-server; then
-			FILES="${FILES} /etc/X11/fs/config"
-		fi
-		#	/etc/fonts/fonts.conf
-		#	/etc/fonts/local.conf
-
-		local FILE
-		for FILE in ${FILES}; do
-			if [ -e ${FILE} ]; then
-				# New font paths
-				sed "s,/usr/X11R6/$(get_libdir)/X11/fonts,/usr/share/fonts,g" \
-					${ROOT}${FILE} > ${IMAGE}${FILE}
-
-				if [ "${FILE}" = "/etc/X11/xorg.conf" ] \
-					|| [ "${FILE}" = "/etc/X11/XF86Config" ] \
-					|| [ "${FILE}" = "/etc/X11/XF86Config-4" ]; then
-					# "keyboard" driver is deprecated and will be removed,
-					# switch to "kbd"
-					sed -i 's~^\([ \t]*Driver[ \t]\+\)"[kK]eyboard"~\1"kbd"~' \
-						${IMAGE}${FILE}
-
-					# This moved in the /usr/X11R6/libdir -> /usr/libdir change
-					sed -i \
-						-e 's~^\([ \t]*RgbPath[ \t]\+\)"/usr/X11R6/$(get_libdir)/X11/rgb"~\1"/usr/$(get_libdir)/X11/rgb"~' \
-						-e 's~^\([ \t]*RgbPath[ \t]\+\)"/usr/X11R6/lib/X11/rgb"~\1"/usr/lib/X11/rgb"~' \
-						${IMAGE}${FILE}
-
-					# Work around upgrade problem where people have
-					# Option "XkbRules" "xfree86" in their config file
-					sed -i "s:^.*Option.*\"XkbRules\".*$::g" \
-						${IMAGE}${FILE}
-				fi
-			fi
-		done
-	fi
-}
-
-cleanup_fonts() {
-	local G_FONTDIRS
-	G_FONTDIRS="Speedo encodings local misc util"
-	if use truetype-fonts; then
-		G_FONTDIRS="${G_FONTDIRS} TTF"
-	fi
-	if use type1-fonts; then
-		G_FONTDIRS="${G_FONTDIRS} Type1"
-	fi
-	if use cjk; then
-		G_FONTDIRS="${G_FONTDIRS} CID"
-	fi
-	if use bitmap-fonts; then
-		G_FONTDIRS="${G_FONTDIRS} 75dpi 100dpi"
-	fi
-	if use nls; then
-		G_FONTDIRS="${G_FONTDIRS} cyrillic ukr"
-	fi
-
-	for G_FONTDIR in ${G_FONTDIRS}; do
-		# clean out old fonts.* and encodings.dir files, as we
-		# will regenerate them
-		# Not Speedo or CID, as their fonts.scale files are "real"
-		if [ "${G_FONTDIR}" != "CID" -a "${G_FONTDIR}" != "Speedo" ]; then
-			find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'fonts.*' \
-				-o -name 'encodings.dir' -exec rm -fv {} \;
-		fi
-	done
-
-	# Get rid of deprecated directories so our symlinks in the same location
-	# work -- users shouldn't be placing fonts here so that should be fine,
-	# they should be using ~/.fonts or /usr/share/fonts. <spyderous>
-	remove_font_dirs
-}
-
-remove_font_dirs() {
-	if [ -e ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts ]; then
-		if [ ! -L ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts ]; then
-			local G_FONTDIR
-			for G_FONTDIR in ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts/*; do
-				if [ -L "${G_FONTDIR}" ]; then
-					einfo "Removing ${G_FONTDIR} symlink."
-					rm -rfv ${G_FONTDIR}
-				else
-					ewarn "${G_FONTDIR} not a symlink, moving to /usr/share/fonts"
-					if [ -d ${G_FONTDIR} ]; then
-						if [ ! -e /usr/share/fonts/${G_FONTDIR##*/} ]; then
-							einfo "Moving ${G_FONTDIR} to /usr/share/fonts/."
-							mv ${G_FONTDIR} /usr/share/fonts/
-						else
-							ewarn "/usr/share/fonts/${G_FONTDIR##*/} exists. Remove it and try again."
-						fi
-					else
-						ewarn "${G_FONTDIR} does not exist."
-					fi
-				fi
-			done
-		fi
-	else
-		ewarn "${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts does not exist."
-	fi
-}
-
-move_app_defaults_to_etc() {
-	if [ -L ${ROOT}/etc/X11/app-defaults ]; then
-		rm -f ${ROOT}/etc/X11/app-defaults
-	fi
-
-	if [ ! -L ${ROOT}/usr/$(get_libdir)/app-defaults ] \
-		&& [ -d ${ROOT}/usr/$(get_libdir)/app-defaults ]; then
-		if [ ! -d ${ROOT}/etc/X11/app-defaults ]; then
-			mkdir -p ${ROOT}/etc/X11/app-defaults
-		fi
-
-		mv -f ${ROOT}/usr/$(get_libdir)/app-defaults ${ROOT}/etc/X11
-	fi
-}
-
-move_xkb_to_usr() {
-	if [ -L ${ROOT}/usr/$(get_libdir)/xkb ]; then
-		rm -f ${ROOT}/usr/$(get_libdir)/xkb
-	fi
-
-	if [ ! -L ${ROOT}/etc/X11/xkb ] \
-		&& [ -d ${ROOT}/etc/X11/xkb ]; then
-		if [ ! -d ${ROOT}/usr/$(get_libdir)/xkb ]; then
-			mkdir -p ${ROOT}/usr/$(get_libdir)
-		fi
-
-	    mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/$(get_libdir)
-	fi
-}
-
-dynamic_libgl_preinst() {
-	# clean the dynamic libGL stuff's home to ensure
-	# we don't have stale libs floating around
-	if [ -d ${ROOT}/usr/$(get_libdir)/opengl/${PN} ]; then
-		rm -rf ${ROOT}/usr/$(get_libdir)/opengl/${PN}/*
-	fi
-
-	# make sure we do not have any stale files lying around
-	# that could break things. Check old and new locations.
-	rm -f ${ROOT}/usr/X11R6/$(get_libdir)/libGL\.* \
-		${ROOT}/usr/$(get_libdir)/libGL\.*
-}
-
-##################
-# pkg_postinst() #
-##################
-
-font_setup() {
-	umask 022
-
-	# These cause ttmkfdir to segfault :/
-	rm -f ${ROOT}/usr/share/fonts/encodings/iso8859-6.8x.enc.gz
-	rm -f ${ROOT}/usr/share/fonts/encodings/iso8859-6.16.enc.gz
-#	rm -f ${ROOT}/usr/share/fonts/encodings/large/cns11643-1.enc
-#	rm -f ${ROOT}/usr/share/fonts/encodings/large/cns11643-2.enc
-#	rm -f ${ROOT}/usr/share/fonts/encodings/large/cns11643-3.enc
-#	rm -f ${ROOT}/usr/share/fonts/encodings/suneu-greek.enc
-
-	# ********************************************************************
-	#  A note about fonts and needed files:
-	#
-	#  1)  Create /usr/share/fonts/encodings/encodings.dir
-	#
-	#  2)  Create fonts.scale for TrueType fonts (need to do this before
-	#      we create fonts.dir files, else fonts.dir files will be
-	#      invalid for TrueType fonts...)
-	#
-	#  3)  Now Generate fonts.dir files.
-	#
-	#  CID fonts is a bit more involved, but as we do not install any,
-	#  thus I am not going to bother.
-	#
-	#  <azarah@gentoo.org> (20 Oct 2002)
-	#
-	# ********************************************************************
-
-	ebegin "Generating encodings.dir"
-		# Create the encodings.dir in /usr/share/fonts/encodings
-		LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
-		${ROOT}/usr/bin/mkfontdir -n \
-			-e ${ROOT}/usr/share/fonts/encodings \
-			-e ${ROOT}/usr/share/fonts/encodings/large \
-			-- ${ROOT}/usr/share/fonts/encodings
-
-	eend 0
-
-	ebegin "Creating fonts.scale files"
-		local x
-		for x in $(find ${ROOT}/usr/share/fonts/* -maxdepth 1 -type d); do
-			[ -z "$(ls ${x}/)" ] && continue
-			[ "$(ls ${x}/)" = "fonts.cache-1" ] && continue
-
-			# Only generate .scale files if truetype, opentype or type1
-			# fonts are present ...
-
-			# First truetype (ttf,ttc)
-			# NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
-			# Also, there is no way to regenerate Speedo/CID fonts.scale
-			# <spyderous@gentoo.org> 2 August 2004
-			if [ "${x/encodings}" = "${x}" -a \
-				-n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then
-				if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then
-					LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
-					${ROOT}/usr/bin/ttmkfdir -x 2 \
-						-e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
-						-o ${x}/fonts.scale -d ${x}
-					# ttmkfdir fails on some stuff, so try mkfontscale if it does
-					local ttmkfdir_return=$?
-				else
-					# We didn't use ttmkfdir at all
-					local ttmkfdir_return=2
-				fi
-				if [ ${ttmkfdir_return} -ne 0 ]; then
-					LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
-					${ROOT}/usr/bin/mkfontscale \
-						-a /usr/share/fonts/encodings/encodings.dir \
-						-- ${x}
-				fi
-			# Next type1 and opentype (pfa,pfb,otf,otc)
-			elif [ "${x/encodings}" = "${x}" -a \
-				-n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then
-				LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
-				${ROOT}/usr/bin/mkfontscale \
-					-a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
-					-- ${x}
-			fi
-		done
-	eend 0
-
-	ebegin "Generating fonts.dir files"
-		for x in $(find ${ROOT}/usr/share/fonts/* -maxdepth 1 -type d); do
-			[ -z "$(ls ${x}/)" ] && continue
-			[ "$(ls ${x}/)" = "fonts.cache-1" ] && continue
-
-			if [ "${x/encodings}" = "${x}" ]; then
-				LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
-				${ROOT}/usr/bin/mkfontdir \
-					-e ${ROOT}/usr/share/fonts/encodings \
-					-e ${ROOT}/usr/share/fonts/encodings/large \
-					-- ${x}
-			fi
-		done
-	eend 0
-
-	ebegin "Generating Xft cache"
-		for x in $(find ${ROOT}/usr/share/fonts/* -maxdepth 1 -type d); do
-			[ -z "$(ls ${x}/)" ] && continue
-			[ "$(ls ${x}/)" = "fonts.cache-1" ] && continue
-
-			# Only generate XftCache files if there are truetype
-			# fonts present ...
-			if [ "${x/encodings}" = "${x}" -a \
-			     -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ]; then
-				LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
-				${ROOT}/usr/bin/xftcache ${x} &> /dev/null
-			fi
-		done
-	eend 0
-
-	ebegin "Fixing permissions"
-		find ${ROOT}/usr/share/fonts/ -type f -name 'font.*' \
-			-exec chmod 0644 {} \;
-	eend 0
-
-	# danarmak found out that fc-cache should be run AFTER all the above
-	# stuff, as otherwise the cache is invalid, and has to be run again
-	# as root anyway
-	if [ -x ${ROOT}/usr/bin/fc-cache ]; then
-		ebegin "Creating FC font cache"
-			HOME="/root" ${ROOT}/usr/bin/fc-cache
-		eend 0
-	fi
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-		local opengl_implem="$(${ROOT}/usr/sbin/opengl-update --get-implementation)"
-		${ROOT}/usr/sbin/opengl-update --use-old ${PN}
-}
-
-remove_old_compose_files() {
-	for x in $(find ${ROOT}/usr/$(get_libdir)/X11/locale/ -mindepth 1 -type d); do
-		# Remove old compose files we might have created incorrectly
-		# CJK must not have that file (otherwise XIM don't works some times)
-		case $(basename ${x}) in
-			ja*|ko*|zh*)
-				if [ -r "${x}/Compose" ]; then
-					rm -f ${x}/Compose
-				fi
-				;;
-		esac
-	done
-}
-
-setup_tmp_files() {
-	# These need to be owned by root and the correct permissions
-	# (bug #8281)
-	local x=""
-	for x in ${ROOT}/tmp/.{ICE,X11}-unix; do
-		if [ ! -d ${x} ]; then
-			mkdir -p ${x}
-		fi
-
-		chown root:wheel ${x}
-		chmod 1777 ${x}
-	done
-}
-
-print_info() {
-	echo
-	einfo "Please note that the xcursors are in /usr/share/cursors/${PN}."
-	einfo "Any custom cursor sets should be placed in that directory."
-	echo
-	einfo "If you wish to set system-wide default cursors, please create"
-	einfo "/usr/local/share/cursors/${PN}/default/index.theme"
-	einfo "with content: \"Inherits=theme_name\" so that future"
-	einfo "emerges will not overwrite those settings."
-	echo
-	einfo "Listening on TCP is disabled by default with startx."
-	einfo "To enable it, edit /usr/bin/startx."
-	echo
-
-	einfo "If you have a Radeon, set this option for direct rendering:"
-	einfo "Option \"ColorTiling\" \"false\""
-	einfo "The Mesa in these developmental snapshots is out of date."
-	echo
-	einfo "Binary drivers may be broken in >=6.8.99.8."
-	einfo "See https://bugs.freedesktop.org/show_bug.cgi?id=3066."
-
-	# (#76985)
-	einfo "Visit http://www.gentoo.org/doc/en/index.xml?catid=desktop"
-	einfo "for more information on configuring X."
-
-	# Try to get people to read this, pending #11359
-	ebeep 5
-	epause 10
-}
-
-fix_links() {
-	# Fix problematic links
-	if [ -x ${ROOT}/usr/bin/Xorg ]; then
-		ln -snf ../bin ${ROOT}/usr/bin/X11
-	fi
-}