Apply zlib patch only if zlib USE flag is enabled (#127917).

(Portage version: 2.0.54)

4 files changed, 11 insertions, 16 deletions

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-r5
index 8293b5fba301..8293b5fba301 100644
--- a/net-proxy/privoxy/files/digest-privoxy-3.0.3-r4
+++ b/net-proxy/privoxy/files/digest-privoxy-3.0.3-r5
diff --git a/net-proxy/privoxy/privoxy-3.0.3-r4.ebuild b/net-proxy/privoxy/privoxy-3.0.3-r5.ebuild
index 1338bbc85294..0dc64e15d3ea 100644
--- a/net-proxy/privoxy/privoxy-3.0.3-r4.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.3-r5.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $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
 
@@ -29,10 +29,9 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
 
 	# add gzip and zlib decompression
-	epatch "${FILESDIR}/${P}-zlib.patch"
+	use zlib && epatch "${FILESDIR}/${P}-zlib.patch"
 
 	rm "${S}"/autom4te.cache/{output.0,requests,traces.0}