Add new ebuilds for security bug #532086.
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
Thu, 8 Jan 2015 15:55:44 +0000 (15:55 +0000)
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
Thu, 8 Jan 2015 15:55:44 +0000 (15:55 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2324E7B566DF2611!

x11-base/xorg-server/ChangeLog
x11-base/xorg-server/Manifest
x11-base/xorg-server/xorg-server-1.12.4-r3.ebuild [new file with mode: 0644]
x11-base/xorg-server/xorg-server-1.15.2-r1.ebuild [new file with mode: 0644]
x11-base/xorg-server/xorg-server-1.16.3-r1.ebuild [new file with mode: 0644]
x11-base/xorg-server/xorg-server-1.16.3.ebuild [new file with mode: 0644]

index 62d5cfc81f6e7ac45d4eae09762dcc4c6b79a155..8fe13ecb5febf5f61d6f07d4668dbfebda74a649 100644 (file)
@@ -1,6 +1,16 @@
 # ChangeLog for x11-base/xorg-server
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.806 2014/12/11 10:08:41 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.807 2015/01/08 15:55:31 chithanh Exp $
+
+*xorg-server-1.15.2-r1 (08 Jan 2015)
+*xorg-server-1.16.3 (08 Jan 2015)
+*xorg-server-1.16.3-r1 (08 Jan 2015)
+*xorg-server-1.12.4-r3 (08 Jan 2015)
+
+  08 Jan 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xorg-server-1.12.4-r3.ebuild, +xorg-server-1.15.2-r1.ebuild,
+  +xorg-server-1.16.3-r1.ebuild, +xorg-server-1.16.3.ebuild:
+  Add new ebuilds for security bug #532086.
 
 *xorg-server-1.16.2.901-r1 (11 Dec 2014)
 
index b717991498a0b5795d365af8168abbf4e72139bd..16a5cd342947d822cd3a6489f15cd89267d453fc 100644 (file)
@@ -25,6 +25,7 @@ AUX xorg-server-glapi_c.patch 2215 SHA256 5f59b883d49f53d2f6f71cbbf5e4ef74bdf545
 AUX xorg-sets.conf 199 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 WHIRLPOOL 4acac88e1688ea71df59a86a8a188b5369ad05f61e1369cd620eecd754511578e961a537ff6d0b22156f671d3485289cbc941dfe83bea24a27329b7bebb46c7d
 DIST xorg-server-1.10.6.tar.bz2 5406712 SHA256 c4da5a97b6986688efe74bc9bff6a38795977019ac032dd6d787abad32c50682 SHA512 91913cba2549c73f8ea3c23bbc48eaf2d4e392403b73da0f51fd4ed94a135081003c0600df653aaa3e420b30c57da58f3b25d7b8424898870c89a5b419c457f1 WHIRLPOOL 45b26330d2bc1d6bdc1e9ef66226a7e26127ed2b0ef9eb16efdc852174d789a43ea576c8f9df9685900180c8b08a55a244ee61a3d610732ad468064f576f617b
 DIST xorg-server-1.11.4.tar.bz2 4900810 SHA256 3e2935bc400612df58d5b5e6840829e2c63af02c2e7d2893092500358a4366fc SHA512 29013ffd51ff1b6a2b5679580c490d68dc5feaebdc9201a2812a410761200f5468de76c8791ab089950504be649e61f2cccb705587fde66eef1bcd3461f537ed WHIRLPOOL f1a5db2396cf1b490542c65177e047b37b636706b2d7e2bc15ef1ba527d2c7afd58669b99b83e7c2d2b7c1994f8603ebfe63419d2d924a75f4032afbe6806f26
+DIST xorg-server-1.12-cve-2014-8091..8103.patches.tar.xz 14832 SHA256 a98fd1589ef92d6f8a633326d387f2f203df72452788a6aaa2bcd4242700fe7f SHA512 2ac18d36cd8b6d9fcaf98a32e3e6b9107e420476e066a4ac9581f12e9afb7e397614761373a20d96c8fa840886b81ee0ec5cfc812e16876b4922bf6c5fe3f736 WHIRLPOOL 5c3ddd654fdecf3285d865b4b864bcaa3de87cd6005f8d500da4250b5b659db69e103743109ec3c72cb79abf24910b6de4ac05c0a7b7bcb2656d5a95c9703d38
 DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 SHA512 70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85 WHIRLPOOL bfee61329ca85ecedb991ca933de6e3a1e94e34a04d9a723a0e9c90a36e067824701c38e8a0034498ed28dfca82eb653d1e1ab5c0223020f5da69cbbf80bbf98
 DIST xorg-server-1.13.4.tar.bz2 5506293 SHA256 a2c969887f3c7b0f3f7d31e2ee8e91fa73ce81ba3c16d82da9150ffa302c98cf SHA512 600fe0fc77a9d6c242ec264f74624cddf5e3dd0e2eacaa65d475be638e2b4d9497bc555d753b43b24845bd6f446a811e387446f94fa98d3e75f664063a7a3d3d WHIRLPOOL 68ca7d6f121496d3a371fb4242c4e9c8fa77eae5c79a13dfec2cdbfd8f0ed82b9a97aa607923674f2e17f3380ec9a8c82d3aab9b2d8b829457a29b8330970f54
 DIST xorg-server-1.14.5.tar.bz2 5503638 SHA256 8d0f06bf1416487a5170318477088826a8d737d4a201e996b2dc1ecff47461d1 SHA512 7b737631fb9a7a6e305c2281b854cde0e1cc62ba546adf008582e2e8a54089df519ad4b79705d0f08f40255e4c607b726299ee4e50e2281efaa871c071e7771b WHIRLPOOL ea6e7368a1a99477a2e57f378f07ca0f1ded826fccd90e810c3b0fa3c71aa8cd7c0285ead23431397ae91e4245da45efa66648c1e77612556d1244f367e72257
@@ -32,19 +33,23 @@ DIST xorg-server-1.14.7.tar.bz2 5520884 SHA256 fcf66fa6ad86227613d2d3e8ae13ded29
 DIST xorg-server-1.15.0.tar.bz2 5546579 SHA256 613b2f2e7ee2a06d2f8e862c836dc70d319c52f1537749e027398f40086aabb8 SHA512 7bf6a9eff9cc606defbaa46600a4d7b41896f4304e06af745a2717687853c7e92b191481f1f4d6d98ef0adfe5f404c9e3997ebd98553c60b626cd1bb53c58d9d WHIRLPOOL 905d3b47938e5e5604b04953f11ec7acee9298d6f32570612d6301ac71b0c5a49e774267b627957b7a6a94f6b9bf211c9ed6b7102f389a2120a40bd45502a6d7
 DIST xorg-server-1.15.1.tar.bz2 5489347 SHA256 626db6882602ebe1ff81f7a4231c7ccc6ceb5032f2b5b3954bf749e1567221e2 SHA512 93c9831d354f926243d047bc05a057484e69914410914193d7e8e8b4724ee7b74f57476f1ba59cae5a845e69565ff5529ec25e45322200de9aa38cdf6394257f WHIRLPOOL 7424e8b06c4edf1cdccc5b64d14cbeb901a9f5eeff5df79c2f138c62b8eccb41f5048ca357c2f688089fe3b7595703aae583c5031b0237f7ff13eb08a4b4708c
 DIST xorg-server-1.15.2.tar.bz2 5551426 SHA256 3c0585607c654ded836da43a45a75492fc13454ff4149704fb08dac39f051163 SHA512 5fcbf0012af309f80e1db206e05d7861796146d765cd17f3963fde6da7f43f0e57d63dbbdbf2c554612a557aa4dee623ef62f7ca7d007834aafd7a46ca7bb1d6 WHIRLPOOL 22cdbad68462f9bac32b13be958df496411ca72fe47435ec7e3ebb470b121ba4b4a0e023913f31a92113c5a56bc4be660dfec5086bc1fb72a617d2cdeaa8adf1
+DIST xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz 27892 SHA256 47d8c9bb79c829389e7599aef1110d43afbc5bf744dbcf73d8f3cf01796d287a SHA512 f8b55c009166883b3e6ec2c8c7a2ff4ed61df6970afcc4f0efb9efa36741af194456a368d4b1c7ba9345ef973fb139a48eb50cb5a7ebc144b43749b9ffdb1f7b WHIRLPOOL 2f8b26c018f4ad4cf780ed7dcb0b844de64e7a612adc30c622d1956dfcee710086ffcc837ff0a64cdcc14d47720d82d8797374488bf0b52d77ca63adf6806885
 DIST xorg-server-1.16.0.tar.bz2 5832944 SHA256 38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b SHA512 eab298e3728aa79ff2ba3f5c12637c4db0f9bbca49ed00b673b2bfedf605f33a69d8eb946bed98e3d28afd9bfaf62e21ce2e8606d84cae9906506d90c26f1662 WHIRLPOOL bd9817cf93587e2b33d63438942c75d49b04f4fc2a4544654dfcc116deaf88abcccd0fa2496fb58848d5a007d2e32177cdbcd3f44237efd8b7882a0abc5b8d56
 DIST xorg-server-1.16.1.tar.bz2 5802984 SHA256 f4677c6ec9fb7b59648321737087aeb9963b60bcea50ee3773fe46be1a37e060 SHA512 c5951ec0b7c006016ff971858974c3a457c8aae0efe2ff9a9eeec21a750cc74be083fc3f07b963add13bef7362a2f33042b58f792c288ae5850c26437bad32a0 WHIRLPOOL 20890ab0ee9505edb457c769a83ee2def798e4359eb73a6db489ec4060604e4de19f04a0bb5674fcf24427ca6550f78700212f6cd0f98a0748e3c745e38d11cc
 DIST xorg-server-1.16.2.901.tar.bz2 5812629 SHA256 ef885a5ce441e6ae5c73461b624f9e66e801e52eaf495e551663306ec4464ba6 SHA512 5e92ce761d7d6e09bd053d2ff13f5ce555c744c02aa1295e5aefb0f9711abe2918a4a962ffa0f94c9b7804023e864312690d4ed939b965a0e44b6cc501a385e6 WHIRLPOOL 8e52ad9f6faff54f47b41ebe1aee6442881b53931473b4bce7e8ba1cf8e841dbecf195b4daa054f6ae270d4eadddd73445f7df17f5c340119ab5907a7ec28f5e
 DIST xorg-server-1.16.2.tar.bz2 5805059 SHA256 446e0c3ebd556aced78ec0000ba9ae73f1e5317117d497f827afba48b787ce64 SHA512 dd7093dd16152ced8320d1191a277cd177e9ae21e467b1cc210f9f88ba8b6a706b7337ebfb8fce03e480acd366f0129362fa7a50368b06b2a53821f917484634 WHIRLPOOL 57b0e7910950597f7221879e3e5a334e246161fe3144f41394ddfb5fe24f2f2ad0cfc9c66b1ebefa819f4681e90cfcd4897ccff6fc8e4ac53c1498f5596f21ec
+DIST xorg-server-1.16.3.tar.bz2 5806406 SHA256 5e0f443238af1078b48f6eea98a382861b59187da221c2cf714d31c1d560b0fb SHA512 c0459ed95a6682b2094340b6b8fc7b59fcda5227ee2f13e87f68eb5c29b91cd3f05c5fc2126e33d6303beb3ad04d19466951ef4eb53f2e9918684cdaf3692c5a WHIRLPOOL 960ecad4cbee0514c2c2b5856d35e51b37942795092e743346d2182b887db53e9fb96c8437f2e9b608d9412941c8ea5c3f3d287a18acc8de1e428e9ee0bf3d72
 DIST xorg-server-1.9.5.tar.bz2 5172054 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc SHA512 f17baa6e871c7df4dc61330e32e235906d9e4c842a70226b0833d2b64ab62811131b960eb942f4dc9359ea828676ce60afd82802aa7cffc711d27c4946c32345 WHIRLPOOL a8ede9d5e4ae80713e2b363042a80fe7ac9a03f8623dbf058b241a4237edd2397b437dda5ea56076ec1da71b946dc5b936adfd4afd436893b5c8350996ba169e
 EBUILD xorg-server-1.10.6-r3.ebuild 7244 SHA256 0ecb1d013df6b783d07e1b98a3b63279303a09adc77c894ce3707d1324cdde97 SHA512 7e360a813c87d33bc1e3e13f9634ace0bec8349835aea1c1a24d4c7a26ebb4dd9359cdd597ff920c62fe32cf4af13f95414f71e9b3034a224dd4dc645cd974d9 WHIRLPOOL d0c1a7e8c63254d9f3c4475a0a2fad7c12a9fb2d7a9bb3341c85b0b9d743cf306d4547897d88577af3d03f436de3dfcb9a7a75e763251d3d7f34e956b9c9af05
 EBUILD xorg-server-1.11.4-r3.ebuild 7256 SHA256 864ef1891d91d492725bd34c7494810df85cca470dd045d9cc0255bd5f80b43f SHA512 6f7a6eed11e8fc2be8de1a1318afdd4d48b82a1084ea6e9f00bb85ba463287fba53c4350deaf5ef58f15d66666a6357955ae79bdceb834863f19976ab0e2970e WHIRLPOOL 67dfa1d6e552eb9d4c6d850a82686185b9a43a116e739a118a17251d1e972a0ce22a6bece879f4aae7cf75ced0c43f53bdf0b4d8567c08525fee9fd7467e54fd
 EBUILD xorg-server-1.12.4-r2.ebuild 6924 SHA256 62e9798512824e720f0b445da642e834af5de26cfb47496d03e666dbdf1475df SHA512 60934fe4f26227892a67d75d746c9b24de48c14cff8856de48e1ed7eeebd91b9293d7bd98c74efe875acfb974022c7bc38560aee455c7bcb2e2338bf3c83dcc3 WHIRLPOOL ec2c6eb6ea3a3978edfa7d0a357d11d0692bcd09458a27848e6a3054d11a017a6aac02bf2e3817a0fe985d2aa9256ed5a727395abd7c32bd4b783881123f4bfe
+EBUILD xorg-server-1.12.4-r3.ebuild 7108 SHA256 2539da4a0ec464611b9efa5df2ed15d88a0be24bce7aa6d3a9534df4fcc366c4 SHA512 92cc394f56ac8d9aa7ad55d6f8359017d712cb6c2eeb34d9d7acc527d93055740583c12b20ed1738be3a9a2b4c5989f55858b331c40dbfb34fa6410951565f8d WHIRLPOOL cebb35045b80ba5567dbccf1a8aa4d1e33291524d2d2adc819df437a7f2330782dcad077e018f7897979d8bb246a3ce1bcfa9a18570f03f1814ebf4f92c00ec4
 EBUILD xorg-server-1.13.4-r1.ebuild 6867 SHA256 dd1fd3668fa0dde0aea23af81b5e5e21160ecb5c49d01b1e798231b99d932009 SHA512 868cf38391e0a2631e9f870162e35410f15da9a0f00854ad81027d407e9655e4ae8ab03daad8ddc6c3876b4269b6f4b033ea15891018b6c18b222a2465f87819 WHIRLPOOL d54235391e9d291580a564abba15160f6c8bb8138d8bee4443684ac7daa64fa1619dfa354cb09722dc5761c8b8c98993854a82c91beccc24a7a929afc8a5295a
 EBUILD xorg-server-1.14.5.ebuild 6982 SHA256 1feb2b09207af6f99664b816e5a6162c3d93271b66d9c97043662bcaddf68dee SHA512 9ceb51f43e85a560f2bb688952a255ed0528f77df4705946533fba16b3a752e348f0c324aba45b1cd2f73a2c98a07a7ea8bdad5a73c8575f56f3ddaf54155d91 WHIRLPOOL d2ef44457092590be0b340f4ada364cc0277693ae9e3c02f7efe1015c06bcd1ccafb00c7ff9e5f46806efb7ec6ebc7a4b5653b1a721a5e2e83ccfbafb4076f6a
 EBUILD xorg-server-1.14.7.ebuild 6990 SHA256 fb8095e48e36082fea4a0d49fb4d0c66cb79b47f4d06188391e752f58149065a SHA512 a3ef2659a70f9a10f85921765c059e2ff125db59acda51aeb1acb93976a4c3c8a5f940c38d7eab1fb44ac2f35e9830fd9fc84cf9148cf15c03c32316a8edca92 WHIRLPOOL 7700ca083678f604297203988788439d7b02682198129fc9c79b0005105bfe30df3e1e4c57a79164e914b8305399b4cb3c5b2a1f38e9cac6a9fd36735158880b
 EBUILD xorg-server-1.15.0.ebuild 7068 SHA256 4ab3e37740c91df1d3e10028617720be02f6a6be7b47d57ebf9b920fa2531397 SHA512 c82540f7f86fab4562f299eb038e78f42923e4976b49c5f8933f5e7ba5f0203dec79bc7fcbe923eeff7bc4874b0bdb6c3d04069991a847f1ce5d62b0cd706bce WHIRLPOOL 4d115d62329424d5ff53d39897d38a407cb323759876f482dd9b7eea0794e7d184a7ac17a69307b6821c219e56f057b4fc18804d4c86ed8ce7ce7d69e461b6fc
 EBUILD xorg-server-1.15.1.ebuild 7076 SHA256 7d5505d9cfb8fb0de119f04f96d903fd43b85ef42a3ed475f2f951ecd9b81f4c SHA512 47e4e63bdf6302621fbcc57a45963b0df87e30a973da46c8a0c98f228a78803f09d9671544eb57ca6333d792141207b807e7793f0e4533998809475a105f377f WHIRLPOOL df31d9e5c868d37e64e70763930a26236a9851685d54c81e3b0e38adba795066ac440919b2de7d9b698694701b06d728669cf72c67a5f2e7378b79b110c20f5a
+EBUILD xorg-server-1.15.2-r1.ebuild 7236 SHA256 20c44c3382b25d875d0d2ac499ee04dfd6860c77b9b90716c557847401d36d45 SHA512 609d6a64f12c16e5aefb2a04d870c0456927b7e7ec7a7fc3734c96763ceebd3b541d4e1520749f371eddbac03d620f734b32a2f66d5fd042556c017c12bf37b8 WHIRLPOOL 847f00d5aedb7d342daf8836e0e140b2f25a424fb332b1c6bb5dc32fbed11d53dae19b231298511997167bb955eca78a0a5fe403deb1d328646a8b13d044093c
 EBUILD xorg-server-1.15.2.ebuild 7076 SHA256 7c8e019fc390eb1a5422f09b5660dd76c89cacae09c21163b0f3b73a847b8153 SHA512 16990e0a57dbb6bbad070f9e667c8462008f26027877925ab9190a161317da29bd1a569d03704ee7cd27ec2d39d1dfdf0354df6c1902f6dc3fdf5f4040a37299 WHIRLPOOL 7d88840be1a90d5cb3bda1bfc21e99565d9231e1eeeaaddb75d64bbba805214dff4dbf858ab56ec98ab27b64cb716d28e371bf6b8dfcecb725a5bffe570dbc49
 EBUILD xorg-server-1.16.0.ebuild 7623 SHA256 d1886ea3eda84940156dfa9f10d38a9f774e18a0cdbe79efe37a5b2236fcc615 SHA512 694e60a8564593ea1b5ad879a25b1b75b0b2ea1595046ea9c0b6a741620c4685304b793aa1ebaf6330614a6bf605bd99deda5f5892c5ee8e5040a507f6fe39f8 WHIRLPOOL 7068fa81114bf173e14d2af015a05b6155c01747dc83289ae2ec746f9553aa0359a543472a5a605c6126bd4ee03fd7202ad053271baa6ec074b53a777260d5a1
 EBUILD xorg-server-1.16.1.ebuild 7623 SHA256 91b59692c7147cf2df2e0723c26dbedba66e0e46452866be9a5e61e3fbb547c8 SHA512 a7f899d824576bebcef44d83c2a0a74b937ab96f7d6b28069b69b2b17c2715609bb4141396fdb5d2fac7527558df883db2f0a2768c75658d0f88f3958918418e WHIRLPOOL 3d43bfebc1feb5b8301bc6de3a74c6b91fd27b452529284ce828336bf9c6c22b56d398715fe2d044f77e344940041f137b8857f602841b75dd7a979700a149d6
@@ -52,26 +57,28 @@ EBUILD xorg-server-1.16.2-r1.ebuild 6759 SHA256 fa3d88d746b78773ee8d5a82b99bb9dd
 EBUILD xorg-server-1.16.2.901-r1.ebuild 6763 SHA256 f76557e23a33934505f02023f945c68b0f3354a0c5adc11293939eddb2b7785f SHA512 585475473279b153ea7c1aa4f58fe6654adab26f83d21a8ddd38e76db2be353a2329ec3a22aea49d6d1149ee4d91aed691488fcf0b4f8578bc7816f48d2179ac WHIRLPOOL 344069cabce30f366cfd7e543fca11bcf2824acc0ed05d187ae2c7e5ea7c50f4d1a6094a019a720249f2a7ba5a72a31f338d676ba2530363c7294c83ee555b8f
 EBUILD xorg-server-1.16.2.901.ebuild 7662 SHA256 56f60110bb58f08a54c55872a20985120c8765d55a506d625ef63795c2c93c51 SHA512 36644408701057260b5ec18c9ac8e1721dbe0c395393ec6a96569877e3fcc6f7cde417d15110377ad087405876882727ee02e546997a41ebe16c302e358aeb78 WHIRLPOOL e00c07e943cc9074ee418fb6556669d2adf85824ac02f033d19b907eae3a1c23068c5ab504ad456f2f99505298f3bfd28c360451564be237f5e713353df38791
 EBUILD xorg-server-1.16.2.ebuild 7623 SHA256 dfb188091397b2dac45d341684b2196d3993fe028f30eba103e4eda57e985b78 SHA512 2fce63f6ec884d334b17e208b90b33fd1600f90fcbcb5d56ec75e12dd8594d464217e3d774ec2721779c08fe1757d00bf660dea56825fc6c1650efadbc9df265 WHIRLPOOL 7766927c3fceecc0cc76665ee09ee35ccda3c573c925ec80ff280152c16420ad229580039be205f63db09b1a9cb376e32ca8cc1a4431dd546040bcac02841ae2
+EBUILD xorg-server-1.16.3-r1.ebuild 6761 SHA256 285ba4a6c9c8e40b1261fae8f606c350dfa03df96fb233f0de237a981bfb8b4c SHA512 457d08a77be36547c4f1802cf0e965449e713e7f930754a10b32d996bfec23fbe69f2e96870d88798d5fc468229552d25a09f18b17c1b591b788552b3e202f66 WHIRLPOOL 1039b0eee178cf6b0f862ee2b26579658e9dbe32ee9c9f278b7c9938f228384dee2aa42ead4375492f6cab191cd322fcd12e59b67cddbc26fb9d0ed341268565
+EBUILD xorg-server-1.16.3.ebuild 7662 SHA256 ed4a52760a60b2baf5162235a5ce6d3c6c0aa87c91f4d05de3c209fbe1f41a61 SHA512 6687e90d925bcd1af3d2e21c2dc8abaec9866ab4952f04d0c2edefa54e00cf246b299ab73c4f5fd7fbf9af3802e4be892ee6e5c8135a7eddb2c1fb3fdad7d1f7 WHIRLPOOL 950ea824fbd63110f11d99d1387031c85c3ecaea7f231e18ac609153cf2f5e981ed284ebcf78b8a36b276447e5f86bd6318c2a168207497bf83048e86e01ef02
 EBUILD xorg-server-1.9.5-r3.ebuild 7967 SHA256 74e6a536de6c99f4c3081ca6f4b65c653e6b54d72ba17963b2186be0b031a3a6 SHA512 bb5b4f17f6fbd07cc1501019464b7b944599256e5ca0021d5481e6c194fd19fdb0e5029351b999b1efa621c61c1c7256970d431f99b3c31a659859649a09a63d WHIRLPOOL 4ff73d879f6a8c3c69d2f8f7414eb08d873187e3cbd6b4f1453d53398a3b13a93da4e3847a62c87e6b26f30fffb2fb7153b2e3da3a8bd0eaffc4eeb870701cb8
-MISC ChangeLog 58684 SHA256 a4c20ec7fe4e68e8bf96cf0f4f2500e810b3e34f7f19adf48d982e513fec7fdb SHA512 0a8cfc176d4de95be3c6ecada7034be3e64f69add78d29db29a1aeeddb4603b82baca3f27be99700e2b8fabea2993b5cdb9cf9566b6893f91e30dbf65c5976c3 WHIRLPOOL 7e8a4d104270e6358e7626fcefa8a8ce8fc92b21810f044e596b0e6555ebe87c3bb2f2b6195216b13089b331437639d1afd2516892290954fcbdd52e4e90c6a4
+MISC ChangeLog 59071 SHA256 5f9b7535f008d179e7f06946fbe1de04fae53d0e5369b01170ebec7a7821972f SHA512 5105c6620f7c108fca92e8921587826bc30ce028e81f3c92beda4428775eee4f6c1b9e9c01a83ac87b59ea13614675bb332fcef04c31f0564a0aecdbe75cb618 WHIRLPOOL 39b2a2aa468432c4de423495eddcbc2aec88b336c2256a21dc26de7dfdd5079d799b79497bdcc00bbd97d38b86a28d2feaa8f9397f4be9ddb1b7e837584c16e6
 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
 MISC metadata.xml 751 SHA256 02f470045d13e4baad4089f1cbc7cafd4dd1ab1b1799eeb2c0fb7864e956df80 SHA512 a58ad7f347519d7ba3bd710f1eab0f67925645961bcfa97fd9f106d5ea81400da79eebe95037ee4589b19c462fbdf6948949818f31210995ec9a930eaef78b26 WHIRLPOOL 67b3f0584a5c1d9e6da206761fc34a82caae36a4d9544c5512a95cdef800417c0f3f03a49606ebef72aa61522f097bf448fa0bdf651b5dd3b04554dcc86aaf5f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUiW0rXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOCVgP/i0Yco7N/FJ2uxgM/bKp07r/
-4TM1/wGqCcJEC+Hk87FvlL0ljhQQpm/3u2INS60g/ChrFIpL+lGcyS3GUYrQGPJg
-BTADUZAi+0/3/cgRbTtUqOkYUVS200XUkjOabgztY5OUWL1C5nv4qxx8q3UHCtjC
-r+mh+29pVtevDYPD517YuRQszeDnzY8R8U4gDMpUDV7cNzrJmOvL/TcJmk0JUO8X
-gBe+IQp1FYjTW/FHwTzuqDveEF9sn7cc1dYPjYZfweBuo3OGIJ4FB9UMtOrG8A6N
-IrVWxkfUOuau7qEOGOChBYpMlwmkIGr9pqeTitVBuLRkewXUv39flNg7WlP0U3gW
-QJKx5Hok3w4IaMIDx+JFsF91QTSVLFHkrx9kGED/XOlELvTUhdc5pW/d4iExdx6k
-P505Mdhkx7+rJSzjVo++zqpzL1jJVhGaclnpFtgFX8qRUtEBuUlEKblpq5/sNNSy
-7OIQ2fczRnMgHmRvJEQxQJUzmLJn2UySbyETL4jigAFyTLbOWNCeKglMfFVUD8Tr
-VNXhEv9Tf5T+aoYiKZKdrnDCY4Rt09YRA0y4X2sVVU/oleDC5NGAizVOqQh5PJhU
-2wvY1+wHJppGSHYn/uics+fGmu5mitiEkLj99GYM9Ke/WXf3x1IqzzsSpDCvMjAv
-u7KuCAFTbE9cSImuNS6U
-=tEg6
+iQJ8BAEBCABmBQJUrqiRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
+MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYROnYP/2X+oduCATU6PqT5agrrRKGH
+PfIFeiKC+wjcDAv+SSbRVVMBIoru/Qv7xe6D6EBhL4XWOzi9ARGcFxLg4o2MOE3U
+PjQhpcfuNMYylOdN/9qnasebIUUHcbEVOoFUxZ74jKA2TrqXf4FtjTaKXose1DTH
+vxfefCAESiFBUOLssnxg/0vCRwmAV/YtC6n53BwBl+VieNnVh/26Gt7/Im4aTOI5
+qWnbHmZtsP8wBOZLgmTSZHAmA8ekz07IwA4DfZnD08fBRsfvPX0wWVFp/tItEXGQ
+ZjCpo0TknMLsboyvyQr7fmeY6tsYOkQ0PvHVOpJ4JuNWI/BPghZJLX4uU2YDLLe3
++jyEuZxlHrRFdg+EJQKoOSagWhrpk9m5v/v3Z5JPSZKO2CaLb2ae6MWxdgdGJvyv
+TeKZQOYD4mGiGalEatf4t3luYBB+tzZ0C3bkMQ5jy7bRW9eIEHTANoQjXiT3UcdY
+zQ08ydhRbKP9E4DvAOgbe+qoWPZqcWcWj4GDKkP8viMox4yVpfGUbTVky+wziYTC
+DqJ6ibwoUH1VcXLx/uWd5QY/cqbjvLobVUh1GoharvjVfRB5R9mFeiI7gjtU6Xb/
+okzbnQBoPYQcUrufvYsRsd3XodUVbO1Mq6R0dgvHNxiVJDKo+oYDhMrRJESraoic
+6fu+/6nZLQg1Zp7u8L7s
+=E4YS
 -----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.12.4-r3.ebuild b/x11-base/xorg-server/xorg-server-1.12.4-r3.ebuild
new file mode 100644 (file)
index 0000000..ae6d680
--- /dev/null
@@ -0,0 +1,247 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.4-r3.ebuild,v 1.1 2015/01/08 15:55:31 chithanh Exp $
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.12-cve-2014-8091..8103.patches.tar.xz"
+
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
+
+RDEPEND=">=app-admin/eselect-opengl-1.0.8
+       dev-libs/openssl
+       media-libs/freetype
+       >=x11-apps/iceauth-1.0.2
+       >=x11-apps/rgb-1.0.3
+       >=x11-apps/xauth-1.0.3
+       x11-apps/xkbcomp
+       >=x11-libs/libpciaccess-0.12.901
+       >=x11-libs/libXau-1.0.4
+       >=x11-libs/libXdmcp-1.0.2
+       >=x11-libs/libXfont-1.4.2
+       >=x11-libs/libxkbfile-1.0.4
+       >=x11-libs/pixman-0.21.8
+       >=x11-libs/xtrans-1.2.2
+       >=x11-misc/xbitmaps-1.0.1
+       >=x11-misc/xkeyboard-config-2.4.1-r3
+       dmx? (
+               x11-libs/libXt
+               >=x11-libs/libdmx-1.0.99.1
+               >=x11-libs/libX11-1.1.5
+               >=x11-libs/libXaw-1.0.4
+               >=x11-libs/libXext-1.0.99.4
+               >=x11-libs/libXfixes-5.0
+               >=x11-libs/libXi-1.2.99.1
+               >=x11-libs/libXmu-1.0.3
+               x11-libs/libXrender
+               >=x11-libs/libXres-1.0.3
+               >=x11-libs/libXtst-1.0.99.2
+       )
+       kdrive? (
+               >=x11-libs/libXext-1.0.5
+               x11-libs/libXv
+       )
+       !minimal? (
+               >=x11-libs/libX11-1.1.5
+               >=x11-libs/libXext-1.0.5
+               >=media-libs/mesa-7.8_rc[nptl=]
+       )
+       tslib? ( >=x11-libs/tslib-1.0 )
+       udev? ( >=virtual/udev-150 )
+       >=x11-apps/xinit-1.3
+       selinux? ( sec-policy/selinux-xserver )"
+
+DEPEND="${RDEPEND}
+       sys-devel/flex
+       >=x11-proto/bigreqsproto-1.1.0
+       >=x11-proto/compositeproto-0.4
+       >=x11-proto/damageproto-1.1
+       >=x11-proto/fixesproto-5.0
+       >=x11-proto/fontsproto-2.0.2
+       >=x11-proto/glproto-1.4.14
+       >=x11-proto/inputproto-2.1.99.3
+       >=x11-proto/kbproto-1.0.3
+       >=x11-proto/randrproto-1.2.99.3
+       >=x11-proto/recordproto-1.13.99.1
+       >=x11-proto/renderproto-0.11
+       >=x11-proto/resourceproto-1.0.2
+       >=x11-proto/scrnsaverproto-1.1
+       >=x11-proto/trapproto-3.4.3
+       >=x11-proto/videoproto-2.2.2
+       >=x11-proto/xcmiscproto-1.2.0
+       >=x11-proto/xextproto-7.1.99
+       >=x11-proto/xf86dgaproto-2.0.99.1
+       >=x11-proto/xf86rushproto-1.1.2
+       >=x11-proto/xf86vidmodeproto-2.2.99.1
+       >=x11-proto/xineramaproto-1.1.3
+       >=x11-proto/xproto-7.0.22
+       dmx? (
+               >=x11-proto/dmxproto-2.2.99.1
+               doc? (
+                       || (
+                               www-client/links
+                               www-client/lynx
+                               www-client/w3m
+                       )
+               )
+       )
+       !minimal? (
+               >=x11-proto/xf86driproto-2.1.0
+               >=x11-proto/dri2proto-2.6
+               >=x11-libs/libdrm-2.4.20
+       )"
+
+PDEPEND="
+       xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+               || ( ${IUSE_SERVERS} )
+       )"
+
+# Security patches taken from Debian from their 1.12 package
+UPSTREAMED_PATCHES=(
+       "${WORKDIR}"/patches/${PN}-1.12-cve-2014-8091..8103.patch
+)
+
+PATCHES=(
+       "${UPSTREAMED_PATCHES[@]}"
+       "${FILESDIR}"/${PN}-1.12-disable-acpi.patch
+       "${FILESDIR}"/${PN}-1.12-cve-2013-1940.patch
+       "${FILESDIR}"/${PN}-1.12-cve-2013-4396.patch
+)
+
+pkg_pretend() {
+       # older gcc is not supported
+       [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+               die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
+}
+
+src_configure() {
+       # localstatedir is used for the log location; we need to override the default
+       #       from ebuild.sh
+       # sysconfdir is used for the xorg.conf location; same applies
+       #       --enable-install-setuid needed because sparcs default off
+       # NOTE: fop is used for doc generating ; and i have no idea if gentoo
+       #       package it somewhere
+       XORG_CONFIGURE_OPTIONS=(
+               $(use_enable ipv6)
+               $(use_enable dmx)
+               $(use_enable kdrive)
+               $(use_enable kdrive kdrive-kbd)
+               $(use_enable kdrive kdrive-mouse)
+               $(use_enable kdrive kdrive-evdev)
+               $(use_enable tslib)
+               $(use_enable !minimal record)
+               $(use_enable !minimal xfree86-utils)
+               $(use_enable !minimal install-libxf86config)
+               $(use_enable !minimal dri)
+               $(use_enable !minimal dri2)
+               $(use_enable !minimal glx)
+               $(use_enable xnest)
+               $(use_enable xorg)
+               $(use_enable xvfb)
+               $(use_enable nptl glx-tls)
+               $(use_enable udev config-udev)
+               $(use_with doc doxygen)
+               $(use_with doc xmlto)
+               --sysconfdir=/etc/X11
+               --localstatedir=/var
+               --enable-install-setuid
+               --with-fontrootdir=/usr/share/fonts
+               --with-xkb-output=/var/lib/xkb
+               --disable-config-hal
+               --without-dtrace
+               --without-fop
+               --with-os-vendor=Gentoo
+       )
+
+       # Xorg-server requires includes from OS mesa which are not visible for
+       # users of binary drivers.
+       mkdir -p "${T}/mesa-symlinks/GL"
+       for i in gl glx glxmd glxproto glxtokens; do
+               ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+       done
+       for i in glext glxext; do
+               ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+       done
+       append-cppflags "-I${T}/mesa-symlinks"
+
+       xorg-2_src_configure
+}
+
+src_install() {
+       xorg-2_src_install
+
+       dynamic_libgl_install
+
+       server_based_install
+
+       if ! use minimal &&     use xorg; then
+               # Install xorg.conf.example into docs
+               dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+       fi
+
+       newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+       newinitd "${FILESDIR}"/xdm.initd-9 xdm
+       newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+       # install the @x11-module-rebuild set for Portage
+       insinto /usr/share/portage/config/sets
+       newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postinst() {
+       # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+       eselect opengl set xorg-x11 --use-old
+
+       if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
+               ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
+               ewarn "because the ABI changed. If you cannot start X because"
+               ewarn "of module version mismatch errors, this is your problem."
+
+               echo
+               ewarn "You can generate a list of all installed packages in the x11-drivers"
+               ewarn "category using this command:"
+               ewarn " emerge portage-utils; qlist -I -C x11-drivers/"
+               ewarn "or using sets from portage-2.2:"
+               ewarn " emerge @x11-module-rebuild"
+       fi
+}
+
+pkg_postrm() {
+       # Get rid of module dir to ensure opengl-update works properly
+       if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+               rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
+       fi
+}
+
+dynamic_libgl_install() {
+       # next section is to setup the dynamic libGL stuff
+       ebegin "Moving GL files for dynamic switching"
+               dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
+               local x=""
+               for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
+                       if [ -f ${x} -o -L ${x} ]; then
+                               mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
+                       fi
+               done
+       eend 0
+}
+
+server_based_install() {
+       if ! use xorg; then
+               rm "${D}"/usr/share/man/man1/Xserver.1x \
+                       "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+                       "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+                       "${D}"/usr/share/man/man1/Xserver.1x
+       fi
+}
diff --git a/x11-base/xorg-server/xorg-server-1.15.2-r1.ebuild b/x11-base/xorg-server/xorg-server-1.15.2-r1.ebuild
new file mode 100644 (file)
index 0000000..bb5ff93
--- /dev/null
@@ -0,0 +1,256 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.15.2-r1.ebuild,v 1.1 2015/01/08 15:55:31 chithanh Exp $
+
+EAPI=5
+
+XORG_EAUTORECONF=yes
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.16-cve-2014-8091..8103.patches.tar.xz"
+
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev unwind"
+
+CDEPEND=">=app-admin/eselect-opengl-1.0.8
+       dev-libs/openssl
+       media-libs/freetype
+       >=x11-apps/iceauth-1.0.2
+       >=x11-apps/rgb-1.0.3
+       >=x11-apps/xauth-1.0.3
+       x11-apps/xkbcomp
+       >=x11-libs/libdrm-2.4.20
+       >=x11-libs/libpciaccess-0.12.901
+       >=x11-libs/libXau-1.0.4
+       >=x11-libs/libXdmcp-1.0.2
+       >=x11-libs/libXfont-1.4.2
+       >=x11-libs/libxkbfile-1.0.4
+       >=x11-libs/libxshmfence-1.1
+       >=x11-libs/pixman-0.27.2
+       >=x11-libs/xtrans-1.3.2
+       >=x11-misc/xbitmaps-1.0.1
+       >=x11-misc/xkeyboard-config-2.4.1-r3
+       dmx? (
+               x11-libs/libXt
+               >=x11-libs/libdmx-1.0.99.1
+               >=x11-libs/libX11-1.1.5
+               >=x11-libs/libXaw-1.0.4
+               >=x11-libs/libXext-1.0.99.4
+               >=x11-libs/libXfixes-5.0
+               >=x11-libs/libXi-1.2.99.1
+               >=x11-libs/libXmu-1.0.3
+               x11-libs/libXrender
+               >=x11-libs/libXres-1.0.3
+               >=x11-libs/libXtst-1.0.99.2
+       )
+       kdrive? (
+               >=x11-libs/libXext-1.0.5
+               x11-libs/libXv
+       )
+       !minimal? (
+               >=x11-libs/libX11-1.1.5
+               >=x11-libs/libXext-1.0.5
+               >=media-libs/mesa-9.2.0[nptl=]
+       )
+       tslib? ( >=x11-libs/tslib-1.0 )
+       udev? ( >=virtual/udev-150 )
+       unwind? ( sys-libs/libunwind )
+       >=x11-apps/xinit-1.3"
+
+DEPEND="${CDEPEND}
+       sys-devel/flex
+       >=x11-proto/bigreqsproto-1.1.0
+       >=x11-proto/compositeproto-0.4
+       >=x11-proto/damageproto-1.1
+       >=x11-proto/fixesproto-5.0
+       >=x11-proto/fontsproto-2.0.2
+       >=x11-proto/glproto-1.4.17
+       >=x11-proto/inputproto-2.2.99.1
+       >=x11-proto/kbproto-1.0.3
+       >=x11-proto/randrproto-1.4.0
+       >=x11-proto/recordproto-1.13.99.1
+       >=x11-proto/renderproto-0.11
+       >=x11-proto/resourceproto-1.2.0
+       >=x11-proto/scrnsaverproto-1.1
+       >=x11-proto/trapproto-3.4.3
+       >=x11-proto/videoproto-2.2.2
+       >=x11-proto/xcmiscproto-1.2.0
+       >=x11-proto/xextproto-7.2.99.901
+       >=x11-proto/xf86dgaproto-2.0.99.1
+       >=x11-proto/xf86rushproto-1.1.2
+       >=x11-proto/xf86vidmodeproto-2.2.99.1
+       >=x11-proto/xineramaproto-1.1.3
+       >=x11-proto/xproto-7.0.22
+       >=x11-proto/presentproto-1.0
+       >=x11-proto/dri3proto-1.0
+       dmx? (
+               >=x11-proto/dmxproto-2.2.99.1
+               doc? (
+                       || (
+                               www-client/links
+                               www-client/lynx
+                               www-client/w3m
+                       )
+               )
+       )
+       !minimal? (
+               >=x11-proto/xf86driproto-2.1.0
+               >=x11-proto/dri2proto-2.8
+       )"
+
+RDEPEND="${CDEPEND}
+       selinux? ( sec-policy/selinux-xserver )
+"
+
+PDEPEND="
+       xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+               || ( ${IUSE_SERVERS} )
+       )"
+
+pkg_pretend() {
+       # older gcc is not supported
+       [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+               die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
+}
+
+src_prepare() {
+       UPSTREAMED_PATCHES=(
+               "${WORKDIR}"/patches/*.patch
+       )
+       PATCHES=(
+               "${UPSTREAMED_PATCHES[@]}"
+               "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
+               "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+       )
+       xorg-2_src_prepare
+}
+
+src_configure() {
+       # localstatedir is used for the log location; we need to override the default
+       #       from ebuild.sh
+       # sysconfdir is used for the xorg.conf location; same applies
+       # NOTE: fop is used for doc generating ; and i have no idea if gentoo
+       #       package it somewhere
+       XORG_CONFIGURE_OPTIONS=(
+               $(use_enable ipv6)
+               $(use_enable dmx)
+               $(use_enable kdrive)
+               $(use_enable kdrive kdrive-kbd)
+               $(use_enable kdrive kdrive-mouse)
+               $(use_enable kdrive kdrive-evdev)
+               $(use_enable suid install-setuid)
+               $(use_enable tslib)
+               $(use_enable unwind libunwind)
+               $(use_enable !minimal record)
+               $(use_enable !minimal xfree86-utils)
+               $(use_enable !minimal install-libxf86config)
+               $(use_enable !minimal dri)
+               $(use_enable !minimal dri2)
+               $(use_enable !minimal glx)
+               $(use_enable xnest)
+               $(use_enable xorg)
+               $(use_enable xvfb)
+               $(use_enable nptl glx-tls)
+               $(use_enable udev config-udev)
+               $(use_with doc doxygen)
+               $(use_with doc xmlto)
+               --enable-libdrm
+               --sysconfdir="${EPREFIX}"/etc/X11
+               --localstatedir="${EPREFIX}"/var
+               --with-fontrootdir="${EPREFIX}"/usr/share/fonts
+               --with-xkb-output="${EPREFIX}"/var/lib/xkb
+               --disable-config-hal
+               --disable-linux-acpi
+               --without-dtrace
+               --without-fop
+               --with-os-vendor=Gentoo
+               --with-sha1=libcrypto
+       )
+
+       # Xorg-server requires includes from OS mesa which are not visible for
+       # users of binary drivers.
+       mkdir -p "${T}/mesa-symlinks/GL"
+       for i in gl glx glxmd glxproto glxtokens; do
+               ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+       done
+       for i in glext glxext; do
+               ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+       done
+       append-cppflags "-I${T}/mesa-symlinks"
+
+       xorg-2_src_configure
+}
+
+src_install() {
+       xorg-2_src_install
+
+       dynamic_libgl_install
+
+       server_based_install
+
+       if ! use minimal &&     use xorg; then
+               # Install xorg.conf.example into docs
+               dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+       fi
+
+       newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+       newinitd "${FILESDIR}"/xdm.initd-11 xdm
+       newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+       # install the @x11-module-rebuild set for Portage
+       insinto /usr/share/portage/config/sets
+       newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postinst() {
+       # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+       eselect opengl set xorg-x11 --use-old
+
+       if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
+               ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
+               ewarn "because the ABI changed. If you cannot start X because"
+               ewarn "of module version mismatch errors, this is your problem."
+
+               echo
+               ewarn "You can rebuild all installed packages in the x11-drivers"
+               ewarn "category using this command:"
+               ewarn " emerge @x11-module-rebuild"
+       fi
+}
+
+pkg_postrm() {
+       # Get rid of module dir to ensure opengl-update works properly
+       if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+               rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+       fi
+}
+
+dynamic_libgl_install() {
+       # next section is to setup the dynamic libGL stuff
+       ebegin "Moving GL files for dynamic switching"
+               dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
+               local x=""
+               for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
+                       if [ -f ${x} -o -L ${x} ]; then
+                               mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
+                       fi
+               done
+       eend 0
+}
+
+server_based_install() {
+       if ! use xorg; then
+               rm "${ED}"/usr/share/man/man1/Xserver.1x \
+                       "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+                       "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+                       "${ED}"/usr/share/man/man1/Xserver.1x
+       fi
+}
diff --git a/x11-base/xorg-server/xorg-server-1.16.3-r1.ebuild b/x11-base/xorg-server/xorg-server-1.16.3-r1.ebuild
new file mode 100644 (file)
index 0000000..b05517d
--- /dev/null
@@ -0,0 +1,245 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.16.3-r1.ebuild,v 1.1 2015/01/08 15:55:31 chithanh Exp $
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/1.16.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
+
+CDEPEND=">=app-admin/eselect-opengl-1.3.0
+       dev-libs/openssl
+       media-libs/freetype
+       >=x11-apps/iceauth-1.0.2
+       >=x11-apps/rgb-1.0.3
+       >=x11-apps/xauth-1.0.3
+       x11-apps/xkbcomp
+       >=x11-libs/libdrm-2.4.20
+       >=x11-libs/libpciaccess-0.12.901
+       >=x11-libs/libXau-1.0.4
+       >=x11-libs/libXdmcp-1.0.2
+       >=x11-libs/libXfont-1.4.2
+       >=x11-libs/libxkbfile-1.0.4
+       >=x11-libs/libxshmfence-1.1
+       >=x11-libs/pixman-0.27.2
+       >=x11-libs/xtrans-1.3.3
+       >=x11-misc/xbitmaps-1.0.1
+       >=x11-misc/xkeyboard-config-2.4.1-r3
+       dmx? (
+               x11-libs/libXt
+               >=x11-libs/libdmx-1.0.99.1
+               >=x11-libs/libX11-1.1.5
+               >=x11-libs/libXaw-1.0.4
+               >=x11-libs/libXext-1.0.99.4
+               >=x11-libs/libXfixes-5.0
+               >=x11-libs/libXi-1.2.99.1
+               >=x11-libs/libXmu-1.0.3
+               x11-libs/libXrender
+               >=x11-libs/libXres-1.0.3
+               >=x11-libs/libXtst-1.0.99.2
+       )
+       glamor? (
+               media-libs/libepoxy
+               >=media-libs/mesa-10.3.4-r1[egl,gbm]
+               !x11-libs/glamor
+       )
+       kdrive? (
+               >=x11-libs/libXext-1.0.5
+               x11-libs/libXv
+       )
+       !minimal? (
+               >=x11-libs/libX11-1.1.5
+               >=x11-libs/libXext-1.0.5
+               >=media-libs/mesa-10.3.4-r1[nptl=]
+       )
+       tslib? ( >=x11-libs/tslib-1.0 )
+       udev? ( >=virtual/udev-150 )
+       unwind? ( sys-libs/libunwind )
+       wayland? (
+               >=dev-libs/wayland-1.3.0
+               media-libs/libepoxy
+       )
+       >=x11-apps/xinit-1.3
+       systemd? (
+               sys-apps/dbus
+               sys-apps/systemd
+       )"
+
+DEPEND="${CDEPEND}
+       sys-devel/flex
+       >=x11-proto/bigreqsproto-1.1.0
+       >=x11-proto/compositeproto-0.4
+       >=x11-proto/damageproto-1.1
+       >=x11-proto/fixesproto-5.0
+       >=x11-proto/fontsproto-2.1.3
+       >=x11-proto/glproto-1.4.17-r1
+       >=x11-proto/inputproto-2.2.99.1
+       >=x11-proto/kbproto-1.0.3
+       >=x11-proto/randrproto-1.4.0
+       >=x11-proto/recordproto-1.13.99.1
+       >=x11-proto/renderproto-0.11
+       >=x11-proto/resourceproto-1.2.0
+       >=x11-proto/scrnsaverproto-1.1
+       >=x11-proto/trapproto-3.4.3
+       >=x11-proto/videoproto-2.2.2
+       >=x11-proto/xcmiscproto-1.2.0
+       >=x11-proto/xextproto-7.2.99.901
+       >=x11-proto/xf86dgaproto-2.0.99.1
+       >=x11-proto/xf86rushproto-1.1.2
+       >=x11-proto/xf86vidmodeproto-2.2.99.1
+       >=x11-proto/xineramaproto-1.1.3
+       >=x11-proto/xproto-7.0.26
+       >=x11-proto/presentproto-1.0
+       >=x11-proto/dri3proto-1.0
+       dmx? (
+               >=x11-proto/dmxproto-2.2.99.1
+               doc? (
+                       || (
+                               www-client/links
+                               www-client/lynx
+                               www-client/w3m
+                       )
+               )
+       )
+       !minimal? (
+               >=x11-proto/xf86driproto-2.1.0
+               >=x11-proto/dri2proto-2.8
+       )"
+
+RDEPEND="${CDEPEND}
+       selinux? ( sec-policy/selinux-xserver )
+"
+
+PDEPEND="
+       xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+               || ( ${IUSE_SERVERS} )
+       )"
+
+#UPSTREAMED_PATCHES=(
+#      "${WORKDIR}/patches/"
+#)
+
+PATCHES=(
+       "${UPSTREAMED_PATCHES[@]}"
+       "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
+       "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+)
+
+pkg_pretend() {
+       # older gcc is not supported
+       [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+               die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
+}
+
+src_configure() {
+       # localstatedir is used for the log location; we need to override the default
+       #       from ebuild.sh
+       # sysconfdir is used for the xorg.conf location; same applies
+       # NOTE: fop is used for doc generating ; and i have no idea if gentoo
+       #       package it somewhere
+       XORG_CONFIGURE_OPTIONS=(
+               $(use_enable ipv6)
+               $(use_enable dmx)
+               $(use_enable glamor)
+               $(use_enable kdrive)
+               $(use_enable kdrive kdrive-kbd)
+               $(use_enable kdrive kdrive-mouse)
+               $(use_enable kdrive kdrive-evdev)
+               $(use_enable suid install-setuid)
+               $(use_enable tslib)
+               $(use_enable unwind libunwind)
+               $(use_enable wayland xwayland)
+               $(use_enable !minimal record)
+               $(use_enable !minimal xfree86-utils)
+               $(use_enable !minimal install-libxf86config)
+               $(use_enable !minimal dri)
+               $(use_enable !minimal dri2)
+               $(use_enable !minimal glx)
+               $(use_enable xnest)
+               $(use_enable xorg)
+               $(use_enable xvfb)
+               $(use_enable nptl glx-tls)
+               $(use_enable udev config-udev)
+               $(use_with doc doxygen)
+               $(use_with doc xmlto)
+               $(use_with systemd systemd-daemon)
+               $(use_enable systemd systemd-logind)
+               --enable-libdrm
+               --sysconfdir="${EPREFIX}"/etc/X11
+               --localstatedir="${EPREFIX}"/var
+               --with-fontrootdir="${EPREFIX}"/usr/share/fonts
+               --with-xkb-output="${EPREFIX}"/var/lib/xkb
+               --disable-config-hal
+               --disable-linux-acpi
+               --without-dtrace
+               --without-fop
+               --with-os-vendor=Gentoo
+               --with-sha1=libcrypto
+       )
+
+       xorg-2_src_configure
+}
+
+src_install() {
+       xorg-2_src_install
+
+       server_based_install
+
+       if ! use minimal &&     use xorg; then
+               # Install xorg.conf.example into docs
+               dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+       fi
+
+       newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+       newinitd "${FILESDIR}"/xdm.initd-11 xdm
+       newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+       # install the @x11-module-rebuild set for Portage
+       insinto /usr/share/portage/config/sets
+       newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postinst() {
+       # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+       eselect opengl set xorg-x11 --use-old
+
+       if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
+               elog "You should consider reading upgrade guide for this release:"
+               elog "  http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
+               echo
+               ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
+               ewarn "because the ABI changed. If you cannot start X because"
+               ewarn "of module version mismatch errors, this is your problem."
+
+               echo
+               ewarn "You can rebuild all installed packages in the x11-drivers"
+               ewarn "category using this command:"
+               ewarn " emerge @x11-module-rebuild"
+       fi
+}
+
+pkg_postrm() {
+       # Get rid of module dir to ensure opengl-update works properly
+       if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+               rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+       fi
+}
+
+server_based_install() {
+       if ! use xorg; then
+               rm "${ED}"/usr/share/man/man1/Xserver.1x \
+                       "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+                       "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+                       "${ED}"/usr/share/man/man1/Xserver.1x
+       fi
+}
diff --git a/x11-base/xorg-server/xorg-server-1.16.3.ebuild b/x11-base/xorg-server/xorg-server-1.16.3.ebuild
new file mode 100644 (file)
index 0000000..4d87a62
--- /dev/null
@@ -0,0 +1,272 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.16.3.ebuild,v 1.1 2015/01/08 15:55:31 chithanh Exp $
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/1.16.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
+
+CDEPEND=">=app-admin/eselect-opengl-1.0.8
+       !>=app-admin/eselect-opengl-1.3.0
+       dev-libs/openssl
+       media-libs/freetype
+       >=x11-apps/iceauth-1.0.2
+       >=x11-apps/rgb-1.0.3
+       >=x11-apps/xauth-1.0.3
+       x11-apps/xkbcomp
+       >=x11-libs/libdrm-2.4.20
+       >=x11-libs/libpciaccess-0.12.901
+       >=x11-libs/libXau-1.0.4
+       >=x11-libs/libXdmcp-1.0.2
+       >=x11-libs/libXfont-1.4.2
+       >=x11-libs/libxkbfile-1.0.4
+       >=x11-libs/libxshmfence-1.1
+       >=x11-libs/pixman-0.27.2
+       >=x11-libs/xtrans-1.3.3
+       >=x11-misc/xbitmaps-1.0.1
+       >=x11-misc/xkeyboard-config-2.4.1-r3
+       dmx? (
+               x11-libs/libXt
+               >=x11-libs/libdmx-1.0.99.1
+               >=x11-libs/libX11-1.1.5
+               >=x11-libs/libXaw-1.0.4
+               >=x11-libs/libXext-1.0.99.4
+               >=x11-libs/libXfixes-5.0
+               >=x11-libs/libXi-1.2.99.1
+               >=x11-libs/libXmu-1.0.3
+               x11-libs/libXrender
+               >=x11-libs/libXres-1.0.3
+               >=x11-libs/libXtst-1.0.99.2
+       )
+       glamor? (
+               media-libs/libepoxy
+               media-libs/mesa[egl,gbm]
+               !x11-libs/glamor
+       )
+       kdrive? (
+               >=x11-libs/libXext-1.0.5
+               x11-libs/libXv
+       )
+       !minimal? (
+               >=x11-libs/libX11-1.1.5
+               >=x11-libs/libXext-1.0.5
+               >=media-libs/mesa-9.2.0[nptl=]
+       )
+       tslib? ( >=x11-libs/tslib-1.0 )
+       udev? ( >=virtual/udev-150 )
+       unwind? ( sys-libs/libunwind )
+       wayland? (
+               >=dev-libs/wayland-1.3.0
+               media-libs/libepoxy
+       )
+       >=x11-apps/xinit-1.3
+       systemd? (
+               sys-apps/dbus
+               sys-apps/systemd
+       )"
+
+DEPEND="${CDEPEND}
+       sys-devel/flex
+       >=x11-proto/bigreqsproto-1.1.0
+       >=x11-proto/compositeproto-0.4
+       >=x11-proto/damageproto-1.1
+       >=x11-proto/fixesproto-5.0
+       >=x11-proto/fontsproto-2.1.3
+       >=x11-proto/glproto-1.4.17
+       >=x11-proto/inputproto-2.2.99.1
+       >=x11-proto/kbproto-1.0.3
+       >=x11-proto/randrproto-1.4.0
+       >=x11-proto/recordproto-1.13.99.1
+       >=x11-proto/renderproto-0.11
+       >=x11-proto/resourceproto-1.2.0
+       >=x11-proto/scrnsaverproto-1.1
+       >=x11-proto/trapproto-3.4.3
+       >=x11-proto/videoproto-2.2.2
+       >=x11-proto/xcmiscproto-1.2.0
+       >=x11-proto/xextproto-7.2.99.901
+       >=x11-proto/xf86dgaproto-2.0.99.1
+       >=x11-proto/xf86rushproto-1.1.2
+       >=x11-proto/xf86vidmodeproto-2.2.99.1
+       >=x11-proto/xineramaproto-1.1.3
+       >=x11-proto/xproto-7.0.26
+       >=x11-proto/presentproto-1.0
+       >=x11-proto/dri3proto-1.0
+       dmx? (
+               >=x11-proto/dmxproto-2.2.99.1
+               doc? (
+                       || (
+                               www-client/links
+                               www-client/lynx
+                               www-client/w3m
+                       )
+               )
+       )
+       !minimal? (
+               >=x11-proto/xf86driproto-2.1.0
+               >=x11-proto/dri2proto-2.8
+       )"
+
+RDEPEND="${CDEPEND}
+       selinux? ( sec-policy/selinux-xserver )
+"
+
+PDEPEND="
+       xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+               || ( ${IUSE_SERVERS} )
+       )"
+
+#UPSTREAMED_PATCHES=(
+#      "${WORKDIR}/patches/"
+#)
+
+PATCHES=(
+       "${UPSTREAMED_PATCHES[@]}"
+       "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
+       "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+)
+
+pkg_pretend() {
+       # older gcc is not supported
+       [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+               die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
+}
+
+src_configure() {
+       # localstatedir is used for the log location; we need to override the default
+       #       from ebuild.sh
+       # sysconfdir is used for the xorg.conf location; same applies
+       # NOTE: fop is used for doc generating ; and i have no idea if gentoo
+       #       package it somewhere
+       XORG_CONFIGURE_OPTIONS=(
+               $(use_enable ipv6)
+               $(use_enable dmx)
+               $(use_enable glamor)
+               $(use_enable kdrive)
+               $(use_enable kdrive kdrive-kbd)
+               $(use_enable kdrive kdrive-mouse)
+               $(use_enable kdrive kdrive-evdev)
+               $(use_enable suid install-setuid)
+               $(use_enable tslib)
+               $(use_enable unwind libunwind)
+               $(use_enable wayland xwayland)
+               $(use_enable !minimal record)
+               $(use_enable !minimal xfree86-utils)
+               $(use_enable !minimal install-libxf86config)
+               $(use_enable !minimal dri)
+               $(use_enable !minimal dri2)
+               $(use_enable !minimal glx)
+               $(use_enable xnest)
+               $(use_enable xorg)
+               $(use_enable xvfb)
+               $(use_enable nptl glx-tls)
+               $(use_enable udev config-udev)
+               $(use_with doc doxygen)
+               $(use_with doc xmlto)
+               $(use_with systemd systemd-daemon)
+               $(use_enable systemd systemd-logind)
+               --enable-libdrm
+               --sysconfdir="${EPREFIX}"/etc/X11
+               --localstatedir="${EPREFIX}"/var
+               --with-fontrootdir="${EPREFIX}"/usr/share/fonts
+               --with-xkb-output="${EPREFIX}"/var/lib/xkb
+               --disable-config-hal
+               --disable-linux-acpi
+               --without-dtrace
+               --without-fop
+               --with-os-vendor=Gentoo
+               --with-sha1=libcrypto
+       )
+
+       # Xorg-server requires includes from OS mesa which are not visible for
+       # users of binary drivers.
+       mkdir -p "${T}/mesa-symlinks/GL"
+       for i in gl glx glxmd glxproto glxtokens; do
+               ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+       done
+       for i in glext glxext; do
+               ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+       done
+       append-cppflags "-I${T}/mesa-symlinks"
+
+       xorg-2_src_configure
+}
+
+src_install() {
+       xorg-2_src_install
+
+       dynamic_libgl_install
+
+       server_based_install
+
+       if ! use minimal &&     use xorg; then
+               # Install xorg.conf.example into docs
+               dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+       fi
+
+       newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+       newinitd "${FILESDIR}"/xdm.initd-11 xdm
+       newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+       # install the @x11-module-rebuild set for Portage
+       insinto /usr/share/portage/config/sets
+       newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postinst() {
+       # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+       eselect opengl set xorg-x11 --use-old
+
+       if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
+               elog "You should consider reading upgrade guide for this release:"
+               elog "  http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
+               echo
+               ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
+               ewarn "because the ABI changed. If you cannot start X because"
+               ewarn "of module version mismatch errors, this is your problem."
+
+               echo
+               ewarn "You can rebuild all installed packages in the x11-drivers"
+               ewarn "category using this command:"
+               ewarn " emerge @x11-module-rebuild"
+       fi
+}
+
+pkg_postrm() {
+       # Get rid of module dir to ensure opengl-update works properly
+       if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+               rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+       fi
+}
+
+dynamic_libgl_install() {
+       # next section is to setup the dynamic libGL stuff
+       ebegin "Moving GL files for dynamic switching"
+               dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
+               local x=""
+               for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
+                       if [ -f ${x} -o -L ${x} ]; then
+                               mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
+                       fi
+               done
+       eend 0
+}
+
+server_based_install() {
+       if ! use xorg; then
+               rm "${ED}"/usr/share/man/man1/Xserver.1x \
+                       "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+                       "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+                       "${ED}"/usr/share/man/man1/Xserver.1x
+       fi
+}