Version bump. Add tremor use flag.

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

5 files changed, 96 insertions, 18 deletions

diff --git a/media-sound/squeezeslave/ChangeLog b/media-sound/squeezeslave/ChangeLog
index f94c913b24a5..412658d391eb 100644
--- a/media-sound/squeezeslave/ChangeLog
+++ b/media-sound/squeezeslave/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/squeezeslave
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeslave/ChangeLog,v 1.8 2012/05/16 08:42:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeslave/ChangeLog,v 1.9 2012/06/30 10:49:55 radhermit Exp $
+
+*squeezeslave-1.1_p350 (30 Jun 2012)
+
+  30 Jun 2012; Tim Harder <radhermit@gentoo.org> +squeezeslave-1.1_p350.ebuild,
+  +files/squeezeslave-1.1_p350-tremor-headers.patch, metadata.xml:
+  Version bump. Add tremor use flag.
 
   05 May 2012; Michał Górny <mgorny@gentoo.org> squeezeslave-1.1_p309.ebuild,
   squeezeslave-1.1_p312.ebuild:
diff --git a/media-sound/squeezeslave/Manifest b/media-sound/squeezeslave/Manifest
index b0b4248f212e..5b1eadb6bc96 100644
--- a/media-sound/squeezeslave/Manifest
+++ b/media-sound/squeezeslave/Manifest
@@ -1,27 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX squeezeslave-1.1_p309-ffmpeg.patch 2350 RMD160 e1cb0cb7bb063aef888553b596d4c3f60b275528 SHA1 2c3c515ff36e0e269e0ed192b1689c4d90dc76d9 SHA256 af549c37f452ff653a05aaaf6ea0be7c069e606ac419eb06d6f96c7f35febd00
+AUX squeezeslave-1.1_p350-tremor-headers.patch 666 RMD160 0c17f45ccc7629f1ac30d1c685b3358bc0ba678e SHA1 60d5bdb82a54281d22747b5a6b1e93c4ed3c263c SHA256 00089edfbc89c83520af08875a11681b855e9365cfbf860b9467f81818231631
 AUX squeezeslave.confd 317 RMD160 23217760c20d12a19ea2d446a77cf045a8e1edec SHA1 8046774d6ec3ad8f924234a9f683289d99f0dbeb SHA256 bc73638b70b736f3b1934871db3a348254f207ce42a03ac26dff6e273192a7c2
 AUX squeezeslave.initd 508 RMD160 7a2bb454ca3c26c1e98f4df4b0b5f0527793fcc1 SHA1 39564b19e4232b966b2677faf8fe7bc18b907c74 SHA256 bf77e77c8aad105119914e1463506ccb49dd96822cb7f2eb74f89e704c27963b
 DIST squeezeslave-1.1_p312.tar.xz 116240 RMD160 e71a595c5df038fc441b375f6fd241315c1aff86 SHA1 763ddfac891de8fbec7b78a3ddb19f29eedd25ad SHA256 847db3efb5ab17c964ca8191c2d0ef3e1a399d2615fed12acfcf5de222c56020
+DIST squeezeslave-1.1_p350.tar.xz 119936 RMD160 cf56ea44491905328a033028f1d9dc28edd817c6 SHA1 3a389e9e12d43a67b62f93b8c6accbb65f338bdc SHA256 873ccdabd07aaa77f1e282ca8be77ddcacfd27de43c9b74d2c12e9787d5c35fb
 EBUILD squeezeslave-1.1_p312.ebuild 1120 RMD160 b2f3e389e70814d86ee3973486103bdddd2e80c4 SHA1 6cdd2fed05fffb6f513ae38bbd778e3249d3d4cb SHA256 cd4741f33dbaf81d27b7aa09f2c51f80d297be0e531c493e0c3bf8ec41c9f8d5
-MISC ChangeLog 1480 RMD160 928bee87f4488284573215ca3a4b570a0522ed1d SHA1 fe2bb4505ef3296a6a1a3b65a1cc6344c626c13a SHA256 d65a2095b8f6d679c7940484f9ebaf4827a25c8d922ae7a5087022fc9272b997
-MISC metadata.xml 487 RMD160 d69347ef77b0c55134a7adc98a0bde2942d8ef8c SHA1 f571eb4abdc89e5d77e45d3cba6d854429c05652 SHA256 43d8a66dc872306b51899396bd9a03051956faf94d596438432b0c15337f68d1
+EBUILD squeezeslave-1.1_p350.ebuild 1215 RMD160 158dee0ad6a109c1d65dd9e3327bb96905bd21fc SHA1 625a55d7a369d460a7646a3a828d4751d5350e35 SHA256 ee5027a673a32fec318a4ba45b7c7b0108762c6173c83d5261cd52f72864ac09
+MISC ChangeLog 1703 RMD160 f762e2fb7b5b93588e1c12be85220db4b7ad3be6 SHA1 40fa759e9b9a4b0bd5877816bfdfd42a8271338b SHA256 bbb3407a50bbfa7e12c137661d0e0f4ab71c10dba951e163fb166e06746c488b
+MISC metadata.xml 599 RMD160 b84512ca023b14bb9f2a30da710f3f7d862b0777 SHA1 d48fbcd135832fa880ab04a8dddca9cf4e0854c8 SHA256 9d70b57adb9ee4c6f62d11188c0f2c35735f936725f7925ce4afb0e39df2d34e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPs2lbAAoJEOSiRoyO7jvooHEP/27DvE/bQRARsxMrKy/oWr7/
-NLXJ4QxvO2UC1YzfzFhBUWP16GUatVRo36rMrgngpuvd6+W0QmKVNlWmZXddTGZ8
-HVQFhzemoRiaTcionIiCk3cnrdg4D6CN5L1EWlvc3f3Sm471WVurKWii9vMtMN3Z
-DE1CB9Adda9hLaf7OQM/d+l+LJmHfXZlXZl/sppmA6ex4zLs3Ccx2xdQ4wwwcMoj
-xCtAZL5Y+hWI0VajPh5NJoQnzAoP2gFOM7jf4M2tBbDFsaiFSzctmcxpZV2MpjUu
-5CRGWI9U2JrOhsxrfQ/k18udo1G/hUTDlqthWgMPekBFLmLL4ceA1Uv2hn3L+QBJ
-xsYKQjI3r4g2I8MB6bvvejWwPUbxOvHjphnJ6V+pGhnygAoqmJVZUY0/d+V1dqJP
-qzx0xmOLbnTZ6aW6OA4Jkr1j0T9fWQK6vO7mCvKoF/dm+CMXHFZqYoJGhH4o0jB6
-SgvjgWempO/gRrytd3KGnf++S0zEW12IkuhOTLv5G5QAHHwApkVnXgnp7hJviSGl
-xAzNuHkM7AYNEgByIEUixigQxyr8LTRTU068azRZchLQ8/98eFJYeD99rh3g7/HG
-FnBpSu1gqXU8gdY3D4UZbmPCC1+911+OX4GSPt5H7iJhxjr942KFV/XK3yxd7Sba
-HrjirnHXHri0SlA/Rkig
-=RQV1
+iQEcBAEBCgAGBQJP7tncAAoJEEqz6FtPBkyjTbcH/155/+CIPssMIoIszFkM7/R5
+C1srqIfdg/6SpsNEWGmhN8UGaJP8L90c81BeDssTHZGTtn69wM5jo9vHWy9R1kXA
+ddH9PrJufuEE/8o6bW9fjORrQhPbk23KY0OSCLevGNfGeNSu2D1VHY2zMRuLpXxt
+yYHILziwFgkYp3jP4EuG9AqtYNdDe4y9MgGILmoGirTfHSIliM3ZshfFaW+Eyfpl
+wzQ5dBO8ft5X+Jzol/l5GeZ/8QcfhkjEtDDyBSyuULKdxO5HAEywbkV4oezM9s5v
+e16reEYJ6kQYhYb6jvBI0dpxL1kAM6doU6BwQR5r29HDw4imAF0WknAn+XmtM3I=
+=mEVN
 -----END PGP SIGNATURE-----
diff --git a/media-sound/squeezeslave/files/squeezeslave-1.1_p350-tremor-headers.patch b/media-sound/squeezeslave/files/squeezeslave-1.1_p350-tremor-headers.patch
new file mode 100644
index 000000000000..b8d9a1cb1e29
--- /dev/null
+++ b/media-sound/squeezeslave/files/squeezeslave-1.1_p350-tremor-headers.patch
@@ -0,0 +1,22 @@
+--- squeezeslave-1.1_p350/src/slimaudio/slimaudio_decoder_vorbis.c
++++ squeezeslave-1.1_p350/src/slimaudio/slimaudio_decoder_vorbis.c
+@@ -27,7 +27,7 @@
+ #define OV_EXCLUDE_STATIC_CALLBACKS
+ 
+ #ifdef TREMOR_DECODER
+-#include <vorbis/ivorbisfile.h>
++#include <tremor/ivorbisfile.h>
+ #else
+ #include <vorbis/vorbisfile.h>
+ #endif /* TREMOR_DECODER */
+--- squeezeslave-1.1_p350/src/slimaudio/slimaudio.h
++++ squeezeslave-1.1_p350/src/slimaudio/slimaudio.h
+@@ -36,7 +36,7 @@
+ #define OV_EXCLUDE_STATIC_CALLBACKS
+ 
+ #ifdef TREMOR_DECODER
+-#include <vorbis/ivorbisfile.h>
++#include <tremor/ivorbisfile.h>
+ #else
+ #include <vorbis/vorbisfile.h>
+ #endif /* TREMOR_DECODER */
diff --git a/media-sound/squeezeslave/metadata.xml b/media-sound/squeezeslave/metadata.xml
index 0b613f0425ee..749da791f339 100644
--- a/media-sound/squeezeslave/metadata.xml
+++ b/media-sound/squeezeslave/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="display">Enable a text-based display</flag>
+		<flag name="tremor">Use a fixed-point version of the Ogg Vorbis decoder (<pkg>media-libs/tremor</pkg>)</flag>
 		<flag name="wma">Enable support for streaming Windows Media Audio</flag>
 		<flag name="zones">Pairs surround sound speakers into stereo zones (requires 5.1 setup or better)</flag>
 	</use>
diff --git a/media-sound/squeezeslave/squeezeslave-1.1_p350.ebuild b/media-sound/squeezeslave/squeezeslave-1.1_p350.ebuild
new file mode 100644
index 000000000000..fb1b692f03aa
--- /dev/null
+++ b/media-sound/squeezeslave/squeezeslave-1.1_p350.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeslave/squeezeslave-1.1_p350.ebuild,v 1.1 2012/06/30 10:49:55 radhermit Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A lightweight streaming audio player for Logitech Media Server"
+HOMEPAGE="http://squeezeslave.googlecode.com"
+SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac +alsa display tremor wma zones"
+
+RDEPEND="media-libs/libmad
+	media-libs/flac
+	tremor? ( media-libs/tremor )
+	!tremor? ( media-libs/libvorbis )
+	media-libs/libogg
+	media-libs/portaudio[alsa?]
+	aac? ( virtual/ffmpeg )
+	wma? ( virtual/ffmpeg )
+	display? ( app-misc/lirc )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tremor-headers.patch
+}
+
+src_compile() {
+	tc-export CC AR RANLIB
+
+	local myconf
+	for i in aac display tremor wma zones ; do
+		use $i && myconf+=" $i=1"
+	done
+
+	emake ${myconf}
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc ChangeLog TODO
+
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}