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 <gentoo-commits+bounces-360261-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QeXgU-000792-KQ
for garchives@archives.gentoo.org; Wed, 06 Jul 2011 19:22:54 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 749BFE068E;
Wed, 6 Jul 2011 19:22:46 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 35028E068E
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Jul 2011 19:22:46 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A1BE91B4028
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Jul 2011 19:22:45 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id F2A958003D
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Jul 2011 19:22:44 +0000 (UTC)
From: "Andreas Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" <dilfridge@gentoo.org>
Message-ID: <f6f5ae976d8b11fa107d4ec5b61f8c35aa0413a9.dilfridge@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild kde-base/kdelibs/kdelibs-4.6.5.ebuild kde-base/kdelibs/kdelibs-4.6.90.ebuild kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild kde-base/kdelibs/kdelibs-9999.ebuild
X-VCS-Directories: kde-base/kdelibs/
X-VCS-Committer: dilfridge
X-VCS-Committer-Name: Andreas Hüttel
X-VCS-Revision: f6f5ae976d8b11fa107d4ec5b61f8c35aa0413a9
Date: Wed, 6 Jul 2011 19:22:44 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: d4d9c914d095c93c170ee0a4ba3c0cc3
commit: f6f5ae976d8b11fa107d4ec5b61f8c35aa0413a9
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> o=
rg>
AuthorDate: Wed Jul 6 19:22:49 2011 +0000
Commit: Andreas H=C3=BCttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jul 6 19:22:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc=
ommit;h=3Df6f5ae97
[kde-base/kdelibs] Only check for gcc version if we actually compile some=
thing
(Portage version: 2.1.10.3/git/Linux x86_64, signed Manifest commit with =
key 7887F787)
---
kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild | 8 +++++---
kde-base/kdelibs/kdelibs-4.6.5.ebuild | 8 +++++---
kde-base/kdelibs/kdelibs-4.6.90.ebuild | 8 +++++---
kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild | 8 +++++---
kde-base/kdelibs/kdelibs-9999.ebuild | 8 +++++---
5 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild b/kde-base/kdeli=
bs/kdelibs-4.6.49.9999.ebuild
index 8e72ab2..29d25fb 100644
--- a/kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.49.9999.ebuild
@@ -142,9 +142,11 @@ PATCHES=3D(
)
=20
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} !=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 won't work for KDE SC 4.6 (see=
bug #354837)."
+ fi
}
=20
src_prepare() {
diff --git a/kde-base/kdelibs/kdelibs-4.6.5.ebuild b/kde-base/kdelibs/kde=
libs-4.6.5.ebuild
index 8f87994..58c109b 100644
--- a/kde-base/kdelibs/kdelibs-4.6.5.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.5.ebuild
@@ -142,9 +142,11 @@ PATCHES=3D(
)
=20
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} !=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 won't work for KDE SC 4.6 (see=
bug #354837)."
+ fi
}
=20
src_prepare() {
diff --git a/kde-base/kdelibs/kdelibs-4.6.90.ebuild b/kde-base/kdelibs/kd=
elibs-4.6.90.ebuild
index 17dfacb..0affb50 100644
--- a/kde-base/kdelibs/kdelibs-4.6.90.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.90.ebuild
@@ -142,9 +142,11 @@ PATCHES=3D(
)
=20
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} !=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 won't work for KDE SC 4.6 (see=
bug #354837)."
+ fi
}
=20
src_prepare() {
diff --git a/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild b/kde-base/kdeli=
bs/kdelibs-4.7.49.9999.ebuild
index 1df0e13..e401de8 100644
--- a/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.7.49.9999.ebuild
@@ -142,9 +142,11 @@ PATCHES=3D(
)
=20
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} !=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 won't work for KDE SC 4.6 (see=
bug #354837)."
+ fi
}
=20
src_prepare() {
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdel=
ibs-9999.ebuild
index 1df0e13..e401de8 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -142,9 +142,11 @@ PATCHES=3D(
)
=20
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} !=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 won't work for KDE SC 4.6 (see=
bug #354837)."
+ fi
}
=20
src_prepare() {