Version bump (#391853,#405517). Move to EAPI=4 (#382533)

Package-Manager: portage-2.2.0_alpha91/cvs/Linux x86_64

4 files changed, 197 insertions, 3 deletions

diff --git a/net-proxy/privoxy/ChangeLog b/net-proxy/privoxy/ChangeLog
index 14ff574325e9..5690582e3940 100644
--- a/net-proxy/privoxy/ChangeLog
+++ b/net-proxy/privoxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/privoxy
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.65 2011/03/01 15:18:05 ranger Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.66 2012/03/18 14:19:33 tove Exp $
+
+*privoxy-3.0.19 (18 Mar 2012)
+
+  18 Mar 2012; Torsten Veller <tove@gentoo.org> +privoxy-3.0.19.ebuild,
+  +files/privoxy-3.0.19-gentoo.patch:
+  Version bump (#391853,#405517). Move to EAPI=4 (#382533)
 
   01 Mar 2011; Brent Baude <ranger@gentoo.org> privoxy-3.0.17.ebuild:
   stable ppc64, bug 353284
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index c2bf12627e06..7f690cc81d1f 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -1,9 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX privoxy-3.0.12-gentoo.patch 2779 RMD160 2f9a1f4eb703143e0da6458fe21b09f852c7b2b7 SHA1 b6ce0960bd95018ea61e688d1fddda7f56df73cd SHA256 ef1810f5ac2aa62e335b2b92fe8c9edcbf0226846f934205801db788ef483021
 AUX privoxy-3.0.13_beta-gentoo.patch 2755 RMD160 8bb264d4bda79d4bbdd51ba6ad19c3658f73fdc9 SHA1 71dfa42eb615d46bf3f76a5039dc8e320dbbd3a4 SHA256 11087191877a8b291720b9d6b98fbb95429f7a329520e5e30cda3aa079923cdb
 AUX privoxy-3.0.14_beta-gentoo.patch 2755 RMD160 58bf5b51bab977bc325e9ddcb73115d752d68e46 SHA1 63437841699b1f7f2d27399ceedf8091195220ce SHA256 e50e7f378053064832015347bfcc4ee7a5236518bd3b2f1ca817bd59e7a441c7
 AUX privoxy-3.0.15_beta-gentoo.patch 2753 RMD160 9b0cd1d3f1897e71553dfc725977ca5ca9bd2fec SHA1 4e4b088e6a774b279df08fad1fb858e095165501 SHA256 d9ac1eb768a5dab19f93e40f048e0621d2f9cbbf181042d9588222496331e23e
 AUX privoxy-3.0.16-gentoo.patch 3324 RMD160 f8779f26612c8d8a45a23e4fca46fd8a7305e11c SHA1 9a670d3705e5202448500c5bcce7a21fbd9530b6 SHA256 abb03fb860afe5f0b0a2fe7848f36baddaa596619d73e903e0b234ccc3e3917b
 AUX privoxy-3.0.17-gentoo.patch 3324 RMD160 f8779f26612c8d8a45a23e4fca46fd8a7305e11c SHA1 9a670d3705e5202448500c5bcce7a21fbd9530b6 SHA256 abb03fb860afe5f0b0a2fe7848f36baddaa596619d73e903e0b234ccc3e3917b
+AUX privoxy-3.0.19-gentoo.patch 3661 RMD160 3bc1a034611888630701b5805585305b7b8780dc SHA1 dc8dadf32a5bdeb561911fbac7ab8a626f77d4c6 SHA256 71c6e6b042a820c44e7110c8a60f7987c826900fd4b22073565977ce63d4860a
 AUX privoxy.initd 745 RMD160 42a6a3399293098eaa6d00d8aa5974ecaa66ae89 SHA1 edcc340c1751d3f3193b138cc2ce1cacf49b4b89 SHA256 224496b498b4f692ae3316a95b5c7c8b6230dcd5fee0ca163956a7acde243de9
 AUX privoxy.logrotate 191 RMD160 0619507db8b0ad5bdd3d0a390807e52da4afca3f SHA1 78e91faf72b5541cb98467b99f5be1d93fff014c SHA256 a14373c8a26aab32f6f025c11a5521d7923ce900d00b31aa61da9f3979e3bb2e
 DIST privoxy-3.0.12-ipv6-1.diff.gz 11835 RMD160 c555a591f3f5498238b0dcd4ba999a0e7a2288a5 SHA1 40e97eb4cf71ca1ed56272fb5984303dc5c9e468 SHA256 655dac4342f732cb2eabb416383a5d4cdae36dec23577cc7117811689a1088a4
@@ -13,11 +17,20 @@ DIST privoxy-3.0.14-beta-src.tar.gz 1651226 RMD160 1d4188b8549b09a1c09544ad0036c
 DIST privoxy-3.0.15-beta-src.tar.gz 1632703 RMD160 3bf6effa2ea5ae5b5edd26b0ac167cbbf372dc03 SHA1 9931e519e57e43179db6e1f368141381e95a8055 SHA256 736b3022b9a09fe387317b82ff23eb38c534ac5c4f098a8eb976e0fe34a95270
 DIST privoxy-3.0.16-stable-src.tar.gz 1656721 RMD160 36723f0269f9a03394c959eb6587b57fdb7eb713 SHA1 2c9c44034ff0509c124fac98cb741a2c2572edcd SHA256 7df74e33cf9263cb8153e5746e4ad09bf82d7c43d175511bb79056b8a4fafee6
 DIST privoxy-3.0.17-stable-src.tar.gz 1670102 RMD160 8e4acc60ca7e7be20a92e1aece92eecedd4d1997 SHA1 cadef2eb8ec182278e092322d3d56f225cb69c93 SHA256 d1de36dc141180a5ab5e910507551564e958cc23a7d8daaa411e1564c208cd77
+DIST privoxy-3.0.19-stable-src.tar.gz 1722316 RMD160 6a4d6914d2cec8f90b82c9b2ab28dda55b271561 SHA1 a82287cbf48375ef449d021473a366baeca49250 SHA256 816e627b31caa3d9e71d0a8b83ac9ea7dcbeaaafef3c9a9c792696aa56255232
 EBUILD privoxy-3.0.12.ebuild 1740 RMD160 f212ae332bfad2cddfc283bd938e0bf2393e747e SHA1 e3002f7f2c30b36725da441cac503a57b2d71c39 SHA256 5a57ff67dca01e52734b250fc597c533eaa17bf59f8e6263822ccc1af263be09
 EBUILD privoxy-3.0.13_beta.ebuild 1717 RMD160 c1f2320ac58ada93801c8988ca288a0d32fdd712 SHA1 a2fe33d3d98e56d6f28f12190a587a7de046b5fc SHA256 8fd5602f948420dbf272e54b91d899682408afc27bcdd6ee64c419a03eb41971
 EBUILD privoxy-3.0.14_beta.ebuild 1717 RMD160 f943b4abc052615d37f592b75f5330e147ed319f SHA1 86594b4fb3b29222f1c750eadb5718df65d98ee1 SHA256 59ee7aa812be165c63a8c07d6a98afd88855e4ddafc340549748314df5bb1193
 EBUILD privoxy-3.0.15_beta.ebuild 1717 RMD160 675877cf94fdc167f9fcaece060f390ffe18d72b SHA1 477ef12a48bb2c3932b6069281250a1bafbc969a SHA256 528fa216a0f81e39458821a1d371c04e280540a2979c25cf9a107c81e9dfca27
 EBUILD privoxy-3.0.16.ebuild 1683 RMD160 b29669666747d32acaf29629ed2e3f4e19c900c4 SHA1 cdfae847d568fe432fa181eda902bca2af8cdb07 SHA256 bf6442c14fa46f2ef974e302b047b4ee5c675fe5863df6cf0c0c691deb8e609b
 EBUILD privoxy-3.0.17.ebuild 1678 RMD160 1ab40a129e96a53e0735e54b3ff3b4ecc058bd96 SHA1 972bde616555fd7e3aafa3c3ca146e0a58eb9ed0 SHA256 fac8b659ccc8c54f98aa3afa565c44de4a7f30f090c59ac1969bf52189a63a51
-MISC ChangeLog 14022 RMD160 d0ac5b9c6d10bb3e3894fc5c0ebe1746b8044611 SHA1 e2322218c8f15f158927bfbb502965dd69439af0 SHA256 1c49a920658fa32a442f3008eebca87acb13f15f317eec65a135573444cc4fdd
+EBUILD privoxy-3.0.19.ebuild 1580 RMD160 3bb534a245b52cc4bf574354b147835e4eb34d4d SHA1 36e81203afbbad218ed42af1a944bd66fb453d7f SHA256 3a3c0d520cbe7d7f4acce123520738402dce29fd07c9290669ebcc00acf32afd
+MISC ChangeLog 14221 RMD160 c001c27368258b3fc0332e5f24b79f59d846729d SHA1 1c0a5ba381fe626540ad7dd087eeca2eef753117 SHA256 75a36aed9555be5514225eadad1256b7b2f6692950ae9131d47f2ef6d30bf0af
 MISC metadata.xml 291 RMD160 1e9cbadea15378b291cd003139d8fbdc8cf4595b SHA1 27e52a5679b01f661170e997bdc9578ef42a5d18 SHA256 694b05be02eb88162313a10a1e3e44acf89214381eab941a0ec497ab8925049c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEAREIAAYFAk9l7voACgkQV3J2n04Eauw2lwCeInsAMc6oIhhVixNXHFZYCqYh
+/ZEAnAq4jHc8X7amn87c9LUQGna+RFRT
+=gbuH
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/privoxy/files/privoxy-3.0.19-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.19-gentoo.patch
new file mode 100644
index 000000000000..4571e24e1f06
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.19-gentoo.patch
@@ -0,0 +1,114 @@
+--- a/GNUmakefile.in
++++ b/GNUmakefile.in
+@@ -62,8 +62,8 @@
+ MAN_DEST     = $(MAN_DIR)/man1
+ MAN_PAGE     = privoxy.1
+ SHARE_DEST   = @datadir@
+-DOC_DEST     = $(SHARE_DEST)/doc/privoxy
+-VAR_DEST     = @localstatedir@
++DOC_DEST     = @docdir@
++VAR_DEST     = /var
+ LOGS_DEST    = $(VAR_DEST)/log/privoxy
+ PIDS_DEST    = $(VAR_DEST)/run
+ 
+@@ -852,7 +852,6 @@
+ 		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/man-page/*html $(DESTDIR)$$DOC/man-page;\
+ 		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/privoxy-index.html $(DESTDIR)$$DOC/index.html;\
+ 		$(INSTALL) $(INSTALL_T) AUTHORS $(DESTDIR)$$DOC;\
+-		$(INSTALL) $(INSTALL_T) LICENSE $(DESTDIR)$$DOC;\
+ 		$(INSTALL) $(INSTALL_T) README $(DESTDIR)$$DOC;\
+ 		$(INSTALL) $(INSTALL_T) ChangeLog $(DESTDIR)$$DOC;\
+ 		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $(DESTDIR)$$DOC;\
+@@ -923,34 +922,8 @@
+ 	fi ;\
+ 	$(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
+ 	for i in $(CONFIGS); do \
+-		if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
+-			$(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
+-			$(ECHO) Installing fresh $$i;\
+ 			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
+-		elif [ -s "$(CONF_DEST)/$$i" ]; then \
+-			$(ECHO) Installing $$i as $$i.new ;\
+-			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
+-			NEW=1;\
+-		else \
+-			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
+-		fi ;\
+ 	done ;\
+-	if [ -n "$$NEW" ]; then \
+-		$(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
+-		$(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\
+-	fi ;\
+-	[ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \
+-		$(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\
+-		$(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
+-	if [ x$$USER != x ]; then \
+-		$(CHOWN) $$USER $(DESTDIR)$(LOG_DEST)/logfile || \
+-		$(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
+-	fi ;\
+-	if [ x$$GROUP_T != x ]; then \
+-		$(CHGRP) $$GROUP_T $(DESTDIR)$(LOG_DEST)/logfile || \
+-		$(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
+-	fi ;\
+-	$(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
+ 	if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \
+ 		if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \
+                $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \
+--- a/config
++++ b/config
+@@ -265,7 +265,7 @@
+ #
+ #      No trailing "/", please.
+ #
+-confdir .
++confdir /etc/privoxy
+ #
+ #
+ #  2.2. templdir
+@@ -322,7 +322,7 @@
+ #
+ #      No trailing "/", please.
+ #
+-logdir .
++logdir /var/log/privoxy
+ #
+ #
+ #  2.4. actionsfile
+@@ -462,7 +462,7 @@
+ #      Any log files must be writable by whatever user Privoxy is
+ #      being run as (on Unix, default user id is "privoxy").
+ #
+-logfile logfile
++logfile privoxy.log
+ #
+ #
+ #  2.7. trustfile
+--- a/default.action.master
++++ b/default.action.master
+@@ -566,7 +566,7 @@
+ +client-header-tagger{css-requests} \
+ +client-header-tagger{image-requests} \
+ +hide-from-header{block} \
+-+set-image-blocker{pattern} \
+++set-image-blocker{blank} \
+ }
+ standard.Cautious
+ 
+@@ -588,7 +588,7 @@
+ +hide-from-header{block} \
+ +hide-referrer{conditional-block} \
+ +session-cookies-only \
+-+set-image-blocker{pattern} \
+++set-image-blocker{blank} \
+ }
+ standard.Medium
+ 
+@@ -627,7 +627,7 @@
+ +hide-referrer{conditional-block} \
+ +limit-connect{,} \
+ +overwrite-last-modified{randomize} \
+-+set-image-blocker{pattern} \
+++set-image-blocker{blank} \
+ }
+ standard.Advanced
+ 
diff --git a/net-proxy/privoxy/privoxy-3.0.19.ebuild b/net-proxy/privoxy/privoxy-3.0.19.ebuild
new file mode 100644
index 000000000000..65cca7d8a78f
--- /dev/null
+++ b/net-proxy/privoxy/privoxy-3.0.19.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.19.ebuild,v 1.1 2012/03/18 14:19:33 tove Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs autotools
+
+[ "${PV##*_}" = "beta" ] &&
+	PRIVOXY_STATUS="beta" ||
+	PRIVOXY_STATUS="stable"
+
+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%_*}-${PRIVOXY_STATUS}-src.tar.gz"
+
+IUSE="selinux threads zlib"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+LICENSE="GPL-2"
+
+DEPEND="dev-libs/libpcre
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-privoxy )"
+
+S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
+
+pkg_setup() {
+	enewgroup privoxy
+	enewuser privoxy -1 -1 /etc/privoxy privoxy
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	# autoreconf needs to be called even if we don't modify any autotools source files
+	# See main makefile
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable zlib) \
+		$(use_enable threads pthread) \
+		--enable-dynamic-pcre \
+		--with-user=privoxy \
+		--with-group=privoxy \
+		--sysconfdir=/etc/privoxy \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_install () {
+	default
+
+	newinitd "${FILESDIR}/privoxy.initd" privoxy
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/privoxy.logrotate" privoxy
+
+	diropts -m 0750 -g privoxy -o privoxy
+	keepdir /var/log/privoxy
+}