summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevan Franchini <twitch153@gentoo.org>2013-09-01 00:39:19 +0000
committerDevan Franchini <twitch153@gentoo.org>2013-09-01 00:39:19 +0000
commitd0f159d9446c3dc041f96df002c24412fb45c42f (patch)
treea353b992888db8fa64708a48cad985ae4860ecdf /games-emulation
parentupdate live ebuild (diff)
downloadhistorical-d0f159d9446c3dc041f96df002c24412fb45c42f.tar.gz
historical-d0f159d9446c3dc041f96df002c24412fb45c42f.tar.bz2
historical-d0f159d9446c3dc041f96df002c24412fb45c42f.zip
Replaces has_version checking of gcc version for more suited use of the gcc-version command to check the current gcc version being used to compile the program
Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/dolphin/ChangeLog7
-rw-r--r--games-emulation/dolphin/Manifest4
-rw-r--r--games-emulation/dolphin/dolphin-3.5.ebuild7
3 files changed, 11 insertions, 7 deletions
diff --git a/games-emulation/dolphin/ChangeLog b/games-emulation/dolphin/ChangeLog
index 06d1e15aab55..c3c0a1fe8cd9 100644
--- a/games-emulation/dolphin/ChangeLog
+++ b/games-emulation/dolphin/ChangeLog
@@ -1,6 +1,11 @@
# 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.7 2013/08/31 23:24:19 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/ChangeLog,v 1.8 2013/09/01 00:39:04 twitch153 Exp $
+
+ 01 Sep 2013; Devan Franchini <twitch153@gentoo.org> dolphin-3.5.ebuild:
+ Replaces has_version checking of gcc version for more suited use of the gcc-
+ version command to check the current gcc version being used to compile the
+ program
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
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 8a953f25e300..8c0a5ce58dbb 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,6 +1,6 @@
AUX dolphin-emu-3.5-gcc-4.8.patch 6682 SHA256 8f153b45b354d52e084694d285fe49409a47f0738e064ca7ba88b38cbbd6f1ca SHA512 98a2e0435b262af4bcf875ef29d14ed5ae204faebadbed7778cfedb3c9841552ecab83ef932e943c779d634d83f6df6d43a656c5e72732e85827902cb08622aa WHIRLPOOL 7128c98fcd22efde2a8067a28d9b064689fa7a5f81b068313a19e41f4fc659b726293bc00539be725077ff5529276c0769e7acbf8146c2c8d578c3812776d488
DIST dolphin-3.5-src.zip 28805192 SHA256 b95cb6f487c1f77471c08cfb52bc9844bb2385f0ffd8fb45416b4c5095eb8d9a SHA512 4e607f9ed15c19967382a178c725a015fa8e2db4f624e9b54c50af31bdbae333989be8397cd32d0aa3b5283caf85a67e5529583be4423ada5c6f098ca7c309ef WHIRLPOOL a840f15153eff2edb5f2c75410e6fed3cca7fbffe2eb05bbf6441b914f7b27c6d9ee90de27fb9a773b601c44311828b95e3c597000cf607ff12d1141266e50bc
-EBUILD dolphin-3.5.ebuild 4061 SHA256 bc4817b596a4fac821c33809adb5b0f5ae8069b52c47dcccfa08018f55955ab7 SHA512 28eee525cc9eed3f86d6e95bea0b7630345f50b5e2f64943eefe6523467ae8061f8e7000c2b96b3122d09ce9ebbfb14ea8f204e6cf47107cdd7f8b86bbc2e0a0 WHIRLPOOL 672d9997a77f010b0cec6e939d50f7b334fd4e6934d69d402d9c4f611f67a8f00033be139299df87a314dc2c6498cd1d1a2822407c44e54f8e670010d73090e6
+EBUILD dolphin-3.5.ebuild 3941 SHA256 3e0c7a8dd13aeec9f8cacf9c906845a24ce5e8608d82967351e0051d893aa5dc SHA512 775572a295857b0cdc91480fe184d5c64646b9495076d724ea1e60a3011c5ba37cb561c3b96954e3bb3d17ff181cd863133621e5db2ea438e139af17872fe30f WHIRLPOOL 5ef2c0896e1abed623cbdec03e78770589f040cbdef7e76f4914da4aaf8318c381fcf837887a7bc1d144ac87c95c1eaa5eda1e94aa3c457b3efcc5e1cf3aac4e
EBUILD dolphin-9999.ebuild 3426 SHA256 8f106de74053c36cac790fb62446afff898f21587c7dc90965649ce0b944bae6 SHA512 45bdb97430fe2dfe6e2000dee9ee3558d4fef687a50adb0efc5aa3b97d04351274ad6c4739116ac756d4128d2a1a486a9b67ddd790bcef8ca99c697d32ad51bc WHIRLPOOL f525bdf7fc01cd28afc6a2f0c00e1f17c170e4c54b22055ef48d74a4254473b52ed9f038ce15ad47f46f28bc9af7292d0203aa5ec629d366b557f2940c3da6e5
-MISC ChangeLog 1573 SHA256 5f02e076600cd2039a55fb1f06396ff579c790344c2ba0aa7fe4cf4fe00d4664 SHA512 02a2653635044e2ff147ea01c2ccaf132c9db7f985982a4bf1455bb6f20edaacac7208af56893cf6e8d69087a480c5c6b0455c2227c8a587aba904195a6f9c0c WHIRLPOOL bcd0f8041f7792b7fa7fbb97e41de40c7000863bdde8fd0642a06fca8e8157172a6b55af1ace110d14efe42e23e8b62b4afc45f2dc27d443ddfbde5e986cfe9c
+MISC ChangeLog 1814 SHA256 a8fa985403df9377c8a646a035c88783bbbe394b3c886669cff37d9efe6f267b SHA512 dff0113f98a79fe6d7ee12bc84ff7013f28bf553a4586ed4b77d19bc8071fb83c86fd082099e6a34c8a542341328543244f3d405e6351cceef971788501c4447 WHIRLPOOL 74a8291a1ef87b88e270ddbcd528e18c4369476137aa578ffc850d37b4235b21c943bb0f390991a2ced16ca91ab70f7bcc1cec6348f8cb4075d37af1692ce944
MISC metadata.xml 442 SHA256 11ac55298ad628e589b592a2da00db1cabfd31ff8621c0fea059d714acdce334 SHA512 96abf53048bb8aea1387eacc40b9cda4e6099f079ddeb669fb23458d67880804fb015970207aa10a21227b87c153208a8dfa4bf4ea279ff7e53dcfebf18ac30e WHIRLPOOL e72458e354da2e4bfeb67de52c31d50a61f3b926fe16c0bcf4aae5e599858e413fcc9057fe1b098e43ee18fabe6a0f05dff008f59065cf34bad02da6480fc120
diff --git a/games-emulation/dolphin/dolphin-3.5.ebuild b/games-emulation/dolphin/dolphin-3.5.ebuild
index e1218fddf5cf..16692f4ce7b1 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.6 2013/08/31 23:24:19 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-3.5.ebuild,v 1.7 2013/09/01 00:39:04 twitch153 Exp $
EAPI=5
@@ -60,11 +60,10 @@ pkg_pretend() {
src_prepare() {
- if has_version ">=sys-devel/gcc-4.8.0" || has_version"<=sys-devel/gcc-4.9.0"; then
+ if [[ $(gcc-version) = "4.8" ]]; then
epatch "${FILESDIR}"/${PN}-emu-${PV}-gcc-4.8.patch
- fi
+ fi
- # Remove automatic dependencies to prevent building without flags enabled.
if use !alsa; then
sed -i -e '/^include(FindALSA/d' CMakeLists.txt || die
fi