Version bump. Remove old prerelease.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

5 files changed, 26 insertions, 65 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 643dece783c7..dcf709ffdeb6 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.777 2013/12/04 10:06:57 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.778 2013/12/16 22:45:39 chithanh Exp $
+
+*xorg-server-1.14.99.904 (16 Dec 2013)
+*xorg-server-1.14.5 (16 Dec 2013)
+
+  16 Dec 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xorg-server-1.14.5.ebuild, +xorg-server-1.14.99.904.ebuild,
+  -files/xorg-server-1.15-xshmfence-1.1.patch,
+  -xorg-server-1.14.99.903-r1.ebuild, -xorg-server-1.14.99.903.ebuild:
+  Version bump. Remove old prerelease.
 
 *xorg-server-1.14.99.903-r1 (04 Dec 2013)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 699b7b4aef2b..3603f0d6faed 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -13,7 +13,6 @@ AUX xorg-server-1.12-disable-acpi.patch 275 SHA256 1d3878d44e2b8690bb7d1595960d0
 AUX xorg-server-1.12-ia64-fix_inx_outx.patch 1737 SHA256 bf996a01faf3d1e6f00f12b17373a2530e7e433d3e6c4cac8935ebddc91cd089 SHA512 18bf9bbb973ae4e3f95ffafca8f82845f0c318c3b2dbf0cf9089a2614215ecf000b9037bfed7d80d9367be01247bf316ba2f6e16aa04fe79c54d81441c962bcd WHIRLPOOL cd133d58fc74de9d49773fe2a570d023cea38d09d7550fb9097a8c83a8393e8fc829ffaac566eee732475410e5d8063d0f99d437a68a67e8d3f65d012522240e
 AUX xorg-server-1.12-unloadsubmodule.patch 1373 SHA256 c68c4c0749b9229c3ca11c72b5ca98b58c7dbaf5c7311ce45890204bdc637c3c SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e WHIRLPOOL 7e9dce7dc4e064567e68697a2966f87cef756670db7e49da50c8d9a5379d7930c3f9642913b8482b8c7597067ef9098e1989284986b5ec605aca6a536329c05c
 AUX xorg-server-1.13-ia64-asm.patch 1166 SHA256 525fc255734f062758877ad45a29862dfeb1fb8e7b3a476d9410a6f0d73420a2 SHA512 51b8695af30988f99a480d2ecadc6dbe7cb46d4d9461fa006d9001200dfc1bed7390025fd1ebbadc936aee90444bb5cfd892d41c5260d5c33347ee2bdc88e78e WHIRLPOOL 46d8b55b67c82118e2a36a01c739217c6e6dd02228b0a0e730b44372b77b476f4a76fcfa8a584550cdfc87db22c26839890b7719318678aaedba7db761a39c6c
-AUX xorg-server-1.15-xshmfence-1.1.patch 1397 SHA256 b7d496e9da649b3831beb3418784f469c11a17e74f87888929d83afe87487fc1 SHA512 ea17a1ce84b7d98149ed8330315036462d2ac4aa7e68b78d5dcc6fc5ff673e11be9b32629009bc1ba37c1493adbc0f8d34c386a2f6a66f468a1f6c33d91757fb WHIRLPOOL c7d3b4a7dfeb232ae559ac9a510ed64b16c37ddc0876858842e33a2d4fbd78009f236eb0363dc8532cdb41b0370828d3a5684ab299c56546972d6822287e7cc7
 AUX xorg-server-1.9-cve-2013-1940.patch 1159 SHA256 2ddde47a5b80b28d5240e51a33862722787d37cf7621aa919d2966b7bdaa7f7c SHA512 744abfda3defd3746783e2e71501c769ee7a09160efbed8fa37d3dc02eea89151de36ff7ad47f8a5cb5c56fa960cf7ea68a09a2ef45e0d0bfb49e9296a9571da WHIRLPOOL c446c7e4a2aad2ee1960d1fab142d1df84fca4822e1bec37e1851576be6fa85522eea64977565303e144d8bd55df866f6a38991575878034f762f883b4706f01
 AUX xorg-server-1.9-cve-2013-4396.patch 915 SHA256 a1686c0bd07337991eba7edf769790be30b33d1295a22a847fd139f4573379cb SHA512 e8a4fb8c4097662d0e4188fec3d6ab827addd7edb0122ddb94f66795ebc8e0ef18bba899da8fd76e918556a625ffa0c0d19c650182683ff6216faa7655aa8d11 WHIRLPOOL 98b4999c932669047094f6063b007d673957547180507dfe714943d21eda5f2371d97424efb97be6b9039aeba8d2b9282efc6023ae3edbfa9d5c8fc63fac848f
 AUX xorg-server-1.9-nouveau-default.patch 916 SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea SHA512 fe91ff469c2569aaf6e2ceb0decf44c46ec4be4314dcb94c42b107adf2aaa8592c84b78b1621856acfd51e604e012c35c0609a3651930999829c7040d4b46ed3 WHIRLPOOL 18ced96c233b537634ee32a5aad186764d8796c5cadc398e9406457c8ace02c6608dc7378ca37fd09ecb178c5564c16f602d46772472166ca3fcb56ac9a04e52
@@ -26,7 +25,8 @@ DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 8ac07c35306ba3fb3c0972722dd4e9193
 DIST xorg-server-1.13.4.tar.bz2 5506293 SHA256 a2c969887f3c7b0f3f7d31e2ee8e91fa73ce81ba3c16d82da9150ffa302c98cf SHA512 600fe0fc77a9d6c242ec264f74624cddf5e3dd0e2eacaa65d475be638e2b4d9497bc555d753b43b24845bd6f446a811e387446f94fa98d3e75f664063a7a3d3d WHIRLPOOL 68ca7d6f121496d3a371fb4242c4e9c8fa77eae5c79a13dfec2cdbfd8f0ed82b9a97aa607923674f2e17f3380ec9a8c82d3aab9b2d8b829457a29b8330970f54
 DIST xorg-server-1.14.3.tar.bz2 5502845 SHA256 02125ae13a443dcbb55f964d5c37f1da2f58ad54c2102356037bec23c1b84f5e SHA512 d5379e2f52e93985ab2636ca02f503baadd359a4ec05bed80162213392e16d433a2b7308e90cdd18c1a0bd283429f2c8b8758b5a2c585923533cced6245de989 WHIRLPOOL 241feac891f48bdc7470891d54abec0e13921cc127898b083665778ab87920d2bf10088536ac05b9db200cc2cc8b002307873786223995624aa70098370ba183
 DIST xorg-server-1.14.4.tar.bz2 5507288 SHA256 608ccfaafb845f6e559884a30f946d365209172416710d687b190e9e1ff65dc3 SHA512 c288a9d38b08d675b90e860539c4cbd423be90fa27dd1a5fa443076475801bfa74b1f5a0dd6282cc1c9c8ff30bdff77c1eb587186479ebfcaf57185c2affba8a WHIRLPOOL 11595991efb4c3bd896e87e0f1624b52004e28195081ece09cd84dbf3f3ab1c60f40461f1c8f79a82360320fd89523d8939aab47b4d9dabb5588bd99a3343923
-DIST xorg-server-1.14.99.903.tar.bz2 5550294 SHA256 3ca451b966944f96eef2823a468cfda21430b7adfe6cf60561327383f7fc01f8 SHA512 e1009e062e5e82976a7f8693a012ebcc89877be0b5c4f66f86fd33385b0ca345d15739062b41568e58c6a17815588539f9d39b519782bcf6e4a890783134a97e WHIRLPOOL 043fcac427cebdbca717f1c06a00f8aacd9c4d4248d210b4b2d3d7ad843735f607fed10986f3c86ea010692f237a48593d6eb35abb96656800ff6987f2491dbc
+DIST xorg-server-1.14.5.tar.bz2 5503638 SHA256 8d0f06bf1416487a5170318477088826a8d737d4a201e996b2dc1ecff47461d1 SHA512 7b737631fb9a7a6e305c2281b854cde0e1cc62ba546adf008582e2e8a54089df519ad4b79705d0f08f40255e4c607b726299ee4e50e2281efaa871c071e7771b WHIRLPOOL ea6e7368a1a99477a2e57f378f07ca0f1ded826fccd90e810c3b0fa3c71aa8cd7c0285ead23431397ae91e4245da45efa66648c1e77612556d1244f367e72257
+DIST xorg-server-1.14.99.904.tar.bz2 5550929 SHA256 cf95321abd0da52be45c7a01eeba4288d886121c1b19de10bf11f00702bbbbf9 SHA512 cfb624f2c3a1bbc6f1448262607971dd32feced5e1fa7edadfa6b05998e8e2fd19d1633be4f81b504e15b0ae5b20268ff4b18c8137c55f79892eac0f4e66f9f7 WHIRLPOOL 0baca458b2e9471df9c32550e87699a087a8241958941289f6c0cfc87bfcbe6c90667b781b1a3a621f0c047fec2e538a485aca5f492f0c86c54d322c8eaade70
 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 7433 SHA256 5d48bb1cfe684d97797b4c9a713f8ceb6efdafc47634803590825de234c02478 SHA512 89e6b0d9fdd6a22cf82d3a3ef1cc04e4802090be3ece8d989d4e3fe8a3fad0937f1f9954701565ac8e64c6caaf2847ab978e7cd6fdfbe4141e2db8a06b7dd334 WHIRLPOOL 1b29c0b381b95ecdb2318ade218e4c0d558d57635c52271a7a7c481e29699e977b0796d9e749d38bc6467d273699a7d198041f91138e315981ac1dd7d6031143
@@ -34,9 +34,9 @@ EBUILD xorg-server-1.12.4-r2.ebuild 7101 SHA256 76fcc2c773e97bd014da74be9ae3b8e1
 EBUILD xorg-server-1.13.4-r1.ebuild 7044 SHA256 b48f1d67a28c352e44eb44d75dbc2d576624971cbc0351a925a9efcb86269c27 SHA512 e83b452b4a9da41cd474921022970b5b4ff04cf06e0ff65fc549479373ffe9b2a711751d0efb10c0a08c3861736e446247e8a2415a0c9acf1515463b3daac8a5 WHIRLPOOL 7ff186b2a4bf469a4fd104b671225471b0c841f91894fdf0db93c874e5d29d9cfe8b8f2c4ee636db5e6e58920debde244cf15a2f5b7580036387ffb4feae3721
 EBUILD xorg-server-1.14.3-r2.ebuild 7165 SHA256 49d86ddaf2aed6ce6dbb165d7ae20e46dc661ad9f82e33cee8fb38d661c466e9 SHA512 7d0766afff2c6cb1373a3066626e35056bb47f8beeecbcb2a876ee948dec6edbe6b19f72461e07897ca07b28e6c6818a54d96818707627827ec53caea4ba0c60 WHIRLPOOL 58eebeae8f8927579f6bf7eb6bb636764f0435fe654280949deb59c1d4072b05757526f9903e6f149c8f2d9f3370bfe57bd1667f6d4333d20c64261590c5e808
 EBUILD xorg-server-1.14.4.ebuild 7129 SHA256 3f6840af8a0cbf9e36b9b91c7a5879839b6acaebf0306f6f16bb0706f79bea32 SHA512 96c7f8e49458189ed1d441890c2038f38551097b9f7b782243cbb960e02c2cfed69c43b90ffb36d4cb113e751b16f7d30f9f0e5adc022c19328d9c315df1d55d WHIRLPOOL a99be785d898e429858cc63edf4362a81feb3e354a636c265bcc02f0133d097e794c950f9ce0af68c0d2a49dce482c168c7c9ba37bba2e4b182bfe691489b8c8
-EBUILD xorg-server-1.14.99.903-r1.ebuild 7413 SHA256 c6caf367a9ffe630add8a7005b2906e20a617e980373e4cdd9c1203c2dbd4aaf SHA512 04b6a5a2e786f942d7d324a5a8bde4c2f929191de0f3818f0bdd713f98fe687e674e3d62ad02101854cafa9cfa624df628082360e77dc99d82fc649fdac4534c WHIRLPOOL dc0584f2d737c09568c57d785097a7fc16d77215d6b409550edc308499f2bd11c818675bdedb4f9f3cbd7b5ad99e437d29ec83e20622c7220bec2bc43721c2b9
-EBUILD xorg-server-1.14.99.903.ebuild 7343 SHA256 e502bfdb44a69a07ae13b0a310f234903ed25cb67cac9ae5f885ff638db52eb7 SHA512 59bc2d1830c858b9cc892ce67813a1470975ceebb30546dbe09ffa1b8fba55975f1e836989b50578df2cc8402f8aa802a52dbbbaea754a55540ba1958a5b7dbf WHIRLPOOL fad668f315ba42733401529f61724f67461809b011123d92cdb6ca1c05bd6dc8d6c01333eb47f40f39b0524e3095d81566a44c5cde0fca2e2d29c9aa461092e7
+EBUILD xorg-server-1.14.5.ebuild 7129 SHA256 fd72fb2500894cfaddb9c172e910d555972f840a2bd0ad52561b96caa72c96cd SHA512 01a15f10086074af8c4149db598192fe49ec39fe87cf2290677ac25fb813e4d199b0233d568e98a449997e362e8488a565754501e93fef4f318457a645cc20c2 WHIRLPOOL 33221b42def9a6e53ab3e07b0b0894517539ea8d94d9a6bfca1b9e657265c5e0d71a39ce493518afabc2ceb27f28b6f9cf9fc470596bec07ff398dd104954f93
+EBUILD xorg-server-1.14.99.904.ebuild 7365 SHA256 b8d56e9e84ec0df5430139b3c4faa80e6c55abb88b3d6688a22f01721fe62ca5 SHA512 7117c28b27fcd49c74c46ba32035d02a5cb8f9cd753ac827a60c5fbd42b714293022fc220e5dfc3cfee4147ec4788bb728d6a100f6e82127c2bac95c75a51a9c WHIRLPOOL 3b55870b9b94842a80ca61ab16308bba40c8ec86ac3b0363d04e6c251a5df635a5e19544ddde98ff73fbc55e97eb8b64313d3ecbc3bcd42ff2ac7946c16915ae
 EBUILD xorg-server-1.9.5-r3.ebuild 7967 SHA256 74e6a536de6c99f4c3081ca6f4b65c653e6b54d72ba17963b2186be0b031a3a6 SHA512 bb5b4f17f6fbd07cc1501019464b7b944599256e5ca0021d5481e6c194fd19fdb0e5029351b999b1efa621c61c1c7256970d431f99b3c31a659859649a09a63d WHIRLPOOL 4ff73d879f6a8c3c69d2f8f7414eb08d873187e3cbd6b4f1453d53398a3b13a93da4e3847a62c87e6b26f30fffb2fb7153b2e3da3a8bd0eaffc4eeb870701cb8
-MISC ChangeLog 52782 SHA256 cf7088a28dd0c411118b370763b38a86e98c21e424cc2d772022f30c87fd4586 SHA512 02c0a0705b146db27d9574e2b3307598e3db0dcbd3235d05ead0b6c5bacc5fed57a83bebb8ca23f70154c47ba730026a79c7a3ae0b9dbd0adbfc293736ba0dc3 WHIRLPOOL a7c80c082c423808900b1a3a0eb32c231b0c7a64850916a814106fc8b2c09dd9c425ab49b0cf6a4e132ed601ba8709d7c3e4b7e45c28be49ef5f8365aa309f46
+MISC ChangeLog 53146 SHA256 3ba2f2e824cf4a26576fa9eaa8a7d5b8a70a8caacae7789b641aa5f4d5d1e0ff SHA512 3faac830ee93eb915fae7bd8077d78d97e7a976ab87112ebfa828e20775831ed91724de8fca342001c1aacca22328b39ce5928ae3935dd3cb7f0c1e1acecafd8 WHIRLPOOL f1072832ea0017423f49d40a9f532e66f29a75a2c67ca9c7a7daac9ec810404717a51c3ba29928b435f6e79e3e2db71f32d0fad3dd8da8c55e9ef91aa30928fe
 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
 MISC metadata.xml 620 SHA256 3fc2f9ce825d48cf91810542f8aa57a0bafbdd24cdd62fcdaf55958a46c1a9b7 SHA512 fc7832f2fc242cc2d8e078ac8593c3e1d2d62b26dab129fd62cd63b984abc2b14dcdfecd19388978d1af4a5c0ff4c42b0b79102fa344a421e0a848e1b321e23d WHIRLPOOL e5d9b64bd5bbe57d0de24ecf7d40ee115aa93646ad031b78ebe69b88f2d1dfabde596f99ec90209d6bdeafaeecbe6e0f080d85febb0e931adda0c04e2680c0c1
diff --git a/x11-base/xorg-server/files/xorg-server-1.15-xshmfence-1.1.patch b/x11-base/xorg-server/files/xorg-server-1.15-xshmfence-1.1.patch
deleted file mode 100644
index d2cffe73b284..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.15-xshmfence-1.1.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From eafba23b34be31c141ddafb8380520ac9a0622ac Mon Sep 17 00:00:00 2001
-From: Keith Packard <keithp@keithp.com>
-Date: Fri, 22 Nov 2013 06:45:18 +0000
-Subject: miext/sync: Handle libxshmfence API change
-
-libxshmfence had an unfortunate 'int32_t' type for the mapped fence.
-That changed to exposing a 'struct shmfence' instead, which is nice
-and opaque and offers fine type checking across the API.
-
-This patch requires the newer version of the library and uses
-the new interface type.
-
-Signed-off-by: Keith Packard <keithp@keithp.com>
-Reviewed-by: Julien Cristau <jcristau@debian.org>
----
-diff --git a/configure.ac b/configure.ac
-index f6ecdc6..5a36e54 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -787,7 +787,7 @@ DMXPROTO="dmxproto >= 2.2.99.1"
- VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"
- WINDOWSWMPROTO="windowswmproto"
- APPLEWMPROTO="applewmproto >= 1.4"
--XSHMFENCE="xshmfence"
-+XSHMFENCE="xshmfence >= 1.1"
- 
- dnl Required modules
- XPROTO="xproto >= 7.0.22"
-diff --git a/miext/sync/misyncshm.c b/miext/sync/misyncshm.c
-index 20780fd..01f82fc 100644
---- a/miext/sync/misyncshm.c
-+++ b/miext/sync/misyncshm.c
-@@ -38,7 +38,7 @@
- static DevPrivateKeyRec syncShmFencePrivateKey;
- 
- typedef struct _SyncShmFencePrivate {
--    int32_t             *fence;
-+    struct xshmfence    *fence;
-     int                 fd;
- } SyncShmFencePrivateRec, *SyncShmFencePrivatePtr;
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-base/xorg-server/xorg-server-1.14.99.903.ebuild b/x11-base/xorg-server/xorg-server-1.14.5.ebuild
index 941d8f91a9fd..8060037588e6 100644
--- a/x11-base/xorg-server/xorg-server-1.14.99.903.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.14.5.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2013 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.14.99.903.ebuild,v 1.2 2013/11/29 15:39:39 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.14.5.ebuild,v 1.1 2013/12/16 22:45:39 chithanh Exp $
 
 EAPI=5
 
 XORG_DOC=doc
+# avoid maintainer mode, bug #484634
+XORG_EAUTORECONF=yes
 inherit xorg-2 multilib versionator flag-o-matic
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
@@ -28,9 +30,8 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	>=x11-libs/libXdmcp-1.0.2
 	>=x11-libs/libXfont-1.4.2
 	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.0
 	>=x11-libs/pixman-0.27.2
-	>=x11-libs/xtrans-1.3.2
+	>=x11-libs/xtrans-1.2.2
 	>=x11-misc/xbitmaps-1.0.1
 	>=x11-misc/xkeyboard-config-2.4.1-r3
 	dmx? (
@@ -53,7 +54,7 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	!minimal? (
 		>=x11-libs/libX11-1.1.5
 		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-9.2.0[nptl=]
+		>=media-libs/mesa-8[nptl=]
 	)
 	tslib? ( >=x11-libs/tslib-1.0 )
 	udev? ( >=virtual/udev-150 )
@@ -78,14 +79,12 @@ DEPEND="${RDEPEND}
 	>=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/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
-	>=x11-proto/presentproto-1.0
-	>=x11-proto/dri3proto-1.0
 	dmx? (
 		>=x11-proto/dmxproto-2.2.99.1
 		doc? (
@@ -114,6 +113,7 @@ REQUIRED_USE="!minimal? (
 
 PATCHES=(
 	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-1.12-disable-acpi.patch
 	"${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
 	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
 )
@@ -158,7 +158,6 @@ src_configure() {
 		--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
@@ -191,7 +190,7 @@ src_install() {
 	fi
 
 	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-9 xdm
+	newinitd "${FILESDIR}"/xdm.initd-10 xdm
 	newconfd "${FILESDIR}"/xdm.confd-4 xdm
 
 	# install the @x11-module-rebuild set for Portage
@@ -204,9 +203,6 @@ pkg_postinst() {
 	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."
diff --git a/x11-base/xorg-server/xorg-server-1.14.99.903-r1.ebuild b/x11-base/xorg-server/xorg-server-1.14.99.904.ebuild
index 4923fb3a3a6d..2866fbb5efa8 100644
--- a/x11-base/xorg-server/xorg-server-1.14.99.903-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.14.99.904.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.14.99.903-r1.ebuild,v 1.1 2013/12/04 10:06:57 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.14.99.904.ebuild,v 1.1 2013/12/16 22:45:39 chithanh Exp $
 
 EAPI=5
 
@@ -68,7 +68,7 @@ DEPEND="${RDEPEND}
 	>=x11-proto/damageproto-1.1
 	>=x11-proto/fixesproto-5.0
 	>=x11-proto/fontsproto-2.0.2
-	>=x11-proto/glproto-1.4.16
+	>=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
@@ -117,7 +117,6 @@ PATCHES=(
 	"${UPSTREAMED_PATCHES[@]}"
 	"${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
 	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-	"${FILESDIR}"/${PN}-1.15-xshmfence-1.1.patch
 )
 
 pkg_pretend() {
@@ -193,7 +192,7 @@ src_install() {
 	fi
 
 	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-9 xdm
+	newinitd "${FILESDIR}"/xdm.initd-10 xdm
 	newconfd "${FILESDIR}"/xdm.confd-4 xdm
 
 	# install the @x11-module-rebuild set for Portage