Add USE pulseaudio, allow more than one audio output by default, can be selected runtime.

Package-Manager: portage-2.1.4_rc9

3 files changed, 40 insertions, 48 deletions

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index ebc3bccf5c95..055c2387c85c 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpg123
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.127 2007/12/10 18:39:34 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.128 2007/12/10 20:25:18 drac Exp $
+
+  10 Dec 2007; Samuli Suominen <drac@gentoo.org> mpg123-1.0_rc2.ebuild:
+  Add USE pulseaudio, allow more than one audio output by default, can be
+  selected runtime.
 
 *mpg123-1.0_rc2 (10 Dec 2007)
 
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 1f1f26a9a7ad..2e98df1417a0 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -34,14 +34,14 @@ EBUILD mpg123-0.67.ebuild 2162 RMD160 55aeb21e50d0944c99cde0cb649b6577adb3ed0f S
 MD5 0daa64d2c7de05d9be71debcb676da52 mpg123-0.67.ebuild 2162
 RMD160 55aeb21e50d0944c99cde0cb649b6577adb3ed0f mpg123-0.67.ebuild 2162
 SHA256 a3fac3a7c355855a6d6d559d38487bdc11722987a9135ee382ec6c8ee935d719 mpg123-0.67.ebuild 2162
-EBUILD mpg123-1.0_rc2.ebuild 2211 RMD160 ba6d05bdd08d177cd822aabc067e01b7b315426c SHA1 9b6cefffd33ec0ccd15e058f4966772bdfccb5d5 SHA256 9dcf6a6facc78cecfe4e198fd00b00cac5119d447426a53b60ed4ad2ec0cee0a
-MD5 b23b1d31ca0324f1ea9e49f2237ad49a mpg123-1.0_rc2.ebuild 2211
-RMD160 ba6d05bdd08d177cd822aabc067e01b7b315426c mpg123-1.0_rc2.ebuild 2211
-SHA256 9dcf6a6facc78cecfe4e198fd00b00cac5119d447426a53b60ed4ad2ec0cee0a mpg123-1.0_rc2.ebuild 2211
-MISC ChangeLog 19051 RMD160 0c4883c4c98c1547f381fe2e5ffeed1cb065ffc5 SHA1 1e3cb7113f5c0d26e4dfad7248f37d09ccb1598e SHA256 e01a4d69be91c8abd6c5773755d692b1ab05c66c9962c2285d618da4b0837532
-MD5 bc0ba94836ce0aa8d2fcf4814a3ce601 ChangeLog 19051
-RMD160 0c4883c4c98c1547f381fe2e5ffeed1cb065ffc5 ChangeLog 19051
-SHA256 e01a4d69be91c8abd6c5773755d692b1ab05c66c9962c2285d618da4b0837532 ChangeLog 19051
+EBUILD mpg123-1.0_rc2.ebuild 1805 RMD160 f8ff01620a9d0a189e50f392475df63afea9b826 SHA1 e5d03b5d89b1dd5a6fe86789b2cc592846f337f1 SHA256 fba59edbd8c05959a5b6f8c7ad799ef3f803417d46f5fd1033760383c2f5fe4b
+MD5 551c0701fdfba5a4076518f4564c9cf0 mpg123-1.0_rc2.ebuild 1805
+RMD160 f8ff01620a9d0a189e50f392475df63afea9b826 mpg123-1.0_rc2.ebuild 1805
+SHA256 fba59edbd8c05959a5b6f8c7ad799ef3f803417d46f5fd1033760383c2f5fe4b mpg123-1.0_rc2.ebuild 1805
+MISC ChangeLog 19218 RMD160 ed9a5d71648bae49259df3aa896cc63fa008c33b SHA1 e9886aaf54063e604c700f9e75cbb4ae5862612d SHA256 cb384828dadef8f9db4da1f7cecbd187332cbe92a45041486e1617571dcbefda
+MD5 5191dbade01df8b1484d02a16e26f3b8 ChangeLog 19218
+RMD160 ed9a5d71648bae49259df3aa896cc63fa008c33b ChangeLog 19218
+SHA256 cb384828dadef8f9db4da1f7cecbd187332cbe92a45041486e1617571dcbefda ChangeLog 19218
 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-1.0_rc2.ebuild b/media-sound/mpg123/mpg123-1.0_rc2.ebuild
index 80fbc961ba88..9f551e88a0ac 100644
--- a/media-sound/mpg123/mpg123-1.0_rc2.ebuild
+++ b/media-sound/mpg123/mpg123-1.0_rc2.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/media-sound/mpg123/mpg123-1.0_rc2.ebuild,v 1.1 2007/12/10 18:39:34 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.0_rc2.ebuild,v 1.2 2007/12/10 20:25:18 drac Exp $
 
 inherit eutils autotools
 
@@ -13,14 +13,15 @@ SRC_URI="http://www.${PN}.de/download/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="3dnow 3dnowext alsa altivec esd jack mmx nas oss portaudio sdl sse"
+IUSE="3dnow 3dnowext alsa altivec esd jack mmx nas oss portaudio pulseaudio sdl sse"
 
 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 ) ) ) ) ) ) )"
+	sdl? ( media-libs/libsdl )
+	esd? ( media-sound/esound )
+	nas? ( media-libs/nas )
+	jack? ( media-sound/jack-audio-connection-kit )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
@@ -30,51 +31,38 @@ PROVIDE="virtual/mpg123"
 src_unpack() {
 	unpack "${A}"
 	cd "${S}"
-	epatch "${FILESDIR}/${PV}-no-faltivec.patch"
+	epatch "${FILESDIR}"/${PV}-no-faltivec.patch
 	eautoreconf
 }
 
 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 nas; then
-		audiodev="nas"
-	elif use jack; then
-		audiodev="jack"
-	elif use portaudio; then
-		audiodev="portaudio";
-	else audiodev="dummy"
-	fi
+	local myaudio
+
+	use alsa && myaudio="${myaudio} alsa"
+	use esd && myaudio="${myaudio} esd"
+	use jack && myaudio="${myaudio} jack"
+	use nas && myaudio="${myaudio} nas"
+	use oss && myaudio="${myaudio} oss"
+	use pulseaudio && myaudio="${myaudio} pulse"
+	use sdl && myaudio="${myaudio} sdl"
+
+	local mycpu
 
 	if use altivec; then
-		myconf="--with-cpu=altivec"
+		mycpu="--with-cpu=altivec"
 	elif use 3dnowext; then
-		myconf="--with-cpu=3dnowext"
+		mycpu="--with-cpu=3dnowext"
 	elif use 3dnow; then
-		myconf="--with-cpu=3dnow"
+		mycpu="--with-cpu=3dnow"
 	elif use sse; then
-		myconf="--with-cpu=sse"
+		mycpu="--with-cpu=sse"
 	elif use mmx; then
-		myconf="--with-cpu=mmx"
+		mycpu="--with-cpu=mmx"
 	fi
 
-	elog "Compiling with ${audiodev} audio output."
-	elog "If that is not what you want, then select exactly ONE"
-	elog "of the following USE flags:"
-	elog "alsa oss sdl esd nas jack portaudio"
-	elog "and recompile ${PN}."
-	epause 5
-
 	econf --with-optimization=0 \
-		--with-audio=${audiodev} \
-		${myconf} || die "econf failed."
+		--with-audio="${myaudio}" \
+		${mycpu} || die "econf failed."
 
 	emake || die "emake failed."
 }