Revbump to fix bug #339988. Thanks to Chris Coleman for the solution and problem investigation.

Package-Manager: portage-2.2_rc98/cvs/Linux x86_64

3 files changed, 14 insertions, 28 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index f163793a4814..cb9a61accc5d 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.546 2010/10/26 07:55:12 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.547 2010/10/31 11:48:28 scarabeus Exp $
+
+*xorg-server-1.9.1-r1 (31 Oct 2010)
+
+  31 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xorg-server-1.9.1.ebuild, +xorg-server-1.9.1-r1.ebuild:
+  Revbump to fix bug #339988. Thanks to Chris Coleman for the solution and
+  problem investigation.
 
 *xorg-server-1.9.1 (26 Oct 2010)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 773a7d013314..e2efd7f9a3c0 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch 1113 RMD160 2f9d636c73258b926e3a78c8ac7aaefac8afb7b6 SHA1 fe4da99464a2907cf826051d39a841f6e6be5e2b SHA256 bc0a37897d3284165aa38e281afd206ca41766a6cdadf5a157a2c137a7e93d03
 AUX 0002-Fix-linking-with-tslib-with-Wl-as-needed.patch 960 RMD160 1dea070e58b582ca93b58c9c1711db1f5bac5d20 SHA1 d3fe4bc1e82112e6e3c4c516a963ad3a23c96b22 SHA256 0ff93d361a19e9615f4551ebaf91cf9d093bec767665a48cc3274310a4da22a3
 AUX 1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch 3142 RMD160 3cd195de58afa6f64df332c80334bdcbd5627706 SHA1 8b226f32183eabf130e85ad07d1bbffaa2a14915 SHA256 c315ee87fb09265b6372503c628192f527064e9493fdd3c66801f26ab974df6a
@@ -23,23 +20,6 @@ DIST xorg-server-1.9.1.tar.bz2 5219517 RMD160 cef01a6c9033d6f0adb740d04618e5642c
 EBUILD xorg-server-1.7.6.ebuild 7387 RMD160 8f2efc7318211110f241f5ac1df28534ecdabfb5 SHA1 2e9f4fc70f7f5727cfd5f2eb0bc3788dc3533bf4 SHA256 2a32249e29c709743a30a73ad7dc03ca83146f6958e91614f17a526dd7fe4c1e
 EBUILD xorg-server-1.7.7-r1.ebuild 7368 RMD160 ccd93332ed25c2884d25cb0de0e0c774bf457fc8 SHA1 88f38a3a42b06000852a0068c568ad7a89d2f394 SHA256 24f07ebc80adfa98007d5bfab22c19a0b5c079c4bd073838e5502422380e7839
 EBUILD xorg-server-1.8.2.ebuild 8257 RMD160 885186326c9416f17e56e41ca448b55dd1b27b04 SHA1 2b2cb027b65dbf479e786dd3a8c6c74458473b32 SHA256 2a64df0f2d87a495b8fc6133655d58ac8305b755b8427e6e1f6fdd1b7499b225
-EBUILD xorg-server-1.9.1.ebuild 8136 RMD160 1d5f4dc16a0c8dfe1f7fa3f0c5b3efcbae8bbae5 SHA1 884df4ad582e3f8d844be816e6e0ca9cf82e5181 SHA256 d7831f1d4e371d844cbadef879c72e2e545e3f3eec6174e5a1351eef8dc8a9f5
-MISC ChangeLog 120425 RMD160 fa16f682ec4c905c83e69ab9151f5810e9545852 SHA1 11047a37205468c8bc78f35e1cc2ebba3f1c51dc SHA256 527fd807b19832bea1a1156c3817847baadef61ed9715a7885e2414cffc862d3
+EBUILD xorg-server-1.9.1-r1.ebuild 8189 RMD160 cb9e63934f5be0d2a79fee7d377c34d7f8f671e8 SHA1 87b52be308ebb977ced4310ecf5dd7bc712cb28d SHA256 50a9d2edc2db83866751f65ed29ea1f355a75acea9331add4dbe32c7146a3fc4
+MISC ChangeLog 120681 RMD160 51d1c5501cea5e93f9d36927cebea873f274caa7 SHA1 9e8c865ee0781de4a1f8ef79ccca691fb8f6f499 SHA256 d9835a3f8001c1f230cd71ea06e1ab0d917e8bd4a73bcee833399a352e790de7
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
-
-iQIcBAEBCAAGBQJMxoquAAoJEDZF8K7rm0r6oOMP/iKP5ZZF/imhU6WNZAt0JrWj
-D2V8gKUC/0DX6ZHT4yExZjdx5BnfAEI20SaZeo7swnAN85lNsR40EK1P2tvXxxlb
-j3wCoDqkCOMGPOV6vxRlp5QF6J9bZyBfq6NAQZ/LQ9bTjlUWGrnhvQV63C1aywv3
-Eybq3DbQiNvY4Nb5fBkZTj0eccyuEX+ErLZ5ZgMiwmBCIIkfvX8GiWNghMuYhmZ/
-lCioDW0/S5+ptC0tUcZEW+eDBPQQtY/JcGM1FLxht417uB2krkkP7rXRKNL4VR5Y
-7yNRt5vYv3kZEExiSfe2KjJ1tFmnH0zCbmkVOcsNISsjubiA+dEqVZjMgnJpC1R6
-U76Ei/qtTV6RjL/MpGqxJjHMOJILiGVuIce7wX6TIk2J6v1/Qp92cqzV2Yf7ypKg
-HVPO4ICAi8AFc5bC6mJlKwoSt8477U/0T/P1r/wG/RoX1X98KKG/joHwrC89faDc
-BcvAzYu4lMpl15uvz/jZ0LpJd6djbJXBLo+1P3V9jmocEayrlXh7UOMVvXzqTWnt
-X6Xkn6or63ZA8olIaP7V+rPtER3Ykuh/pyeKtJlMs6fWy1ASQ89jbpDVnfoHb8/d
-YuNTMBvNFsyuygg5Rup8JyA8nyd8GXWurStbsfyXfI/uqq6K0jAawE3HLZZyu+hU
-SFpz6RpYUzFsohWLKpy3
-=C0NH
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.9.1.ebuild b/x11-base/xorg-server/xorg-server-1.9.1-r1.ebuild
index 9971362fca8b..5ec1898de2f6 100644
--- a/x11-base/xorg-server/xorg-server-1.9.1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.9.1-r1.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2010 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.9.1.ebuild,v 1.1 2010/10/26 07:55:12 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.1-r1.ebuild,v 1.1 2010/10/31 11:48:28 scarabeus Exp $
 
 EAPI=3
+# They generate the configure.ac with wrong version of util-macros
+# see bug #339988
+XORG_EAUTORECONF="yes"
 inherit xorg-2 multilib versionator
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
@@ -158,10 +161,6 @@ pkg_setup() {
 		--with-os-vendor=Gentoo
 		${conf_opts}"
 
-	if use kdrive && use tslib; then
-		XORG_EAUTORECONF=yes
-	fi
-
 	# Xorg-server requires includes from OS mesa which are not visible for
 	# users of binary drivers.
 	# Due to the limitations of CONFIGURE_OPTIONS, we have to export this