From 73c8e076bc302049762c0fda26959a07703edbbf Mon Sep 17 00:00:00 2001
From: Alin Năstac <mrness@gentoo.org>
Date: Thu, 6 Apr 2006 14:31:00 +0000
Subject: Apply zlib patch only if zlib USE flag is enabled (#127917). (Portage
 version: 2.0.54)

---
 net-proxy/privoxy/ChangeLog                     |  8 ++-
 net-proxy/privoxy/Manifest                      | 14 +---
 net-proxy/privoxy/files/digest-privoxy-3.0.3-r4 |  1 -
 net-proxy/privoxy/files/digest-privoxy-3.0.3-r5 |  1 +
 net-proxy/privoxy/privoxy-3.0.3-r4.ebuild       | 95 -------------------------
 net-proxy/privoxy/privoxy-3.0.3-r5.ebuild       | 94 ++++++++++++++++++++++++
 6 files changed, 104 insertions(+), 109 deletions(-)
 delete mode 100644 net-proxy/privoxy/files/digest-privoxy-3.0.3-r4
 create mode 100644 net-proxy/privoxy/files/digest-privoxy-3.0.3-r5
 delete mode 100644 net-proxy/privoxy/privoxy-3.0.3-r4.ebuild
 create mode 100644 net-proxy/privoxy/privoxy-3.0.3-r5.ebuild

(limited to 'net-proxy/privoxy')

diff --git a/net-proxy/privoxy/ChangeLog b/net-proxy/privoxy/ChangeLog
index ced752604849..ff7ae3d8f0d6 100644
--- a/net-proxy/privoxy/ChangeLog
+++ b/net-proxy/privoxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/privoxy
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.7 2006/03/30 16:40:07 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.8 2006/04/06 14:31:00 mrness Exp $
+
+*privoxy-3.0.3-r5 (06 Apr 2006)
+
+  06 Apr 2006; Alin Nastac <mrness@gentoo.org> -privoxy-3.0.3-r4.ebuild,
+  +privoxy-3.0.3-r5.ebuild:
+  Apply zlib patch only if zlib USE flag is enabled (#127917).
 
 *privoxy-3.0.3-r4 (30 Mar 2006)
 
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index dca36ec6526c..4888b98e325f 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7ac51507c629afdde46a7db367792228 ChangeLog 5953
 MD5 56d88e9a6970c67adde3386b83dcb2ae files/digest-privoxy-3.0.3-r3 77
-MD5 56d88e9a6970c67adde3386b83dcb2ae files/digest-privoxy-3.0.3-r4 77
+MD5 56d88e9a6970c67adde3386b83dcb2ae files/digest-privoxy-3.0.3-r5 77
 MD5 b35f03c7c5b207f9c216f8a66978bac0 files/privoxy-3.0.3-zlib.patch 18288
 MD5 199b985be5ba80912fdd3bf5776e697f files/privoxy-zlib.patch 17945
 MD5 f2b6a652dbfbc65e5b89024a8ea3da7e files/privoxy.logrotate 191
 MD5 2a366b72a6ff8d6d01cf0bef2ac71f0a files/privoxy.rc7 579
 MD5 a31f52e5785898edac47ca00310413e2 metadata.xml 291
 MD5 116b629d35a9c45ff430fbbda3f46b51 privoxy-3.0.3-r3.ebuild 2355
-MD5 13c5764aef78b0863b5357d90a3edce1 privoxy-3.0.3-r4.ebuild 2418
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFELA76jG8pv1lIUX4RAjbXAJ9ilI/Bh+WhaBKzGLSJIVYZzH+63ACg7KH+
-UmWpSY8qFHcD0aH68JLHHxs=
-=vULD
------END PGP SIGNATURE-----
+MD5 7040180516caddf6652652df0d51eb0f privoxy-3.0.3-r5.ebuild 2431
diff --git a/net-proxy/privoxy/files/digest-privoxy-3.0.3-r4 b/net-proxy/privoxy/files/digest-privoxy-3.0.3-r4
deleted file mode 100644
index 8293b5fba301..000000000000
--- a/net-proxy/privoxy/files/digest-privoxy-3.0.3-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0710be8af09409bfb03f52523a17010 privoxy-3.0.3-stable-src.tar.gz 1561072
diff --git a/net-proxy/privoxy/files/digest-privoxy-3.0.3-r5 b/net-proxy/privoxy/files/digest-privoxy-3.0.3-r5
new file mode 100644
index 000000000000..8293b5fba301
--- /dev/null
+++ b/net-proxy/privoxy/files/digest-privoxy-3.0.3-r5
@@ -0,0 +1 @@
+MD5 b0710be8af09409bfb03f52523a17010 privoxy-3.0.3-stable-src.tar.gz 1561072
diff --git a/net-proxy/privoxy/privoxy-3.0.3-r4.ebuild b/net-proxy/privoxy/privoxy-3.0.3-r4.ebuild
deleted file mode 100644
index 1338bbc85294..000000000000
--- a/net-proxy/privoxy/privoxy-3.0.3-r4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.3-r4.ebuild,v 1.1 2006/03/30 16:40:08 mrness Exp $
-
-inherit toolchain-funcs 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"
-
-IUSE="pcre selinux zlib"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-LICENSE="GPL-2"
-
-DEPEND="=sys-devel/autoconf-2.1*
-	pcre? ( dev-libs/libpcre )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="selinux? ( sec-policy/selinux-privoxy )
-	pcre? ( dev-libs/libpcre )
-	zlib? ( sys-libs/zlib )"
-
-S="${WORKDIR}/${P}-stable"
-
-pkg_setup() {
-	enewgroup privoxy
-	enewuser privoxy -1 -1 /etc/privoxy privoxy
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# add gzip and zlib decompression
-	epatch "${FILESDIR}/${P}-zlib.patch"
-
-	rm "${S}"/autom4te.cache/{output.0,requests,traces.0}
-
-	sed -e 's:confdir .:confdir /etc/privoxy:' \
-		-e 's:logdir .:logdir /var/log/privoxy:' \
-		-e 's:logfile logfile:logfile privoxy.log:' \
-		-i "${S}/config" || die "sed failed."
-	sed -e 's:^\+set-image-blocker{pattern}:+set-image-blocker{blank}:' \
-		-i "${S}/default.action.master" || die "sed 2 failed."
-}
-
-src_compile() {
-	export WANT_AUTOCONF=2.1
-	autoheader || die "autoheader failed"
-	autoconf || die "autoconf failed"
-
-	export CC=$(tc-getCC)
-	econf \
-		$(use_enable pcre dynamic-pcre) \
-		$(use_enable zlib) \
-		--sysconfdir=/etc/privoxy || die "econf failed"
-
-	emake || die "make failed."
-}
-
-pkg_preinst() {
-	pkg_setup
-}
-
-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
-	local i
-	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/net-proxy/privoxy/privoxy-3.0.3-r5.ebuild b/net-proxy/privoxy/privoxy-3.0.3-r5.ebuild
new file mode 100644
index 000000000000..0dc64e15d3ea
--- /dev/null
+++ b/net-proxy/privoxy/privoxy-3.0.3-r5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.3-r5.ebuild,v 1.1 2006/04/06 14:31:00 mrness Exp $
+
+inherit toolchain-funcs 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"
+
+IUSE="pcre selinux zlib"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+LICENSE="GPL-2"
+
+DEPEND="=sys-devel/autoconf-2.1*
+	pcre? ( dev-libs/libpcre )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="selinux? ( sec-policy/selinux-privoxy )
+	pcre? ( dev-libs/libpcre )
+	zlib? ( sys-libs/zlib )"
+
+S="${WORKDIR}/${P}-stable"
+
+pkg_setup() {
+	enewgroup privoxy
+	enewuser privoxy -1 -1 /etc/privoxy privoxy
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# add gzip and zlib decompression
+	use zlib && epatch "${FILESDIR}/${P}-zlib.patch"
+
+	rm "${S}"/autom4te.cache/{output.0,requests,traces.0}
+
+	sed -e 's:confdir .:confdir /etc/privoxy:' \
+		-e 's:logdir .:logdir /var/log/privoxy:' \
+		-e 's:logfile logfile:logfile privoxy.log:' \
+		-i "${S}/config" || die "sed failed."
+	sed -e 's:^\+set-image-blocker{pattern}:+set-image-blocker{blank}:' \
+		-i "${S}/default.action.master" || die "sed 2 failed."
+}
+
+src_compile() {
+	export WANT_AUTOCONF=2.1
+	autoheader || die "autoheader failed"
+	autoconf || die "autoconf failed"
+
+	export CC=$(tc-getCC)
+	econf \
+		$(use_enable pcre dynamic-pcre) \
+		$(use_enable zlib) \
+		--sysconfdir=/etc/privoxy || die "econf failed"
+
+	emake || die "make failed."
+}
+
+pkg_preinst() {
+	pkg_setup
+}
+
+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
+	local i
+	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
+}
-- 
cgit v1.2.3-65-gdbad