xorg-server: Sync with upstream.

[gentoo-draconx.git] / x11-base / xorg-server / xorg-server-1.8.1-r1.ebuild

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