diff now done with sed. Version bumped. Closes #20011.

6 files changed, 95 insertions, 71 deletions

diff --git a/net-www/privoxy/ChangeLog b/net-www/privoxy/ChangeLog
index 1a16b5d964e3..b8f015008888 100644
--- a/net-www/privoxy/ChangeLog
+++ b/net-www/privoxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/privoxy
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/privoxy/ChangeLog,v 1.10 2003/04/16 14:33:46 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/privoxy/ChangeLog,v 1.11 2003/04/29 20:47:30 mholzer Exp $
+
+*privoxy-3.0.2 (29 Apr 2003)
+
+  29 Apr 2003; Martin Holzer <mholzer@gentoo.org> privoxy-3.0.0.ebuild,
+  privoxy-3.0.2.ebuild, files/privoxy-3.0.0-gentoo.diff:
+  diff now done with sed. Version bumped. Closes #20011.
 
 *privoxy-3.0.0 (14 Dec 2002)
 
diff --git a/net-www/privoxy/Manifest b/net-www/privoxy/Manifest
index 8a094f96f8cf..85c80df3cacd 100644
--- a/net-www/privoxy/Manifest
+++ b/net-www/privoxy/Manifest
@@ -1,10 +1,9 @@
-MD5 fb945ca8b478c57fdd66cb502aad7dcd ChangeLog 1255
+MD5 755ac7c2d3d186c036a4321b8b7d574c ChangeLog 1473
 MD5 f9451a62665ebd57ed72f8cdc45321df privoxy-2.9.14_beta.ebuild 1857
-MD5 6ee53bdd0471e7dc78525a347448f5c5 privoxy-3.0.0.ebuild 1752
-MD5 97629b04ab764fb976e3ccf134bc1e57 privoxy-3.0.2.ebuild 1934
+MD5 6abd10622938d7ca38b694b6ff9a5189 privoxy-3.0.0.ebuild 1934
+MD5 3771a902fc50bc19076e9bf8fde11edb privoxy-3.0.2.ebuild 1935
 MD5 a0be004362422bbf19e3cadf3cba42bd files/digest-privoxy-2.9.14_beta 75
 MD5 3211cde74635fce8f6c54af8cc380a8b files/digest-privoxy-3.0.0 77
-MD5 6af2ed22a2332e7030481a1b7125fc67 files/privoxy-3.0.0-gentoo.diff 1816
 MD5 3633255c0f7643530768ad4edbc48b82 files/privoxy-gentoo.diff 2374
 MD5 badf304294e798588ab25ffb2aae570e files/privoxy.rc6 431
 MD5 498b2ae85af76ed736ac4979e28bfe8a files/digest-privoxy-3.0.2 77
diff --git a/net-www/privoxy/files/digest-privoxy-3.0.2 b/net-www/privoxy/files/digest-privoxy-3.0.2
new file mode 100644
index 000000000000..2e45d5b22967
--- /dev/null
+++ b/net-www/privoxy/files/digest-privoxy-3.0.2
@@ -0,0 +1 @@
+MD5 9a9e25ad4420dac73d57a8efe6be58a0 privoxy-3.0.2-stable-src.tar.gz 1925287
diff --git a/net-www/privoxy/files/privoxy-3.0.0-gentoo.diff b/net-www/privoxy/files/privoxy-3.0.0-gentoo.diff
deleted file mode 100644
index 206519cf6928..000000000000
--- a/net-www/privoxy/files/privoxy-3.0.0-gentoo.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -ur privoxy-3.0.0-stable.orig/config privoxy-3.0.0-stable/config
---- privoxy-3.0.0-stable.orig/config	Mon Aug 26 01:50:21 2002
-+++ privoxy-3.0.0-stable/config	Wed Aug 28 13:40:08 2002
-@@ -1,3 +1,7 @@
-+#
-+# Small changes to the original for Gentoo ebuild
-+#
-+
- #        Sample Configuration File for Privoxy v3.0.0
- #  
- #  Copyright (C) 2001, 2002 Privoxy Developers http://privoxy.org
-@@ -104,7 +108,7 @@
- #      flat, except for confdir/templates, where the HTML templates
- #      for CGI output reside (e.g. Privoxy's 404 error page).
- #  
--confdir .
-+confdir /etc/privoxy
- 
- #  
- #  1.2. logdir
-@@ -131,7 +135,7 @@
- #  
- #      No trailing "/", please
- #  
--logdir .
-+logdir /var/log/privoxy
- 
- #  
- #  1.3. actionsfile
-@@ -259,7 +263,7 @@
- #      Any log files must be writable by whatever user Privoxy is
- #      being run as (default on UNIX, user id is "privoxy").
- #  
--logfile logfile
-+logfile privoxy.log
- 
- #  
- #  1.6. jarfile
-Only in privoxy-3.0.0-stable: config.rej
-Only in privoxy-3.0.0-stable: config~
-diff -ur privoxy-3.0.0-stable.orig/default.action.master privoxy-3.0.0-stable/default.action.master
---- privoxy-3.0.0-stable.orig/default.action.master	Tue Aug 27 18:33:04 2002
-+++ privoxy-3.0.0-stable/default.action.master	Wed Aug 28 13:39:23 2002
-@@ -1,3 +1,10 @@
-+#
-+# Small change for Gentoo ebuild
-+
-+# set +set-image-blocker{blank} in the Defaults section
-+# for explanation see: http://www.privoxy.org/faq/configuration.html#AEN442
-+
-+
- ######################################################################
- # 
- #  File        :  $Source: /var/cvsroot/gentoo-x86/net-www/privoxy/files/privoxy-3.0.0-gentoo.diff,v $
-@@ -444,7 +451,7 @@
- -send-vanilla-wafer \
- -send-wafer \
- +session-cookies-only \
--+set-image-blocker{pattern} \
-++set-image-blocker{blank} \
- }
- / # Match all URLs
- 
diff --git a/net-www/privoxy/privoxy-3.0.0.ebuild b/net-www/privoxy/privoxy-3.0.0.ebuild
index d871171b5bc9..8bad50ff32c9 100644
--- a/net-www/privoxy/privoxy-3.0.0.ebuild
+++ b/net-www/privoxy/privoxy-3.0.0.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/privoxy/privoxy-3.0.0.ebuild,v 1.6 2003/04/16 14:33:46 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/privoxy/privoxy-3.0.0.ebuild,v 1.7 2003/04/29 20:47:30 mholzer Exp $
 
 S="${WORKDIR}/${P}-stable"
 HOMEPAGE="http://www.privoxy.org"
@@ -26,9 +26,13 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${P}-stable-src.tar.gz
+	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}-gentoo.diff || die
+	sed -i 's:confdir .:confdir /etc/privoxy:' config
+	sed -i 's:logdir .:logdir /var/log/privoxy:' config
+	sed -i 's:logfile logfile:logfile privoxy.log:' config
+	sed -i 's:set-image-blocker{pattern}:set-image-blocker{blank}:' default.action.master
+
 	autoheader || die "autoheader failed"
 	autoconf || die "autoconf failed"
 }
diff --git a/net-www/privoxy/privoxy-3.0.2.ebuild b/net-www/privoxy/privoxy-3.0.2.ebuild
new file mode 100644
index 000000000000..a0cba6150aa2
--- /dev/null
+++ b/net-www/privoxy/privoxy-3.0.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/privoxy/privoxy-3.0.2.ebuild,v 1.1 2003/04/29 20:47:30 mholzer Exp $
+
+S="${WORKDIR}/${P}-stable"
+HOMEPAGE="http://www.privoxy.org"
+DESCRIPTION="A web proxy with advanced filtering capabilities for protecting privacy against internet junk."
+SRC_URI="mirror://sourceforge/ijbswa/${P}-stable-src.tar.gz"
+
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~alpha"
+LICENSE="GPL-2"
+
+DEPEND="virtual/textbrowser"
+
+pkg_setup() {
+
+	if ! grep -q ^privoxy: /etc/group ; then
+		groupadd privoxy || die "problem adding group privoxy"
+	fi
+
+	if ! grep -q ^privoxy: /etc/passwd ; then
+		useradd  -g privoxy -s /bin/false -d /etc/privoxy -c "privoxy" privoxy\
+			|| die "problem adding user privoxy"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i 's:confdir .:confdir /etc/privoxy:' config
+	sed -i 's:logdir .:logdir /var/log/privoxy:' config
+	sed -i 's:logfile logfile:logfile privoxy.log:' config
+	sed -i 's:set-image-blocker{pattern}:set-image-blocker{blank}:' default.action.master
+
+	autoheader || die "autoheader failed"
+	autoconf || die "autoconf failed"
+}
+
+src_compile() {
+	econf \
+		--sysconfdir=/etc/privoxy
+
+	emake || die "make failed."
+
+}
+
+src_install () {
+
+	diropts -m 0750 -g privoxy -o privoxy
+	dodir /var/log/privoxy
+	dodir /etc/privoxy /etc/privoxy/templates
+
+	insopts -m 0640 -g privoxy -o privoxy
+	insinto /etc/privoxy
+	doins default.action default.filter config standard.action trust user.action
+
+	insinto /etc/privoxy/templates
+	doins templates/*
+
+	doman privoxy.1
+
+	dodoc LICENSE README AUTHORS doc/text/faq.txt ChangeLog
+
+	insopts
+	for i in developer-manual faq man-page user-manual
+	do
+		insinto /usr/share/doc/${PF}/$i
+		doins doc/webserver/$i/*
+	done
+		
+	insopts -m 0750 -g root -o root
+	insinto /usr/sbin
+	doins privoxy
+	insinto /etc/init.d
+	newins ${FILESDIR}/privoxy.rc6 privoxy
+}