Remove short <longdescription>. Remove old.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

9 files changed, 14 insertions, 584 deletions

diff --git a/net-proxy/privoxy/ChangeLog b/net-proxy/privoxy/ChangeLog
index 2906d4c9cb40..72123866ede8 100644
--- a/net-proxy/privoxy/ChangeLog
+++ b/net-proxy/privoxy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/privoxy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.93 2014/01/18 19:49:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.94 2014/11/04 08:30:57 jer Exp $
+
+  04 Nov 2014; Jeroen Roovers <jer@gentoo.org>
+  -files/privoxy-3.0.12-gentoo.patch, -files/privoxy-3.0.13_beta-gentoo.patch,
+  -files/privoxy-3.0.14_beta-gentoo.patch,
+  -files/privoxy-3.0.15_beta-gentoo.patch, -files/privoxy-3.0.16-gentoo.patch,
+  -files/privoxy-3.0.17-gentoo.patch, metadata.xml:
+  Remove short <longdescription>. Remove old.
 
   18 Jan 2014; Agostino Sarubbo <ago@gentoo.org> privoxy-3.0.21-r2.ebuild:
   Stable for alpha, wrt bug #485236
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index b65d3dceb4fc..feea89c30c4d 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -1,12 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX privoxy-3.0.12-gentoo.patch 2779 SHA256 ef1810f5ac2aa62e335b2b92fe8c9edcbf0226846f934205801db788ef483021 SHA512 d10ca2a715e8ac37defc741f21f5aa43f43044b100c296c25422c6d92eb95357eb91ee17ec777997f60010b3bba832c21286bc3d777e2f4d9b2463591dde13c2 WHIRLPOOL 97db7a7798f68e18c63b99c70bfd0ccb6230a1098445c74ac00404777bc53150d35f3f4d90ac6e0965f8eb17beb5a39d11daeeea060d73bbe9a9af1f061a1ae9
-AUX privoxy-3.0.13_beta-gentoo.patch 2755 SHA256 11087191877a8b291720b9d6b98fbb95429f7a329520e5e30cda3aa079923cdb SHA512 3cafb30916f153d5b1f035e8fd835eccb567e4dd9a13cf2a9464622758ab19ea3a03bf90976c0e25993c0d977b171fb0e1b8783e013a66252f7d6830ac89ee0d WHIRLPOOL 5a54adb43c65ec608ada833a3441033d9dfd63d9b2a3f220a7ca01bbd6bc195481a32c1f95ac7e3040e9eff4835d7c2d54043211863e7d1e5c7aec67ec139164
-AUX privoxy-3.0.14_beta-gentoo.patch 2755 SHA256 e50e7f378053064832015347bfcc4ee7a5236518bd3b2f1ca817bd59e7a441c7 SHA512 d92f7b798be14dcef24a4c5528ce05f93c10fecf3473d4ae0d6c15d331adadc49b632c3d409d12b3bcddf90132b269a7c6d6de11ee7302cb0f2a462141b68720 WHIRLPOOL 1a135ce497bc0d2d5ffd498199d5d18e4a343982216e7a1372064e1ce8192b57553e54682e1b6e273805e33650d42eaed9d6b771ae38f161a818aa190e91ba12
-AUX privoxy-3.0.15_beta-gentoo.patch 2753 SHA256 d9ac1eb768a5dab19f93e40f048e0621d2f9cbbf181042d9588222496331e23e SHA512 9d4376d3771e6163a327aee0857be20744f7becfa53515222a01c73809bc37c25cec2492ac074239195916079f620798443659e26f288015d9b7f4efc90396d9 WHIRLPOOL 99a35021c13a14ed784375a6ccc6d125e8aeffa1813b2ae5b6941f0d3c4e4e0315e6baf20612508d0f13734c4a49dc8b01986c8fbef1966496692ec60931b4f9
-AUX privoxy-3.0.16-gentoo.patch 3324 SHA256 abb03fb860afe5f0b0a2fe7848f36baddaa596619d73e903e0b234ccc3e3917b SHA512 9e1b5d4a0d459ce52e87e927f768a6f2d87db64e8eec1e60606b07670186a0e308a4518a55b427dd0130346d5bc4426074eb943b83d320f7ed01dc2fa6f3d034 WHIRLPOOL e1742ed2161adf5a00252f3cc64e43c173bc1bad9fd16a705c9ff564bbe2ffa3a85a55d2425ec5d4cfd549460180cbc7a78ff6e183bca78e893cd09651e4364a
-AUX privoxy-3.0.17-gentoo.patch 3324 SHA256 abb03fb860afe5f0b0a2fe7848f36baddaa596619d73e903e0b234ccc3e3917b SHA512 9e1b5d4a0d459ce52e87e927f768a6f2d87db64e8eec1e60606b07670186a0e308a4518a55b427dd0130346d5bc4426074eb943b83d320f7ed01dc2fa6f3d034 WHIRLPOOL e1742ed2161adf5a00252f3cc64e43c173bc1bad9fd16a705c9ff564bbe2ffa3a85a55d2425ec5d4cfd549460180cbc7a78ff6e183bca78e893cd09651e4364a
 AUX privoxy-3.0.19-gentoo.patch 3661 SHA256 71c6e6b042a820c44e7110c8a60f7987c826900fd4b22073565977ce63d4860a SHA512 e0f916f33b8f17375b60686a0e4795883f29e46c55e273e0a69fae63d4b4e5a2585bb86b04aa288fdd75cdf51eedf7d72a9f8092e13a853e934e0029ae919a24 WHIRLPOOL 701a5c7ec31b7d2d68801005d81f01ec727712aab7d5d866427a78c940ef2d63201f6ba9e1679bf8e919653b355ea8a0577d4bce5c13b24812d43f2b09797553
 AUX privoxy.initd 745 SHA256 224496b498b4f692ae3316a95b5c7c8b6230dcd5fee0ca163956a7acde243de9 SHA512 5d3870a672cd58d2d88a14af1ebb9c953f951016ba9e0905d7b9bd4ad1b699bf8b77bbb8bc8f31a71a928d3cd4c7f47c6cc20e01962a5ee89981414573fc0972 WHIRLPOOL d55a1df238e24589602174592bfc67af3333f3228abdf9be0f39527d35e7c088421472851b3c54bdb4af9273e714782598c939947fdda6f7e5673fc4b53cb0aa
 AUX privoxy.logrotate 191 SHA256 a14373c8a26aab32f6f025c11a5521d7923ce900d00b31aa61da9f3979e3bb2e SHA512 118caaeac3aba751584c5bdfc737bf5bfeddf1a62fda1f44bcd4654ae2e33183bc1ce6fc66d4a1bdd79766e42e669b1615a6d46d528a1bd49cabdf98385a3bb9 WHIRLPOOL 4f7f576eb52a02daf38ccec68c49ee5ae0d449cbefdc11ecd1a9790eeee99f800576e05467f80a915423aa077ed3769e85a7c03a92679f31d6b3fe4a3aa3a792
@@ -15,22 +9,12 @@ DIST privoxy-3.0.21-stable-src.tar.gz 1733120 SHA256 5ec7e601948d2bd0ebf0ebe90ee
 EBUILD privoxy-3.0.21-r1.ebuild 1651 SHA256 c1f820ad52b2665e900e641663e3c0dd59b83e8a046828cf894a5c3a99f10630 SHA512 16e21874fc191f986a7871a0de259625b06b9e46677e7466f2224735b03ace9c63fea882841f6db893ea27c656f79415e2918b02895e66fdfe646b9ff1761629 WHIRLPOOL cfcf5574da98e6fb1ce26cae6f84e933004f2fcf5d307c484ace0e6bf3da488169cc8330246557998494e665da8377858d35a82368fe6d5884bfd868334511df
 EBUILD privoxy-3.0.21-r2.ebuild 1683 SHA256 b324d5a9df9f3c9f6e4b0f9466a0ef5bc97da552c05c32ea249d9a075c1af096 SHA512 93dd79ce1d8df74bf8499831bddcd7334cdd08e33bd02bd52e5aee8c90c590c7037916363c4e04eeb9ccea5689a11fa27a85ca0f84f2e77188d50eaa27f7a034 WHIRLPOOL 1e3d4322cfb4504ce88b1be7c50c39f64175f70d4ae1b0fa0d172f5523331f35559893c06caed836406ec2ae7f9ef607bef7bddeccf02ad06ffe1a9fe9050c07
 EBUILD privoxy-3.0.21.ebuild 1585 SHA256 038b865802540bf699a7697f9ce570e79d08256c0ccc77675d5fcfb56623cfe7 SHA512 731df12e7a3bacda7fc4902f89af30fdf114a00eaba7edfae2fb2954d8dee45a9def054d9fd0c97c352af5c0ebaf287108ecba7291f916d1989967f93083e22e WHIRLPOOL 3b3cb5baae4409b3180449b27362cbbc5427bd2595544dda17ce40ac394ee5386d79de01a3a030ff6a0de35547ced1de0ad1f8e176e817955163426955a342c8
-MISC ChangeLog 17727 SHA256 d1c871717ff60ff9758fb0086d2d4e7d41a0f2422f817dc8b5cc4d4d11d52716 SHA512 186f48376128fc3c0279bd4cd1342ff7f17d98aa0def8a694a6c960c0aebf45ee7244f927bd21b230f9d6b512e9234f1f912df2aac2566fc5a9ce250f2436021 WHIRLPOOL 431ed40be216897672207767a0362277b110b32c738965a70e3d6881813d2863d820881d0d1ddaa0cf23a59a2f1b2a937b62f54f5e164c0224bc84589d37c3df
-MISC metadata.xml 291 SHA256 694b05be02eb88162313a10a1e3e44acf89214381eab941a0ec497ab8925049c SHA512 6ec5354c20ce662e799bb9ffcf4eb58e2a4cd110b6dfc8b1be546b10a268f7caab71b6cb096f4fd81ea3ff9016f7de2ffa68381d2ab89bbc34e178fa941d19ee WHIRLPOOL a7b15612fa65d2b4d17387106137daad17c60aa68f7faa1ddc6d8f4f66af982da2fd88a5de5d785e8a40eb18221df85bc4a7becf5dc93497c5db5ee269a9f32e
+MISC ChangeLog 18074 SHA256 1689d1ebe9acdb14bd583874583edc69c016f73e7347c7dfc4d39eb4a9aaafac SHA512 008084783d1ec78210095dd0231d74db98181288b53b0f26facc4b1e5e0c156e8e0ae3eb3b26175f9cd1c5862058ea113979db8f2376fedd8378e9683ada7be0 WHIRLPOOL 4c574cca9bb0636a69b0a37bfae9b892e6081e14c32834df5fe6e86bf1013f78f32deb44f50d938631e03dfba4a0b83e473f9b6aeb8a3324ffd346d9774e31c4
+MISC metadata.xml 162 SHA256 7452c4deeae23532b16b9030c3b32a9a09a5f82faed0fd23810a83db174dc60f SHA512 45a066ff67b0386b4f7dda2eb84ede5a8d83d0c20ccecce12c145f6358f42cf58de0688ad2a20fc4d4e0a1732dd6106a8d215c3f7b86ecaad333898c1dfcee9a WHIRLPOOL 8eb55a1c39e758e950d54bb48d6d814799f3f8e7a3fe14b82c6b163373a69edc9b60dd04686ff1b5a26fa92935c9092c60f8f16e4f82d4da7ea1655aebd34a45
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJS2tq0AAoJELp701BxlEWfJSQQAJr9ZIWRDG0yHOJ8W4r/QbB4
-z2esh8JgGx5S1+YJopfZ8dcum4VstV+F5uq2ZCcaa+bduMOy4i5WIQjqzKLCGiH4
-kPvSn6gPPkN15FwVlJaAjQRHIgMGTiVAHnzn9b4S+QhR74wT4LZdMpwphXpEnggF
-omUd5Tm5rQGiSex20MM+KtXONMiZGrD7K0cNrFm9r/ETxIx5Elk98DURqeFtEg9I
-Za/dIxkThWaA0zW1pnQlvJ1rh0wOlJYIFibeEXNN4bPiwZE/LA2hVFEtCaj2pkaM
-Ugn5ze28l/II1hPktN7O8k4c2hr9n+DaGxniFviY/66wmS1HCE5KGvI+YVV8cTep
-Bi9mE404v5yfW16Cy37nA3d731Vjhjl5DHfAPJ0EOHSAJYkm0hU7daV+FqW8+yue
-0uM9PxdwedX8/faMn8Tv9fGiUlvZsfPvQ5Ykujg/PByyeMzssXxshxRWy3X0yQPb
-x0NsvbLpiSqAxAheV17vka6R8IjNQ8ckUWAdgy9iKLmfpao6uHdLlbmXGBPsVLyv
-xsZZ2PKcrWbToDKJ9F8l3taopbyt4Y9/fZW4227XtaCP0XQg6CK3A9QGucNu/wZj
-FkNabXyK8tAKKCDvOw6kk7h7tPOrNgYaMBtg9SHAbt+AqrsB0EnOgTkfBbSlXlNc
-Bzh4/SkvOG5ai44uKX0h
-=8/ck
+iEYEAREIAAYFAlRYjsIACgkQVWmRsqeSphOU9gCfX6tup2q+ajl+HBahlZcg4rwl
+ImcAnixE5geN9VVD0Uec3F952oS4qj8s
+=AVHJ
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/privoxy/files/privoxy-3.0.12-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.12-gentoo.patch
deleted file mode 100644
index 38d0c34579ca..000000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.12-gentoo.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Nru privoxy-3.0.12-stable.orig/config privoxy-3.0.12-stable/config
---- privoxy-3.0.12-stable.orig/config	2009-03-21 11:51:51.000000000 +0000
-+++ privoxy-3.0.12-stable/config	2009-04-09 00:02:30.000000000 +0000
-@@ -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
-diff -Nru privoxy-3.0.12-stable.orig/default.action.master privoxy-3.0.12-stable/default.action.master
---- privoxy-3.0.12-stable.orig/default.action.master	2009-03-04 17:52:32.000000000 +0000
-+++ privoxy-3.0.12-stable/default.action.master	2009-04-09 00:02:30.000000000 +0000
-@@ -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 -Nru privoxy-3.0.12-stable.orig/GNUmakefile.in privoxy-3.0.12-stable/GNUmakefile.in
---- privoxy-3.0.12-stable.orig/GNUmakefile.in	2009-02-28 08:28:14.000000000 +0000
-+++ privoxy-3.0.12-stable/GNUmakefile.in	2009-04-09 00:02:30.000000000 +0000
-@@ -1143,22 +1143,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 ;\
diff --git a/net-proxy/privoxy/files/privoxy-3.0.13_beta-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.13_beta-gentoo.patch
deleted file mode 100644
index ac34a21f9453..000000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.13_beta-gentoo.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Nru privoxy-3.0.13-beta.orig/config privoxy-3.0.13-beta/config
---- privoxy-3.0.13-beta.orig/config	2009-06-12 16:34:10.000000000 +0200
-+++ privoxy-3.0.13-beta/config	2009-07-12 13:20:21.000000000 +0200
-@@ -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
-diff -Nru privoxy-3.0.13-beta.orig/default.action.master privoxy-3.0.13-beta/default.action.master
---- privoxy-3.0.13-beta.orig/default.action.master	2009-05-25 23:27:19.000000000 +0200
-+++ privoxy-3.0.13-beta/default.action.master	2009-07-12 13:20:21.000000000 +0200
-@@ -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 -Nru privoxy-3.0.13-beta.orig/GNUmakefile.in privoxy-3.0.13-beta/GNUmakefile.in
---- privoxy-3.0.13-beta.orig/GNUmakefile.in	2009-04-04 22:24:29.000000000 +0200
-+++ privoxy-3.0.13-beta/GNUmakefile.in	2009-07-12 13:20:21.000000000 +0200
-@@ -1144,22 +1144,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 ;\
diff --git a/net-proxy/privoxy/files/privoxy-3.0.14_beta-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.14_beta-gentoo.patch
deleted file mode 100644
index edd3de7f524d..000000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.14_beta-gentoo.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Nru privoxy-3.0.14-beta.orig/config privoxy-3.0.14-beta/config
---- privoxy-3.0.14-beta.orig/config	2009-07-18 18:06:33.000000000 +0200
-+++ privoxy-3.0.14-beta/config	2009-08-08 11:47:22.000000000 +0200
-@@ -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
-diff -Nru privoxy-3.0.14-beta.orig/default.action.master privoxy-3.0.14-beta/default.action.master
---- privoxy-3.0.14-beta.orig/default.action.master	2009-07-21 16:19:57.000000000 +0200
-+++ privoxy-3.0.14-beta/default.action.master	2009-08-08 11:47:22.000000000 +0200
-@@ -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 -Nru privoxy-3.0.14-beta.orig/GNUmakefile.in privoxy-3.0.14-beta/GNUmakefile.in
---- privoxy-3.0.14-beta.orig/GNUmakefile.in	2009-07-24 14:23:07.000000000 +0200
-+++ privoxy-3.0.14-beta/GNUmakefile.in	2009-08-08 11:47:22.000000000 +0200
-@@ -1144,22 +1144,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 ;\
diff --git a/net-proxy/privoxy/files/privoxy-3.0.15_beta-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.15_beta-gentoo.patch
deleted file mode 100644
index 7792e1616453..000000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.15_beta-gentoo.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Nru privoxy-3.0.15-beta.orig/config privoxy-3.0.15-beta/config
---- privoxy-3.0.15-beta.orig/config	2009-10-10 07:56:41.000000000 +0200
-+++ privoxy-3.0.15-beta/config	2009-10-22 23:26:11.000000000 +0200
-@@ -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
-diff -Nru privoxy-3.0.15-beta.orig/default.action.master privoxy-3.0.15-beta/default.action.master
---- privoxy-3.0.15-beta.orig/default.action.master	2009-10-02 20:07:22.000000000 +0200
-+++ privoxy-3.0.15-beta/default.action.master	2009-10-22 23:26:11.000000000 +0200
-@@ -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 -Nru privoxy-3.0.15-beta.orig/GNUmakefile.in privoxy-3.0.15-beta/GNUmakefile.in
---- privoxy-3.0.15-beta.orig/GNUmakefile.in	2009-09-26 19:21:01.000000000 +0200
-+++ privoxy-3.0.15-beta/GNUmakefile.in	2009-10-22 23:26:11.000000000 +0200
-@@ -901,22 +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 ;\
diff --git a/net-proxy/privoxy/files/privoxy-3.0.16-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.16-gentoo.patch
deleted file mode 100644
index d445ec1b01c5..000000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.16-gentoo.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- 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/files/privoxy-3.0.17-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.17-gentoo.patch
deleted file mode 100644
index d445ec1b01c5..000000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.17-gentoo.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- 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/metadata.xml b/net-proxy/privoxy/metadata.xml
index f1810cf5c4a6..9cb9f71e4f8d 100644
--- a/net-proxy/privoxy/metadata.xml
+++ b/net-proxy/privoxy/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-proxy</herd>
-<longdescription>A web proxy with advanced filtering capabilities for protecting privacy against internet junk</longdescription>
 </pkgmetadata>