summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-office/akonadi-server/ChangeLog5
-rw-r--r--app-office/akonadi-server/akonadi-server-1.13.0.ebuild10
2 files changed, 13 insertions, 2 deletions
diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index e796c216beb8..0d3fada3b8e2 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-office/akonadi-server
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.147 2014/11/03 11:14:37 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.148 2014/11/09 16:48:12 mrueg Exp $
+
+ 09 Nov 2014; Manuel Rüger <mrueg@gentoo.org> akonadi-server-1.13.0.ebuild:
+ Apply gcc check. See bug #520102.
03 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org>
akonadi-server-1.11.0.ebuild, akonadi-server-1.12.1-r1.ebuild,
diff --git a/app-office/akonadi-server/akonadi-server-1.13.0.ebuild b/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
index 0b88055cb90b..95e3b76ac6e7 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0.ebuild,v 1.2 2014/11/03 11:14:37 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0.ebuild,v 1.3 2014/11/09 16:48:12 mrueg Exp $
EAPI=5
@@ -61,6 +61,14 @@ RDEPEND="${CDEPEND}
RESTRICT="test"
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ [[ $(gcc-major-version) -lt 4 ]] || \
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 7 ]] ) \
+ && die "Sorry, but gcc-4.7 and earlier won't work (see bug #520102)."
+ fi
+}
+
pkg_setup() {
# Set default storage backend in order: MySQL, SQLite PostgreSQL
# reverse driver check to keep the order