Version bump for bug 169505, thanks to Ákos Maróy for reporting, armin76 at gentoo.org for poking.

(Portage version: 2.1.3_rc9)

9 files changed, 60 insertions, 140 deletions

diff --git a/media-sound/darkice/ChangeLog b/media-sound/darkice/ChangeLog
index 2e0cf6f13773..dd1e1057151a 100644
--- a/media-sound/darkice/ChangeLog
+++ b/media-sound/darkice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/darkice
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/ChangeLog,v 1.40 2007/07/23 18:22:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/ChangeLog,v 1.41 2007/07/23 18:43:32 drac Exp $
+
+*darkice-0.18.1 (23 Jul 2007)
+
+  23 Jul 2007; Samuli Suominen <drac@gentoo.org> -darkice-0.14.ebuild,
+  -darkice-0.15.ebuild, -darkice-0.17.ebuild, +darkice-0.18.1.ebuild:
+  Version bump for bug 169505, thanks to Ákos Maróy for reporting, armin76
+  at gentoo.org for poking.
 
   23 Jul 2007; Raúl Porcel <armin76@gentoo.org> darkice-0.14.ebuild,
   darkice-0.15.ebuild, darkice-0.17.ebuild:
diff --git a/media-sound/darkice/darkice-0.14.ebuild b/media-sound/darkice/darkice-0.14.ebuild
deleted file mode 100644
index 909a0d96483b..000000000000
--- a/media-sound/darkice/darkice-0.14.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 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.15 2007/07/23 18:22:30 armin76 Exp $
-
-IUSE="encode vorbis alsa"
-
-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="mirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ~ppc sparc x86"
-
-DEPEND="encode?	( >=media-sound/lame-1.89 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )"
-
-src_compile() {
-	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 \`vorbis' USE flags enabled:"
-		eerror
-		eerror "  # USE=\"encode\" emerge darkice"
-		eerror "  # USE=\"vorbis\" emerge darkice"
-		die "Won't build without support for lame nor vorbis"
-	fi
-
-	econf `use_with alsa` \
-	      `use_with encode lame` \
-	      `use_with vorbis vorbis` || die
-
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	einstall darkicedocdir=${D}/usr/share/doc/${PF} || die
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-sound/darkice/darkice-0.15.ebuild b/media-sound/darkice/darkice-0.15.ebuild
deleted file mode 100644
index 6203c3161f5b..000000000000
--- a/media-sound/darkice/darkice-0.15.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.15.ebuild,v 1.9 2007/07/23 18:22:30 armin76 Exp $
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc sparc x86"
-IUSE="alsa encode jack vorbis"
-
-DEPEND="encode?	( >=media-sound/lame-1.89 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	jack? ( media-sound/jack-audio-connection-kit )"
-
-src_compile() {
-	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 \`vorbis' USE flags enabled:"
-		eerror
-		eerror "  # USE=\"encode\" emerge darkice"
-		eerror "  # USE=\"vorbis\" emerge darkice"
-		die "Won't build without support for lame nor vorbis"
-	fi
-
-	econf $(use_with alsa) \
-	      $(use_with encode lame) \
-		  $(use_with jack) \
-	      $(use_with vorbis) || die "configuration failed"
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	einstall darkicedocdir=${D}/usr/share/doc/${PF} || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-sound/darkice/darkice-0.17.ebuild b/media-sound/darkice/darkice-0.17.ebuild
deleted file mode 100644
index 3a0baa13395f..000000000000
--- a/media-sound/darkice/darkice-0.17.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.17.ebuild,v 1.4 2007/07/23 18:22:30 armin76 Exp $
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc sparc x86"
-IUSE="alsa encode jack vorbis"
-
-DEPEND="encode?	( >=media-sound/lame-1.89 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	jack? ( media-sound/jack-audio-connection-kit )"
-
-src_compile() {
-	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 \`vorbis' USE flags enabled:"
-		eerror
-		eerror "  # USE=\"encode\" emerge darkice"
-		eerror "  # USE=\"vorbis\" emerge darkice"
-		die "Won't build without support for lame nor vorbis"
-	fi
-
-	econf $(use_with alsa) \
-	      $(use_with encode lame) \
-		  $(use_with jack) \
-	      $(use_with vorbis) || die "configuration failed"
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	einstall darkicedocdir=${D}/usr/share/doc/${PF} || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-sound/darkice/darkice-0.18.1.ebuild b/media-sound/darkice/darkice-0.18.1.ebuild
new file mode 100644
index 000000000000..e7437b0b169e
--- /dev/null
+++ b/media-sound/darkice/darkice-0.18.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2007 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.1 2007/07/23 18:43:32 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"
+
+DEPEND="encode?	( >=media-sound/lame-1.89 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	aac? ( media-libs/faac )
+	twolame? ( >=media-sound/twolame-0.3.6 )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	jack? ( media-sound/jack-audio-connection-kit )"
+
+src_compile() {
+	if ! use encode && ! use vorbis && ! use aac && ! use twolame
+	then
+		eerror "You need support for mp3, Ogg Vorbis, AAC or MP2 enconding"
+		eerror "for this package. Please merge again with at least one of the"
+		eerror "\`encode', \`vorbis', \`aac' and \`twolame'  USE flags enabled:"
+		eerror
+		eerror "  # USE=\"encode\" emerge darkice"
+		eerror "  # USE=\"vorbis\" emerge darkice"
+		eerror "  # USE=\"aac\" emerge darkice"
+		eerror "  # USE=\"twolame\" emerge darkice"
+		die "Won't build without support for lame, vorbis, aac nor twolame"
+	fi
+
+	econf $(use_with aac faac) \
+		$(use_with alsa) \
+		$(use_with encode lame) \
+		$(use_with jack) \
+		$(use_with twolame) \
+		$(use_with vorbis) || die "econf failed."
+	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/files/digest-darkice-0.14 b/media-sound/darkice/files/digest-darkice-0.14
deleted file mode 100644
index a35e21e846ee..000000000000
--- a/media-sound/darkice/files/digest-darkice-0.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e196487f376ab29c43277add33be15be darkice-0.14.tar.gz 337956
-RMD160 05f712fe8e2bb27dcd33543c4d9cd7cf696fd58e darkice-0.14.tar.gz 337956
-SHA256 efafad4000fc7b9843c47f2d4062e7fccea09dcee48a210db5ba1c50e64c8018 darkice-0.14.tar.gz 337956
diff --git a/media-sound/darkice/files/digest-darkice-0.15 b/media-sound/darkice/files/digest-darkice-0.15
deleted file mode 100644
index 4f3e2b7f10cd..000000000000
--- a/media-sound/darkice/files/digest-darkice-0.15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 313470008e387b70745ae2d75d5626c9 darkice-0.15.tar.gz 1181764
-RMD160 e02a396e4d7a7cebac31b883e097fc1a1bdec525 darkice-0.15.tar.gz 1181764
-SHA256 ddef0288ea7cde7ab11e6ed75b207bb573ce5611b094b5948ee5f7a511883a22 darkice-0.15.tar.gz 1181764
diff --git a/media-sound/darkice/files/digest-darkice-0.17 b/media-sound/darkice/files/digest-darkice-0.17
deleted file mode 100644
index 7a836fa38728..000000000000
--- a/media-sound/darkice/files/digest-darkice-0.17
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ae7b3637ab1a427964f7bf335e2f2d14 darkice-0.17.tar.gz 1402534
-RMD160 2d0946da3ccf9ff268fc90c2cec4e387424477c2 darkice-0.17.tar.gz 1402534
-SHA256 4b095073d931ca04aa964bfd36a9ab2e284dd687cc52d9a4085da297689b506e darkice-0.17.tar.gz 1402534
diff --git a/media-sound/darkice/files/digest-darkice-0.18.1 b/media-sound/darkice/files/digest-darkice-0.18.1
new file mode 100644
index 000000000000..6d57bbd77c7a
--- /dev/null
+++ b/media-sound/darkice/files/digest-darkice-0.18.1
@@ -0,0 +1,3 @@
+MD5 b1baef967b9a258dd3061677bd77d7d9 darkice-0.18.1.tar.gz 286477
+RMD160 8a51fae97b1a53ec4636c908ac40ec88b2fd2f97 darkice-0.18.1.tar.gz 286477
+SHA256 0f1b024c5729956390fa07544080784e94c28bbb632dfdb61e2b37baeb7e3630 darkice-0.18.1.tar.gz 286477