xorg-server: Version bump to 1.7.7 + DontLie.

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

diff --git a/x11-base/xorg-server/xorg-server-1.7.6.ebuild b/x11-base/xorg-server/xorg-server-1.7.7.ebuild
similarity index 95%
rename from x11-base/xorg-server/xorg-server-1.7.6.ebuild
rename to x11-base/xorg-server/xorg-server-1.7.7.ebuild
index 0f4db4028428295e0ffacfe4f07e31c0fe58d58f..5ec29a8ec688175254f2aa62d04226d7b1f15845 100644 (file)
--- a/x11-base/xorg-server/xorg-server-1.7.6.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.7.7.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.7.6.ebuild,v 1.1 2010/03/17 15:35:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.7.ebuild,v 1.2 2010/05/04 12:53:24 scarabeus Exp $
 
 EAPI="2"
 
@@ -35,7 +35,7 @@ RDEPEND="hal? ( sys-apps/hal )
        >=x11-apps/iceauth-1.0.2
        >=x11-apps/rgb-1.0.3
        >=x11-apps/xauth-1.0.3
-       >=x11-apps/xinit-1.0.8-r3
+       <=x11-apps/xinit-1.2.1
        >=app-admin/eselect-opengl-1.0.8
        dmx? (
                x11-libs/libXt
@@ -121,9 +121,6 @@ EPATCH_SUFFIX="patch"
 # These have been sent upstream
 UPSTREAMED_PATCHES=(
        #"${WORKDIR}/patches/"
-
-       # Fix from bug http://bugs.freedesktop.org/show_bug.cgi?id=25400
-       "${FILESDIR}/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch"
        # Fix for bug #304067
        "${FILESDIR}/1.7.5.902-fix-tslib-1.0-check.patch"
        )
@@ -182,6 +179,12 @@ pkg_setup() {
                fi
        fi
 
+       # Incompatible with GCC 3.x CPP, bug #314615
+       if [[ $(gcc-major-version) -lt 4 ]]; then
+               ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x"
+               ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)"
+       fi
+
        OLD_IMPLEM="$(eselect opengl show)"
        eselect opengl set ${OPENGL_DIR}
 }