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 1QgLCo-0007Ub-MZ for garchives@archives.gentoo.org; Mon, 11 Jul 2011 18:27:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9048321C091; Mon, 11 Jul 2011 18:27:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5B94121C091 for ; Mon, 11 Jul 2011 18:27:34 +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 A049C2AC1BF for ; Mon, 11 Jul 2011 18:27:33 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2276) id 5D9072004B; Mon, 11 Jul 2011 18:27:32 +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: <20110711182732.5D9072004B@flycatcher.gentoo.org> Date: Mon, 11 Jul 2011 18:27:32 +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: 354ac81756e74ca3f4041a20bace8d72 dilfridge 11/07/11 18:27:32 Modified: kde4-base.eclass Log: Revert last commit, as the old version was 1) making less assumptions a= bout gcc version numvers and 2) correct. Revision Changes Path 1.104 eclass/kde4-base.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.e= class?rev=3D1.104&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.e= class?rev=3D1.104&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.e= class?r1=3D1.103&r2=3D1.104 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.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- kde4-base.eclass 11 Jul 2011 17:16:04 -0000 1.103 +++ kde4-base.eclass 11 Jul 2011 18:27:32 -0000 1.104 @@ -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.103 2011/= 07/11 17:16:04 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.104 2011/= 07/11 18:27:32 dilfridge Exp $ =20 # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -621,7 +621,6 @@ # Do some basic settings kde4-base_pkg_setup() { debug-print-function ${FUNCNAME} "$@" - local gccversion =20 if has kdeprefix ${IUSE//+} && use kdeprefix; then eerror "Sorry, kdeprefix support has been removed." @@ -645,8 +644,8 @@ # and for others we do just quick scan in pkg_setup because pkg_pretend # executions consume quite some time. if [[ ${MERGE_TYPE} !=3D binary ]]; then - gccversion=3D$(gcc-major-version)$(gcc-minor-version) - [[ ${gccversion} < 43 ]] \ + [[ $(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