Revive the previous stable version and bump to the latest beta version (#229049).

(Portage version: 2.1.4.4, RepoMan options: --force)

4 files changed, 173 insertions, 1 deletions

diff --git a/net-proxy/privoxy/ChangeLog b/net-proxy/privoxy/ChangeLog
index a609fa36dbc4..61cd4c7c8236 100644
--- a/net-proxy/privoxy/ChangeLog
+++ b/net-proxy/privoxy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/privoxy
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.36 2008/07/13 14:30:56 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.37 2008/07/24 16:44:06 mrness Exp $
+
+*privoxy-3.0.9_beta (24 Jul 2008)
+
+  24 Jul 2008; Alin Năstac <mrness@gentoo.org>
+  +files/privoxy-3.0.6-implicit-decl.patch, +privoxy-3.0.6.ebuild,
+  +privoxy-3.0.9_beta.ebuild:
+  Revive the previous stable version and bump to the latest beta version
+  (#229049).
 
   13 Jul 2008; Alin Năstac <mrness@gentoo.org>
   -files/privoxy-3.0.6-implicit-decl.patch, -privoxy-3.0.6.ebuild:
diff --git a/net-proxy/privoxy/files/privoxy-3.0.6-implicit-decl.patch b/net-proxy/privoxy/files/privoxy-3.0.6-implicit-decl.patch
new file mode 100644
index 000000000000..4c2029729956
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.6-implicit-decl.patch
@@ -0,0 +1,11 @@
+diff -Nru privoxy-3.0.6-stable.orig/parsers.c privoxy-3.0.6-stable/parsers.c
+--- privoxy-3.0.6-stable.orig/parsers.c	2006-11-13 21:05:51.000000000 +0200
++++ privoxy-3.0.6-stable/parsers.c	2007-04-11 16:07:33.000000000 +0300
+@@ -541,6 +541,7 @@
+ #include <ctype.h>
+ #include <assert.h>
+ #include <string.h>
++#define __USE_XOPEN
+ #include <time.h>
+ 
+ #if !defined(_WIN32) && !defined(__OS2__)
diff --git a/net-proxy/privoxy/privoxy-3.0.6.ebuild b/net-proxy/privoxy/privoxy-3.0.6.ebuild
new file mode 100644
index 000000000000..f85d109a2afb
--- /dev/null
+++ b/net-proxy/privoxy/privoxy-3.0.6.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.6.ebuild,v 1.13 2008/07/24 16:44:06 mrness Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+
+inherit toolchain-funcs eutils autotools
+
+HOMEPAGE="http://www.privoxy.org
+	http://sourceforge.net/projects/ijbswa/"
+DESCRIPTION="A web proxy with advanced filtering capabilities for protecting privacy against Internet junk"
+SRC_URI="mirror://sourceforge/ijbswa/${P}-stable-src.tar.gz"
+
+IUSE="pcre selinux"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+LICENSE="GPL-2"
+
+DEPEND="pcre? ( dev-libs/libpcre )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-privoxy )"
+
+S="${WORKDIR}/${P}-stable"
+
+pkg_setup() {
+	enewgroup privoxy
+	enewuser privoxy -1 -1 /etc/privoxy privoxy
+}
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}"/${P}-implicit-decl.patch
+
+	cd "${S}"
+	sed -e 's:confdir .:confdir /etc/privoxy:' \
+		-e 's:logdir .:logdir /var/log/privoxy:' \
+		-e 's:logfile logfile:logfile privoxy.log:' \
+		-i config || die "sed failed."
+	sed -e 's:^\+set-image-blocker{pattern}:+set-image-blocker{blank}:' \
+		-i default.action.master || die "sed 2 failed."
+	eautoreconf || die "autoconf failed"
+}
+
+src_compile() {
+	export CC=$(tc-getCC)
+	econf \
+		$(use_enable pcre dynamic-pcre) \
+		--with-user=privoxy \
+		--with-group=privoxy \
+		--sysconfdir=/etc/privoxy \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install () {
+	dosbin privoxy
+	newinitd "${FILESDIR}/privoxy.initd" privoxy
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/privoxy.logrotate" 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 README AUTHORS doc/text/faq.txt ChangeLog
+	cd doc/webserver
+	dohtml -r developer-manual faq man-page user-manual
+
+	diropts -m 0750 -g privoxy -o privoxy
+	keepdir /var/log/privoxy
+}
diff --git a/net-proxy/privoxy/privoxy-3.0.9_beta.ebuild b/net-proxy/privoxy/privoxy-3.0.9_beta.ebuild
new file mode 100644
index 000000000000..2e6b4479b38f
--- /dev/null
+++ b/net-proxy/privoxy/privoxy-3.0.9_beta.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.9_beta.ebuild,v 1.1 2008/07/24 16:44:06 mrness Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+
+inherit toolchain-funcs autotools
+
+HOMEPAGE="http://www.privoxy.org
+	http://sourceforge.net/projects/ijbswa/"
+DESCRIPTION="A web proxy with advanced filtering capabilities for protecting privacy against Internet junk"
+SRC_URI="mirror://sourceforge/ijbswa/${P/_/-}-src.tar.gz"
+
+IUSE="pcre selinux threads zlib"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+LICENSE="GPL-2"
+
+DEPEND="pcre? ( dev-libs/libpcre )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-privoxy )"
+
+S="${WORKDIR}/${P/_/-}"
+
+pkg_setup() {
+	enewgroup privoxy
+	enewuser privoxy -1 -1 /etc/privoxy privoxy
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	sed -e 's:confdir .:confdir /etc/privoxy:' \
+		-e 's:logdir .:logdir /var/log/privoxy:' \
+		-e 's:logfile logfile:logfile privoxy.log:' \
+		-i config || die "sed failed."
+	sed -e 's:^\+set-image-blocker{pattern}:+set-image-blocker{blank}:' \
+		-i default.action.master || die "sed 2 failed."
+	eautoreconf || die "autoreconf failed"
+}
+
+src_compile() {
+	export CC=$(tc-getCC)
+	econf \
+		$(use_enable pcre dynamic-pcre) \
+		$(use_enable zlib) \
+		$(use_enable threads pthread) \
+		--with-user=privoxy \
+		--with-group=privoxy \
+		--sysconfdir=/etc/privoxy \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install () {
+	dosbin privoxy
+	newinitd "${FILESDIR}/privoxy.initd" privoxy
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/privoxy.logrotate" 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 README AUTHORS doc/text/faq.txt ChangeLog
+	cd doc/webserver
+	dohtml -r developer-manual faq man-page user-manual
+
+	diropts -m 0750 -g privoxy -o privoxy
+	keepdir /var/log/privoxy
+}