From: Timothy Redaelli <drizzt@gentoo.org>
Date: Fri, 16 Feb 2007 23:57:34 +0000 (+0000)
Subject: Add use ao to amd64 package.use.mask
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8f095a801b40cbdc65bfbb5105686888bf9c0cc6;p=gentoo.git

Add use ao to amd64 package.use.mask

Package-Manager: portage-2.1.2-r4
---

diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog
index 8abaa24859c8..716f831f8703 100644
--- a/games-emulation/zsnes/ChangeLog
+++ b/games-emulation/zsnes/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/zsnes
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.27 2007/01/31 14:40:50 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.28 2007/02/16 23:57:34 drizzt Exp $
+
+  16 Feb 2007; Timothy Redaelli <drizzt@gentoo.org> zsnes-1.51.ebuild:
+  Add use ao to amd64 package.use.mask
 
   31 Jan 2007; Timothy Redaelli <drizzt@gentoo.org> zsnes-1.51.ebuild:
   Fixed ao configure argument, thanks to Andreas Fackler for reporting wrt bug
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index 2c1ac46cef37..a7a2f759395a 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -23,14 +23,14 @@ EBUILD zsnes-1.42.ebuild 1506 RMD160 acfb4288a677b5bb41ad8392695b96506866e32a SH
 MD5 d2185588da42a9edd0f6ce9288ce33b6 zsnes-1.42.ebuild 1506
 RMD160 acfb4288a677b5bb41ad8392695b96506866e32a zsnes-1.42.ebuild 1506
 SHA256 76ea0337597ce7b0cd921b24e626db5aa5938b632fabc1b0c52d03f1efe92fa2 zsnes-1.42.ebuild 1506
-EBUILD zsnes-1.51.ebuild 2253 RMD160 aa179fc93371b953f251ed96d6b3747280f427e5 SHA1 7e2ca0a0912995b1d784fa94fe92a71d2c3f91f9 SHA256 85b59ac554563993ddaa871f0ed4f73ee0c9bfaaf5e0c1a33b20ae804f671d02
-MD5 4da872c4f767a406fb1c92208bc0595a zsnes-1.51.ebuild 2253
-RMD160 aa179fc93371b953f251ed96d6b3747280f427e5 zsnes-1.51.ebuild 2253
-SHA256 85b59ac554563993ddaa871f0ed4f73ee0c9bfaaf5e0c1a33b20ae804f671d02 zsnes-1.51.ebuild 2253
-MISC ChangeLog 6522 RMD160 a14758ff9cc5a8d0a4841d15a7322a89733346b8 SHA1 cac10e67b029d7690cab87b6c767884a9aade96f SHA256 bd75739f155e2d0ef042ec306634d6a3153700693567737e3ffb0c50773af9ea
-MD5 3006422091a55cd2058a075e7d6f1a45 ChangeLog 6522
-RMD160 a14758ff9cc5a8d0a4841d15a7322a89733346b8 ChangeLog 6522
-SHA256 bd75739f155e2d0ef042ec306634d6a3153700693567737e3ffb0c50773af9ea ChangeLog 6522
+EBUILD zsnes-1.51.ebuild 2094 RMD160 4ec1bbe3410b1143ac8faa8665421b71bd530d67 SHA1 ad2ab7683236c6326efbbf9cc15ac120f7102d5f SHA256 6304944e5adab6fd6109c717d9055af6a20a643ab8c1aa2e9e81867eead1f752
+MD5 78c9fc70d8a3782193702a7feca309b1 zsnes-1.51.ebuild 2094
+RMD160 4ec1bbe3410b1143ac8faa8665421b71bd530d67 zsnes-1.51.ebuild 2094
+SHA256 6304944e5adab6fd6109c717d9055af6a20a643ab8c1aa2e9e81867eead1f752 zsnes-1.51.ebuild 2094
+MISC ChangeLog 6633 RMD160 9b54ff71f0f94d9a7a63bdd7f1344d8ffcfe5414 SHA1 7cdb0a1de954d6edbc5327c630277cd869fb780c SHA256 e26130b15dfecb0997d955df3a487aefa4d0beb3fcd0e5cf6c6883fefd67256c
+MD5 887575eac679cb493bd176fce8f2d351 ChangeLog 6633
+RMD160 9b54ff71f0f94d9a7a63bdd7f1344d8ffcfe5414 ChangeLog 6633
+SHA256 e26130b15dfecb0997d955df3a487aefa4d0beb3fcd0e5cf6c6883fefd67256c ChangeLog 6633
 MISC metadata.xml 372 RMD160 0d0b2eeec56fca840beec662062dfa3961537649 SHA1 41d62af5e7cd389224135e8385b22355f2c7f2ac SHA256 043dd4fd85df344c5a335c1f3bc1a0f9ce9b169337060367f767b3e4be217bdb
 MD5 67c743475aa0bdcc349144352575421c metadata.xml 372
 RMD160 0d0b2eeec56fca840beec662062dfa3961537649 metadata.xml 372
@@ -44,7 +44,7 @@ SHA256 f9ba651da95dcbc8a7c53b572bc4ecd38f552891b26c351b8ab719177399e6c1 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFwLdadz7hIScOURERApAvAKCLB5nzJZQf64PxmbCGhO+Jga2q6QCfYS7t
-6SrsCfF7MXJf3sK4wMPS88Y=
-=cK1N
+iD8DBQFF1kT0GDyatLGpTbYRAg5NAJ456skesejJjnN9xnU8tX4FOku+ZwCfSwCz
+xohUCWkJjulDIer8/e/BtY4=
+=qXSp
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/zsnes/zsnes-1.51.ebuild b/games-emulation/zsnes/zsnes-1.51.ebuild
index 85b6854532e1..c0484919a620 100644
--- a/games-emulation/zsnes/zsnes-1.51.ebuild
+++ b/games-emulation/zsnes/zsnes-1.51.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51.ebuild,v 1.6 2007/01/31 15:35:47 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51.ebuild,v 1.7 2007/02/16 23:57:34 drizzt Exp $
 
 inherit eutils autotools flag-o-matic toolchain-funcs games
 
@@ -16,21 +16,15 @@ IUSE="ao custom-cflags opengl png"
 RDEPEND="media-libs/libsdl
 	>=sys-libs/zlib-1.2.3-r1
 	amd64? ( app-emulation/emul-linux-x86-sdl )
-	!amd64? ( ao? ( media-libs/libao ) )
+	ao? ( media-libs/libao )
 	opengl? ( virtual/opengl )
 	png? ( media-libs/libpng )"
 DEPEND="${RDEPEND}
-	dev-lang/nasm"
+	dev-lang/nasm
+	amd64? ( >=sys-apps/portage-2.1 )"
 
 S=${WORKDIR}/${PN}_${PV//./_}/src
 
-pkg_setup() {
-	games_pkg_setup
-	if use ao && [[ "${ARCH}" = "amd64" ]]; then
-		ewarn "libao use flag is disabled on amd64 since deps cannot be met."
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -63,7 +57,7 @@ src_compile() {
 	local myconf=""
 	use custom-cflags && myconf="--disable-cpucheck force_arch=no"
 
-	if use ao && [[ "${ARCH}" != amd64 ]]; then
+	if use ao; then
 		myconf="${myconf} --enable-libao"
 	else
 		myconf="${myconf} --disable-libao"