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 1RHO8d-0008Bx-DQ for garchives@archives.gentoo.org; Fri, 21 Oct 2011 23:04:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66C8D21C04E; Fri, 21 Oct 2011 23:04:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 37D1721C04E for ; Fri, 21 Oct 2011 23:04:22 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B00BD1B400D for ; Fri, 21 Oct 2011 23:04:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 22C0480042 for ; Fri, 21 Oct 2011 23:04:21 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <5f1c11709404c9b1fb898fd8dc49309a5a9effe4.dilfridge@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde4-base.eclass X-VCS-Directories: eclass/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 5f1c11709404c9b1fb898fd8dc49309a5a9effe4 Date: Fri, 21 Oct 2011 23:04:21 +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: a87291728815a1ffc1c3c78f9a7cae50 commit: 5f1c11709404c9b1fb898fd8dc49309a5a9effe4 Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Fri Oct 21 23:03:55 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Fri Oct 21 23:03:55 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D5f1c1170 [eclass] use MERGE_TYPE only for EAPI 4, bug 385589 --- eclass/kde4-base.eclass | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index c602231..e367c27 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -621,10 +621,14 @@ kde4-base_pkg_setup() { # 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. - 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)." + # We can only do this for EAPI 4 or later because the MERGE_TYPE variab= le + # is otherwise undefined. + if [[ ${EAPI:-0} !=3D 3 ]]; then=20 + 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 35= 4837)." + fi fi =20 KDEDIR=3D/usr