From: Charlie Shepherd <masterdriverz@gentoo.org>
Date: Sat, 6 Jan 2007 14:08:04 +0000 (+0000)
Subject: Fix dependencies; bug 159693; thanks to jakub
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c24b05e041252c639dfdde4e67a46a9c0e44aa31;p=gentoo.git

Fix dependencies; bug 159693; thanks to jakub
Package-Manager: portage-2.1.2_rc4-r3
---

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index be03009f8223..1ad655657ad2 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpg123
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.105 2006/10/22 19:04:52 genstef Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.106 2007/01/06 14:08:04 masterdriverz Exp $
+
+  06 Jan 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  mpg123-0.61.ebuild:
+  Fix dependencies; bug 159693; thanks to jakub
 
 *mpg123-0.61 (22 Oct 2006)
 
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 1145d7dffca1..30539a280423 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -26,14 +26,14 @@ EBUILD mpg123-0.59s-r9.ebuild 3048 RMD160 47f49b6b4fb13f3a95dd3afd0ca7f082afdd88
 MD5 15087675c7f8776c29b28cd3b42a9ed7 mpg123-0.59s-r9.ebuild 3048
 RMD160 47f49b6b4fb13f3a95dd3afd0ca7f082afdd8802 mpg123-0.59s-r9.ebuild 3048
 SHA256 d96b73bcd2a237e6bbd994add3a2aa180b30a6e6c0d36c6bdc4eb983cac7feb8 mpg123-0.59s-r9.ebuild 3048
-EBUILD mpg123-0.61.ebuild 1279 RMD160 bcc2dc1673c4229051932ffaebe538857111cf08 SHA1 736f9dc59657c0f5b257c4e7c0a7caee70ac16ce SHA256 a0285a77d7c4e94ff7d512e712f2d4af51934bbc09bd172effc8da1a8327c534
-MD5 fac273ced36e156af0aad1219fb94078 mpg123-0.61.ebuild 1279
-RMD160 bcc2dc1673c4229051932ffaebe538857111cf08 mpg123-0.61.ebuild 1279
-SHA256 a0285a77d7c4e94ff7d512e712f2d4af51934bbc09bd172effc8da1a8327c534 mpg123-0.61.ebuild 1279
-MISC ChangeLog 16212 RMD160 17f1539c2aa01607c04648eb29ade4fea64e9631 SHA1 651d379e271281de613979d8b2b738fcb2f3e73f SHA256 0693204f837aba52d15c88a7dc63a59d8e8404218340b2acc99474f45f0a46b2
-MD5 a39c12dfb5f1bedaa1c05dcc8f1e001a ChangeLog 16212
-RMD160 17f1539c2aa01607c04648eb29ade4fea64e9631 ChangeLog 16212
-SHA256 0693204f837aba52d15c88a7dc63a59d8e8404218340b2acc99474f45f0a46b2 ChangeLog 16212
+EBUILD mpg123-0.61.ebuild 1923 RMD160 d1460c4ca83411564ec9245ff3874e0af3c1e367 SHA1 6f8c9a875b7d2b2d0e02bd6701cf7a3662b8f99f SHA256 1553281d6b0b3fba5d9fc2b71df62a8671c67178a22aae7c2de3559277506b61
+MD5 f8be0f7cbd93b1027ab0cf88e673a65c mpg123-0.61.ebuild 1923
+RMD160 d1460c4ca83411564ec9245ff3874e0af3c1e367 mpg123-0.61.ebuild 1923
+SHA256 1553281d6b0b3fba5d9fc2b71df62a8671c67178a22aae7c2de3559277506b61 mpg123-0.61.ebuild 1923
+MISC ChangeLog 16348 RMD160 bc214954aa69df2ab9c17edadbdf25f0e378a201 SHA1 62b4510c0b2de8242f4abbb017674cdcbb9e4622 SHA256 3d5c559219c10154e8297682b7dd7f6680d038bfdcc256fb4e40ff5827254a63
+MD5 0d6491f3ec1df025f352c210d4e554d0 ChangeLog 16348
+RMD160 bc214954aa69df2ab9c17edadbdf25f0e378a201 ChangeLog 16348
+SHA256 3d5c559219c10154e8297682b7dd7f6680d038bfdcc256fb4e40ff5827254a63 ChangeLog 16348
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
diff --git a/media-sound/mpg123/mpg123-0.61.ebuild b/media-sound/mpg123/mpg123-0.61.ebuild
index b8dbb13d9049..b8f4739d4b69 100644
--- a/media-sound/mpg123/mpg123-0.61.ebuild
+++ b/media-sound/mpg123/mpg123-0.61.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.61.ebuild,v 1.2 2006/10/22 19:09:49 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.61.ebuild,v 1.3 2007/01/06 14:08:04 masterdriverz Exp $
+
+inherit eutils
 
 DESCRIPTION="Real Time mp3 player"
 HOMEPAGE="http://www.mpg123.de/"
@@ -10,39 +12,53 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-IUSE="mmx 3dnow esd nas oss alsa sdl"
+IUSE="mmx 3dnow alsa oss sdl esd nas jack portaudio"
 
-RDEPEND="esd? ( media-sound/esound )
-	nas? ( media-libs/nas )
-	alsa? ( media-libs/alsa-lib )
-	sdl? ( media-libs/libsdl )"
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	sdl? ( !alsa? ( !oss? ( media-libs/libsdl ) ) )
+	esd? ( !alsa? ( !oss? ( !sdl? ( media-sound/esound ) ) ) )
+	nas? ( !alsa? ( !oss? ( !sdl? ( !esd? ( media-libs/nas ) ) ) ) )
+	jack? ( !alsa? ( !oss? ( !sdl? ( !esd? ( !nas? ( media-sound/jack-audio-connection-kit ) ) ) ) ) )
+	portaudio? ( !alsa? ( !oss? ( !sdl? ( !esd? ( !nas? ( !jack? ( media-libs/portaudio ) ) ) ) ) ) )"
 
 DEPEND="${RDEPEND}"
 
 PROVIDE="virtual/mpg123"
 
 src_compile() {
+	local audiodev
 	if use alsa; then
-	  audiodev="alsa"
-	 elif use oss; then
-	  audiodev="oss"
-	 elif use sdl; then
-	  audiodev="sdl"
-	 elif use esd; then
-	  audiodev="esd"
-	 elif use ppc-macos; then
-	  audiodev="macosx";
-	 elif use nas; then
-	  audiodev="nas"
-	 else die "no audio device selected"
+		audiodev="alsa"
+	elif use oss; then
+		audiodev="oss"
+	elif use sdl; then
+		audiodev="sdl"
+	elif use esd; then
+		audiodev="esd"
+	elif use nas; then
+		audiodev="nas"
+	elif use jack; then
+		audiodev="jack"
+	elif use portaudio; then
+		audiodev="portaudio"
+	elif use ppc-macos; then
+		audiodev="macosx";
+	else audiodev="dummy"
 	fi
 
 	if use 3dnow; then
-	 myconf="--with-cpu=3dnow"
+		myconf="--with-cpu=3dnow"
 	elif use mmx; then
-	 myconf="--with-cpu=mmx"
+		myconf="--with-cpu=mmx"
 	fi
 
+	einfo "Compiling with ${audiodev} audio output."
+	einfo "If that is not what you want, then select exactly ONE"
+	einfo "of the following USE flags:"
+	einfo "alsa oss sdl esd nas jack portaudio"
+	einfo "and recompile ${PN}."
+	epause 5
+	
 	econf \
 	      --with-optimization=0 \
 	      --with-audio=$audiodev \