diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-11-16 02:29:48 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-11-16 02:29:48 +0000 |
| commit | 4af5bcc93d48f7f01e5214182992b2769f016553 (patch) | |
| tree | b5996c0a365b95bf7b04569a716d6f74f379607b /x11-base | |
| parent | Adding sys-libs/ncurses to RDEPEND (thanks Michael, bug 381021) (diff) | |
| download | gentoo-2-4af5bcc93d48f7f01e5214182992b2769f016553.tar.gz gentoo-2-4af5bcc93d48f7f01e5214182992b2769f016553.tar.bz2 gentoo-2-4af5bcc93d48f7f01e5214182992b2769f016553.zip | |
Disable gcc version check for binary merges, bug #383155.
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.11.2.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 8c7ce15804a2..12bc7a3057bc 100644 --- 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/xorg-server-1.11.2.ebuild b/x11-base/xorg-server/xorg-server-1.11.2.ebuild index eaf050e30cb7..d4d98d9f9c75 100644 --- 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." } |