change herd from web-apps to www-proxy; add pcre & logrotate support (#71557); remove obsolete version

(Portage version: 2.0.51-r15)

12 files changed, 139 insertions, 189 deletions

diff --git a/www-proxy/privoxy/ChangeLog b/www-proxy/privoxy/ChangeLog
index 97c2eeabf8f3..275f1de9bffc 100644
--- a/www-proxy/privoxy/ChangeLog
+++ b/www-proxy/privoxy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-proxy/privoxy
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/privoxy/ChangeLog,v 1.5 2004/12/29 01:53:50 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/privoxy/ChangeLog,v 1.6 2005/02/24 15:43:54 mrness Exp $
+
+*privoxy-3.0.3-r1 (24 Feb 2005)
+
+  24 Feb 2005; Alin Nastac <mrness@gentoo.org> metadata.xml,
+  -files/privoxy-gentoo.diff, +files/privoxy.logrotate, +files/privoxy.rc7,
+  -privoxy-2.9.14_beta.ebuild, +privoxy-3.0.3-r1.ebuild:
+  Changed herd from web-apps to www-proxy. Added pcre and logrotate support,
+  thanks to Torsten Veller <tove@gentoo.org> (#71557). Removed old version.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/www-proxy/privoxy/Manifest b/www-proxy/privoxy/Manifest
index ed3cadb0e739..fff5f8908eda 100644
--- a/www-proxy/privoxy/Manifest
+++ b/www-proxy/privoxy/Manifest
@@ -1,10 +1,11 @@
-MD5 8dafa99d98f951c6506422a8d7ae6eaa privoxy-3.0.3.ebuild 1888
-MD5 f345484276ab7d126b3d3a02b6313c9f privoxy-3.0.2.ebuild 1880
 MD5 3642b2702536c5fd8aa61adb6f438cb3 ChangeLog 3865
-MD5 940c7de53ff5826afdb9b431f907cc35 privoxy-2.9.14_beta.ebuild 1729
-MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
+MD5 acc475c99bfbf9b1cff330da7ef939a6 metadata.xml 291
+MD5 d8f4aef43413a3e2a211343f3e4bb7ba privoxy-3.0.3-r1.ebuild 2079
+MD5 f345484276ab7d126b3d3a02b6313c9f privoxy-3.0.2.ebuild 1880
+MD5 8dafa99d98f951c6506422a8d7ae6eaa privoxy-3.0.3.ebuild 1888
+MD5 2760360001df367f12d98ee964007363 files/privoxy.logrotate 191
+MD5 4ebea2bdbf04f6e9cd17c4c14071c649 files/privoxy.rc7 482
 MD5 498b2ae85af76ed736ac4979e28bfe8a files/digest-privoxy-3.0.2 77
-MD5 84c5590bae09be1d5419c27a1d5b676d files/privoxy.rc6 523
-MD5 a0be004362422bbf19e3cadf3cba42bd files/digest-privoxy-2.9.14_beta 75
 MD5 56d88e9a6970c67adde3386b83dcb2ae files/digest-privoxy-3.0.3 77
-MD5 3633255c0f7643530768ad4edbc48b82 files/privoxy-gentoo.diff 2374
+MD5 84c5590bae09be1d5419c27a1d5b676d files/privoxy.rc6 523
+MD5 56d88e9a6970c67adde3386b83dcb2ae files/digest-privoxy-3.0.3-r1 77
diff --git a/www-proxy/privoxy/files/digest-privoxy-2.9.14_beta b/www-proxy/privoxy/files/digest-privoxy-2.9.14_beta
deleted file mode 100644
index 806f43c69496..000000000000
--- a/www-proxy/privoxy/files/digest-privoxy-2.9.14_beta
+++ /dev/null
@@ -1 +0,0 @@
-MD5 406ef39a81c371a9723aa69460028534 privoxy-2.9.14-beta-src.tar.gz 980020
diff --git a/www-proxy/privoxy/files/digest-privoxy-3.0.3-r1 b/www-proxy/privoxy/files/digest-privoxy-3.0.3-r1
new file mode 100644
index 000000000000..8293b5fba301
--- /dev/null
+++ b/www-proxy/privoxy/files/digest-privoxy-3.0.3-r1
@@ -0,0 +1 @@
+MD5 b0710be8af09409bfb03f52523a17010 privoxy-3.0.3-stable-src.tar.gz 1561072
diff --git a/www-proxy/privoxy/files/privoxy-gentoo.diff b/www-proxy/privoxy/files/privoxy-gentoo.diff
deleted file mode 100644
index 65f885e2b377..000000000000
--- a/www-proxy/privoxy/files/privoxy-gentoo.diff
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -ur privoxy-2.9.14-beta.orig/config privoxy-2.9.14-beta/config
---- privoxy-2.9.14-beta.orig/config	Tue Apr  2 22:11:35 2002
-+++ privoxy-2.9.14-beta/config	Mon Jul  8 17:55:11 2002
-@@ -1,3 +1,8 @@
-+#
-+# Small changes to the original for Gentoo ebuild
-+#
-+# i.e. only two directory locations
-+
- #  Sample Configuration file for Privoxy
- 
- #
-@@ -72,13 +77,13 @@
- #  for CGI results.
- #
- #  No trailing /, please.
--confdir .
-+confdir /etc/privoxy
- 
- #
- #  The directory where all logging (i.e. logfile and jarfile) takes place
- #  No trailing /, please.
- #
--logdir .
-+logdir /var/log/privoxy
- 
- #  Note that all file specifications below are relative to 
- #  the above two directories!!!
-@@ -120,7 +125,7 @@
- #
- #  Default: Log to the standard error channel, not to a file
- #
--logfile logfile
-+logfile privoxy.log
- 
- #
- #  The jarfile defines where Privoxy stores the cookies it
-diff -ur privoxy-2.9.14-beta.orig/default.action privoxy-2.9.14-beta/default.action
---- privoxy-2.9.14-beta.orig/default.action	Thu Apr 11 09:37:54 2002
-+++ privoxy-2.9.14-beta/default.action	Mon Jul  8 18:00:25 2002
-@@ -1,3 +1,9 @@
-+#
-+# Small change for Gentoo ebuild
-+
-+# set +image-blocker{blank} in the Defaults section
-+# for explanation see: http://www.privoxy.org/faq/configuration.html#AEN442
-+
- #############################################################################
- #
- # Bare-bones actions file for Privoxy pre release testdrive
-@@ -14,7 +20,6 @@
- 
- # Shops should be allowed to set persistent cookies
- shop        = -filter -no-cookies-keep
--
- #############################################################################
- # Defaults
- #############################################################################
-@@ -22,28 +27,28 @@
- -add-header \
- -block \
- +deanimate-gifs{last} \
---downgrade \
--+filter{html-annoyances} \
--+filter{content-cookies} \
-+-downgrade +filter{html-annoyances} \
- +filter{js-annoyances} \
-++filter{content-cookies} \
- +filter{no-popups} \
- +filter{webbugs} \
- +filter{nimda} \
- +filter{banners-by-size} \
--+no-compression \
- +hide-forwarded \
- +hide-from{block} \
- +hide-referer{forge} \
- -hide-user-agent \
- -image \
--+image-blocker{pattern} \
-++image-blocker{blank} \
-++no-compression \
- +no-cookies-keep \
- -no-cookies-read \
- -no-cookies-set \
- +no-popups \
- -vanilla-wafer \
---wafer \
-+-wafer\
- }
-+
- / # Match all URLs
- 
- {+filter{noflash}}
diff --git a/www-proxy/privoxy/files/privoxy.logrotate b/www-proxy/privoxy/files/privoxy.logrotate
new file mode 100644
index 000000000000..f5d6b2b91703
--- /dev/null
+++ b/www-proxy/privoxy/files/privoxy.logrotate
@@ -0,0 +1,9 @@
+/var/log/privoxy/privoxy.log /var/log/privoxy/jarfile {
+	missingok
+	notifempty
+	create 0750 privoxy privoxy
+	sharedscripts
+	postrotate
+		killall -HUP privoxy 2>/dev/null || true
+	endscript
+}
diff --git a/www-proxy/privoxy/files/privoxy.rc7 b/www-proxy/privoxy/files/privoxy.rc7
new file mode 100644
index 000000000000..48a03d114953
--- /dev/null
+++ b/www-proxy/privoxy/files/privoxy.rc7
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/privoxy/files/privoxy.rc7,v 1.1 2005/02/24 15:43:54 mrness Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting privoxy"
+	start-stop-daemon --start --quiet --exec /usr/sbin/privoxy -- \
+		--pidfile /var/run/privoxy.pid \
+		--user privoxy.privoxy  /etc/privoxy/config 2>/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping privoxy"
+	start-stop-daemon --stop --quiet --pidfile /var/run/privoxy.pid
+	eend $?
+}
diff --git a/www-proxy/privoxy/metadata.xml b/www-proxy/privoxy/metadata.xml
index 13bc126c7d91..ac211cdf0fa4 100644
--- a/www-proxy/privoxy/metadata.xml
+++ b/www-proxy/privoxy/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
-<maintainer>
-<email>web-apps@gentoo.org</email>
-<name>Gentoo Web Application Packages Maintainers</name>
-</maintainer>
+<herd>www-proxy</herd>
+<longdescription>A web proxy with advanced filtering capabilities for protecting privacy against internet junk</longdescription>
 </pkgmetadata>
diff --git a/www-proxy/privoxy/privoxy-2.9.14_beta.ebuild b/www-proxy/privoxy/privoxy-2.9.14_beta.ebuild
deleted file mode 100644
index 3130d9870654..000000000000
--- a/www-proxy/privoxy/privoxy-2.9.14_beta.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/privoxy/privoxy-2.9.14_beta.ebuild,v 1.2 2004/08/15 18:35:46 stuart Exp $
-
-inherit eutils
-
-IUSE="selinux"
-MY_P=${P/_beta/-beta}
-S=${WORKDIR}/${MY_P}
-HOMEPAGE="http://www.privoxy.org"
-DESCRIPTION="A web proxy with advanced filtering capabilities for protecting privacy against internet junk."
-SRC_URI="mirror://sourceforge/ijbswa/${MY_P}-src.tar.gz"
-
-DEPEND="virtual/textbrowser"
-RDEPEND="selinux? ( sec-policy/selinux-privoxy )"
-
-SLOT="2"
-KEYWORDS="x86 sparc"
-LICENSE="GPL-2"
-
-pkg_setup() {
-	enewgroup privoxy
-	enewuser privoxy -1 /bin/false /etc/privoxy privoxy
-}
-
-src_unpack() {
-	unpack ${A}
-	patch -p0 < ${FILESDIR}/privoxy-gentoo.diff
-
-	cd ${S}
-	autoheader || die "autoheader failed"
-	autoconf || die "autoconf failed"
-}
-
-src_compile() {
-
-	econf \
-		--sysconfdir=/etc/privoxy || die "./configure failed"
-
-	emake || die "make failed."
-
-}
-
-src_install () {
-	cd ${WORKDIR}/privoxy-2.9.14-beta
-
-	diropts -m 0750 -g privoxy -o privoxy
-	dodir /var/log/privoxy
-	keepdir /var/log/privoxy
-	dodir /etc/privoxy /etc/privoxy/templates
-
-	insopts -m 0640 -g privoxy -o privoxy
-	insinto /etc/privoxy
-	doins default.filter trust default.action config
-
-	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 0754 -g privoxy -o privoxy
-	insinto /etc/init.d
-	newins ${FILESDIR}/privoxy.rc6 privoxy
-
-	insopts -m 0750 -g privoxy -o privoxy
-	insinto /usr/sbin
-	doins privoxy
-}
diff --git a/www-proxy/privoxy/privoxy-3.0.2.ebuild b/www-proxy/privoxy/privoxy-3.0.2.ebuild
index 0b808ebcb208..08a5927ae075 100644
--- a/www-proxy/privoxy/privoxy-3.0.2.ebuild
+++ b/www-proxy/privoxy/privoxy-3.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/privoxy/privoxy-3.0.2.ebuild,v 1.3 2004/09/03 16:06:50 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/privoxy/privoxy-3.0.2.ebuild,v 1.4 2005/02/24 15:43:54 mrness Exp $
 
 inherit eutils
 
diff --git a/www-proxy/privoxy/privoxy-3.0.3-r1.ebuild b/www-proxy/privoxy/privoxy-3.0.3-r1.ebuild
new file mode 100644
index 000000000000..92def516dc64
--- /dev/null
+++ b/www-proxy/privoxy/privoxy-3.0.3-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/privoxy/privoxy-3.0.3-r1.ebuild,v 1.1 2005/02/24 15:43:54 mrness Exp $
+
+inherit eutils
+
+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"
+RESTRICT="nomirror"
+
+IUSE="pcre selinux"
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
+LICENSE="GPL-2"
+
+DEPEND=">=sys-apps/sed-4
+	sys-devel/autoconf
+	virtual/libc
+	pcre? ( dev-libs/libpcre )"
+
+RDEPEND="virtual/libc
+	selinux? ( sec-policy/selinux-privoxy )
+	pcre? ( dev-libs/libpcre )"
+
+S="${WORKDIR}/${P}-stable"
+
+pkg_setup() {
+	enewgroup privoxy
+	enewuser privoxy -1 /bin/false /etc/privoxy privoxy
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e 's:confdir .:confdir /etc/privoxy:' \
+		-e 's:logdir .:logdir /var/log/privoxy:' \
+		-e 's:logfile logfile:logfile privoxy.log:' ${S}/config
+	sed -i 's:^\+set-image-blocker{pattern}:+set-image-blocker{blank}:' ${S}/default.action.master
+
+	autoheader || die "autoheader failed"
+	autoconf || die "autoconf failed"
+}
+
+src_compile() {
+	econf \
+		$(use_enable pcre dynamic-pcre) \
+		--sysconfdir=/etc/privoxy || die "econf failed"
+
+	emake || die "make failed."
+}
+
+src_install () {
+	diropts -m 0750 -g privoxy -o privoxy
+	insopts -m 0640 -g privoxy -o privoxy
+
+	keepdir /var/log/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 -m 0644 -g root -o root
+	diropts -m 0755 -g root -o root
+	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
+	newinitd ${FILESDIR}/privoxy.rc7 privoxy
+	insopts -m 0640
+	insinto /etc/logrotate.d
+	newins ${FILESDIR}/privoxy.logrotate privoxy
+}
diff --git a/www-proxy/privoxy/privoxy-3.0.3.ebuild b/www-proxy/privoxy/privoxy-3.0.3.ebuild
index 3993bc4261a0..ccbfb14e4366 100644
--- a/www-proxy/privoxy/privoxy-3.0.3.ebuild
+++ b/www-proxy/privoxy/privoxy-3.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/privoxy/privoxy-3.0.3.ebuild,v 1.2 2004/08/15 18:35:46 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/privoxy/privoxy-3.0.3.ebuild,v 1.3 2005/02/24 15:43:54 mrness Exp $
 
 inherit eutils