using epatch.

3 files changed, 24 insertions, 28 deletions

diff --git a/net-www/squid/ChangeLog b/net-www/squid/ChangeLog
index 81c6fa4e7ded..441940b1ff0e 100644
--- a/net-www/squid/ChangeLog
+++ b/net-www/squid/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/squid
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/squid/ChangeLog,v 1.24 2003/09/19 02:12:19 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squid/ChangeLog,v 1.25 2003/10/18 18:46:47 mholzer Exp $
+
+  18 Oct 2003; Martin Holzer <mholzer@gentoo.org> squid-2.5.4.ebuild:
+  using epatch.
 
 *squid-2.5.4 (18 Sep 2003)
 
diff --git a/net-www/squid/Manifest b/net-www/squid/Manifest
index 405173d19b2a..d7709c27b984 100644
--- a/net-www/squid/Manifest
+++ b/net-www/squid/Manifest
@@ -1,14 +1,14 @@
-MD5 a4100a78074c1195fc18e31a2888e8bd squid-2.5.4.ebuild 5200
-MD5 4c07223b8c83f25398383f3757db0411 squid-2.5.3.ebuild 4921
+MD5 867aee28294836f7b5f2bb71f097f139 ChangeLog 4160
 MD5 23e3312058fbdd7661ff20bb234dedcd squid-2.4.7.ebuild 3503
-MD5 63bfed206ec586bd46a2543e420ee4e5 ChangeLog 4074
+MD5 df572acbd7dfd085874ff700465bd870 squid-2.5.4.ebuild 4856
+MD5 4c07223b8c83f25398383f3757db0411 squid-2.5.3.ebuild 4921
+MD5 bb029026a8d6bd24efd9086a2f3e959e files/digest-squid-2.4.7 74
+MD5 7183dd9775e11802755e8dc6be14e083 files/digest-squid-2.5.4 146
+MD5 6658bb10c03cd2940380d3358c2d8eef files/digest-squid-2.5.3 71
+MD5 626914d5b07105602773bf8a1534a3ae files/squid-2.4.7-debian.diff 12078
 MD5 60b9ab4d53c4485a214baa7c8f9a2cc0 files/squid-2.4.7-gentoo.diff 1828
+MD5 0c7867dce4b8bef078a93bf717196b0e files/squid-2.5.3-gentoo.diff 11534
 MD5 ac30b2c837f1e3e58b89a49f71786ea1 files/squid.confd 456
 MD5 a0542fba85e03f3eeeeabfbd8ce74afc files/squid.cron 36
-MD5 0c7867dce4b8bef078a93bf717196b0e files/squid-2.5.3-gentoo.diff 11534
-MD5 626914d5b07105602773bf8a1534a3ae files/squid-2.4.7-debian.diff 12078
 MD5 c91a09e06237e673a07ec28364f3e0e1 files/squid.pam 506
 MD5 cdb6c071e42e7f98cc28972c9629b83f files/squid.rc6 1868
-MD5 bb029026a8d6bd24efd9086a2f3e959e files/digest-squid-2.4.7 74
-MD5 6658bb10c03cd2940380d3358c2d8eef files/digest-squid-2.5.3 71
-MD5 7183dd9775e11802755e8dc6be14e083 files/digest-squid-2.5.4 146
diff --git a/net-www/squid/squid-2.5.4.ebuild b/net-www/squid/squid-2.5.4.ebuild
index ad4298ae60da..9ad8c45cf465 100644
--- a/net-www/squid/squid-2.5.4.ebuild
+++ b/net-www/squid/squid-2.5.4.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/net-www/squid/squid-2.5.4.ebuild,v 1.1 2003/09/19 02:12:19 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.5.4.ebuild,v 1.2 2003/10/18 18:46:47 mholzer Exp $
 
 IUSE="pam ldap ssl sasl snmp debug"
 
@@ -29,26 +29,23 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
 SLOT="0"
 
 src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
+	unpack ${A}
+	cd ${S}
 	#patch up to 2.5.STABLE4
-	patch -p1 <../diff-2.5.STABLE3-2.5.STABLE4 || die
+	epatch ../diff-2.5.STABLE3-2.5.STABLE4 || die
 
 	#do NOT just remove this patch.  yes, it's here for a reason.
 	#woodchip@gentoo.org (07 Nov 2002)
-	patch -p1 <${FILESDIR}/squid-2.5.3-gentoo.diff || die
+	epatch ${FILESDIR}/squid-2.5.3-gentoo.diff || die
 
 	#hmm #10865
 	cd helpers/external_acl/ldap_group
-	cp Makefile.in Makefile.in.orig
-	sed -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \
-		Makefile.in.orig > Makefile.in
+	sed -i 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' Makefile.in
 
 	if [ -z "`use debug`" ]
 	then
 		cd ${S}
-		mv configure.in configure.in.orig
-		sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in
+		sed -i 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in
 		autoconf || die
 	fi
 }
@@ -68,9 +65,7 @@ src_compile() {
 				-e "s:NULL, NULL, NULL:NULL, NULL, NULL, NULL, NULL:" \
 				-e "s:strlen(password), \&errstr:strlen(password):" \
 				< sasl_auth.c.orig > sasl_auth.c
-			cp Makefile.in Makefile.in.orig
-			sed -e "s:-lsasl:-lsasl2:" \
-				< Makefile.in.orig > Makefile.in
+			sed -i "s:-lsasl:-lsasl2:" Makefile.in
 			cd ${S}
 		fi
 	fi
@@ -115,15 +110,13 @@ src_compile() {
 		--host=${CHOST} ${myconf} || die "bad ./configure"
 		#--enable-icmp
 
-	mv include/autoconf.h include/autoconf.h.orig
-	sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 4096:" \
-		include/autoconf.h.orig > include/autoconf.h
+	sed -i "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 4096:" \
+		include/autoconf.h
 
 	if [ "${ARCH}" = "hppa" ]
 	then
-		mv include/autoconf.h include/autoconf.h.orig
-		sed -e "s:^#define HAVE_MALLOPT 1:#undef HAVE_MALLOPT:" \
-			include/autoconf.h.orig > include/autoconf.h
+		sed -i "s:^#define HAVE_MALLOPT 1:#undef HAVE_MALLOPT:" \
+			include/autoconf.h
 	fi
 
 	emake || die "compile problem"