Fix building with GLIBC 2.10 and GCC 4.4 wrt #277216, thanks to Diego E. 'Flameeyes' Pettenò.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 37 insertions, 68 deletions

diff --git a/media-sound/darkice/ChangeLog b/media-sound/darkice/ChangeLog
index e34d52514f84..6fc804479b30 100644
--- a/media-sound/darkice/ChangeLog
+++ b/media-sound/darkice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/darkice
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/ChangeLog,v 1.54 2009/06/25 17:42:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/ChangeLog,v 1.55 2009/07/10 01:07:23 ssuominen Exp $
+
+  10 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -darkice-0.18.1.ebuild, darkice-0.19.ebuild,
+  +files/darkice-0.19-gcc44.patch:
+  Fix building with GLIBC 2.10 and GCC 4.4 wrt #277216, thanks to Diego E.
+  'Flameeyes' Pettenò.
 
   25 Jun 2009; Raúl Porcel <armin76@gentoo.org> darkice-0.19.ebuild:
   sparc stable wrt #270783
diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
index c99cc41fdcaf..ad97ab08e344 100644
--- a/media-sound/darkice/Manifest
+++ b/media-sound/darkice/Manifest
@@ -1,7 +1,6 @@
 AUX darkice-0.18.1-gcc43.patch 426 RMD160 0fb1a3be17391a3df459c36f354e6f61bbe64e59 SHA1 8c711d5fd305cc582c9870c079fab1f6a52d0237 SHA256 916da60de67bb66ee05d00c2bf166f02a956c6f0328404473e6ca162c85a499e
-DIST darkice-0.18.1.tar.gz 286477 RMD160 8a51fae97b1a53ec4636c908ac40ec88b2fd2f97 SHA1 dce706dd593daa0e7832ec0657ab265e6eecc98e SHA256 0f1b024c5729956390fa07544080784e94c28bbb632dfdb61e2b37baeb7e3630
+AUX darkice-0.19-gcc44.patch 405 RMD160 1e7c41b039508e1c7be52f0643d7af6277c271dc SHA1 0e42256abe8a6a443f812871b71fae17366d3eae SHA256 b1b184c00f98290ec316ad7b0f6c15a2deadee553b82ec277595883ddc3d943d
 DIST darkice-0.19.tar.gz 288762 RMD160 2d863584b667f6c36fcf4cd26873edaa282e2317 SHA1 ed37ffb4e1a2f8097d828a936b2157f08a652d6a SHA256 c32f30441cd33cc78a2ddb8c7163ba8c97b8a6303b9e7ffb0386dd77c179456d
-EBUILD darkice-0.18.1.ebuild 1477 RMD160 00d06686b78fbbdc23626c4d848e3dcd51cb9e9f SHA1 5dc3344293b51383c93878e6d2416c200e107235 SHA256 1c3345f8984c958197e1dc9c40a3d5f8283523b89bde0079369eb589f220cf44
-EBUILD darkice-0.19.ebuild 1486 RMD160 2338dbf192b0942211500afb1c75a052c20267e2 SHA1 0ebec2550c532bb2e8513d69cf2c71ad8f36f5cd SHA256 ab51a789a00e229f6ceee16a9940a36e8573402725627d2e96c3249a82ad381c
-MISC ChangeLog 6865 RMD160 bbf5a50252ae526791c88938e92b7634910024da SHA1 c394a8e70022a4305cd44f869dc0b688c61b9b6e SHA256 57fd55f5cb8f2f00b1233fef07632744397bde2cbc53ef7052803bf923a0384a
+EBUILD darkice-0.19.ebuild 1486 RMD160 424eae38e60ec3e6b33fb2bf80a1d948bc4b878a SHA1 ec448839aca39509cebd7ed8666de903c097090f SHA256 d839fb61c6d28a4776c0e1f213049ebeb55fe3bef851fd7a4f72c2a283993fad
+MISC ChangeLog 7103 RMD160 61a07cfd5cb4e7078cc8d0720cfc3a833db84654 SHA1 c0c5058ec6388d4d64d11a131a9f75340f8d9a00 SHA256 921b13005c5d6cb3053f7ed99b300b81431102eb4dc2261b4a09935a77bb2927
 MISC metadata.xml 338 RMD160 cdeff4feb5f3e2dcc8502842d1ac8a1bc4acefd8 SHA1 5e5c2a00e85910110f8fddfe79f60074536415e1 SHA256 ff4fa22ac9966ecf786c3ab3183e15d98eafa8db340a7f15655dbdea8a7cdd1d
diff --git a/media-sound/darkice/darkice-0.18.1.ebuild b/media-sound/darkice/darkice-0.18.1.ebuild
deleted file mode 100644
index a965ca30a3ea..000000000000
--- a/media-sound/darkice/darkice-0.18.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.18.1.ebuild,v 1.7 2008/03/27 10:45:18 drac Exp $
-
-inherit eutils
-
-DESCRIPTION="IceCast live streamer, delivering ogg and mp3 streams simultaneously to multiple hosts."
-HOMEPAGE="http://darkice.sourceforge.net"
-SRC_URI="http://${PN}.tyrell.hu/dist/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc sparc x86"
-IUSE="aac alsa encode jack twolame vorbis"
-
-RDEPEND="encode? ( media-sound/lame )
-	vorbis? ( media-libs/libvorbis )
-	aac? ( media-libs/faac )
-	twolame? ( media-sound/twolame )
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	!encode? ( !vorbis? ( !aac? ( !twolame? ( media-libs/libvorbis ) ) ) )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-}
-
-src_compile() {
-	if ! use encode && ! use vorbis && ! use aac && ! use twolame; then
-		ewarn "One of USE flags encode, vorbis, aac, or twolame is required."
-		ewarn "Selecting vorbis for you."
-		local myconf="--with-vorbis"
-	fi
-
-	econf $(use_with aac faac) \
-		$(use_with alsa) \
-		$(use_with encode lame) \
-		$(use_with jack) \
-		$(use_with twolame) \
-		$(use_with vorbis) \
-		${myconf}
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog FAQ NEWS README TODO
-}
diff --git a/media-sound/darkice/darkice-0.19.ebuild b/media-sound/darkice/darkice-0.19.ebuild
index f87cc3c603b5..fd72c5d28834 100644
--- a/media-sound/darkice/darkice-0.19.ebuild
+++ b/media-sound/darkice/darkice-0.19.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.19.ebuild,v 1.6 2009/06/25 17:42:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.19.ebuild,v 1.7 2009/07/10 01:07:23 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="IceCast live streamer, delivering ogg and mp3 streams simultaneously to multiple hosts."
@@ -11,7 +12,7 @@ SRC_URI="http://${PN}.tyrell.hu/dist/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 hppa ppc sparc x86"
-IUSE="aac alsa encode jack twolame vorbis"
+IUSE="aac alsa jack mp3 twolame vorbis"
 
 RDEPEND="encode? ( media-sound/lame )
 	vorbis? ( media-libs/libvorbis )
@@ -19,33 +20,35 @@ RDEPEND="encode? ( media-sound/lame )
 	twolame? ( media-sound/twolame )
 	alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )
-	!encode? ( !vorbis? ( !aac? ( !twolame? ( media-libs/libvorbis ) ) ) )"
+	!mp3? ( !vorbis? ( !aac? ( !twolame? ( media-sound/lame ) ) ) )"
 DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.18.1-gcc43.patch
+	epatch "${FILESDIR}"/${PN}-0.18.1-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc44.patch
 }
 
-src_compile() {
-	if ! use encode && ! use vorbis && ! use aac && ! use twolame; then
-		ewarn "One of USE flags encode, vorbis, aac, or twolame is required."
-		ewarn "Selecting vorbis for you."
-		local myconf="--with-vorbis"
+src_configure() {
+	local myconf
+
+	if ! use mp3 && ! use vorbis && ! use aac && ! use twolame; then
+		ewarn "One of USE flags mp3, vorbis, aac, or twolame is required."
+		ewarn "Selecting mp3 for you."
+		myconf="--with-lame"
 	fi
 
 	econf $(use_with aac faac) \
 		$(use_with alsa) \
-		$(use_with encode lame) \
+		$(use_with mp3 lame) \
 		$(use_with jack) \
 		$(use_with twolame) \
 		$(use_with vorbis) \
 		${myconf}
-	emake || die "emake failed."
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog FAQ NEWS README TODO
 }
diff --git a/media-sound/darkice/files/darkice-0.19-gcc44.patch b/media-sound/darkice/files/darkice-0.19-gcc44.patch
new file mode 100644
index 000000000000..77388ccc2f0c
--- /dev/null
+++ b/media-sound/darkice/files/darkice-0.19-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur darkice-0.19.orig/src/Util.cpp darkice-0.19/src/Util.cpp
+--- darkice-0.19.orig/src/Util.cpp	2007-02-25 18:38:33.000000000 +0200
++++ darkice-0.19/src/Util.cpp	2009-07-10 04:08:37.000000000 +0300
+@@ -296,7 +296,7 @@
+     unsigned int    size;
+     char          * s;
+     char          * strdate;
+-    char          * last;
++    const char    * last;
+     time_t          now;
+ 
+     if ( !str ) {