Revision: 1738
Author: gentoid
Date: 2010-09-01 23:41:12 +0200 (Wed, 01 Sep 2010)
Log Message:
-----------
xwax: cleanup & bump to git-version
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/xwax/ChangeLog
trunk/overlays/proaudio/media-sound/xwax/Manifest
trunk/overlays/proaudio/media-sound/xwax/metadata.xml
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/xwax/xwax-9999.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/xwax/xwax-0.2.ebuild
trunk/overlays/proaudio/media-sound/xwax/xwax-0.3.ebuild
Modified: trunk/overlays/proaudio/media-sound/xwax/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/xwax/ChangeLog 2010-09-01 20:00:16 UTC
(rev 1737)
+++ trunk/overlays/proaudio/media-sound/xwax/ChangeLog 2010-09-01 21:41:12 UTC
(rev 1738)
@@ -1,7 +1,14 @@
# ChangeLog for media-sound/xwax
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*xwax-9999 (01 Sep 2010)
+
+ 01 Sep 2010; Viktor Lazarev <[email protected]> -xwax-0.2.ebuild,
+ -xwax-0.3.ebuild, +xwax-9999.ebuild, metadata.xml:
+ Removed old ebuild. New ebuild was taken from official Gentoo Portage tree
+ and bumped to git-version.
+
17 Dec 2007; Thomas Kuther <[email protected]> +xwax-0.3.ebuild:
version bump, adds support for ALSA
Modified: trunk/overlays/proaudio/media-sound/xwax/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/xwax/Manifest 2010-09-01 20:00:16 UTC
(rev 1737)
+++ trunk/overlays/proaudio/media-sound/xwax/Manifest 2010-09-01 21:41:12 UTC
(rev 1738)
@@ -1,6 +1,3 @@
-DIST xwax-0.2.tar.gz 30565 RMD160 8209b6428d121b8d08bb5e7063195d91d31d1e6d
SHA1 7b14c825354ba6d8ce2ba761ced3e6222b3ab3e0 SHA256
bb97da43e7696c5f412b1b48aa15f176e5b8768f0bf4964df10807cb6aa596b1
-DIST xwax-0.3.tar.gz 37915 RMD160 b3bb8254fed3eb1ba5ac8ee5498ed80f5532e6d9
SHA1 92308405d908470ce62d041ad5beae6356d9ed1a SHA256
0f306f81b442413748db9ed8c03ec75f1873ae256e60213dd927aab95eb1fd15
-EBUILD xwax-0.2.ebuild 740 RMD160 8f81a33f448ef0b694f232771d224c513ff4b220
SHA1 40b87d89e90ea3150bf8f100385a678261e5af01 SHA256
c6247ee2079abbeacc1304c3a869f7c593d617617ef9ec830d60cb14b0aacbd1
-EBUILD xwax-0.3.ebuild 837 RMD160 7ea99816a8eba0917b1d61ddd3bbf20db8d6a0e9
SHA1 c157621739a53c808f0ce5696dae2762d7d27a70 SHA256
2aadf568595c4963ad58bf94e669ab7d6bcb0d8b9f6850ddf43da74e50037861
-MISC ChangeLog 316 RMD160 3451c26248fa0c469eb0bfd0029f1e0b01da1abd SHA1
8244bb836c6f70b217e7ef6a85227d93555d4c2d SHA256
fc82af7b382cf5c9e0a316e85a7c6b9fe510ddeda11328f8178de3a38da66ef3
-MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1
2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256
96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
+EBUILD xwax-9999.ebuild 2615 RMD160 ee840adc3d032c1040ea4cedf8b7ce16f61e0ce0
SHA1 6985d0425168086993b635a7149cb725eb1849d0 SHA256
d9a24cfec44780a58ab8f3ef8d552564282f1dd92078aac2fd0c20a4f100e2d6
+MISC ChangeLog 573 RMD160 eaf545995d264c78627e7e9c2a76fc03e03ec237 SHA1
23f2479204301c4cffe6fda0c1031c79b9060dce SHA256
0020da23caa7e73bd1e5733d3aa41e1a211225d9a982772b2dfa3d050412936e
+MISC metadata.xml 969 RMD160 6a89a45b06440653ff8652c94c03aeb04c62620f SHA1
5bf503236ef07d8fc2d1c28ea41fc576034b3cb3 SHA256
c51c81879a64aafd511ce83909518104aa9293a0af8b9b0dcf5aa378366d4131
Modified: trunk/overlays/proaudio/media-sound/xwax/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/xwax/metadata.xml 2010-09-01
20:00:16 UTC (rev 1737)
+++ trunk/overlays/proaudio/media-sound/xwax/metadata.xml 2010-09-01
21:41:12 UTC (rev 1738)
@@ -6,4 +6,13 @@
<email>[email protected]</email>
<name>pro-audio overlay team</name>
</maintainer>
+ <use>
+ <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>
Deleted: trunk/overlays/proaudio/media-sound/xwax/xwax-0.2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/xwax/xwax-0.2.ebuild 2010-09-01
20:00:16 UTC (rev 1737)
+++ trunk/overlays/proaudio/media-sound/xwax/xwax-0.2.ebuild 2010-09-01
21:41:12 UTC (rev 1738)
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="open source vinyl emulation"
-HOMEPAGE="http://www.pogo.org.uk/xwax/";
-
-SRC_URI="http://www.pogo.org.uk/xwax/releases/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64"
-
-
-IUSE="aac cdparanoia ffmpeg mp3 vorbis"
-DEPEND="media-libs/libsdl
- media-libs/sdl-ttf"
-
-RDEPEND="${DEPEND}
- aac? ( media-libs/faad2 )
- cdparanoia? ( media-sound/cdparanoia )
- ffmpeg? ( media-video/ffmpeg )
- flac? ( media-libs/flac )
- mp3? ( media-sound/mpg123 )
- vorbis? ( media-sound/vorbis-tools )"
-
-src_compile() {
- emake || die "Make failed"
-}
-
-src_install() {
- dobin xwax xwax_import || die "dobin failed"
- dodoc README
-}
Deleted: trunk/overlays/proaudio/media-sound/xwax/xwax-0.3.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/xwax/xwax-0.3.ebuild 2010-09-01
20:00:16 UTC (rev 1737)
+++ trunk/overlays/proaudio/media-sound/xwax/xwax-0.3.ebuild 2010-09-01
21:41:12 UTC (rev 1738)
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="open source vinyl emulation"
-HOMEPAGE="http://www.pogo.org.uk/xwax/";
-
-SRC_URI="http://www.pogo.org.uk/xwax/releases/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64"
-
-
-IUSE="aac alsa cdparanoia ffmpeg mp3 vorbis"
-DEPEND="media-libs/libsdl
- media-libs/sdl-ttf"
-
-RDEPEND="${DEPEND}
- alsa? ( media-libs/alsa-lib )
- aac? ( media-libs/faad2 )
- cdparanoia? ( media-sound/cdparanoia )
- ffmpeg? ( media-video/ffmpeg )
- flac? ( media-libs/flac )
- mp3? ( media-sound/mpg123 )
- vorbis? ( media-sound/vorbis-tools )"
-
-src_compile() {
- econf \
- $(use_enable alsa) \
- || die "econf failed!"
-
- emake || die "Make failed"
-}
-
-src_install() {
- dobin xwax xwax_import || die "dobin failed"
- dodoc README
-}
Added: trunk/overlays/proaudio/media-sound/xwax/xwax-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/xwax/xwax-9999.ebuild
(rev 0)
+++ trunk/overlays/proaudio/media-sound/xwax/xwax-9999.ebuild 2010-09-01
21:41:12 UTC (rev 1738)
@@ -0,0 +1,83 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+inherit toolchain-funcs git
+
+DESCRIPTION="Digital vinyl emulation software"
+HOMEPAGE="http://www.xwax.co.uk/";
+EGIT_REPO_URI="http://www.xwax.co.uk/devel/${PN}.git";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+# 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"
+}
