Added pkg_pretend() function to check for gcc version instead of src_prepare() in both ebuilds; also fixes keywording issues in 9999 ebuild

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64

4 files changed, 35 insertions, 12 deletions

diff --git a/games-emulation/dolphin/ChangeLog b/games-emulation/dolphin/ChangeLog
index dc39f48315a9..d2eb0096e00b 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.1 2013/08/26 04:25:00 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/ChangeLog,v 1.2 2013/08/26 07:19:36 twitch153 Exp $
+
+  26 Aug 2013; Devan Franchini <twitch153@gentoo.org> dolphin-3.5.ebuild,
+  dolphin-9999.ebuild:
+  Added pkg_pretend() function to check for gcc version instead of src_prepare()
+  in both ebuilds; also fixes keywording issues in 9999 ebuild
 
 *dolphin-9999 (26 Aug 2013)
 *dolphin-3.5 (26 Aug 2013)
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 2b77dbea7a3d..648baf950544 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 3857 SHA256 52595c115f826cbc26b3b8e2c06d254a8e036e66364405f94991aeb7a2b3f199 SHA512 c248ad029a0b294052f9ed0f2a9cfd8bb6756f8e2c04c7f748a903cc29acac059c2a96fd746d5db001ca4c38d6b9e1714655f1e120c95bea19194a82d0373e13 WHIRLPOOL b4eea100b9c4051e9169a2d19e0563e1965bfdd19b02958e0536dd96c4b0b94fe6f3637ff5e51778912a73ae1217f78511ff802b99cb31d76953fa9c5feb074c
-EBUILD dolphin-9999.ebuild 3258 SHA256 3b51231bb32920a6209ca5fba23f8efd34a08a6d7445c45fd24a585be7b28a7f SHA512 5e99b188abaea266ec1a18e394de458d75a8c20ae32f4ac0c76b746c63e5c38083bea5d84549617fe58ff1442081f7b28457d96023dd94fbe858f959cefcfde3 WHIRLPOOL cf780c78f5caa99ebf32391c6b192a778271b5ada2cd731fab54813e8d60f82541d8eada10a7e29fb710987913973dca7672bc6d1d5f8cd0e73ee110765878d7
-MISC ChangeLog 491 SHA256 914787ba27c772ead9b5bc8830f8ae52ce70a1ea96dbeef0eb482ab71eed6f1c SHA512 48b5e3f842321b2aff440e7d5a3673261a9b87f69b92499e401daa73de4d29da6d9d921bc42c4ed55cd8b9e1eb7d4a4aa8e6791cce118bfe33ba654509fd4971 WHIRLPOOL 0712e6a393ce7ae7cc5833f90d47e88607ec1907372be321346b681887aeb71c88dd2aa4bb1972f2e2bdff33cd19256e3d335dd861d1c871d1157ed31e6362b9
+EBUILD dolphin-3.5.ebuild 3951 SHA256 7b0f62da5ae381268091ba0ae8bba26e5e663d093a375e28eca9e1a04e39a55a SHA512 222734090a80ca53ad6ca3e872fc444764ae26b5195a9ab4cd98aadc3f7352947d4dadeef0f584b988712387e16097b8092483b938dc483b0c9c1d61e88840d8 WHIRLPOOL 2a29e44c788055c7f877f5232049291df43a8f3ac39fd8abdedd780b4b2538bcc1662b7e6ac30c994f9ffd6dc30c024005b09b3e36d6fc8da268e86ad926fbf7
+EBUILD dolphin-9999.ebuild 3354 SHA256 c57ed95c4e3eef9095bc423730c5bf68af615e62230352d8d26d5c7bc1368a78 SHA512 0bde89423b76beebf6303ed57e1c17abc0263676002840babfd5779c5b7509bf370964d4d05fee1a75c41e01669a1299fa68025284eebc2933d7786abb499240 WHIRLPOOL 03cd78f04b3b877d0bc1e0eb3767377124fbdab6be31a97135aef67793e845b5fce12b357f515d50ff2d8360eb51d9f37f8c97db5a46fa7720a0e8a49b074dc1
+MISC ChangeLog 733 SHA256 883f9d0593777551df5f6e612d816d36921bcfc960f2e69f5ffadaa41a1cb425 SHA512 128c9b890704f4537a4f9e46d7c05b6a07deb535a0c5f6452f8082d72d330143714fdbe393a176c67d028c71d07b192205e58d8df9d2af19b06e89c234a95fcd WHIRLPOOL c6f00003721d9f14f52837951a40518f67de7b3a09979e1e13315f13357603ddce7109ed4c7d29a017b7b441bb1ea0ebe357979853d523f515894a3290159226
 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 71612b53ed25..cf26a70fbb03 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.1 2013/08/26 04:24:59 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-3.5.ebuild,v 1.2 2013/08/26 07:19:36 twitch153 Exp $
 
 EAPI=5
 
@@ -45,9 +45,18 @@ DEPEND="${RDEPEND}
 	x11-libs/wxGTK:2.9
 	"
 
-src_prepare() {
+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}
+	fi
+}
 
-	version_is_at_least 4.6.0 $(gcc-fullversion) || die "${PN} needs >=gcc-4.6.0 set to compile."
+src_prepare() {
 
 	if has_version "=sys-devel/gcc-4.8.0"; then
 		epatch "${FILESDIR}"/${PN}-emu-${PV}-gcc-4.8.patch
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index 21e9911f70d6..8453cd49fbdc 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.1 2013/08/26 04:24:59 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-9999.ebuild,v 1.2 2013/08/26 07:19:36 twitch153 Exp $
 
 EAPI=5
 
@@ -12,10 +12,10 @@ if [[ ${PV} == 9999* ]]
 then
 	EGIT_REPO_URI="https://code.google.com/p/dolphin-emu/"
 	inherit git-2
-	KEYWORKD=""
+	KEYWORDS=""
 else
 	SRC_URI="http://${PN}-emu.googlecode.com/files/${P}-src.zip"
-	KEYWORDS="~amd"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Dolphin is a Gamecube and Wii game emulator"
@@ -51,9 +51,18 @@ DEPEND="${RDEPEND}
 	x11-libs/wxGTK:2.9
 	"
 
-src_prepare() {
+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}
+	fi
+}
 
-	version_is_at_least 4.6.0 $(gcc-fullversion) || die "${PN} needs >=gcc-4.6.0 set to compile."
+src_prepare() {
 
 	# Remove automatic dependencies to prevent building without flags enabled.
 	if use !alsa; then