From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QeXkW-0007TU-O9 for garchives@archives.gentoo.org; Wed, 06 Jul 2011 19:27:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7AB7921C0E1; Wed, 6 Jul 2011 19:26:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4A2C921C0E1 for ; Wed, 6 Jul 2011 19:26:42 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C303D1B4022 for ; Wed, 6 Jul 2011 19:26:41 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2276) id 79B2B2004B; Wed, 6 Jul 2011 19:26:40 +0000 (UTC) From: "Andreas HAttel (dilfridge)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, dilfridge@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: kde4-base.eclass X-VCS-Directories: eclass X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas HAttel Content-Type: text/plain; charset=utf8 Message-Id: <20110706192640.79B2B2004B@flycatcher.gentoo.org> Date: Wed, 6 Jul 2011 19:26:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: d7b49f9ab0954be139b337e332213ba6 dilfridge 11/07/06 19:26:40 Modified: kde4-base.eclass Log: Only check for gcc version in kde4-base.eclass if we actually compile s= omething Revision Changes Path 1.101 eclass/kde4-base.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.e= class?rev=3D1.101&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.e= class?rev=3D1.101&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.e= class?r1=3D1.100&r2=3D1.101 Index: kde4-base.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- kde4-base.eclass 15 Jun 2011 22:03:13 -0000 1.100 +++ kde4-base.eclass 6 Jul 2011 19:26:40 -0000 1.101 @@ -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/eclass/kde4-base.eclass,v 1.100 2011/= 06/15 22:03:13 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.101 2011/= 07/06 19:26:40 dilfridge Exp $ =20 # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -635,9 +635,11 @@ # In theory should be in pkg_pretend but we check it only for kdelibs t= here # and for others we do just quick scan in pkg_setup because pkg_pretend # executions consume quite some time. - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ - && die "Sorry, but gcc-4.3 and earlier wont work for KDE (see bug 3548= 37)." + if [[ ${MERGE_TYPE} !=3D binary ]]; then + [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ + && die "Sorry, but gcc-4.3 and earlier wont work for KDE (see bug 354= 837)." + fi =20 KDEDIR=3D/usr : ${PREFIX:=3D/usr}