diff options
| -rw-r--r-- | net-misc/cbqinit/cbqinit-0.7.ebuild | 28 | ||||
| -rw-r--r-- | net-www/squid/squid-2.4.7.ebuild | 25 |
2 files changed, 29 insertions, 24 deletions
diff --git a/net-misc/cbqinit/cbqinit-0.7.ebuild b/net-misc/cbqinit/cbqinit-0.7.ebuild index 0efe565994e9..b4a9cce2fdc4 100644 --- a/net-misc/cbqinit/cbqinit-0.7.ebuild +++ b/net-misc/cbqinit/cbqinit-0.7.ebuild @@ -1,36 +1,36 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/cbqinit-0.7.ebuild,v 1.3 2003/02/13 14:46:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/cbqinit-0.7.ebuild,v 1.4 2003/03/27 02:24:54 seemant Exp $ +S=${WORKDIR} DESCRIPTION="Sets up class-based queue traffic control (QoS) with iproute2" HOMEPAGE="http://www.sourceforge.net/projects/cbqinit" -SRC_URI="http://unc.dl.sourceforge.net/sourceforge/cbqinit/cbq.init-v${PV}" +SRC_URI="mirror://sourceforge/cbqinit/cbq.init-v${PV}" + LICENSE="GPL-2" SLOT="0" -KEYWORDS="*" +KEYWORDS="x86 ppc sparc alpha mips hppa arm" -RDEPEND="sys-apps/iproute" -DEPEND="" +DEPEND=">=sys-apps/sed-4.0.5" -S="${WORKDIR}" +RDEPEND="sys-apps/iproute" src_unpack() { cp ${DISTDIR}/cbq.init-v${PV} ${S} } src_compile() { - mv cbq.init-v${PV} cbq.init-v${PV}.orig - sed <cbq.init-v${PV}.orig >cbq.init-v${PV} \ - -e 's|CBQ_PATH=${CBQ_PATH:-/etc/sysconfig/cbq}|CBQ_PATH=/etc/cbqinit|' \ - -e 's|CBQ_CACHE=${CBQ_CACHE:-/var/cache/cbq.init}|CBQ_CACHE=/var/cache/cbqinit|' \ - -e 's|-x /sbin/tc -a -x /sbin/ip|-x /usr/sbin/tc -a -x /usr/sbin/ip|' + sed -i \ + -e 's|^CBQ_PATH=.*|CBQ_PATH=/etc/cbqinit|' \ + -e 's|CBQ_CACHE=.*|CBQ_CACHE=/var/cache/cbqinit|' \ + -e 's|/sbin/tc|/usr/sbin/tc|' \ + -e 's|/sbin/ip|/usr/sbin/ip|' \ + cbq.init-v${PV} } src_install() { - mv cbq.init-v${PV} cbqinit - exeinto /usr/sbin - doexe cbqinit + newexe cbq.init-v${PV} cbqinit exeinto /etc/init.d newexe ${FILESDIR}/rc_cbqinit cbqinit diff --git a/net-www/squid/squid-2.4.7.ebuild b/net-www/squid/squid-2.4.7.ebuild index 141b0caeed49..5550bdd517b5 100644 --- a/net-www/squid/squid-2.4.7.ebuild +++ b/net-www/squid/squid-2.4.7.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.4.7.ebuild,v 1.5 2003/03/11 21:11:46 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.4.7.ebuild,v 1.6 2003/03/27 02:28:38 seemant Exp $ IUSE="snmp pam ldap" @@ -8,26 +8,31 @@ IUSE="snmp pam ldap" MY_P=${PN}-2.4.STABLE7 S=${WORKDIR}/${MY_P} DESCRIPTION="A caching web proxy, with advanced features" +HOMEPAGE="http://www.squid-cache.org/" SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${MY_P}-src.tar.gz ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/${MY_P}-src.tar.gz" -HOMEPAGE="http://www.squid-cache.org/" -RDEPEND="virtual/glibc pam? ( >=sys-libs/pam-0.72 ) ldap? ( >=net-nds/openldap-2 )" -DEPEND="${RDEPEND} dev-lang/perl" -LICENSE="GPL-2" -KEYWORDS="*" SLOT="0" +LICENSE="GPL-2" +KEYWORDS="x86 ppc sparc alpha mips hppa arm" + +RDEPEND="pam? ( >=sys-libs/pam-0.72 ) + ldap? ( >=net-nds/openldap-2 )" + +DEPEND=">=sys-apps/portage-2.0.47-r10 + >=sys-apps/sed-4.0.5 + dev-lang/perl" src_unpack() { unpack ${A} cd ${S} # see the tops of these patches for details.. - patch -p1 < ${FILESDIR}/${P}-debian.diff || die - patch -p1 < ${FILESDIR}/${P}-gentoo.diff || die + epatch ${FILESDIR}/${P}-debian.diff + epatch ${FILESDIR}/${P}-gentoo.diff + if [ -z "$DEBUG" ] then - 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 } |