cleanup

7 files changed, 12 insertions, 127 deletions

diff --git a/media-sound/darkice/darkice-0.10.1.ebuild b/media-sound/darkice/darkice-0.10.1.ebuild
deleted file mode 100644
index 8c96d0ecde6f..000000000000
--- a/media-sound/darkice/darkice-0.10.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.10.1.ebuild,v 1.7 2003/10/27 09:47:42 aliz Exp $
-
-IUSE="encode oggvorbis"
-
-DESCRIPTION="IceCast live streamer delivering Ogg and mp3 streams simulatenously to multiple hosts."
-HOMEPAGE="http://darkice.sourceforge.net/"
-LICENSE="GPL-2"
-
-DEPEND="encode?	( >=media-sound/lame-1.89 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
-
-SLOT="0"
-KEYWORDS="x86"
-SRC_URI="mirror://sourceforge/darkice/darkice-${PV}.tar.gz"
-S=${WORKDIR}/${P}
-
-src_compile() {
-	local myconf
-	use encode && myconf="--with-lame"
-	use oggvorbis && myconf="${myconf} --with-vorbis"
-
-	./configure ${myconf} \
-		    --prefix=/usr \
-		    --sysconfdir=/etc \
-		    --mandir=/usr/share/man \
-		    --infodir=/usr/share/info || die
-	emake || die
-}
-
-src_install() {
-	einstall darkicedocdir=${D}/usr/share/doc/${PF} || die
-
-	dodoc README TODO NEWS AUTHORS ChangeLog NEWS
-}
diff --git a/media-sound/darkice/darkice-0.12.ebuild b/media-sound/darkice/darkice-0.12.ebuild
deleted file mode 100644
index b4ea2a2a2f09..000000000000
--- a/media-sound/darkice/darkice-0.12.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.12.ebuild,v 1.4 2003/09/07 00:06:04 msterret Exp $
-
-DESCRIPTION="IceCast live streamer delivering Ogg and mp3 streams simulatenously to multiple hosts."
-HOMEPAGE="http://darkice.sourceforge.net/"
-KEYWORDS="x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="encode oggvorbis"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-DEPEND="encode?	( >=media-sound/lame-1.89 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
-
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	unpack ${A}
-
-	patch -p0 < ${FILESDIR}/${P}-gentoo.diff
-}
-
-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}
-
-	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.13.ebuild b/media-sound/darkice/darkice-0.13.ebuild
index 7c225f6bf296..1c1b5f6f6539 100644
--- a/media-sound/darkice/darkice-0.13.ebuild
+++ b/media-sound/darkice/darkice-0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.5 2003/09/08 07:09:44 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.13.ebuild,v 1.6 2004/01/20 18:56:15 mholzer Exp $
 
 IUSE="encode oggvorbis"
 
@@ -8,10 +8,11 @@ S=${WORKDIR}/${P}
 DESCRIPTION="IceCast live streamer delivering Ogg and mp3 streams simulatenously 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 ~mips ~hppa"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa"
 
 
 DEPEND="encode?	( >=media-sound/lame-1.89 )
diff --git a/media-sound/darkice/files/darkice-0.12-gentoo.diff b/media-sound/darkice/files/darkice-0.12-gentoo.diff
deleted file mode 100644
index db57d1bc247a..000000000000
--- a/media-sound/darkice/files/darkice-0.12-gentoo.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -NurB darkice-0.12/src/MultiThreadedConnector.h darkice-0.12-patched/src/MultiThreadedConnector.h
---- darkice-0.12/src/MultiThreadedConnector.h	2002-10-19 08:35:21.000000000 -0500
-+++ darkice-0.12-patched/src/MultiThreadedConnector.h	2003-01-14 03:29:53.000000000 -0500
-@@ -180,15 +180,6 @@
-         void
-         strip ( void )                              throw ( Exception );
- 
--        /**
--         *  This is the function for each thread.
--         *  This function has to return fast
--         *
--         *  @param ixSink the index of the sink this thread works on.
--         */
--        void
--        sinkThread( int     ixSink );
--
-     protected:
- 
-         /**
-@@ -206,6 +197,15 @@
-     public:
- 
-         /**
-+         *  This is the function for each thread.
-+         *  This function has to return fast
-+         *
-+         *  @param ixSink the index of the sink this thread works on.
-+         */
-+        void
-+        sinkThread( int     ixSink );
-+
-+        /**
-          *  Constructor based on a Source.
-          *
-          *  @param source the source to connect to the sinks.
diff --git a/media-sound/darkice/files/digest-darkice-0.10.1 b/media-sound/darkice/files/digest-darkice-0.10.1
deleted file mode 100644
index 2f1c765c8b8d..000000000000
--- a/media-sound/darkice/files/digest-darkice-0.10.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a92704124f3b8045e4e7fe122f9549fc darkice-0.10.1.tar.gz 299033
diff --git a/media-sound/darkice/files/digest-darkice-0.12 b/media-sound/darkice/files/digest-darkice-0.12
deleted file mode 100644
index d8867398096e..000000000000
--- a/media-sound/darkice/files/digest-darkice-0.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a28af863edaab12366a5b66b167b8fd6 darkice-0.12.tar.gz 314628
diff --git a/media-sound/darkice/metadata.xml b/media-sound/darkice/metadata.xml
new file mode 100644
index 000000000000..78ec7f6984fe
--- /dev/null
+++ b/media-sound/darkice/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+<maintainer>
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound Team</name>
+</maintainer>
+</pkgmetadata>