new upstream version, fixes #90268. changed oggvorbis useflag to vorbis, oggvorbis is deprecated.

(Portage version: 2.0.51.19)

8 files changed, 31 insertions, 76 deletions

diff --git a/media-sound/darkice/ChangeLog b/media-sound/darkice/ChangeLog
index 63866359732a..860d81b1fff3 100644
--- a/media-sound/darkice/ChangeLog
+++ b/media-sound/darkice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/darkice
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/ChangeLog,v 1.15 2004/09/14 07:33:30 eradicator Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/ChangeLog,v 1.16 2005/04/25 16:34:54 luckyduck Exp $
+
+*darkice-0.15 (25 Apr 2005)
+
+  25 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> -darkice-0.13.2.ebuild,
+  -darkice-0.13.ebuild, +darkice-0.15.ebuild:
+  new upstream version, fixes #90268. changed oggvorbis useflag to vorbis,
+  oggvorbis is deprecated.
 
   14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> darkice-0.14.ebuild:
   Stable amd64, sparc.
diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
index eccc1ded6a8a..f46ba528944b 100644
--- a/media-sound/darkice/Manifest
+++ b/media-sound/darkice/Manifest
@@ -1,8 +1,6 @@
-MD5 6f4c1add3c107c2a3f26f30885c9417f ChangeLog 2018
-MD5 e584e51d555fae5a50df59a993e138eb darkice-0.13.2.ebuild 1340
-MD5 8d9f2c7c38e9fea4a011d8ac382806e2 darkice-0.13.ebuild 1338
-MD5 1cfbbfd3614db9b21d030b8b8f09019f darkice-0.14.ebuild 1345
+MD5 6e15581db541a3e6c6a99891e710ba2e darkice-0.14.ebuild 1345
+MD5 1d3d71875086a8f4aa955075f88180c0 darkice-0.15.ebuild 1343
+MD5 1c66e82726f051181c223fa67e7f9c54 ChangeLog 2272
 MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
-MD5 43a06c201266d5d52ea3b5c034678f7f files/digest-darkice-0.13 64
-MD5 eab656d99709f96c8a402d5d77b71d99 files/digest-darkice-0.13.2 66
 MD5 dc687438c29f2bf61a02265c3c1632ce files/digest-darkice-0.14 64
+MD5 90f40fff234ed9f0943b2afd28765961 files/digest-darkice-0.15 65
diff --git a/media-sound/darkice/darkice-0.13.ebuild b/media-sound/darkice/darkice-0.13.ebuild
deleted file mode 100644
index 36acbc164b85..000000000000
--- a/media-sound/darkice/darkice-0.13.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.13.ebuild,v 1.12 2004/08/07 23:24:40 slarti Exp $
-
-IUSE="encode oggvorbis"
-
-DESCRIPTION="IceCast live streamer delivering Ogg and mp3 streams simultaneously to multiple hosts."
-HOMEPAGE="http://darkice.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa"
-
-DEPEND="encode?	( >=media-sound/lame-1.89 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
-
-src_compile() {
-	local myconf=""
-
-	if ! use encode && ! use oggvorbis
-	then
-
-		eerror "You need support for mp3 or Ogg Vorbis enconding for this"
-		eerror "package. Please merge again with at least one of the "
-		eerror "\`encode' and \`oggvorbis' USE flags enabled:"
-		eerror
-		eerror "  # USE=\"encode\" emerge darkice"
-		eerror "  # USE=\"oggvorbis\" emerge darkice"
-		die "Won't build without support for lame nor vorbis"
-	fi
-
-	use encode    || myconf="--without-lame"
-	use oggvorbis || myconf="--without-vorbis"
-
-	econf ${myconf} || die "econf failed"
-
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	einstall darkicedocdir=${D}/usr/share/doc/${PF} || die
-
-	dodoc AUTHORS ChangeLog COPYING NEWS README TODO
-}
diff --git a/media-sound/darkice/darkice-0.14.ebuild b/media-sound/darkice/darkice-0.14.ebuild
index 8a69818491ba..de20a2443113 100644
--- a/media-sound/darkice/darkice-0.14.ebuild
+++ b/media-sound/darkice/darkice-0.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.14.ebuild,v 1.9 2004/09/14 07:33:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.14.ebuild,v 1.10 2005/04/25 16:34:54 luckyduck Exp $
 
 IUSE="encode oggvorbis alsa"
 
diff --git a/media-sound/darkice/darkice-0.13.2.ebuild b/media-sound/darkice/darkice-0.15.ebuild
index 7e10a1c7d733..38dc704c14df 100644
--- a/media-sound/darkice/darkice-0.13.2.ebuild
+++ b/media-sound/darkice/darkice-0.15.ebuild
@@ -1,46 +1,43 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.13.2.ebuild,v 1.6 2004/08/07 23:24:40 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.15.ebuild,v 1.1 2005/04/25 16:34:54 luckyduck Exp $
 
-IUSE="encode oggvorbis"
 
 DESCRIPTION="IceCast live streamer delivering Ogg and mp3 streams simultaneously to multiple hosts."
 HOMEPAGE="http://darkice.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+IUSE="encode vorbis alsa"
 
 DEPEND="encode?	( >=media-sound/lame-1.89 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )"
 
 src_compile() {
-	local myconf=""
-
-	if ! use encode && ! use oggvorbis
+	if ! use encode && ! use vorbis
 	then
 
 		eerror "You need support for mp3 or Ogg Vorbis enconding for this"
 		eerror "package. Please merge again with at least one of the "
-		eerror "\`encode' and \`oggvorbis' USE flags enabled:"
+		eerror "\`encode' and \`vorbis' USE flags enabled:"
 		eerror
 		eerror "  # USE=\"encode\" emerge darkice"
-		eerror "  # USE=\"oggvorbis\" emerge darkice"
+		eerror "  # USE=\"vorbis\" emerge darkice"
 		die "Won't build without support for lame nor vorbis"
 	fi
 
-	use encode    || myconf="--without-lame"
-	use oggvorbis || myconf="--without-vorbis"
-
-	econf ${myconf} || die "econf failed"
+	econf $(use_with alsa) \
+	      $(use_with encode lame) \
+	      $(use_with vorbis) || die "configuration failed"
 
 	emake || die "Compilation failed"
 }
 
 src_install() {
-	einstall darkicedocdir=${D}/usr/share/doc/${PF} || die
+	einstall darkicedocdir=${D}/usr/share/doc/${PF} || die "make install failed"
 
-	dodoc AUTHORS ChangeLog COPYING NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-sound/darkice/files/digest-darkice-0.13 b/media-sound/darkice/files/digest-darkice-0.13
deleted file mode 100644
index 155a33cc9dea..000000000000
--- a/media-sound/darkice/files/digest-darkice-0.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ddf0df78db85278eac4964d7c15ce3ea darkice-0.13.tar.gz 316510
diff --git a/media-sound/darkice/files/digest-darkice-0.13.2 b/media-sound/darkice/files/digest-darkice-0.13.2
deleted file mode 100644
index c52e0a2cc512..000000000000
--- a/media-sound/darkice/files/digest-darkice-0.13.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 66a848a87e7f4090603791bc7bccf44b darkice-0.13.2.tar.gz 329186
diff --git a/media-sound/darkice/files/digest-darkice-0.15 b/media-sound/darkice/files/digest-darkice-0.15
new file mode 100644
index 000000000000..16e70fbfcec5
--- /dev/null
+++ b/media-sound/darkice/files/digest-darkice-0.15
@@ -0,0 +1 @@
+MD5 313470008e387b70745ae2d75d5626c9 darkice-0.15.tar.gz 1181764