Version bump; added XWAX_DECODERS to IUSE

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

4 files changed, 103 insertions, 4 deletions

diff --git a/media-sound/xwax/ChangeLog b/media-sound/xwax/ChangeLog
index b34869937915..60ad9bd566de 100644
--- a/media-sound/xwax/ChangeLog
+++ b/media-sound/xwax/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/xwax
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/ChangeLog,v 1.14 2010/02/09 21:16:35 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/ChangeLog,v 1.15 2010/03/08 00:26:02 nixphoeni Exp $
+
+*xwax-0.7 (08 Mar 2010)
+
+  08 Mar 2010; Joe Sapp <nixphoeni@gentoo.org> +xwax-0.7.ebuild,
+  metadata.xml:
+  Version bump; added XWAX_DECODERS to IUSE so RDEPEND (and the xwax-import
+  script) can be setup properly to handle the audio files the user cares
+  about; bumped EAPI for access to EROOT
 
   09 Feb 2010; Joseph Jezak <josejx@gentoo.org> xwax-0.5.ebuild,
   xwax-0.6-r1.ebuild:
diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index acf1c5a7352f..f45058680acf 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -2,7 +2,9 @@ AUX xwax-0.4-fonts.patch 339 RMD160 afcc620ba588f7a57f3e5f9aa503a176aaf3d8dd SHA
 AUX xwax-0.6-execlp.patch 1033 RMD160 94e42cef447ec49669963e5d35aaab07594607fc SHA1 61067ce3a06886b970b63bc8e43253202edcf7c3 SHA256 2b845879cb752a68cfd2cad538256707c89bc19e11fe8d8ab9173cf6e184458c
 DIST xwax-0.5.tar.gz 40448 RMD160 8afadfc94a1e67896a2c172b1072e3f5d185201c SHA1 30ab3d60670d1b07d02ceb35c7376eafe034f02e SHA256 eaf9528f49ff61ba9d74978cf67dcd8e3b57df24a9f54d797d9e5d6d856a07b3
 DIST xwax-0.6.tar.gz 41786 RMD160 3209ee2ec2bc4d6bad8b4850ac2e03d5f31ab060 SHA1 420c90c61007e800653972b0d1217a1bcd423af6 SHA256 629db1c2f05f8f474cdd75b2db764f101d3fa1d57c355067f05287966c70531e
+DIST xwax-0.7.tar.gz 47167 RMD160 2c15a51027ba2ec25b4953a49e4953864400f279 SHA1 a94e4b9b60c81b9ebd74f85be0717007eb6ddadf SHA256 c2274ec002d157ee51494b6c6eaf2a5429f6c007f000defdfcbd5a9e39b75362
 EBUILD xwax-0.5.ebuild 1030 RMD160 79e5a0c713146875a47c401690f15fa466e1c285 SHA1 2dc6751c64b294ba5ee5a232c83c55b19d1a7670 SHA256 e83ac7d5633fe3569406b2ecb0b681ebd72c1e4ee338d76a853ce5d2dddd8775
 EBUILD xwax-0.6-r1.ebuild 1140 RMD160 49954928d248f4d2c866816f85433272eafb4843 SHA1 4c11e705b2b376d09b674e3c162aff77d0c4e31c SHA256 e258ff588801f2a335991338134ceb2790c3ca6f87ddca185eacf0c34c478c83
-MISC ChangeLog 2201 RMD160 0ac43d0903c9453aa8893e3d68c3bb230cd644f2 SHA1 fc8a7be497330195005945aa68193192310eb578 SHA256 1070c44b2643e49835654c87533395162bc6cd26a3bf0b16671d1e881aad924a
-MISC metadata.xml 313 RMD160 6f9b9b4a376ba954ff56a0f07f2fe09b334fd25e SHA1 e193093135d9f25f35519539e6d268afea3f64a8 SHA256 66a26e7635f26541f5d01379f65127eb2407b1cc6c527c1d3a1184a68e32c6e7
+EBUILD xwax-0.7.ebuild 2728 RMD160 ddaa50bbb5cbeb755baa01e9a9b988b6dcc7c58d SHA1 9f9c352d036c770176d2c50ecbf02358717c52db SHA256 f3aaf774f6414863c39ceb366493499765da0c23e55d1a9fdca34f4b159ea2d1
+MISC ChangeLog 2501 RMD160 ac9b42af009d08356456005b400d80d314973d58 SHA1 76ad6c02454fb346f89cff754b713c616f04d53c SHA256 1acc3cb9fe9b220268d869a535c3bbdfafdce7bf3a66fa1ccd84044ef6c0699a
+MISC metadata.xml 951 RMD160 0fbeebdaa2cd21809d5d91d422f15518652693b7 SHA1 d5e698d35c2b339c0bdf0a26dd11830b701a7f84 SHA256 b7e433deaf2a12d7d8550f3732ed2d6506672d4fa6b81b169c843782ddea7b30
diff --git a/media-sound/xwax/metadata.xml b/media-sound/xwax/metadata.xml
index 33cb55baa49c..4f7926689cd8 100644
--- a/media-sound/xwax/metadata.xml
+++ b/media-sound/xwax/metadata.xml
@@ -7,6 +7,12 @@
 		<name>Joe Sapp</name>
 	</maintainer>
 	<use>
-		<flag name='alsa'>Enable ALSA support.</flag>
+		<flag name='alsa'>Adds support for ALSA audio input/output.</flag>
+		<flag name='xwax_decoders_aac'>Sets runtime dependencies to support decoding AAC audio.</flag>
+		<flag name='xwax_decoders_cd'>Sets runtime dependencies to support decoding audio from a compact disc.</flag>
+		<flag name='xwax_decoders_flac'>Sets runtime dependencies to support decoding FLAC audio.</flag>
+		<flag name='xwax_decoders_mp3'>Sets runtime dependencies to support decoding MP3 audio.</flag>
+		<flag name='xwax_decoders_ogg'>Sets runtime dependencies to support decoding Ogg Vorbis audio.</flag>
+		<flag name='xwax_decoders_misc'>Sets runtime dependencies to support decoding "other" audio files.</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/xwax/xwax-0.7.ebuild b/media-sound/xwax/xwax-0.7.ebuild
new file mode 100644
index 000000000000..13f1801e2ad3
--- /dev/null
+++ b/media-sound/xwax/xwax-0.7.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-0.7.ebuild,v 1.1 2010/03/08 00:26:02 nixphoeni Exp $
+
+EAPI=3
+inherit toolchain-funcs
+
+DESCRIPTION="Digital vinyl emulation software"
+HOMEPAGE="http://www.xwax.co.uk/"
+SRC_URI="http://www.xwax.co.uk/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+# These make sure the user can decode the files he or she cares about by
+# setting appropriate runtime depends and (perhaps) configuring the import
+# script
+IUSE_XWAX_DECODERS="xwax_decoders_aac xwax_decoders_cd xwax_decoders_flac \
+	+xwax_decoders_mp3 xwax_decoders_ogg xwax_decoders_misc"
+IUSE="alsa jack ${IUSE_XWAX_DECODERS}"
+
+RDEPEND="media-libs/libsdl
+	media-libs/sdl-ttf
+	media-fonts/dejavu
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	xwax_decoders_aac? ( media-libs/faad2 )
+	xwax_decoders_cd? ( media-sound/cdparanoia )
+	xwax_decoders_flac? ( media-libs/flac )
+	xwax_decoders_mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) )
+	xwax_decoders_ogg? ( media-sound/vorbis-tools )
+	xwax_decoders_misc? ( media-video/ffmpeg )"
+DEPEND="${RDEPEND}"
+
+DOCS="README CHANGES"
+
+src_prepare() {
+	# Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in
+	# the Makefile
+	sed -i -e 's:\(^CFLAGS.*\)-O[0-9]\(.*\):\1\2:' \
+		-e 's:\(^LDFLAGS.*\)-O[0-9]\(.*\):\1\2:' \
+		Makefile || die "sed failed"
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_enable alsa) \
+		$(use_enable jack)
+}
+
+src_compile() {
+	# EXECDIR is the default directory in which xwax will look for
+	# the 'xwax-import' and 'xwax-scan' scripts
+	emake PREFIX="${EROOT}usr" EXECDIR="${EROOT}usr/bin"
+}
+
+src_install() {
+	# This is easier than setting all the environment variables
+	# needed, running the sed script required to get the man directory
+	# correct, and removing the GPL-2 after a 'make install' run
+	dobin xwax || die "failed to install xwax"
+	newbin import xwax-import || die "failed to install xwax-import"
+	newbin scan xwax-scan || die "failed to install xwax-scan"
+	doman xwax.1 || die "failed to install man page"
+
+	# Replace any decoder commands in the import script, if necessary
+	if use xwax_decoders_mp3; then
+		# mpg123 is upstream's default
+		if has_version media-sound/mpg123; then
+			debug-print "found mpg123"
+			dosed "s:mpg321:mpg123:g" /usr/bin/xwax-import || \
+				die "problem converting xwax-import to use mpg123"
+		# Otherwise, use mpg321
+		else
+			debug-print "found mpg321"
+			dosed "s:mpg123:mpg321:g" /usr/bin/xwax-import || \
+				die "problem converting xwax-import to use mpg321"
+		fi
+	fi
+
+	dodoc ${DOCS} || die "failed to install docs"
+}