x11-base/xorg-server: warn user about gcc-3 incompatibility, bug 314615

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

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 8a84ea7faa640fbf9f5291e30f44bd9c14f6bf0d..8ce48c4b7e0dac1e236acaca211632725cfcfdf2 100644 (file)
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
 # 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.496 2010/04/09 10:42:53 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.497 2010/04/11 21:40:11 chithanh Exp $
+
+  11 Apr 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  xorg-server-1.7.6.ebuild:
+  warn user about gcc-3 incompatibility, bug #314615
 
   09 Apr 2010; Christian Faulhammer <fauli@gentoo.org>
   xorg-server-1.7.6.ebuild:

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 900dadbe62eab2b95e294d101acded16e9ae2708..6cdfa20612d60a0a4e24a53f222e8f2c75d52f27 100644 (file)
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.4-fix-kdrive-automake.patch 382 RMD160 78062824a416a2b452866d50592cc71bf34b13be SHA1 f21a54aed8eae1e718f2f0c262c37c36ccccd152 SHA256 126b67332c902802da506970acf253030004e4f7e17b3b6d2e68dd6b7bb0db81
 AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237
 AUX 1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch 3303 RMD160 69966b78924cc4f03df8ff0edc1666370a6b9e67 SHA1 a95b2e0ec5f47e91769b596872c4a7700101d730 SHA256 8f24228cf93819a59f016b42d31cd1d4c6d4b014a24d690dd3b5e88e0040563f
@@ -13,13 +10,6 @@ DIST xorg-server-1.6.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2
 DIST xorg-server-1.7.6.tar.bz2 4927689 RMD160 811ca10c01da9b4bdeb743ee90b6845971dfd4c7 SHA1 77a8c3dec86960e1be818df3a75d69b5fad6a3c0 SHA256 da372e064aa5c2a0421830941372d4fea864e69c70290d56d6ffc042a6e80760
 EBUILD xorg-server-1.5.3-r6.ebuild 15607 RMD160 13afb38910b3e04ff352c363aea529f984066de9 SHA1 55d4538178c2d4a1d3775ac605b03a852e9813db SHA256 230f98c9cdcebd42f94f1364a1a0ae317de9772968bcd97229e1be2e08f1d4af
 EBUILD xorg-server-1.6.5-r1.ebuild 6842 RMD160 7dc826b80d62c7bad6bc36dbcd9d5134ac8def0e SHA1 fca33f2816607703c3ed2612be1238f9cd6f28da SHA256 71441f59df32e25dad5deae4838e312e62a87497e0e4362cd297e27f33b96584
-EBUILD xorg-server-1.7.6.ebuild 7073 RMD160 2ae39b8a0c33ee494ad7c1a72da6cd742537e2a1 SHA1 c1a851d947cce0da177cc8164587b837a475be0a SHA256 c30979bda1f1a9b10f3215a2c06c8d3774a21c5119a295a4dc38ce71e3e2c11b
-MISC ChangeLog 111925 RMD160 f811b75b10747b5bbed488c54bd7f6000b8d3f88 SHA1 0ab825165cd1f96e60587538f4f20566556738e6 SHA256 c0a95dc54883c0d4515982bdad537c28ec1515787f1f9e17062217ad7c02354a
+EBUILD xorg-server-1.7.6.ebuild 7316 RMD160 365ff9876f752f5b72eae8b8b1015e9cb248b209 SHA1 1fd284118c3cd59ad0939789f8c3e7a16088ec0b SHA256 23977e1ee2dd9554605883b4b5b2cab6ec8a30fa244377c6492d7d26da657fec
+MISC ChangeLog 112079 RMD160 d88c0a58e71582bb0de9101de5ad4447cd351ad7 SHA1 2a5de7b317642071a5a60e9dbdcb5bf05351ab91 SHA256 59b07cab6a692b8ea0642b62f23ebe6ae7de25e88a988dd9a58b2e9c01e19297
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAku/BLMACgkQNQqtfCuFneMNpgCgnsTge7ywJ0VURa2lI4TDFjLh
-DT0AoI+moWq1jlELqMoGiVTbtdyERGug
-=Iko9
------END PGP SIGNATURE-----

diff --git a/x11-base/xorg-server/xorg-server-1.7.6.ebuild b/x11-base/xorg-server/xorg-server-1.7.6.ebuild
index af688d65ead9370e3fa1304ab46638fcf9e1d6e5..5b129c3d6fbc6231dca790f28d96ad155a7796a0 100644 (file)
--- a/x11-base/xorg-server/xorg-server-1.7.6.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.7.6.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.3 2010/04/09 10:42:53 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.6.ebuild,v 1.4 2010/04/11 21:40:11 chithanh Exp $
 
 EAPI="2"
 
@@ -181,6 +181,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}
 }