Version bump

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

3 files changed, 92 insertions, 16 deletions

diff --git a/media-sound/xwax/ChangeLog b/media-sound/xwax/ChangeLog
index fc56b65a37d8..5dea53e3cee9 100644
--- a/media-sound/xwax/ChangeLog
+++ b/media-sound/xwax/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/xwax
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/ChangeLog,v 1.39 2012/02/25 15:10:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/ChangeLog,v 1.40 2012/05/13 19:22:14 nixphoeni Exp $
+
+*xwax-1.2 (13 May 2012)
+
+  13 May 2012; Joe Sapp <nixphoeni@gentoo.org> +xwax-1.2.ebuild:
+  Version bump
 
   25 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> xwax-1.0.ebuild:
   ppc/ppc64 stable wrt #400415
diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index 0decb794e2db..75ef93dcdc9b 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -1,24 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST xwax-0.8.tar.gz 47660 RMD160 ce974475cc7b36d9362513f0951adff00c11569c SHA1 f72199faf79cea9025b69daf703a1b6e51140d76 SHA256 552ebbac9edfc6d85b269ca49170cf7f89b48702e683da6ab02f8878bfa8fd58
 DIST xwax-0.9.tar.gz 52835 RMD160 12e7c1d90c90ba2c0c8c4d2a14751aa33f571bcc SHA1 1c440a82471d4fb0049ba81f5823f038e1f664e4 SHA256 bc51bb5a19ec68ceaba7fb5f63c31481c8e8958d82d460ac45abbb4565dde106
 DIST xwax-1.0.tar.gz 54094 RMD160 cd8503395e85477955d7b632a6cca030c5b7879a SHA1 6836fa6028f63be366517a9caf44576ab60c2201 SHA256 8d5617bb11c964e9ec5b85ed9a3f004d4f0728ca0ae65b238443404c5bc0358d
 DIST xwax-1.1.tar.gz 57647 RMD160 b5a368fb5104ac24a9a8d633df138d587c83e874 SHA1 d092366df2be76fcc1689f20ed5388223ec3fa59 SHA256 150ee25efc8446a7788547f62e4d0b26dea7b9c18ed4c8461902db526616c750
+DIST xwax-1.2.tar.gz 64910 RMD160 ce47c26388199d88af089a1e094e6581ff5a980a SHA1 7a8a07cd1b64f5956adc37ed4fb3d0de146094b4 SHA256 2e35aafb2a08d29c611e19a54b3e45b5c7243cf53b2aec1634c87f01fb35e6a9
 EBUILD xwax-0.8.ebuild 2649 RMD160 55827c6da33928640b0364a965c554c2217455c2 SHA1 cbb38885588ed643c23d212a24a32f4ed9801e31 SHA256 0be55923bdcb2b1c90cdc0d28a8a968962c6b67283a4bf14fb45409cd755e177
 EBUILD xwax-0.9.ebuild 2491 RMD160 4f550a516dec5aa79b46485f1e78d52c1b8e6e69 SHA1 f2fedb3f07e405bf11dee7c6ddd9ff30be18a24c SHA256 96cf2baf1d89f731fce0b3514183f96d32d9e5c91430db344bcc9fdb24e088b3
 EBUILD xwax-1.0.ebuild 2372 RMD160 bfbab535eb8cf2bf71eb60c64fae660a75a81918 SHA1 8e6f1b6a8f73101bb6a2226a05d22c2667bdf53b SHA256 727842845449aee4e3e1a0f30d1937b1b661ecba35f7f4e32db6c74b72711607
 EBUILD xwax-1.1.ebuild 2376 RMD160 286b008ec2cb0c0d5da03f648fb66b375711fc84 SHA1 f26736179dc7b7a6d2d00474f813c02d32053705 SHA256 0756e8140617a20d1dd2559f467f9bfa74e9c61ef55492ad4a91222805348995
-MISC ChangeLog 5867 RMD160 2f32bff6605629d1a50a5ab06d4d2a75508f3e92 SHA1 b1466a868ecce972efc33636a14bd381bcbaa7a6 SHA256 4ae9d63562007770cf64dd93f4afe38262e7d3a69cfd7db6d5247689937ea8d3
+EBUILD xwax-1.2.ebuild 2376 RMD160 fd508467fc45e43faff3191bf5d68925282f6162 SHA1 f8b27b48c9be8a3efe2c02193429e1bc3b2e7aa6 SHA256 55ca0461b561922add983f44cee914164939cd10cda0064b720e0ccf843d13e4
+MISC ChangeLog 5973 RMD160 1a93ee2909a7f4641d774d985f3576e15d852552 SHA1 0861dc72ed33569b0e2e026126c460fec83fe289 SHA256 a21367286457e23e644c4fa36cc1be9fce18e88a3b2814ae98cc1727aa64ddbb
 MISC metadata.xml 1232 RMD160 da6ef6ba859ba6adaa6c258a5a29128551e1988e SHA1 f5195e554ced97a966f8774008451d8234b003c3 SHA256 3d4ed19e666eecab3d091124d841127fd915f18fcaa7616eb0a854a60d228323
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQEcBAEBAgAGBQJPSPnEAAoJEEdUh39IaPFN+BwIAKL8cGXvsFQsBJeCLCzgnZUg
-9MVJ7VXbwjXnFF6AxxXp7BiQ1/ixxneHQUl67O+WCkITStv9ptywkrZrqDRL102e
-ceYPadU0BKMGI0z0I1kKHEykm6CggPoxygeG8Yryl+rE9x4vdp3DGwyojlUicrwC
-HojI5wIBPxon9qZ/7hYdeZQSeRNk+I/dATxGA2iA9ljiErX/qO6N80DERIg7LUIg
-yhcApva3NMHJTPv9UJOKXapBXE6U+pXLdSN9+LzhMZKGZHByrWCpACJuLcfyayPu
-XaXoRte0opyVrkJZDaGEyaqm8xDMNUbaSNx5nf03GD9UpgH9Ua//YBl5AXlkgpI=
-=5geJ
------END PGP SIGNATURE-----
diff --git a/media-sound/xwax/xwax-1.2.ebuild b/media-sound/xwax/xwax-1.2.ebuild
new file mode 100644
index 000000000000..6b8b990d2616
--- /dev/null
+++ b/media-sound/xwax/xwax-1.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-1.2.ebuild,v 1.1 2012/05/13 19:22:14 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="sys-libs/glibc
+	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"
+
+src_prepare() {
+	# Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in
+	# the Makefile
+	# Also remove the dependency on the .version target so we don't need
+	# git just to build
+	sed -i -e 's/\(^\(LD\|C\)FLAGS.*\)-O[0-9]\(.*\)/\1\3/g' \
+		-e 's/^xwax\.o:.*\.version//' \
+		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="\$(BINDIR)" VERSION="${PV}"
+}
+
+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"
+}