diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-10-19 09:26:01 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-10-19 09:26:01 +0000 |
| commit | dd770bcd9bd7c7cda13eb93b47550d1f9b4fcb5e (patch) | |
| tree | 792d8ff717bcf6ba7509f269c5035940a256c037 /app-office | |
| parent | Stable for HPPA (bug #387521). (diff) | |
| download | gentoo-2-dd770bcd9bd7c7cda13eb93b47550d1f9b4fcb5e.tar.gz gentoo-2-dd770bcd9bd7c7cda13eb93b47550d1f9b4fcb5e.tar.bz2 gentoo-2-dd770bcd9bd7c7cda13eb93b47550d1f9b4fcb5e.zip | |
Fix the gcc checking to avoid bug 387515.
(Portage version: 2.2.0_alpha68/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice-bin/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog index f5cd2e75e6f0..d111182f7edd 100644 --- a/app-office/libreoffice-bin/ChangeLog +++ b/app-office/libreoffice-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice-bin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.36 2011/10/19 07:55:54 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.37 2011/10/19 09:26:01 scarabeus Exp $ + + 19 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> + libreoffice-bin-3.4.3.2-r1.ebuild: + Fix the gcc checking to avoid bug 387515. 19 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-bin-3.4.3.2-r1.ebuild: diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild index cdbe35cf61b2..438ece59ae16 100644 --- a/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild +++ b/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild @@ -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/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild,v 1.2 2011/10/19 07:55:54 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild,v 1.3 2011/10/19 09:26:01 scarabeus Exp $ EAPI=4 @@ -103,6 +103,12 @@ RESTRICT="test strip" S="${WORKDIR}" +pkg_pretend() { + [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \ + && die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)." +} + pkg_setup() { kde4-base_pkg_setup } |