From b8f1bc8e87c791cb53b5bedb1787be9418b857cd Mon Sep 17 00:00:00 2001 From: Joe Sapp Date: Sat, 7 May 2011 17:50:00 +0000 Subject: Version bump and deprecated XWAX_DECODERS for USE flags - see ChangeLog for details (Portage version: 2.1.9.45/cvs/Linux x86_64) --- media-sound/xwax/ChangeLog | 11 ++++- media-sound/xwax/metadata.xml | 3 ++ media-sound/xwax/xwax-0.9.ebuild | 87 +++++++++++++++++++++++++++++++++ media-sound/xwax/xwax-0.9_beta3.ebuild | 88 ---------------------------------- 4 files changed, 100 insertions(+), 89 deletions(-) create mode 100644 media-sound/xwax/xwax-0.9.ebuild delete mode 100644 media-sound/xwax/xwax-0.9_beta3.ebuild (limited to 'media-sound/xwax') 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 -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 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 @@ Sets runtime dependencies to support decoding MP3 audio. Sets runtime dependencies to support decoding Ogg Vorbis audio. Sets runtime dependencies to support decoding "other" audio files. + Sets runtime dependencies to support decoding audio from a compact disc. + Sets runtime dependencies to support decoding MP3 audio. + Sets runtime dependencies to support decoding "other" audio files. diff --git a/media-sound/xwax/xwax-0.9.ebuild b/media-sound/xwax/xwax-0.9.ebuild new file mode 100644 index 000000000000..3bf3d4fdb97e --- /dev/null +++ b/media-sound/xwax/xwax-0.9.ebuild @@ -0,0 +1,87 @@ +# 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.ebuild,v 1.1 2011/05/07 17:50:00 nixphoeni Exp $ + +EAPI=4 +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" +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 ) + cdda? ( media-sound/cdparanoia ) + mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) ) + fallback? ( virtual/ffmpeg )" +DEPEND="${RDEPEND}" + +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 oss) +} + +src_compile() { + # EXECDIR is the default directory in which xwax will look for + # the 'xwax-import' and 'xwax-scan' scripts + emake 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" + + dodoc ${DOCS} || die "failed to install docs" +} diff --git a/media-sound/xwax/xwax-0.9_beta3.ebuild b/media-sound/xwax/xwax-0.9_beta3.ebuild deleted file mode 100644 index 63eb67a598ea..000000000000 --- a/media-sound/xwax/xwax-0.9_beta3.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# 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 $ - -EAPI=3 -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" - -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? ( virtual/ffmpeg )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${PN}-${MY_PV}" - -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 - 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" -} -- cgit v1.2.3-65-gdbad