Version bump (#308615). Fix docdir and logdir (#297206)

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 192 insertions, 2 deletions

diff --git a/net-proxy/privoxy/ChangeLog b/net-proxy/privoxy/ChangeLog
index c91ced85e79b..1926a0b29a3c 100644
--- a/net-proxy/privoxy/ChangeLog
+++ b/net-proxy/privoxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/privoxy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.56 2010/01/23 18:32:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.57 2010/05/08 11:00:50 tove Exp $
+
+*privoxy-3.0.16 (08 May 2010)
+
+  08 May 2010; Torsten Veller <tove@gentoo.org> +privoxy-3.0.16.ebuild,
+  +files/privoxy-3.0.16-gentoo.patch:
+  Version bump (#308615). Fix docdir and logdir (#297206)
 
   23 Jan 2010; Raúl Porcel <armin76@gentoo.org> privoxy-3.0.12.ebuild,
   privoxy-3.0.13_beta.ebuild, privoxy-3.0.14_beta.ebuild,
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index 1b2f6119732c..188523f8c57b 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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.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
@@ -9,9 +13,18 @@ DIST privoxy-3.0.12-stable-src.tar.gz 1811124 RMD160 32509b897e073f1cc100b8a4a15
 DIST privoxy-3.0.13-beta-src.tar.gz 1658445 RMD160 f5438caef675ae37cadb141133b0e082339a6628 SHA1 45547a116dd4c99239c98a6365e1d4a81c1adb2f SHA256 dacdd5d7f79ad7af67ea3d04c04e490ea1d896cfedd5456ce70ca02ecf220edb
 DIST privoxy-3.0.14-beta-src.tar.gz 1651226 RMD160 1d4188b8549b09a1c09544ad0036c98784897fbd SHA1 ea2fdf98a5dbad368158187aa19f525997166529 SHA256 8aaff8c354e873795673ca582756bcae5a1c3e630d971e1a3f610bc6219d3a11
 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
 EBUILD privoxy-3.0.12.ebuild 1741 RMD160 99cf1e5d6cd1b4fd2134da3091addfa533c5321a SHA1 10ff263214e37434bf9abf7d94d5761a1b22d45c SHA256 386a3fb100fb02db06498dc08a2e520f03ebc40082dd0ce600aa8a8b63140854
 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
-MISC ChangeLog 12962 RMD160 798cb96719f04471439f6ad04267315f4b8c2e6c SHA1 c6c2b4bc03be4ce98a668b748a6f112fba8c3bd0 SHA256 403f5f07e6aabd0a147f7a95f1f656722d12402050a1066b5a158174e6e996ff
+EBUILD privoxy-3.0.16.ebuild 1683 RMD160 b29669666747d32acaf29629ed2e3f4e19c900c4 SHA1 cdfae847d568fe432fa181eda902bca2af8cdb07 SHA256 bf6442c14fa46f2ef974e302b047b4ee5c675fe5863df6cf0c0c691deb8e609b
+MISC ChangeLog 13159 RMD160 8ff0e8292b522ce9790af30e6860bfcfcac49f02 SHA1 4b627fddd8fab19c4783676c365a115320b4386e SHA256 a48995b1d4cb9118f571fa8b58c8d454a8024085ede64e6dc6ed2bfd89b4a44a
 MISC metadata.xml 291 RMD160 1e9cbadea15378b291cd003139d8fbdc8cf4595b SHA1 27e52a5679b01f661170e997bdc9578ef42a5d18 SHA256 694b05be02eb88162313a10a1e3e44acf89214381eab941a0ec497ab8925049c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkvlRGcACgkQV3J2n04EauxHLACfRAluXCh7975tsEgTlTqnXnDM
+Y64An0uNd6Vypa65hODGdBOUTnHhaoj8
+=S9lc
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/privoxy/files/privoxy-3.0.16-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.16-gentoo.patch
new file mode 100644
index 000000000000..d445ec1b01c5
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.16-gentoo.patch
@@ -0,0 +1,108 @@
+--- privoxy/GNUmakefile.in
++++ privoxy/GNUmakefile.in
+@@ -61,10 +61,10 @@
+ MAN_DIR      = @mandir@
+ MAN_DEST     = $(MAN_DIR)/man1
+ SHARE_DEST   = @datadir@
+-DOC_DEST     = $(SHARE_DEST)/doc/privoxy
++DOC_DEST     = @docdir@
+-VAR_DEST     = @localstatedir@
++VAR_DEST     = /var
+ LOGS_DEST    = $(VAR_DEST)/log/privoxy
+ PIDS_DEST    = $(VAR_DEST)/run
+ 
+ # if $prefix = /usr/local then the default CONFDEST change from 
+ # CONF_DEST = $(CONF_BASE) to CONF_DEST = $(CONF_BASE)/privoxy  
+@@ -901,34 +901,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 | \
+--- privoxy/config
++++ privoxy/config
+@@ -267,7 +267,7 @@
+ #
+ #      No trailing "/", please.
+ #
+-confdir .
++confdir /etc/privoxy
+ #
+ #
+ #  2.2. templdir
+@@ -324,7 +324,7 @@
+ #
+ #      No trailing "/", please.
+ #
+-logdir .
++logdir /var/log/privoxy
+ #
+ #
+ #  2.4. actionsfile
+@@ -464,7 +464,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
+--- privoxy/default.action.master
++++ privoxy/default.action.master
+@@ -564,7 +564,7 @@
+ { \
+ +change-x-forwarded-for{block} \
+ +hide-from-header{block} \
+-+set-image-blocker{pattern} \
+++set-image-blocker{blank} \
+ }
+ standard.Cautious
+ 
+@@ -584,7 +584,7 @@
+ +hide-from-header{block} \
+ +hide-referrer{conditional-block} \
+ +session-cookies-only \
+-+set-image-blocker{pattern} \
+++set-image-blocker{blank} \
+ }
+ standard.Medium
+ 
+@@ -623,7 +623,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.16.ebuild b/net-proxy/privoxy/privoxy-3.0.16.ebuild
new file mode 100644
index 000000000000..319967b90a46
--- /dev/null
+++ b/net-proxy/privoxy/privoxy-3.0.16.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.16.ebuild,v 1.1 2010/05/08 11:00:50 tove Exp $
+
+EAPI="2"
+
+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 || die "eautoreconf failed"
+}
+
+src_configure() {
+	export CC=$(tc-getCC)
+	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 () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	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
+}