summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevan Franchini <twitch153@gentoo.org>2013-08-27 01:33:14 +0000
committerDevan Franchini <twitch153@gentoo.org>2013-08-27 01:33:14 +0000
commit8e42b700cf501eaa73bc1f329cc23dffe38baca7 (patch)
treea1425213c48e0a1fffa88ccab12edc2af11af0eb /games-emulation
parentdolphin-3.5.ebuild: Adds check for binary package to prevent unnecessary chec... (diff)
downloadhistorical-8e42b700cf501eaa73bc1f329cc23dffe38baca7.tar.gz
historical-8e42b700cf501eaa73bc1f329cc23dffe38baca7.tar.bz2
historical-8e42b700cf501eaa73bc1f329cc23dffe38baca7.zip
dolphin-9999.ebuild: Adds check for merge type to prevent unnecessary checking of gcc-version when emerging as a binary package
Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/dolphin/ChangeLog6
-rw-r--r--games-emulation/dolphin/Manifest4
-rw-r--r--games-emulation/dolphin/dolphin-9999.ebuild11
3 files changed, 14 insertions, 7 deletions
diff --git a/games-emulation/dolphin/ChangeLog b/games-emulation/dolphin/ChangeLog
index 60a09930a53f..2cb5153c2e3e 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.5 2013/08/27 01:29:10 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/ChangeLog,v 1.6 2013/08/27 01:33:09 twitch153 Exp $
+
+ 27 Aug 2013; Devan Franchini <twitch153@gentoo.org> dolphin-9999.ebuild:
+ dolphin-9999.ebuild: Adds check for merge type to prevent unnecessary checking
+ of gcc-version when emerging as a binary package
27 Aug 2013; Devan Franchini <twitch153@gentoo.org> dolphin-3.5.ebuild:
dolphin-3.5.ebuild: Adds check for binary package to prevent unnecessary
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 5914b3381ed6..86e2d9441e84 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 4022 SHA256 1faa652c1097c6a1ed75571e23e16b0850c8bc22219397cc2a1e6a5657105d5e SHA512 7d521b45fa1369d64bf3ba5cfe86961049958409fc23dc08d554765ca82317ec3f71737fb5c8b218ba7b7b171ca338cd5a85b603f39ce32d429982dea7349b54 WHIRLPOOL 54fd475a0dd63d2eb63913ad8a1da59fa3cf89a1543df2e758d08eff64d6612b9e0649d789909ae2af6388be5cda7592e6e36bea67235925b8d04a47cc217fd3
-EBUILD dolphin-9999.ebuild 3377 SHA256 895bae1afa2059e497a6860250819fdccb5532b8f39d03e36912c3db6f1cdcde SHA512 c83c207b6887651cd8030e15b04fec0178f985279139a7bc6b3ebae44159e900e91cbc1e2eabe8d03f814b09af87bf8a840adb1f50a67b20f95b3634093a2a1f WHIRLPOOL 705491a3c011e721a28ebe0735a10acd03e8b0c2813f2db6e1f73b926005e29bfa4c0a5fe654183676933217ad5b55f25618093ab4a791aebf690bf06d413f0d
-MISC ChangeLog 1202 SHA256 535eec46f8df9c6d152e1a5ff0dfa6cea05f457c4957beb2a11392f42ed0cdbd SHA512 c7a338a05bfdb9ad76d6c277ed5cfe88d907416fc06c2f34ffa13a09467d40dc0f8e344717da9ecc326e767c53ae42ce5ffee0b662857c63ecfe028ab1b6919e WHIRLPOOL 4c1e4255e846f1151a572329c7714015b4189bce5c57cc57414ea4fb5bd8b2f3c73579569ebf9ac5c2b3341e2e37c00b24a8b46dd1a162e0b80f3df29f1d30f2
+EBUILD dolphin-9999.ebuild 3426 SHA256 8f106de74053c36cac790fb62446afff898f21587c7dc90965649ce0b944bae6 SHA512 45bdb97430fe2dfe6e2000dee9ee3558d4fef687a50adb0efc5aa3b97d04351274ad6c4739116ac756d4128d2a1a486a9b67ddd790bcef8ca99c697d32ad51bc WHIRLPOOL f525bdf7fc01cd28afc6a2f0c00e1f17c170e4c54b22055ef48d74a4254473b52ed9f038ce15ad47f46f28bc9af7292d0203aa5ec629d366b557f2940c3da6e5
+MISC ChangeLog 1410 SHA256 9778ec043c06d9661607492eb12807d622255289c24a58bd481286187360b77d SHA512 6e2d9328f788f5f49662217a9ba0611444db287d642d0a571fac7ece55f9b3f5de82febf6a61025238e6ff7bc4e5ba9cf55e27362c51d3962522bb3fc8ddec54 WHIRLPOOL 513b2ee0ea471a88df80fcf5614004c9b30581c658457cb10588c19374b2e105d9d7c9385b5fc07096cc546c75b55c700199c57387eb53b1feef1691fa5ef40e
MISC metadata.xml 442 SHA256 11ac55298ad628e589b592a2da00db1cabfd31ff8621c0fea059d714acdce334 SHA512 96abf53048bb8aea1387eacc40b9cda4e6099f079ddeb669fb23458d67880804fb015970207aa10a21227b87c153208a8dfa4bf4ea279ff7e53dcfebf18ac30e WHIRLPOOL e72458e354da2e4bfeb67de52c31d50a61f3b926fe16c0bcf4aae5e599858e413fcc9057fe1b098e43ee18fabe6a0f05dff008f59065cf34bad02da6480fc120
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index 4ccb6f54e9c8..ced449678fe6 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.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-9999.ebuild,v 1.4 2013/08/26 18:09:23 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-9999.ebuild,v 1.5 2013/08/27 01:33:09 twitch153 Exp $
EAPI=5
@@ -56,10 +56,13 @@ pkg_pretend() {
local ver=4.6.0
local msg="${PN} needs at least GCC ${ver} set to compile."
- if ! version_is_at_least ${ver} $(gcc-fullversion); then
- eerror ${msg}
- die ${msg}
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ if ! version_is_at_least ${ver} $(gcc-fullversion); then
+ eerror ${msg}
+ die ${msg}
+ fi
fi
+
}
src_prepare() {