summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevan Franchini <twitch153@gentoo.org>2013-08-31 23:24:19 +0000
committerDevan Franchini <twitch153@gentoo.org>2013-08-31 23:24:19 +0000
commitd8538193f7207cc924436d02cdc66fc664e2ad41 (patch)
treea3fab89c554fffe18fb507f46f57ffa15d4c41ea /games-emulation
parentVersion bump. (diff)
downloadgentoo-2-d8538193f7207cc924436d02cdc66fc664e2ad41.tar.gz
gentoo-2-d8538193f7207cc924436d02cdc66fc664e2ad41.tar.bz2
gentoo-2-d8538193f7207cc924436d02cdc66fc664e2ad41.zip
dolphin-3.5.ebuild: Added check to apply gcc-4.8.patch to all variants of gcc 4.8.*
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key )
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/dolphin/ChangeLog6
-rw-r--r--games-emulation/dolphin/dolphin-3.5.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/games-emulation/dolphin/ChangeLog b/games-emulation/dolphin/ChangeLog
index 2cb5153c2e3e..06d1e15aab55 100644
--- a/games-emulation/dolphin/ChangeLog
+++ b/games-emulation/dolphin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-emulation/dolphin
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/ChangeLog,v 1.6 2013/08/27 01:33:09 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/ChangeLog,v 1.7 2013/08/31 23:24:19 twitch153 Exp $
+
+ 31 Aug 2013; Devan Franchini <twitch153@gentoo.org> dolphin-3.5.ebuild:
+ dolphin-3.5.ebuild: Added check to apply gcc-4.8.patch to all variants of gcc
+ 4.8.*
27 Aug 2013; Devan Franchini <twitch153@gentoo.org> dolphin-9999.ebuild:
dolphin-9999.ebuild: Adds check for merge type to prevent unnecessary checking
diff --git a/games-emulation/dolphin/dolphin-3.5.ebuild b/games-emulation/dolphin/dolphin-3.5.ebuild
index 6760ae425568..e1218fddf5cf 100644
--- a/games-emulation/dolphin/dolphin-3.5.ebuild
+++ b/games-emulation/dolphin/dolphin-3.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-3.5.ebuild,v 1.5 2013/08/27 01:29:10 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-3.5.ebuild,v 1.6 2013/08/31 23:24:19 twitch153 Exp $
EAPI=5
@@ -60,7 +60,7 @@ pkg_pretend() {
src_prepare() {
- if has_version "=sys-devel/gcc-4.8.0"; then
+ if has_version ">=sys-devel/gcc-4.8.0" || has_version"<=sys-devel/gcc-4.9.0"; then
epatch "${FILESDIR}"/${PN}-emu-${PV}-gcc-4.8.patch
fi