diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2014-12-09 17:18:39 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2014-12-09 17:18:39 +0000 |
| commit | 347767e8c256999d2726743767bbc8b6edf2506f (patch) | |
| tree | e1b84d6d4a8675b4d20ec7b341d982e55542f0b8 /app-office/akonadi-server | |
| parent | Enable rdesktop USE flag by default wrt bug #530968. (diff) | |
| download | gentoo-2-347767e8c256999d2726743767bbc8b6edf2506f.tar.gz gentoo-2-347767e8c256999d2726743767bbc8b6edf2506f.tar.bz2 gentoo-2-347767e8c256999d2726743767bbc8b6edf2506f.zip | |
Fix GCC version check logic wrt bug #520102.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Diffstat (limited to 'app-office/akonadi-server')
| -rw-r--r-- | app-office/akonadi-server/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/akonadi-server/akonadi-server-1.13.0.ebuild | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog index eef204b8b1a4..3d009289890f 100644 --- a/app-office/akonadi-server/ChangeLog +++ b/app-office/akonadi-server/ChangeLog @@ -1,6 +1,10 @@ # 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.152 2014/11/24 15:28:30 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.153 2014/12/09 17:18:39 kensington Exp $ + + 09 Dec 2014; Michael Palimaka <kensington@gentoo.org> + akonadi-server-1.13.0.ebuild: + Fix GCC version check logic wrt bug #520102. 24 Nov 2014; Agostino Sarubbo <ago@gentoo.org> akonadi-server-1.13.0.ebuild: Stable for ppc64, wrt bug #528754 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 1aa0e96a0909..6a3814950818 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.7 2014/11/24 15:28:30 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0.ebuild,v 1.8 2014/12/09 17:18:39 kensington Exp $ EAPI=5 @@ -64,8 +64,8 @@ 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)." + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \ + && die "Sorry, but gcc-4.6 and earlier won't work (see bug #520102)." fi } |