some fix0rs

4 files changed, 19 insertions, 75 deletions

diff --git a/net-misc/icecast/ChangeLog b/net-misc/icecast/ChangeLog
index 6fc891a88c66..4a645c872bf2 100644
--- a/net-misc/icecast/ChangeLog
+++ b/net-misc/icecast/ChangeLog
@@ -1,9 +1,15 @@
 # ChangeLog for net-misc/icecast
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/ChangeLog,v 1.9 2003/02/12 08:24:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/ChangeLog,v 1.10 2003/02/12 12:34:39 seemant Exp $
 
 *icecast-1.3.12-r1 (23 Jul 2002)
 
+  12 Feb 2003; Seemant Kulleen <seemant@gentoo.org>
+  icecast-1.3.12-r1.ebuild files/variables.diff
+  files/icecast-1.3.12-variables-gentoo.diff.bz2 :
+
+  Compressed the patch, and used epatch from eutils instead.
+
   23 Jul 2002; Nick Hadaway <raker@gentoo.org>
   icecast-1.3.12-r1.ebuild, files/digest-icecast-1.3.12-r1,
   files/variables.diff :
diff --git a/net-misc/icecast/files/icecast-1.3.12-variables-gentoo.diff.bz2 b/net-misc/icecast/files/icecast-1.3.12-variables-gentoo.diff.bz2
new file mode 100644
index 000000000000..cdc2088d2c36
--- /dev/null
+++ b/net-misc/icecast/files/icecast-1.3.12-variables-gentoo.diff.bz2
diff --git a/net-misc/icecast/files/variables.diff b/net-misc/icecast/files/variables.diff
deleted file mode 100644
index f9d99e3cdb6c..000000000000
--- a/net-misc/icecast/files/variables.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -urN icecast-1.3.12/Makefile.in icecast-1.3.12-modified/Makefile.in
---- icecast-1.3.12/Makefile.in	Wed Apr 10 17:51:24 2002
-+++ icecast-1.3.12-modified/Makefile.in	Tue Jul 23 18:16:26 2002
-@@ -59,17 +59,17 @@
- POST_UNINSTALL = :
- CC = @CC@
- CRYPTLIB = @CRYPTLIB@
--ICECAST_BINDIR = @ICECAST_BINDIR@
--ICECAST_DOCDIR = @ICECAST_DOCDIR@
--ICECAST_ETCDIR = @ICECAST_ETCDIR@
--ICECAST_ETCDIR_INST = @ICECAST_ETCDIR_INST@
--ICECAST_LOGDIR = @ICECAST_LOGDIR@
--ICECAST_LOGDIR_INST = @ICECAST_LOGDIR_INST@
--ICECAST_SBINDIR = @ICECAST_SBINDIR@
--ICECAST_STATICDIR = @ICECAST_STATICDIR@
--ICECAST_STATICDIR_INST = @ICECAST_STATICDIR_INST@
--ICECAST_TEMPLATEDIR = @ICECAST_TEMPLATEDIR@
--ICECAST_TEMPLATEDIR_INST = @ICECAST_TEMPLATEDIR_INST@
-+ICECAST_BINDIR = /usr/bin
-+ICECAST_DOCDIR = /usr/share/doc/${P}
-+ICECAST_ETCDIR = /etc/icecast
-+ICECAST_ETCDIR_INST = /etc/icecast
-+ICECAST_LOGDIR = /var/log/icecast
-+ICECAST_LOGDIR_INST = /var/log/icecast
-+ICECAST_SBINDIR = /usr/sbin
-+ICECAST_STATICDIR = /usr/share/icecast/static
-+ICECAST_STATICDIR_INST = /usr/share/icecast/static
-+ICECAST_TEMPLATEDIR = /usr/share/icecast/templates
-+ICECAST_TEMPLATEDIR_INST = /usr/share/icecast/templates
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- PACKAGE = @PACKAGE@
-diff -urN icecast-1.3.12/conf/icecast.conf.dist.in icecast-1.3.12-modified/conf/icecast.conf.dist.in
---- icecast-1.3.12/conf/icecast.conf.dist.in	Fri Dec 10 22:11:02 1999
-+++ icecast-1.3.12-modified/conf/icecast.conf.dist.in	Tue Jul 23 18:31:02 2002
-@@ -210,7 +210,7 @@
- ######################
- 
- #staticdir c:\windows\desktop
--staticdir @ICECAST_STATICDIR_INST@
-+staticdir /usr/share/icecast/static
- 
- ############################# Templates ######################################
- # the icecast server uses templtes to format output for list.cgi and
-@@ -218,7 +218,7 @@
- # please use absolute paths if possible
- #############################
- 
--templatedir @ICECAST_TEMPLATEDIR_INST@
-+templatedir /usr/share/icecast/templates
- 
- ############################# Statistics ######################################
- # The icecast server dumps statistics to a file on a regular basis.
-@@ -228,7 +228,7 @@
- # X > 0 means dump stats every X seconds to the file specified by stats_log
- #############################
- 
--logdir @ICECAST_LOGDIR_INST@
-+logdir /var/log/icecast
- stats_log stats.log
- statshtml_log stats.html
- stats_time 60
diff --git a/net-misc/icecast/icecast-1.3.12-r1.ebuild b/net-misc/icecast/icecast-1.3.12-r1.ebuild
index 25be37652079..494aff980f11 100644
--- a/net-misc/icecast/icecast-1.3.12-r1.ebuild
+++ b/net-misc/icecast/icecast-1.3.12-r1.ebuild
@@ -1,34 +1,34 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-1.3.12-r1.ebuild,v 1.5 2003/02/12 12:34:39 seemant Exp $
+
+inherit eutils
+
+IUSE="crypt"
 
 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/"
+SRC_URI="http://www.icecast.org/releases/${P}.tar.gz"
 
-KEYWORDS="x86 -ppc sparc"
-LICENSE="GPL-2"
 SLOT="0"
-IUSE="crypt"
+LICENSE="GPL-2"
+KEYWORDS="x86 -ppc sparc"
 
 DEPEND="virtual/glibc"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/variables.diff || die
+	epatch ${FILESDIR}/${P}-variables-gentoo.diff.bz2
 }
 
 src_compile() {
-	./configure \
+	econf \
 		`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"
+		|| die "configure failed"
 	emake || die "emake failed"
 }