cleanups

7 files changed, 27 insertions, 114 deletions

diff --git a/net-misc/icecast/ChangeLog b/net-misc/icecast/ChangeLog
index 09d869a4eec1..113cd1ec428e 100644
--- a/net-misc/icecast/ChangeLog
+++ b/net-misc/icecast/ChangeLog
@@ -1,9 +1,7 @@
 # ChangeLog for net-misc/icecast
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/ChangeLog,v 1.7 2002/12/13 11:00:11 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/ChangeLog,v 1.8 2003/01/09 21:29:17 vapier Exp $
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *icecast-1.3.12-r1 (23 Jul 2002)
 
   23 Jul 2002; Nick Hadaway <raker@gentoo.org>
diff --git a/net-misc/icecast/files/digest-icecast-1.3.11 b/net-misc/icecast/files/digest-icecast-1.3.11
deleted file mode 100644
index 8a4a92a561a1..000000000000
--- a/net-misc/icecast/files/digest-icecast-1.3.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 20d3b21829bc450c19607ee39ccb0e6c icecast-1.3.11.tar.gz 267709
diff --git a/net-misc/icecast/files/digest-icecast-1.3.12 b/net-misc/icecast/files/digest-icecast-1.3.12
deleted file mode 100644
index 12bd2d747ed3..000000000000
--- a/net-misc/icecast/files/digest-icecast-1.3.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 69ba36d30722884ea538b70628f1de80 icecast-1.3.12.tar.gz 269822
diff --git a/net-misc/icecast/icecast-1.3.11.ebuild b/net-misc/icecast/icecast-1.3.11.ebuild
deleted file mode 100644
index d2ae9c746c07..000000000000
--- a/net-misc/icecast/icecast-1.3.11.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Icecast is an Internet based broadcasting system based on the Mpeg Layer III streaming technology."
-SRC_URI="http://www.icecast.org/releases/${P}.tar.gz"
-HOMEPAGE="http://www.icecast.org"
-KEYWORDS="x86 sparc "
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-
-        ./configure --with-libwrap              \
-                    --with-crypt                \
-                    --infodir=/usr/share/info   \
-                    --mandir=/usr/share/man     \
-                    --host=${CHOST} || die
-
-        emake || die
-}
-
-
-src_install () {
-
-        make DESTDIR=${D} install || die
-        dodoc AUTHORS BUGS CHANGES COPYING FAQ INSTALL README TESTED TODO
-
-}
diff --git a/net-misc/icecast/icecast-1.3.12-r1.ebuild b/net-misc/icecast/icecast-1.3.12-r1.ebuild
index c0b3f14c2e7a..25be37652079 100644
--- a/net-misc/icecast/icecast-1.3.12-r1.ebuild
+++ b/net-misc/icecast/icecast-1.3.12-r1.ebuild
@@ -1,46 +1,38 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-1.3.12-r1.ebuild,v 1.4 2003/01/09 21:29:05 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="Icecast is an Internet based broadcasting system based on the Mpeg Layer III streaming technology."
+DESCRIPTION="Internet based broadcasting system based on the mpeg3 streaming technology"
 SRC_URI="http://www.icecast.org/releases/${P}.tar.gz"
-HOMEPAGE="http://www.icecast.org"
-KEYWORDS="x86 -ppc -sparc "
+HOMEPAGE="http://www.icecast.org/"
+
+KEYWORDS="x86 -ppc sparc"
 LICENSE="GPL-2"
 SLOT="0"
+IUSE="crypt"
 
 DEPEND="virtual/glibc"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/variables.diff
-
+	patch -p1 < ${FILESDIR}/variables.diff || die
 }
 
 src_compile() {
-
-	local myconf
-
-	use crypt && myconf="--with-crypt" || myconf="--without-crypt"	
-	
-	./configure 	--with-libwrap              \
-			${myconf}                   \
-			--prefix=/usr               \
-			--sysconfdir=/etc/icecast   \
-			--localstatedir=/var        \
-			--infodir=/usr/share/info   \
-			--mandir=/usr/share/man     \
-			--host=${CHOST} || die "configure failed"
-
+	./configure \
+		`use_with crypt` \
+		--with-libwrap \
+		--prefix=/usr \
+		--sysconfdir=/etc/icecast \
+		--localstatedir=/var \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--host=${CHOST} || die "configure failed"
 	emake || die "emake failed"
 }
 
-
-src_install () {
-
+src_install() {
 	make DESTDIR=${D} \
 		ICECAST_BINDIR=/usr/bin \
 		ICECAST_DOCDIR=/usr/share/doc/${P} \
@@ -54,6 +46,5 @@ src_install () {
         	ICECAST_TEMPLATEDIR=/usr/share/icecast/templates \
 		ICECAST_TEMPLATEDIR_INST=/usr/share/icecast/templates \
 		install || die "make install failed"
-
 	dodoc AUTHORS BUGS CHANGES COPYING FAQ INSTALL README TESTED TODO
 }
diff --git a/net-misc/icecast/icecast-1.3.12.ebuild b/net-misc/icecast/icecast-1.3.12.ebuild
deleted file mode 100644
index 2711fce5a774..000000000000
--- a/net-misc/icecast/icecast-1.3.12.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Icecast is an Internet based broadcasting system based on the Mpeg Layer III streaming technology."
-SRC_URI="http://www.icecast.org/releases/${P}.tar.gz"
-HOMEPAGE="http://www.icecast.org"
-KEYWORDS="x86 sparc "
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-
-	local myconf
-
-	use crypt && myconf="--with-crypt" || myconf="--without-crypt"
-
-	./configure 	--with-libwrap              \
-			${myconf}                   \
-			--infodir=/usr/share/info   \
-			--mandir=/usr/share/man     \
-			--host=${CHOST} || die
-
-	emake || die
-}
-
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS CHANGES COPYING FAQ INSTALL README TESTED TODO
-}
diff --git a/net-misc/icecast2/icecast2-08072002.ebuild b/net-misc/icecast2/icecast2-08072002.ebuild
index bfe7f2dfcc9b..58f22c245145 100644
--- a/net-misc/icecast2/icecast2-08072002.ebuild
+++ b/net-misc/icecast2/icecast2-08072002.ebuild
@@ -1,40 +1,33 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# Packaged by Blake Watters <sbw@ibiblio.org>
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast2/icecast2-08072002.ebuild,v 1.5 2003/01/09 21:25:47 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="A streaming media server capable of delivering ogg-vorbis streams."
-SRC_URI="http://ibiblio.org/sbw/gentoo/icecast2-08072002.tar.bz2"
-HOMEPAGE="http://www.icecast.org"
+DESCRIPTION="streaming media server capable of delivering ogg-vorbis streams"
+SRC_URI="http://ibiblio.org/sbw/gentoo/${P}.tar.bz2"
+HOMEPAGE="http://www.icecast.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
+KEYWORDS="x86 sparc"
 
 DEPEND=">=media-libs/libvorbis-1.0
-		>=dev-libs/libxml-1.8.0"
+	>=dev-libs/libxml-1.8.0"
 
 
 src_compile() {	
-
 	econf || die
-
 	emake || die
 }
 
 src_install() {	
 	dodoc README AUTHORS HACKING COPYING TODO
-	
-	exeinto /usr/bin
-	newexe src/icecast icecast2
-
+	newbin src/icecast icecast2
 	insinto /etc
 	doins ${FILESDIR}/icecast2.xml
 }
 
 pkg_postinst() {
 	einfo "Please edit the configuration file located at /etc/icecast2.xml"
-    einfo "to configure your icecast2 server. Execute with icecast2 -c /etc/icecast2.xml"
-    einfo "to start your streaming server."
-    einfo
+	einfo "to configure your icecast2 server. Execute with icecast2 -c /etc/icecast2.xml"
+	einfo "to start your streaming server."
 }