xorg-server: Sync with upstream.

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index a0a57ffa858527a4fd5fddefc6905454391892ef..955b0e65ecea1a2ff521689bb31664f036cb9080 100644 (file)
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -11,4 +11,4 @@ DIST xorg-server-1.8.0.tar.bz2 5097035 RMD160 4dedc88bcbbbe545b0e795d541edb3c665
 DIST xorg-server-1.8.1.tar.bz2 5200978 RMD160 27bd6d1e565e241412f1fb8e18b5b9b194b94356 SHA1 cba0d3b3d28696609a1f9b110d4d129cd066e133 SHA256 bddb974d8f21107ab8f79abf92cebb06ec13243f1ffd1ef56b48452c4994659d
 EBUILD xorg-server-1.7.7.ebuild 7220 RMD160 ed925fe7fccf08ae58ce59314a0c472535f13ec0 SHA1 5d72d32a1b8c9c4f40f88627b42d749ed4223e7b SHA256 f70710b49e1ca43c8cc765fe20ab9819bc5b2793eff0064cee607e4703d73ccc
 EBUILD xorg-server-1.8.0.ebuild 8221 RMD160 6aa53ec1042a8c12b9aa06c1aee767a50e1c2445 SHA1 d1e770f5108c161fb5d20207c612c568c32cfdc8 SHA256 5e21d8ab052b17774c40b67fb20981847a289ddbad39b8753501d21b50a6d450
-EBUILD xorg-server-1.8.1.ebuild 8038 RMD160 3b253838cd8f3bf455c8baab504b63ec8a1c2136 SHA1 987b78cca326fadac53f8336ed5de06c114414c4 SHA256 9f8b8fc1004d97642e78b77accb0c8197f3b156bea3ddec593a11ef150db570c
+EBUILD xorg-server-1.8.1-r1.ebuild 7998 RMD160 c1035725f811ee2b5723a8bdac73cb3eeb3f6dd0 SHA1 08cf52506fb9eb2261b9c3d64dd8807fd95daeb5 SHA256 43b5bc070b8f479c08532f4a5c62b332cf8f579ee5f49614ffb256a1bb746a1a

diff --git a/x11-base/xorg-server/xorg-server-1.8.1.ebuild b/x11-base/xorg-server/xorg-server-1.8.1-r1.ebuild
similarity index 97%
rename from x11-base/xorg-server/xorg-server-1.8.1.ebuild
rename to x11-base/xorg-server/xorg-server-1.8.1-r1.ebuild
index 674bfba9524129554abec1b183047a05bb652801..2d5f5fe3096b442d282ffe4041bd6d830d10ba67 100644 (file)
--- a/x11-base/xorg-server/xorg-server-1.8.1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.8.1.ebuild,v 1.1 2010/05/15 20:59:56 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.8.1-r1.ebuild,v 1.1 2010/05/19 07:47:45 scarabeus Exp $
 
 EAPI=3
 XORG_EAUTORECONF="yes"
@@ -52,7 +52,7 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
                >=media-libs/mesa-7.8_rc[nptl=]
        )
        tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
-       udev? ( sys-fs/udev[extras] )"
+       udev? ( sys-fs/udev )"
 
 DEPEND="${RDEPEND}
        !!net-dialup/dtrace
@@ -205,10 +205,9 @@ src_install() {
 
        server_based_install
 
-       if ! use minimal &&     use xorg; then
-               # Install xorg.conf.example (see bugs #151421 and #151670)
-               insinto /etc/X11
-               doins hw/xfree86/xorg.conf.example \
+       if ! use minimal && use xorg; then
+               # Install xorg.conf.example into docs
+               dodoc hw/xfree86/xorg.conf.example \
                        || die "couldn't install xorg.conf.example"
        fi