From 1943748a10c59e50335351966049c22ce64a1b7f Mon Sep 17 00:00:00 2001 From: Donny Davies Date: Sun, 2 Nov 2003 19:10:39 +0000 Subject: mark x86 stable. --- net-www/squid/ChangeLog | 6 +++--- net-www/squid/Manifest | 17 +++++++++-------- net-www/squid/metadata.xml | 9 +++++++++ net-www/squid/squid-2.5.4.ebuild | 33 ++++++++++++++++++++------------- 4 files changed, 41 insertions(+), 24 deletions(-) create mode 100644 net-www/squid/metadata.xml (limited to 'net-www') diff --git a/net-www/squid/ChangeLog b/net-www/squid/ChangeLog index 441940b1ff0e..1c52e8725d29 100644 --- a/net-www/squid/ChangeLog +++ b/net-www/squid/ChangeLog @@ -1,9 +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.25 2003/10/18 18:46:47 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/squid/ChangeLog,v 1.26 2003/11/02 19:10:34 woodchip Exp $ - 18 Oct 2003; Martin Holzer squid-2.5.4.ebuild: - using epatch. + 02 Nov 2003; Donny Davies squid-2.5.4.ebuild: + Mark x86 stable, add metadata.xml. *squid-2.5.4 (18 Sep 2003) diff --git a/net-www/squid/Manifest b/net-www/squid/Manifest index d7709c27b984..0d2ce0e8facd 100644 --- a/net-www/squid/Manifest +++ b/net-www/squid/Manifest @@ -1,14 +1,15 @@ -MD5 867aee28294836f7b5f2bb71f097f139 ChangeLog 4160 -MD5 23e3312058fbdd7661ff20bb234dedcd squid-2.4.7.ebuild 3503 -MD5 df572acbd7dfd085874ff700465bd870 squid-2.5.4.ebuild 4856 +MD5 ae72e497d571762eba42af478bace77c squid-2.5.4.ebuild 5199 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 23e3312058fbdd7661ff20bb234dedcd squid-2.4.7.ebuild 3503 +MD5 7290623df4ea821be5598d7a7e86c73e ChangeLog 4182 +MD5 abd44e391b7ba8c288305b87309a264e metadata.xml 250 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/metadata.xml b/net-www/squid/metadata.xml new file mode 100644 index 000000000000..e45d9514c96b --- /dev/null +++ b/net-www/squid/metadata.xml @@ -0,0 +1,9 @@ + + + +no-herd + + woodchip@gentoo.org + Donny Davies + + diff --git a/net-www/squid/squid-2.5.4.ebuild b/net-www/squid/squid-2.5.4.ebuild index 9ad8c45cf465..6d874d244a14 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.2 2003/10/18 18:46:47 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.5.4.ebuild,v 1.3 2003/11/02 19:10:34 woodchip Exp $ IUSE="pam ldap ssl sasl snmp debug" @@ -25,27 +25,30 @@ RDEPEND="virtual/glibc sasl? ( >=dev-libs/cyrus-sasl-1.5.27 )" DEPEND="${RDEPEND} dev-lang/perl" LICENSE="GPL-2" -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa" +KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa" SLOT="0" src_unpack() { - unpack ${A} - cd ${S} + unpack ${A} || die + cd ${S} || die #patch up to 2.5.STABLE4 - epatch ../diff-2.5.STABLE3-2.5.STABLE4 || die + patch -p1 <../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) - epatch ${FILESDIR}/squid-2.5.3-gentoo.diff || die + patch -p1 <${FILESDIR}/squid-2.5.3-gentoo.diff || die #hmm #10865 cd helpers/external_acl/ldap_group - sed -i 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' Makefile.in + cp Makefile.in Makefile.in.orig + sed -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \ + Makefile.in.orig > Makefile.in if [ -z "`use debug`" ] then cd ${S} - sed -i 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in + mv configure.in configure.in.orig + sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in autoconf || die fi } @@ -65,7 +68,9 @@ 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 - sed -i "s:-lsasl:-lsasl2:" Makefile.in + cp Makefile.in Makefile.in.orig + sed -e "s:-lsasl:-lsasl2:" \ + < Makefile.in.orig > Makefile.in cd ${S} fi fi @@ -110,13 +115,15 @@ src_compile() { --host=${CHOST} ${myconf} || die "bad ./configure" #--enable-icmp - sed -i "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 4096:" \ - include/autoconf.h + 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 if [ "${ARCH}" = "hppa" ] then - sed -i "s:^#define HAVE_MALLOPT 1:#undef HAVE_MALLOPT:" \ - include/autoconf.h + 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 fi emake || die "compile problem" -- cgit v1.2.3-65-gdbad