Fix bugs 205435, 213325, 218075 and 224803. Respectively broken useflags, gcc-4.3 breakage, openrc breakage and version bump. Removed old, since they're all broken with newer systems.

Package-Manager: portage-2.1.5.4

10 files changed, 43 insertions, 247 deletions

diff --git a/net-misc/icecast/ChangeLog b/net-misc/icecast/ChangeLog
index 89bda59cad03..f66430b4bc6a 100644
--- a/net-misc/icecast/ChangeLog
+++ b/net-misc/icecast/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/icecast
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/ChangeLog,v 1.75 2007/10/17 18:22:29 beandog Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/ChangeLog,v 1.76 2008/06/08 21:15:33 loki_val Exp $
+
+*icecast-2.3.2 (08 Jun 2008)
+
+  08 Jun 2008; Peter Alfredsen <loki_val@gentoo.org> files/init.d.icecast,
+  metadata.xml, -icecast-2.0.1-r1.ebuild, -icecast-2.0.2.ebuild,
+  -icecast-2.1.0.ebuild, -icecast-2.2.0.ebuild, -icecast-2.3.1.ebuild,
+  -icecast-2.3.1-r2.ebuild, +icecast-2.3.2.ebuild:
+  Fix bugs 205435, 213325, 218075 and 224803. Respectively broken useflags,
+  gcc-4.3 breakage, openrc breakage and version bump. Removed old, since
+  they're all broken with newer systems.
 
 *icecast-2.3.1-r2 (17 Oct 2007)
 
diff --git a/net-misc/icecast/Manifest b/net-misc/icecast/Manifest
index 8f9535d7e9a6..e4ba3cae9d2d 100644
--- a/net-misc/icecast/Manifest
+++ b/net-misc/icecast/Manifest
@@ -2,18 +2,10 @@ AUX 1.3.12-errno.patch 1732 RMD160 a7597217ced94b814dd7f8e5fe60fddfd68375ce SHA1
 AUX 2.2.0-gentoo.patch 15011 RMD160 d46545edd4613d6443e0d816e77d7e0ecda1b996 SHA1 de9db027d958cc272e65424667c45b3b416842ec SHA256 1c8c6757451f2cdca1308396472dfdc327f013244613c9b93285b36d389642b5
 AUX icecast-2.3.1-nocurlpassword.patch 908 RMD160 bddfa70d24ebab868537aeab0eb0df2b0e1ab34a SHA1 bcc2d06059ae7894de80cf2bea5095f37ac933c9 SHA256 0a36be49b7914e97cfac647310680a1c921dfb85083fa5a215159f2444a87671
 AUX icecast.xml 6810 RMD160 8f1864d8d4af6092b3901f04d670b0ab5c4d7019 SHA1 70d7247cd2359593ba08b988acd2915789dbd0a4 SHA256 8c9c209797d79153e0995665d08007bc2d59ff564f5e415df77212767b78f3cb
-AUX init.d.icecast 357 RMD160 2bca862859c52fa079100e1ce135384529bfb89f SHA1 febf1a74aa9e3bd986b22abf2e22a18797dc2047 SHA256 0f6ab4447a9c3788b4ca9685f3d2e37fa00173c7408008a8b1cce1d090c51575
-DIST icecast-2.0.1.tar.gz 750259 RMD160 6492cedc2eb3c75f8c20d391f7ccbb5f81171d7c SHA1 e9ecbb55d2a5d950bcca00c46f58a9eec28b6ae4 SHA256 66db83866a859f29a80d89fda9704a25dd912a12f2a33cd3028519d2290e1a99
-DIST icecast-2.0.2.tar.gz 750391 RMD160 449911633943686b2dc6a0cebb4a63728c4cefe8 SHA1 d85ff7e686040eb2d6f70aae175614cba318762a SHA256 b61f59ee8d790e003b49ebb009e995c0182a3b711f7388c2e72296fd26e287f2
-DIST icecast-2.1.0.tar.gz 684382 RMD160 8c3861ff9dd187188776852152bf1722dc86d155 SHA1 48913d2f50e1eb2fbf058080d11413d709c95fa0 SHA256 02b08bd4d8cfb4e50e6bf36e4abd70fa7c8a3cedb786db474c64eb5c96cb7c7f
-DIST icecast-2.2.0.tar.gz 702418 RMD160 536ae6c658937e2b273ca218408056e69e26f798 SHA1 5cfd558b159517a55bdf99da8e5e5ebeca232a5e SHA256 c95ee1d68c287f654e6ee1d3416a91c058531232d6f08ff6ed156376f997a41d
+AUX init.d.icecast 357 RMD160 c31dabf39606ad168e0cd06cb8d663f0a583fa94 SHA1 5956926ec34bfeb22fb6e93e53e9d8aff1ab93b2 SHA256 bffdb754a923d12fd619b022b94398b609b940214ef012ed8e9cd03ebb2b60e6
 DIST icecast-2.3.1.tar.gz 1094154 RMD160 394148f060daca979d49787530c4928558dd325c SHA1 e874ffc7dbed82a15889186a1cd3b7b7de3aba5d SHA256 7bcc2a1e2137a143deeacd7619cd348300672aaf8774fcfcb2e43aa7c3e74660
-EBUILD icecast-2.0.1-r1.ebuild 1042 RMD160 1780e59d216ad5c3b359ef8937a95d82c9b1e3d1 SHA1 4d6f9b4063ebfdfbc226706248d49e7cd0d41c1c SHA256 1fa9f131e80aa7aa3eca1652cc849df1e5aa4c1b11689f115b3322f7d052cbef
-EBUILD icecast-2.0.2.ebuild 1107 RMD160 2b1f3f67296146d3e56d14fdf157eeb32073d7d3 SHA1 77d28d9ea9f005c7e060879a208a2053f54b0c3e SHA256 84e09d637f9125d37fddd37dc4d1a28ba64afb4f4731cb65de2f10edab19bac1
-EBUILD icecast-2.1.0.ebuild 1059 RMD160 facd94f33a7f73d5833bee65b436be17eb3bfdf3 SHA1 c06eb9825d4739c31a00fc94b26d7bf9eebc76de SHA256 851d1e6836a1737b259d7879e6d9252bab6256d03d13d3961fac578addb8c801
-EBUILD icecast-2.2.0.ebuild 1154 RMD160 9c65a30c6177b89e997871ab671510fa9037e058 SHA1 c07a57f897f500f120683c89c87403070a42dfda SHA256 3800e94e840a6d3b39da78e1c77464419b7b1add8d4817b1962523fea01509cc
+DIST icecast-2.3.2.tar.gz 1152319 RMD160 ec14553cce652fb80823316c9705f4cb6179cc2a SHA1 a52b13505548c2eff2c64aab95a42dcafda11227 SHA256 4742b38fc55b6373895a7c0a35baed49a848fec99f5e8538e3f0157383d0b3f0
 EBUILD icecast-2.3.1-r1.ebuild 1431 RMD160 7d637a122cffdc4cf27328f9f4a5890a73f49c1d SHA1 a2c3e6a3d40e66750dd1ea0552dc960ae31d2c6c SHA256 b3ad36f2320dbbd8df45df44df94ff69ce5fc6c794e45f2a74299c77e00c4162
-EBUILD icecast-2.3.1-r2.ebuild 1511 RMD160 5c49b5078ae97295bf35e1b21049b8a84aff3da4 SHA1 5ff0dbd6499a38266c3a7cbd4d95d6ef98f22127 SHA256 759fe1b9fd2dfdaec4542d75e9e13cdc5c8e6c56d9a031c58f6f3826477532f9
-EBUILD icecast-2.3.1.ebuild 1110 RMD160 6d883df222dccf5b0c278f5d0f4e3b489f9b3442 SHA1 51fbd0fac1f2488cec9b9965bce1314a7f1d6b2c SHA256 a8ab8cfd2637df569cf7c5cc0a23f7d361a704253e8f5cbdce76af9befb91d01
-MISC ChangeLog 10520 RMD160 4c731827c2ecf8cd682005b8584f8741d5bc70f8 SHA1 bf471b8be6d4b50c9a6700b989aff345b28dbf03 SHA256 a0cb8d6a31f1be4871ea0401bac8a2297b57c78db7fba73103a4c9e928c04d3d
-MISC metadata.xml 221 RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 SHA1 aff61004cffd7341912643e1ab44a8df84e14c23 SHA256 3341e7789c5ba08aade2440d5ce6d2937e8432775731033190f11df5f64d085e
+EBUILD icecast-2.3.2.ebuild 1793 RMD160 b493ce6ec44f4d58f4827760cd41e54b5bf96125 SHA1 9bcb492f79327fd60fc368f1bad253da8e9e3296 SHA256 1c6fd28a6854de9a33587f41fdbf086302937780a7b0949ee12f4379297bfb0e
+MISC ChangeLog 11004 RMD160 17b494136add89437503d4853afc61ba2aa58ca2 SHA1 80e3ca16fbb9d5e1f19c93b97a9816c19c8655cf SHA256 2aa14f7849fa034856a0dc741452e63292ef45b3bad51f831d818d95969ede8f
+MISC metadata.xml 219 RMD160 1311be2ec3797b97e67acd02afa5083523d06721 SHA1 8d1e8571dd1d104255107dd46473ddc08e0de932 SHA256 5cceaad9e92392f27e672ac3a4c7127bf5b8f60a737788cd6d4856568e2f795c
diff --git a/net-misc/icecast/files/init.d.icecast b/net-misc/icecast/files/init.d.icecast
index 39f8a45d1367..202ce67ae5e1 100644
--- a/net-misc/icecast/files/init.d.icecast
+++ b/net-misc/icecast/files/init.d.icecast
@@ -6,7 +6,7 @@ depend() {
 
 start() {
 	ebegin "Starting Icecast 2"
-	start-stop-daemon --background --start --pidfile /var/run/icecast.pid --make-pidfile --exec /usr/bin/icecast -- -c /etc/icecast2/icecast.xml
+	start-stop-daemon --background --start --make-pidfile --pidfile /var/run/icecast.pid --exec /usr/bin/icecast -- -c /etc/icecast2/icecast.xml
 	eend $?
 }
 
diff --git a/net-misc/icecast/icecast-2.0.1-r1.ebuild b/net-misc/icecast/icecast-2.0.1-r1.ebuild
deleted file mode 100644
index 9e1ec2864e62..000000000000
--- a/net-misc/icecast/icecast-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.0.1-r1.ebuild,v 1.10 2007/04/28 16:55:28 swegener Exp $
-
-inherit eutils
-
-DESCRIPTION="An opensource alternative to shoutcast that supports mp3 and ogg streaming"
-HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc alpha amd64 ppc64"
-IUSE="curl"
-
-DEPEND="virtual/libc
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=media-libs/libvorbis-1.0
-	>=media-libs/libogg-1.0
-	curl? ( <net-misc/curl-7.16.0 )"
-
-src_compile() {
-	local myconf=""
-	use curl || myconf="${myconf} --disable-yp"
-	econf \
-		--sysconfdir=/etc/icecast2 \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS README TODO HACKING NEWS
-
-	newinitd ${FILESDIR}/init.d.icecast icecast
-
-	rm -rf ${D}usr/share/doc/icecast
-}
diff --git a/net-misc/icecast/icecast-2.0.2.ebuild b/net-misc/icecast/icecast-2.0.2.ebuild
deleted file mode 100644
index 89d47d1d8379..000000000000
--- a/net-misc/icecast/icecast-2.0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.0.2.ebuild,v 1.8 2007/04/28 16:55:28 swegener Exp $
-
-inherit eutils
-
-IUSE="curl doc"
-DESCRIPTION="An opensource alternative to shoutcast that supports mp3 and ogg streaming"
-HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc64"
-
-DEPEND="dev-libs/libxslt
-	media-libs/libogg
-	media-libs/libvorbis
-	curl? ( <net-misc/curl-7.16.0 )"
-
-src_compile() {
-	local myconf=""
-	use curl || myconf="${myconf} --disable-yp"
-	econf \
-		--sysconfdir=/etc/icecast2 \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist
-	use doc && dohtml -A chm,hhc,hhp doc/*
-
-	newinitd ${FILESDIR}/init.d.icecast icecast
-
-	fperms 600 /etc/icecast2/icecast.xml
-
-	rm -rf ${D}/usr/share/doc/icecast
-}
diff --git a/net-misc/icecast/icecast-2.1.0.ebuild b/net-misc/icecast/icecast-2.1.0.ebuild
deleted file mode 100644
index c5457a50942c..000000000000
--- a/net-misc/icecast/icecast-2.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.1.0.ebuild,v 1.13 2007/04/28 16:55:28 swegener Exp $
-
-IUSE="doc yp"
-
-inherit eutils
-
-DESCRIPTION="An opensource alternative to shoutcast that supports mp3 and ogg streaming"
-HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-
-DEPEND="dev-libs/libxslt
-	media-libs/libogg
-	media-libs/libvorbis
-	yp? ( <net-misc/curl-7.16.0 )"
-
-src_compile() {
-
-	econf \
-		--sysconfdir=/etc/icecast2 \
-		$(use_enable yp) \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist
-	use doc && dohtml -A chm,hhc,hhp doc/*
-
-	newinitd ${FILESDIR}/init.d.icecast icecast
-
-	fperms 600 /etc/icecast2/icecast.xml
-
-	rm -rf ${D}/usr/share/doc/icecast
-}
diff --git a/net-misc/icecast/icecast-2.2.0.ebuild b/net-misc/icecast/icecast-2.2.0.ebuild
deleted file mode 100644
index 8edf6d8317e1..000000000000
--- a/net-misc/icecast/icecast-2.2.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.2.0.ebuild,v 1.13 2007/07/26 21:07:35 chainsaw Exp $
-
-IUSE="yp"
-
-inherit eutils
-
-DESCRIPTION="An opensource alternative to shoutcast that supports mp3 and ogg streaming"
-HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-
-DEPEND="dev-libs/libxslt
-	media-libs/libogg
-	media-libs/libvorbis
-	yp? ( <net-misc/curl-7.16.0 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${PV}-gentoo.patch
-}
-
-src_compile() {
-
-	econf \
-		--sysconfdir=/etc/icecast2 \
-		$(use_enable yp) \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist
-	dohtml -A chm,hhc,hhp doc/*
-	doman ${S}/debian/icecast2.1
-
-	newinitd ${FILESDIR}/init.d.icecast icecast
-
-	fperms 600 /etc/icecast2/icecast.xml
-
-	rm -rf ${D}/usr/share/doc/icecast
-}
diff --git a/net-misc/icecast/icecast-2.3.1.ebuild b/net-misc/icecast/icecast-2.3.1.ebuild
deleted file mode 100644
index a03593197259..000000000000
--- a/net-misc/icecast/icecast-2.3.1.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/net-misc/icecast/icecast-2.3.1.ebuild,v 1.2 2007/04/18 10:59:49 dragonheart Exp $
-
-IUSE="yp theora"
-
-inherit eutils
-
-DESCRIPTION="An opensource alternative to shoutcast that supports mp3, ogg (vorbis/theora) and aac streaming"
-HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND="dev-libs/libxslt
-	media-libs/libogg
-	media-libs/libvorbis
-	theora? ( media-libs/libtheora )
-	yp? ( <net-misc/curl-7.16.0 )"
-
-src_compile() {
-	econf \
-		--sysconfdir=/etc/icecast2 \
-		$(use_enable yp) \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist
-	dohtml -A chm,hhc,hhp doc/*
-	doman ${S}/debian/icecast2.1
-
-	newinitd ${FILESDIR}/init.d.icecast icecast
-
-	fperms 600 /etc/icecast2/icecast.xml
-
-	rm -rf ${D}/usr/share/doc/icecast
-}
diff --git a/net-misc/icecast/icecast-2.3.1-r2.ebuild b/net-misc/icecast/icecast-2.3.2.ebuild
index cba292938ff7..a7afbdf66dc8 100644
--- a/net-misc/icecast/icecast-2.3.1-r2.ebuild
+++ b/net-misc/icecast/icecast-2.3.2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.3.1-r2.ebuild,v 1.1 2007/10/17 18:22:29 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.3.2.ebuild,v 1.1 2008/06/08 21:15:33 loki_val Exp $
 
-inherit eutils
+EAPI=1
+
+inherit libtool base eutils
 
 DESCRIPTION="An opensource alternative to shoutcast that supports mp3, ogg (vorbis/theora) and aac streaming"
 HOMEPAGE="http://www.icecast.org/"
@@ -11,24 +13,31 @@ SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="ogg speex theora vorbis yp"
+IUSE="+speex +ssl +theora +yp"
 
+#Although there is a --with-ogg and --with-orbis configure option, they're
+#only useful for specifying paths, not for disabling.
 DEPEND="dev-libs/libxslt
-	ogg? ( media-libs/libogg )
-	vorbis? ( media-libs/libvorbis )
+	dev-libs/libxml2
+	media-libs/libogg
+	media-libs/libvorbis
 	speex? ( media-libs/speex )
 	theora? ( media-libs/libtheora )
-	yp? ( net-misc/curl )"
+	yp? ( net-misc/curl )
+	ssl? ( dev-libs/openssl )"
 
 src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-nocurlpassword.patch"
+	base_src_unpack
+	elibtoolize
 }
 
 src_compile() {
-	econf \
+	econf 	--disable-dependency-tracking \
 		--sysconfdir=/etc/icecast2 \
+		$(use_with theora) \
+		$(use_with speex) \
+		$(use_with yp curl) \
+		$(use_with ssl openssl) \
 		$(use_enable yp) || die "configure failed"
 
 	emake || die "make failed"
@@ -40,7 +49,7 @@ pkg_preinst() {
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist
+	dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist || die
 	dohtml -A chm,hhc,hhp doc/*
 	doman "${S}/debian/icecast2.1"
 
@@ -50,8 +59,9 @@ src_install() {
 	doins "${FILESDIR}/icecast.xml"
 	fperms 600 /etc/icecast2/icecast.xml
 
+	diropts -m0764 -o icecast -g nogroup
+	dodir /var/log/icecast
 	keepdir /var/log/icecast
-	fowners icecast:nogroup /var/log/icecast
-
 	rm -rf "${D}/usr/share/doc/icecast"
 }
+
diff --git a/net-misc/icecast/metadata.xml b/net-misc/icecast/metadata.xml
index ea12fab7b274..1e8035259e42 100644
--- a/net-misc/icecast/metadata.xml
+++ b/net-misc/icecast/metadata.xml
@@ -4,5 +4,5 @@
 <herd>sound</herd>
 <maintainer>
   <email>sound@gentoo.org</email>
-  </maintainer>
+</maintainer>
 </pkgmetadata>