Version bump and deprecated XWAX_DECODERS for USE flags - see ChangeLog for details

(Portage version: 2.1.9.45/cvs/Linux x86_64)

3 files changed, 49 insertions, 38 deletions

diff --git a/media-sound/xwax/ChangeLog b/media-sound/xwax/ChangeLog
index 504673da2fa8..de06eedd8ad6 100644
--- a/media-sound/xwax/ChangeLog
+++ b/media-sound/xwax/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/xwax
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/ChangeLog,v 1.30 2011/04/04 12:33:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/ChangeLog,v 1.31 2011/05/07 17:50:00 nixphoeni Exp $
+
+*xwax-0.9 (07 May 2011)
+
+  07 May 2011; Joe Sapp <nixphoeni@gentoo.org> -xwax-0.9_beta3.ebuild,
+  +xwax-0.9.ebuild, metadata.xml:
+  Version bump, deprecated XWAX_DECODERS for USE flags, bumped EAPI to reflect
+  proper USE flag configurations, and moved patching of the import script to
+  src_prepare(). Also added OSS support through USE and the --prefix flag to
+  econf.
 
   04 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> xwax-0.7.ebuild,
   xwax-0.8.ebuild, xwax-0.9_beta3.ebuild:
diff --git a/media-sound/xwax/metadata.xml b/media-sound/xwax/metadata.xml
index 4f7926689cd8..65c3b3ec09ac 100644
--- a/media-sound/xwax/metadata.xml
+++ b/media-sound/xwax/metadata.xml
@@ -14,5 +14,8 @@
 		<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>
+		<flag name='cdda'>Sets runtime dependencies to support decoding audio from a compact disc.</flag>
+		<flag name='mp3'>Sets runtime dependencies to support decoding MP3 audio.</flag>
+		<flag name='fallback'>Sets runtime dependencies to support decoding "other" audio files.</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/xwax/xwax-0.9_beta3.ebuild b/media-sound/xwax/xwax-0.9.ebuild
index 63eb67a598ea..3bf3d4fdb97e 100644
--- a/media-sound/xwax/xwax-0.9_beta3.ebuild
+++ b/media-sound/xwax/xwax-0.9.ebuild
@@ -1,62 +1,77 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-0.9_beta3.ebuild,v 1.2 2011/04/04 12:33:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-0.9.ebuild,v 1.1 2011/05/07 17:50:00 nixphoeni Exp $
 
-EAPI=3
+EAPI=4
 inherit toolchain-funcs
 
-MY_PV="${PV/_/-}"
-
 DESCRIPTION="Digital vinyl emulation software"
 HOMEPAGE="http://www.xwax.co.uk/"
-SRC_URI="http://www.xwax.co.uk/testing/${PN}-${MY_PV}.tar.gz"
+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}"
+IUSE="alsa jack oss cdda mp3 +fallback"
+REQUIRED_USE="|| ( cdda mp3 fallback )
+	|| ( alsa jack oss )"
 
 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? ( virtual/ffmpeg )"
+	cdda? ( media-sound/cdparanoia )
+	mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) )
+	fallback? ( virtual/ffmpeg )"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 DOCS="README CHANGES"
 
+pkg_setup() {
+	ewarn "Please note that XWAX_DECODERS is deprecated in favor of USE flags."
+	ewarn "Sorry for the inconvenience."
+}
+
 src_prepare() {
 	# Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in
 	# the Makefile
+	# Also replace VERSION so we don't have to depend on git...
 	sed -i -e 's:\(^CFLAGS.*\)-O[0-9]\(.*\):\1\2:' \
 		-e 's:\(^LDFLAGS.*\)-O[0-9]\(.*\):\1\2:' \
+		-e "s:\(^VERSION =\).*:\1 ${PV}:" \
 		Makefile || die "sed failed"
+
+	# Replace any decoder commands in the import script, if necessary
+	if [[ `use mp3` ]]; then
+		# mpg123 is upstream's default
+		if has_version media-sound/mpg123; then
+			TO="mpg123"
+			FROM="mpg321"
+		# Otherwise, use mpg321
+		else
+			TO="mpg321"
+			FROM="mpg123"
+		fi
+		debug-print "found ${TO}"
+		sed -i -e "s:${FROM}:${TO}:g" import || \
+			die "problem converting xwax-import to use ${TO}"
+	fi
 }
 
 src_configure() {
 	tc-export CC
 	econf \
+		--prefix "${EROOT}usr" \
 		$(use_enable alsa) \
-		$(use_enable jack)
+		$(use_enable jack) \
+		$(use_enable oss)
 }
 
 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"
+	emake EXECDIR="${EROOT}usr/bin"
 }
 
 src_install() {
@@ -68,21 +83,5 @@ src_install() {
 	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
-			TO="mpg123"
-			FROM="mpg321"
-		# Otherwise, use mpg321
-		else
-			TO="mpg321"
-			FROM="mpg123"
-		fi
-		debug-print "found ${TO}"
-		sed -i -e "s:${FROM}:${TO}:g" "${D}/usr/bin/xwax-import" || \
-			die "problem converting xwax-import to use ${TO}"
-	fi
-
 	dodoc ${DOCS} || die "failed to install docs"
 }