sanitize the code

Package-Manager: portage-2.0.54

4 files changed, 21 insertions, 29 deletions

diff --git a/net-proxy/squirm/Manifest b/net-proxy/squirm/Manifest
index 27e473a94ff6..a299dce7882f 100644
--- a/net-proxy/squirm/Manifest
+++ b/net-proxy/squirm/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8c10440d756e822e30f0fbf6af4f1c79 ChangeLog 1117
 MD5 09f57f010bc9572e95566ab97181d8fc files/digest-squirm-1.23 59
 MD5 72e4905c488cbc93ddc5cedf48876077 metadata.xml 220
-MD5 a7f4687d97907ac6c1eb3773374b0a1e squirm-1.23.ebuild 996
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDmt37V3J2n04EauwRAjENAJ0acBsMU12jQ03zZ1PPjH1Lh0W8JACfeZtC
-BcRivhxFQgt2JaXrqrkxfaI=
-=jYt/
------END PGP SIGNATURE-----
+MD5 ec60a9a8c80f085f74220359c81d2a7d squirm-1.23.ebuild 936
diff --git a/net-proxy/squirm/squirm-1.23.ebuild b/net-proxy/squirm/squirm-1.23.ebuild
index bf14a75603d4..ee8833c49cc2 100644
--- a/net-proxy/squirm/squirm-1.23.ebuild
+++ b/net-proxy/squirm/squirm-1.23.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squirm/squirm-1.23.ebuild,v 1.2 2005/07/10 01:09:55 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squirm/squirm-1.23.ebuild,v 1.3 2006/03/06 21:55:43 mrness Exp $
 
 DESCRIPTION="A redirector for Squid"
 HOMEPAGE="http://squirm.foote.com.au"
 SRC_URI="http://squirm.foote.com.au/${P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
@@ -13,17 +14,18 @@ IUSE=""
 RDEPEND="net-proxy/squid"
 
 src_unpack() {
-	unpack ${A} || die "unpack failed"
-	cd ${S} || die
-	mv Makefile Makefile.orig
-	sed -e 's|^EXTRALIBS=.*|EXTRALIBS=|' \
+	unpack ${A}
+
+	sed -i \
+		-e 's|^EXTRALIBS=.*|EXTRALIBS=|' \
 		-e 's|^PREFIX=.*|PREFIX=/usr/squirm|' \
 		-e "s|^OPTIMISATION=.*|OPTIMISATION=${CFLAGS}|" \
-		-e "s|^CFLAGS =.*|CFLAGS=${CFLAGS} -DPREFIX=\\\\\"\$(PREFIX)\\\\\"|" Makefile.orig > Makefile
+		-e "s|^CFLAGS =.*|CFLAGS=${CFLAGS} -DPREFIX=\\\\\"\$(PREFIX)\\\\\"|" \
+		"${S}/Makefile"
 }
 
 src_install() {
-	make PREFIX=${D}/usr/squirm install || die "make install failed"
+	make PREFIX="${D}/usr/squirm" install || die "make install failed"
 }
 
 pkg_postinst() {
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index a3bb0611b7c4..db52256e39a3 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -1,5 +1,5 @@
-MD5 c6e916598a96f63da0c8b2c8add12374 tinyproxy-1.6.3.ebuild 1121
-MD5 9cafc01ae2d4a91da29afd4613e9683f metadata.xml 226
 MD5 23766bed9ffa8536c1e6107d3604e12a ChangeLog 2412
-MD5 7041efb40925a2cc0cea7b352e809ef5 files/tinyproxy.rc 552
 MD5 9a5f65bb4b75d82277efa9cddc4d05ca files/digest-tinyproxy-1.6.3 67
+MD5 7041efb40925a2cc0cea7b352e809ef5 files/tinyproxy.rc 552
+MD5 9cafc01ae2d4a91da29afd4613e9683f metadata.xml 226
+MD5 7f91895a33a05bd14bdcb4d57024ac42 tinyproxy-1.6.3.ebuild 1147
diff --git a/net-proxy/tinyproxy/tinyproxy-1.6.3.ebuild b/net-proxy/tinyproxy/tinyproxy-1.6.3.ebuild
index ffff039ad498..8b348f1a5fad 100644
--- a/net-proxy/tinyproxy/tinyproxy-1.6.3.ebuild
+++ b/net-proxy/tinyproxy/tinyproxy-1.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.6.3.ebuild,v 1.5 2005/09/16 05:00:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.6.3.ebuild,v 1.6 2006/03/06 22:00:32 mrness Exp $
 
 DESCRIPTION="A lightweight HTTP/SSL proxy"
 HOMEPAGE="http://tinyproxy.sourceforge.net/"
@@ -23,19 +23,19 @@ src_compile() {
 		`use_enable debug` \
 		`use_enable debug profiling` \
 		`use_enable socks5 socks` \
-		|| die
+		|| die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
 	sed -i \
-		's:mkdir $(datadir)/tinyproxy:mkdir -p $(DESTDIR)$(datadir)/tinyproxy:' \
+		-e 's:mkdir $(datadir)/tinyproxy:mkdir -p $(DESTDIR)$(datadir)/tinyproxy:' \
 		Makefile
-	make DESTDIR=${D} install || die "install failed"
+	make DESTDIR="${D}" install || die "install failed"
 
 	dodoc AUTHORS ChangeLog NEWS README TODO
-	mv ${D}/usr/share/tinyproxy ${D}/usr/share/doc/${PF}/html
+	mv "${D}/usr/share/tinyproxy" "${D}/usr/share/doc/${PF}/html"
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/tinyproxy.rc tinyproxy
+	newexe "${FILESDIR}/tinyproxy.rc" tinyproxy
 }