Disable gcc version check for binary merges, bug #383155.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 8c7ce15804a24ee07ccdfbfb37f383397555e745..12bc7a3057bc8e6e7f469546e48c7ac342d65a94 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.625 2011/11/06 09:54:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.626 2011/11/16 02:29:48 chithanh Exp $
+
+  16 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  xorg-server-1.11.2.ebuild:
+  Disable gcc version check for binary merges, bug #383155.
 
   06 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   xorg-server-1.11.1-r1.ebuild, xorg-server-1.11.2.ebuild, +files/xdm.confd-4,

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 9c7afa69405ee6c4f1a1cedd4bd2e129c54e3792..70f04dfdc6af4343f4256120191125334ddeebb6 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 xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406
 AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
 AUX xdm.confd-4 562 RMD160 3440e564c5d52ec1d30902c870daf282698f04c4 SHA1 630b8e05706050a6b7260d2a1a19d6d54cba59fa SHA256 9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5912668344d8
@@ -16,24 +13,7 @@ DIST xorg-server-1.11.2.tar.bz2 4945939 RMD160 cc69cfd86a5a870d1433262dd1445a860
 DIST xorg-server-1.9.5.tar.bz2 5172054 RMD160 6383b126ed313943fc5cb0939fdae4a737aabb70 SHA1 03be24d6906f3ed3237057a5a7df2b02723c9749 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc
 EBUILD xorg-server-1.10.4-r1.ebuild 7127 RMD160 8175211bb28ac4559c8f229c947ffbf0a716e886 SHA1 dec56fcce06846cd3eeb1836a0bc0d4f90810380 SHA256 f3e3e1e78106b8f9f2333d74e5e531b9c6a2daaf8ee8634644f8088d5b7f5957
 EBUILD xorg-server-1.11.1-r1.ebuild 6770 RMD160 7e9d0c031766c7fd12994260f759a8e3980ca569 SHA1 092a325ee51bcf8f6fde382c1443b67536ae552d SHA256 e60eb4532335a30eabed6678bbdf9afc1a8ec690085f7009355320e6adae4e2e
-EBUILD xorg-server-1.11.2.ebuild 6722 RMD160 274716a8bdefe00b1cd4eed1a8af550f042a1469 SHA1 aa01223efd259061fd01d91fd6bc7503e9b08d91 SHA256 de1ed078ec358ed4806a8beba18b32fb23680736084bb555d5441f4c0ef85e08
+EBUILD xorg-server-1.11.2.ebuild 6752 RMD160 5dec547d294de16e50b6074a338250c46063208b SHA1 8b32fea19719be06c57c8c636f6341b73c0f6bae SHA256 35812632ffc4f8dc8acf567da62101093624c816b2b322ac649d4493595c9be5
 EBUILD xorg-server-1.9.5-r1.ebuild 7850 RMD160 e2c14bf529edbafa9452855ca893a45e510d8625 SHA1 c52c0d51c61452fb83ea92cf20978cc2374ab23e SHA256 270f6563b0cf3b96b86e94a5d428ebf1b20be22bfe2a33b76a4463c79c6120c3
-MISC ChangeLog 132689 RMD160 00402230b5f80615b9ad56759d543edd84c66d24 SHA1 74fde6d5bc52faa019a3fb4e60c5693aa5489840 SHA256 a9e6350730c5ce4f5e0171edf371e6e65e21c210792e804aaf0a9a81c3aacd2e
+MISC ChangeLog 132847 RMD160 16917ddd74fcbab4fa43f12f56e5e11440b28e08 SHA1 75a6edd2f41378467fb117bc420028295617dd17 SHA256 eaaedf092c931a51556d199a6baea913869b94cc54b485206ead4b541a933ae5
 MISC metadata.xml 537 RMD160 36f5ed1e9869e06c50c882193aad04d9553fbab9 SHA1 505782abd459abe3ba35969cc190675e00c65408 SHA256 38cd6ed34cf5447cbc3e0a9c4a9e24d5af12e2a12b80b106821bb19e69d2281f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBAgAGBQJOtllQAAoJEOSiRoyO7jvolCwP/3cRSRYXEoK859ZM2PPEnrrs
-a1MEwueQAv1fdIambq8IzgFXt446miADi14ebkmRk1LugmmptGnPFCehdCL/i7b/
-9i+SrOD1oL6jFzqVzt6hCN2jZV9/NjPdiUfuW0yggwcJ4cu0oJHMvLQDg5FFEP7N
-Gb+Yuy9mCgst9LEfcWJBb80p1DPNT1CZvPE9rsGwokOzlHVEbl82SRelAs2Cz0GG
-pBq4vsf4MOBYuka08DO8/V6HVY/fFKkkfWMRojA6dz1jJCmkvJycW7hpkaeZRmU0
-+A0eGitIb4sjnak4AZmFjpFUJ8JJaDIJRSocu7SUoCdO53hEOUq1QLomK8Y15jh/
-pROC5ptyCuPmE1TJAqcTmW4jC33stNIOlgZR6eW8H3yJ3dv/1e14YEN2VFtjyXUK
-sAtg5QeA/0JGFgmYHwy4aRGziktjMUPXbDxf6D+st58LhHO8NQIuFCdGFUjQKORi
-LyHK0isN8AyPyGSgd/GZOQ8frzIWrDvIQPsT54qkzA3twSly/0z954ogaxHlvlvE
-HBAXwjg8oPuKYhKXb+8v6YyoV7VeH5wFeMlbxUCoYcpyYUXUMyYDygYjhQyC6Qjj
-04n7TXLXaNiFRcTLgydEo4U9XJtJ3rIrequiW6e7/RMsHXYRxFAYS/waOVybN1Xu
-4eoLQJtPDbIw37+pwLM9
-=sKtY
------END PGP SIGNATURE-----

diff --git a/x11-base/xorg-server/xorg-server-1.11.2.ebuild b/x11-base/xorg-server/xorg-server-1.11.2.ebuild
index eaf050e30cb7771668103f22833a6104bba9975c..d4d98d9f9c75ee7be0b788ca4e1b4958e51ad0f0 100644 (file)
--- a/x11-base/xorg-server/xorg-server-1.11.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.11.2.ebuild,v 1.2 2011/11/06 09:54:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.2.ebuild,v 1.3 2011/11/16 02:29:48 chithanh Exp $
 
 EAPI=4
 
@@ -114,7 +114,7 @@ PATCHES=(
 
 pkg_pretend() {
        # older gcc is not supported
-       [[ $(gcc-major-version) -lt 4 ]] && \
+       [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
                die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
 }