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

Package-Manager: portage-2.1.3_rc9

10 files changed, 72 insertions, 168 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/Manifest b/media-sound/darkice/Manifest
index ea0faf592954..873f520c4aa1 100644
--- a/media-sound/darkice/Manifest
+++ b/media-sound/darkice/Manifest
@@ -2,43 +2,27 @@ AUX darkice-0.17.1-64bit.patch 1378 RMD160 cddaf66fa7a80bcaf37df9f857914a6a2e9c0
 MD5 132400707edda1ebca2458105f93bcd1 files/darkice-0.17.1-64bit.patch 1378
 RMD160 cddaf66fa7a80bcaf37df9f857914a6a2e9c0aab files/darkice-0.17.1-64bit.patch 1378
 SHA256 d9f4905780fafccd472d4aea185f38dc2ff822590f8ee535267afc409ad43968 files/darkice-0.17.1-64bit.patch 1378
-DIST darkice-0.14.tar.gz 337956 RMD160 05f712fe8e2bb27dcd33543c4d9cd7cf696fd58e SHA1 3c86c1f68ee7b1616911345ede1515652603b34f SHA256 efafad4000fc7b9843c47f2d4062e7fccea09dcee48a210db5ba1c50e64c8018
-DIST darkice-0.15.tar.gz 1181764 RMD160 e02a396e4d7a7cebac31b883e097fc1a1bdec525 SHA1 d43320081031ce9e70092f8e75c96d947c093387 SHA256 ddef0288ea7cde7ab11e6ed75b207bb573ce5611b094b5948ee5f7a511883a22
 DIST darkice-0.17.1.tar.gz 1407826 RMD160 b6575b28190276d77e721e2ef15e8a93162693cc SHA1 2952961c8e99412d831ca619f152ba6774efefac SHA256 905f0d928e8ef009c864f6ac89884bb1bf773e6a91e625b37888d444f5115c45
-DIST darkice-0.17.tar.gz 1402534 RMD160 2d0946da3ccf9ff268fc90c2cec4e387424477c2 SHA1 b4d60892a8df713f21a5f961617862c7d4c81d51 SHA256 4b095073d931ca04aa964bfd36a9ab2e284dd687cc52d9a4085da297689b506e
-EBUILD darkice-0.14.ebuild 1308 RMD160 1e45b44eb7885f0632c93f18d9d3088c3c19f974 SHA1 ae8fed991de3c166fae6fdd68c5d849feb284762 SHA256 6643740572ec2f436b232c1c584f42d309f3fb723cc0c0794bc54d686441c61e
-MD5 0c361d900fe1bf42eeea47f827b0fe79 darkice-0.14.ebuild 1308
-RMD160 1e45b44eb7885f0632c93f18d9d3088c3c19f974 darkice-0.14.ebuild 1308
-SHA256 6643740572ec2f436b232c1c584f42d309f3fb723cc0c0794bc54d686441c61e darkice-0.14.ebuild 1308
-EBUILD darkice-0.15.ebuild 1404 RMD160 83f07912f71d30a840baf1137775220c403d148f SHA1 c81c4b31419d2802986938090ae92b6c6fba7d9b SHA256 0d4588754e51c778044669fbf70f7f8737881370402f80b3d51352ec1132ac70
-MD5 4e2552b4ac2e30a85073d2cd36c0c5e1 darkice-0.15.ebuild 1404
-RMD160 83f07912f71d30a840baf1137775220c403d148f darkice-0.15.ebuild 1404
-SHA256 0d4588754e51c778044669fbf70f7f8737881370402f80b3d51352ec1132ac70 darkice-0.15.ebuild 1404
+DIST darkice-0.18.1.tar.gz 286477 RMD160 8a51fae97b1a53ec4636c908ac40ec88b2fd2f97 SHA1 dce706dd593daa0e7832ec0657ab265e6eecc98e SHA256 0f1b024c5729956390fa07544080784e94c28bbb632dfdb61e2b37baeb7e3630
 EBUILD darkice-0.17.1.ebuild 1745 RMD160 cb921c719d514a9b551f867782a0433be3e91975 SHA1 d95e097d470f8b0c7fd2fc8caf34d9da9f8baf49 SHA256 897c3d390fd30d32c08caf2746b51a7eb85592258c359f0438e1d6eb19d836a0
 MD5 6a3a89eef19afbbb9469ad5220e29ccc darkice-0.17.1.ebuild 1745
 RMD160 cb921c719d514a9b551f867782a0433be3e91975 darkice-0.17.1.ebuild 1745
 SHA256 897c3d390fd30d32c08caf2746b51a7eb85592258c359f0438e1d6eb19d836a0 darkice-0.17.1.ebuild 1745
-EBUILD darkice-0.17.ebuild 1407 RMD160 ad0b5db159efeb9dde3ece5fb774443de5359045 SHA1 a930fd55a7c284fcff469388c27d87acba4b252b SHA256 f29b1b0f4cb7812597c0a38e2aea327ee03ec52d6c22a410b54ad8a18fc8b442
-MD5 a56a60e403df9b2f32799bb967e2c427 darkice-0.17.ebuild 1407
-RMD160 ad0b5db159efeb9dde3ece5fb774443de5359045 darkice-0.17.ebuild 1407
-SHA256 f29b1b0f4cb7812597c0a38e2aea327ee03ec52d6c22a410b54ad8a18fc8b442 darkice-0.17.ebuild 1407
-MISC ChangeLog 4947 RMD160 8d54879ba77050381fb32eb84ad486ccfa503623 SHA1 e8b15c0843d4349b1f5ed8fcf194b59a42e142c2 SHA256 4311c4c3611eae5e9e4798233cdd1d182b9c37d2bd69a72986ed384c69aab58b
-MD5 c6ce2663b262e65faf669452c434aaf9 ChangeLog 4947
-RMD160 8d54879ba77050381fb32eb84ad486ccfa503623 ChangeLog 4947
-SHA256 4311c4c3611eae5e9e4798233cdd1d182b9c37d2bd69a72986ed384c69aab58b ChangeLog 4947
+EBUILD darkice-0.18.1.ebuild 1682 RMD160 55910bbaf5518dd72c2e33fc14d4558e2050ee2f SHA1 b630edb03e24cf9ad6428ce18f27610690acb43a SHA256 8ed56ca30cb43fc7bcaddbadbd663f25a9293245654e85fa917daef1e9ffba7f
+MD5 ae0133d7eb360d0cf71704111837e8be darkice-0.18.1.ebuild 1682
+RMD160 55910bbaf5518dd72c2e33fc14d4558e2050ee2f darkice-0.18.1.ebuild 1682
+SHA256 8ed56ca30cb43fc7bcaddbadbd663f25a9293245654e85fa917daef1e9ffba7f darkice-0.18.1.ebuild 1682
+MISC ChangeLog 5222 RMD160 262772285294b506886dae26aecc03815d440c12 SHA1 29fd79c01f57aaa97e25c964d28de8545c29867d SHA256 ae18b5bb79b5b235e84dd68d19a50f48cdcc4640a49d03f556f3296f841043fc
+MD5 6c9a4f2fd0f902d2a29f63cdf80f3200 ChangeLog 5222
+RMD160 262772285294b506886dae26aecc03815d440c12 ChangeLog 5222
+SHA256 ae18b5bb79b5b235e84dd68d19a50f48cdcc4640a49d03f556f3296f841043fc ChangeLog 5222
 MISC metadata.xml 252 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a SHA1 6e5cc1551616801a2f257d688e6fc286044c3499 SHA256 5ab00710d822d203a1a38e1b6a9754137de4fe2cf5c4e79470419ed3f3927450
 MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a metadata.xml 252
 SHA256 5ab00710d822d203a1a38e1b6a9754137de4fe2cf5c4e79470419ed3f3927450 metadata.xml 252
-MD5 0e6db5bebc7a7fc9e3536dae26b64bc1 files/digest-darkice-0.14 238
-RMD160 03e84b6b9aae2356af8e7953dfc8190289cabb05 files/digest-darkice-0.14 238
-SHA256 21a84de99ee74b41b0dbe6f7e0b184e4da4247d728b1778952e3196edb9e2738 files/digest-darkice-0.14 238
-MD5 978e31abb759d08306d8fba134a43652 files/digest-darkice-0.15 241
-RMD160 06ce6452987028414415937f22519a9f6285de37 files/digest-darkice-0.15 241
-SHA256 98d9ec5405adc016ebcefeb1b0112488fcb1862f0930fdf6a3eb24be3e1c487c files/digest-darkice-0.15 241
-MD5 f76bb25a841acb7158dddc0ea9569731 files/digest-darkice-0.17 241
-RMD160 ab69fcd905131ec0931be47ea5cf6ea69e7546b3 files/digest-darkice-0.17 241
-SHA256 cd9bc4a8ec1e8fbf3def012dc83c16c1b950f4f4fe3e3da90263fab028438045 files/digest-darkice-0.17 241
 MD5 1623e84d39bbb812a26e9f715a07b1c9 files/digest-darkice-0.17.1 247
 RMD160 cf492e5f5f324a21a40773247777fdb17c3d213e files/digest-darkice-0.17.1 247
 SHA256 7f97a6b2cc147c89f6c3cbc735d8aae621b12bf7cd04310b6ccc397897e41569 files/digest-darkice-0.17.1 247
+MD5 1d5d3c06a3b528d070dee1540aee0ce2 files/digest-darkice-0.18.1 244
+RMD160 015fe198a750c6a51858228b4487e018cac2febc files/digest-darkice-0.18.1 244
+SHA256 f98909202058c29f3ebb33b6c290e03360cfacf47926ead2cbf160120ce0ea7e files/digest-darkice-0.18.1 244
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