Version bump (bug #476926). Fixes automagic dependency on pulseaudio (bug #460072) and compilation failure with gcc-4.7 (bug #428596)

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

6 files changed, 56 insertions, 46 deletions

diff --git a/media-sound/darkice/ChangeLog b/media-sound/darkice/ChangeLog
index 3c15bd0003bf..c9661cd467b7 100644
--- a/media-sound/darkice/ChangeLog
+++ b/media-sound/darkice/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/darkice
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/ChangeLog,v 1.58 2012/09/07 22:13:07 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/ChangeLog,v 1.59 2013/07/16 10:48:58 polynomial-c Exp $
+
+*darkice-1.2 (16 Jul 2013)
+
+  16 Jul 2013; Lars Wendler <polynomial-c@gentoo.org> -darkice-1.0.ebuild,
+  +darkice-1.2.ebuild, -files/darkice-1.0-gcc44.patch,
+  +files/darkice-1.2-gcc47.patch, metadata.xml:
+  Non-maintainer commit: Version bump (bug #476926). Fixes automagic dependency
+  on pulseaudio (bug #460072) and compilation failure with gcc-4.7 (bug
+  #428596). Removed old.
 
   07 Sep 2012; Tim Harder <radhermit@gentoo.org> metadata.xml:
   Remove redundant maintainer from metadata.
diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
index c56c2a5c3849..4ce33cebf53c 100644
--- a/media-sound/darkice/Manifest
+++ b/media-sound/darkice/Manifest
@@ -3,23 +3,29 @@ Hash: SHA256
 
 AUX darkice-0.18.1-gcc43.patch 426 SHA256 916da60de67bb66ee05d00c2bf166f02a956c6f0328404473e6ca162c85a499e SHA512 e734bdec2d98b30752365c9735e5359d955282a2627f4da8de4cc2c53c4ab2508f9c6d596a28e0c5066835924c1739c419ff286b87cc42c20231fd3c411c4ffe WHIRLPOOL 88f7e4cacaf777cde1d544879df208bf443893b4ed1b1cceca244250318c8e99181d280565c40b866681b5dd9c0c2f140013bdb0beddf29630a152f03545586b
 AUX darkice-0.19-gcc44.patch 753 SHA256 8c188fa23bbad7fbc58942471f82327d59e290662ed42be56f6f9d94cb08a7a7 SHA512 3d62ae6df5e22f9db03e70a2e04263f2a816546735a577a6d67ca2d53415dcf5d794378ff51a81284095ddd44d94581d5b2a5b74626eb25a8e63a2dc7d7e3404 WHIRLPOOL 3fd10a8f44cac0f0639c74d191be598c7c9807faaab74500d313d68e49510466814fde06e8bb2be36648898e2cc55e2a0bedf327d2f5a3745dc6fa9363941a49
-AUX darkice-1.0-gcc44.patch 295 SHA256 85c2c8fe5ab3377c90675a7870043c2fcdaf56969fe94d113694a893201064f9 SHA512 f79d345e360b78f9b72e2f03dc63051a00952e32f2609917a4c2fdde39862c75384dd290f99869f29de2dc1ecfb7f74a6815ce465e5d21efd98ebb9c6c651ebb WHIRLPOOL f2196c258ca725b8f6c411b0d580effb66a84420df4e4df34e4cbb2ff5ebd2d2c54b6eefe8394b484ee79e249d072c10a864744daf8de854f6743096dde0da0d
+AUX darkice-1.2-gcc47.patch 236 SHA256 bcd7e2bd9d5901e1118971c3db02ef26206198a0a850421b8c155358f7df1d16 SHA512 4f77a2694f2bb574c600edfe1d2b88dd1d9c932ff8280e8fe0739c50f5ec346c284d49ac34993e351582c1a4909b9dd380073df7a16b62b8db71c66b0f1c7326 WHIRLPOOL e90bd4880e44bef724e5ea37f4c253b0eb4b865b002cc210eaa8605c5b7a3f3aaceb61651c778a4a5fa95cb04cf59301108e445ab012d63aa482c2e8d8930a08
 DIST darkice-0.19.tar.gz 288762 SHA256 c32f30441cd33cc78a2ddb8c7163ba8c97b8a6303b9e7ffb0386dd77c179456d
-DIST darkice-1.0.tar.gz 311567 SHA256 61a05c4dab206c22c3e3d5570ee4841f9c8875241098adf687717e7dcc6df332
 DIST darkice-1.1.tar.gz 344568 SHA256 170342cb4dbb0b44a62e37d0db1515fa7799c410fc4995bf8f32aaa6614f5f79
+DIST darkice-1.2.tar.gz 357026 SHA256 b3fba9be2d9c72f36b0659cd9ce0652c8f973b5c6498407f093da9a364fdb254 SHA512 d8959819d70eb9b44a34d087fcf3897be5e4cb23681c049f8d88e251d83dfd86b90fdd37744fe27d861dfcbb6bb6e1521b48c5c7b4967bb061ede75596f0a823 WHIRLPOOL f12ff32ce31cf508f556146baeb64860b3a698edf0836675a62c817b34fa1df499c3a281a3e2a66a1db5be3eb89d5fc91438184c998f4a7a0ad24e27fd7fea1e
 EBUILD darkice-0.19.ebuild 1460 SHA256 571235ad757a0ced234a97b0d70058e7dd5233c8cca3aaeb946027f8b496618a SHA512 4b12ab9c84c59ee9c38637e4380965e47205c2f781fde692fc6d7da4b62532c0002fe5d5779be7858ae333fa068c1164a1f52d885beeeb9311a580296434af7e WHIRLPOOL e754ed925fc1f99c139d2350c577b8514f58e437dd649869cea3204bdb751ead4e2cdda90f61f48b6115283fe2fe292262c33e427aa35255bf6d77951a4e2cf6
-EBUILD darkice-1.0.ebuild 1395 SHA256 24e91ce9c7b790ae865615b99805826a007794009d67a82e114e4cba2adcefb8 SHA512 102cf5f723e4e6e4f1e92a4a731f891d29b777023e87ef4940af4a17e8913a7117663c804bd7dfcd4ab28214552f69920d5552e6ad408996d4995feae1622b4c WHIRLPOOL e353c71669c351710e4f14bef1a56a5f70dcb8abaf05bfbc8dd22405820b6a8f16582220e55b526061273a765e4e83acf5cc16b6c9c8cb099863f96eea20768b
 EBUILD darkice-1.1.ebuild 1396 SHA256 77c25d7269dc38ed14005ec43fbea0fe8f6d47c32cba754c61dc54301a0a8fba SHA512 be1128819bd89ac64304fc1266b2f96a918e3a52646f2323a40021cc3e6d78ac520a461f39d01bb1e912f757f9be18a1d25d2cb720fc2e5ff6a4e9e6103b4be5 WHIRLPOOL 2a70ad0bb1b3aa18e0a82f85e1c153833c60ac12a6783e4b580064d9a82e4cd003e96ee843b6f75d9ea6a562ef945ed3aafb7a0c1faa5c765651164d4c8781da
-MISC ChangeLog 7490 SHA256 4003e61fa59fc0e0dc86fe4adfe739399bedd25c59287353d69f23dc95de76bd SHA512 f31a7652fa95cec843000be7f907e4069a2f2b5c163be1314317959d237d047c7fe54c9ed8bee1a505dc2ae5f480bf89ebaad809149cf983ea04247d0e3a83bd WHIRLPOOL 783a207a6e94f95ad58a5a79056cb14fe48c383cd26d981091b22b5799f85889b6670a32bb24b1d7cc5c7ea4185ca47b7c0c6a9565511004f0739f14dbe88cf1
-MISC metadata.xml 308 SHA256 1b634e1d2e7a29147c0f55b4146ca5508fcb2508bf84bf4011771cb097ff7b2c SHA512 d518016a440991e6a165ce6d50a3120b571474a08c945033c05f8a45d09a8d10fb4d0c6767b8b22fed9265d0ec2177972f38a77c35430ddd692a6cd047ddb451 WHIRLPOOL ecf00174d64e53c8e69f4fa693837863a57ca119ff08382bb7dba860c739f4c8476eefee7998009c645019507c8fbfbc349a3745d509490b5ee930f91dc1df7d
+EBUILD darkice-1.2.ebuild 1354 SHA256 ba66ecd1b8a36e1a9a18ac4ef562536c0953097cd010b1c5fe331619120adaa4 SHA512 3851cd78e84ba5bcff8f540541d37121f6b1252fcefa5854d6968c1a9866cc5d5fc881768e6360331bdb601569e2f488d7bfc08d5eba3aa2d5b66d1671b37f9e WHIRLPOOL 4d0ad7c77f3d2932d75f6c83608af00828408ca75a60b799822db9f558fe3623060a77970a4a212a33c63d185d26561c37f6fb57608af7fd0e43f8d98e99e187
+MISC ChangeLog 7877 SHA256 3a7dd44538a866bb3977520e71773dc468cef0352ac93aca51a07725c40b815b SHA512 8f6eeb16449d8766f5abb1d224bb139e817103547716a14e0a991cc2d1d96f128ca4d07bcce958e4752796f2f334496f1763790d41ac9e2d0f159f5a66b803a4 WHIRLPOOL 56aa250d8f385011b30cfb86cc69bb974fa88334953511f64ddfd178c27fb8e504ec13d27ce0fc526e202a00cad2b2e3eadc93329b945aa2775797c8adb91812
+MISC metadata.xml 367 SHA256 f91f8e1424fdd4905a41c5865817d073d82d462c501294dd3693e829e6a97201 SHA512 90ef96bc60f4c8e7fdd5e7c212c974c67e8df2c6f755a88b6f74161a5d79638b7faaf43d3cb2b87e5f1cd625f08eb408b2ed4399848c8f47bb62f13fef77af97 WHIRLPOOL 0e0ba29eef2f635e565bbdb8d4340bda1de2f87b614cf5be94c87449c59476828ea4d3b3ba7c120506d9fdc3c2ea9b3657b2b626a35b9710ac78ca195c15a3b8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQSnF4AAoJEEqz6FtPBkyjIdEH/0IWOcwr2qeBWrQG8Y5QxwEf
-kkz5VcVoESWKVjz+5T9u44Fgenw1rHx3LY3W8TNxcQwTOwtzJ1WXpLAlGA2UbV4E
-74q7A8GP2moQeG1o2LqdgiaEvAMINlWTiFtXo7U8mbJoGOJNetsUtfEdf1Nnbke6
-RlXKfqxw+Hyod/a7dxGCFErsISROJIcXvTefqlMhNXmHY7uJM9B0/qvK2FLJMtOG
-unXZ5fPFUaiFT95NrE81gnUiiGTxg2X6vp2Mqsl6DmWoRoU4YtXs5X1IEo8ePN4k
-KZlatWfP5xh9r8AZvVNmuWkaw6yGqoRodeIXKPExebyjfWd2SmxasSYhmI8XWdc=
-=W7s+
+iQIcBAEBCAAGBQJR5SUbAAoJEPiazRVxLXTFFdgP/jxBuP+J57uxkshEhq1D9RiB
+DeXHylXbpAAQ9PCSwytKxq1TRfI1iL/LEdffuEQWgD2qSCuiUgSo19RlcZ86UYwT
+6yJMmESRBIUmqfoNkk20cyG29w1E+eLw6z+JLisr6TdCs9q+vMbu/G3zMdSy2vto
+ZSJJYtaK47rNWhmw/Ng14a3H6wIIobtGkg2Wg29tK6C1i3Koi//G08IJSdKhqPSQ
+d/EI8+JM4YAWL01ikSDkZk9m+BfoGkYLqpN948AGADg8U6ov1184cqVieh+oYOnm
+hCySy6ChySy+spqDKenaeJmX0sn+yQFAxhsnwJBAeFQDG8xBiZd6rYuX2h6VtDuu
+mUirGRT4uPdrsniYgwTGEqsZcF8++VEp4v9DjP2FSRPIh1bU+E+3MdwkoEycge1Q
+BeJcjNGzhp/CteX85zJqKNglRXxvpTXpvczmbjBWxJGnYKo0cZpI29Okkf051MP4
+qJLmMR4jaDK1tYSNv6dzfZiPPy0OmcBW2K9qBcKUmIIHPocXJcsfb9lXxGdNuH7z
+ci2+19YpP2b+SAZ5WhaZk/y1oCq3si36Ncez/UMy7cHjblOJ4dJZPe8L4RldCoW8
+1xcoEQL4bB15Y5X3T00wPsaWTlMprt/mcGnlT+jIsx1aBqHqwz8C334VO7oR8UlP
+OJBMu8eIF6MgpPuYOZiQ
+=VFNN
 -----END PGP SIGNATURE-----
diff --git a/media-sound/darkice/darkice-1.0.ebuild b/media-sound/darkice/darkice-1.2.ebuild
index 522888c9aa51..05c12d2bea98 100644
--- a/media-sound/darkice/darkice-1.0.ebuild
+++ b/media-sound/darkice/darkice-1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-1.0.ebuild,v 1.1 2010/07/29 23:37:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-1.2.ebuild,v 1.1 2013/07/16 10:48:58 polynomial-c Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils
 
 DESCRIPTION="A live audio streamer"
@@ -12,43 +12,40 @@ SRC_URI="http://darkice.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="aac alsa jack libsamplerate mp3 twolame vorbis"
+IUSE="aac alsa jack libsamplerate mp3 opus pulseaudio twolame vorbis"
 
 RDEPEND="aac? ( media-libs/faac )
 	alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )
 	mp3? ( media-sound/lame )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
 	twolame? ( media-sound/twolame )
 	vorbis? ( media-libs/libvorbis )
-	libsamplerate? ( media-libs/libsamplerate )
-	!mp3? ( !vorbis? ( !aac? ( !twolame? ( media-sound/lame ) ) ) )"
+	libsamplerate? ( media-libs/libsamplerate )"
 DEPEND="${RDEPEND}"
 
+REQUIRED_USE="|| ( aac mp3 opus twolame vorbis )
+		|| ( alsa jack pulseaudio )"
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc44.patch
+	epatch "${FILESDIR}"/${P}-gcc47.patch
 }
 
 src_configure() {
-	local myconf
-
-	if ! use mp3 && ! use vorbis && ! use aac && ! use twolame; then
-		myconf="--with-lame"
-	fi
-
 	econf \
-		--disable-dependency-tracking \
 		$(use_with mp3 lame) \
 		$(use_with vorbis) \
 		$(use_with aac faac) \
 		--without-aacplus \
 		$(use_with twolame) \
+		$(use_with opus) \
 		$(use_with alsa) \
 		$(use_with jack) \
-		$(use_with libsamplerate samplerate) \
-		${myconf}
+		$(use_with libsamplerate samplerate)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog FAQ NEWS README TODO
 }
diff --git a/media-sound/darkice/files/darkice-1.0-gcc44.patch b/media-sound/darkice/files/darkice-1.0-gcc44.patch
deleted file mode 100644
index f531258add8d..000000000000
--- a/media-sound/darkice/files/darkice-1.0-gcc44.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://code.google.com/p/darkice/issues/detail?id=29
-SerialUlaw.cpp:296:26: error: ‘perror’ was not declared in this scope
-
---- src/SerialUlaw.cpp
-+++ src/SerialUlaw.cpp
-@@ -40,6 +40,8 @@
- #include "config.h"
- #endif
- 
-+#include <stdio.h>
-+
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #else
diff --git a/media-sound/darkice/files/darkice-1.2-gcc47.patch b/media-sound/darkice/files/darkice-1.2-gcc47.patch
new file mode 100644
index 000000000000..e10439f27e45
--- /dev/null
+++ b/media-sound/darkice/files/darkice-1.2-gcc47.patch
@@ -0,0 +1,11 @@
+--- darkice-1.2/src/PulseAudioDspSource.cpp
++++ darkice-1.2/src/PulseAudioDspSource.cpp
+@@ -43,6 +43,8 @@
+ #include "config.h"
+ #endif
+ 
++#include <stdio.h>
++
+ #include "Util.h"
+ #include "Exception.h"
+ #include "PulseAudioDspSource.h"
diff --git a/media-sound/darkice/metadata.xml b/media-sound/darkice/metadata.xml
index 6848826abbd5..4197bc9059f4 100644
--- a/media-sound/darkice/metadata.xml
+++ b/media-sound/darkice/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<herd>sound</herd>
 	<use>
+		<flag name="opus">Enable Opus audio codec support</flag>
 		<flag name="twolame">Build with twolame support</flag>
 	</use>
 	<upstream>