[gentoo-commits] gentoo-x86 commit in kde-base/kdelibs: kdelibs-4.6.4-r1.ebuild

[Andreas HAttel (dilfridge)]

dilfridge    11/07/06 19:30:01

  Modified:             kdelibs-4.6.4-r1.ebuild
  Log:
  Only check for gcc version if we actually compile something
  
  (Portage version: 2.1.10.3/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  kde-base/kdelibs/kdelibs-4.6.4-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.4-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.4-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.4-r1.ebuild?r1=1.1&r2=1.2

Index: kdelibs-4.6.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.4-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.6.4-r1.ebuild	21 Jun 2011 20:36:38 -0000	1.1
+++ kdelibs-4.6.4-r1.ebuild	6 Jul 2011 19:30:01 -0000	1.2
@@ -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/kde-base/kdelibs/kdelibs-4.6.4-r1.ebuild,v 1.1 2011/06/21 20:36:38 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.4-r1.ebuild,v 1.2 2011/07/06 19:30:01 dilfridge Exp $
 
 EAPI=4
 
@@ -137,9 +137,11 @@
 )
 
 pkg_pretend() {
-	[[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
-		&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+	if [[ ${MERGE_TYPE} != 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 won't work for KDE SC 4.6 (see bug #354837)."
+	fi
 }
 
 src_prepare() {