gentoo resync : 03.03.2021

13 files changed, 274 insertions, 175 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 36da3874374a..0fb345b1408c 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index 21c14851241d..13957db52b84 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,3 +1,3 @@
 DIST mitmproxy-6.0.2.tar.gz 27274682 BLAKE2B 146fc4cd376e4ff02d13bf168b26868c5a33b47b30e678fb6d97df36c4b8ec9e8b9ca6e864e56c3943b231a2f2745c1abd7c58814ddf712113c2a20704a6964f SHA512 27eb5e9736891148b5ebec963a2d18de6a69b44428538d2ed1cf9a1dcdd7cbcdeeed662edb2d25521098374e2f9a29b5bb8fba8da4f77ac0d32bf7881ac70d61
-EBUILD mitmproxy-6.0.2.ebuild 3114 BLAKE2B 862dc87f9745307c64abc22dacf3e994eb4a30dbab46e3f721c7a9f25e74a7c13719adc020399b7bddc7076c5991b6e0e12c3b0a5820f56cb2c356e83ca495ad SHA512 3d991400b0d36982cf37bc8e17275a6043c37ddb8b262fd459a7e70f1180b1d80de21149aef5d6fdc247ec570b58a633b5d5ae61c22675dbf2e6cf5ccf816bcc
+EBUILD mitmproxy-6.0.2.ebuild 3113 BLAKE2B 1512ec1be8f45885f334b91363fa2cc61b46cf56bcd3a713bb6a760712d4862e745304c190e63b8babb7c2990c38176dfc014e7111349e3086452e94670addab SHA512 d2ae20195230d170131edce5fae35a01e9a54ab41eb8928f8a832d4cfad0297066fa320ba47ef0bd84914324462389399a031801529491abe570cb1442798c15
 MISC metadata.xml 1035 BLAKE2B 8d378cec75895df5c0fe8414ad37676de709f1c73242cbc23a0bfa6e4863ea234d99aa724c9ace560a91d6f9e533dd4281914ece0cd38df05dd7375b134211ff SHA512 3bdb95f97d85f63e93fafd18e5a6c82e20c12a1d27acae162b6aa6f3813d65dbc3f756e29cfb05cd9b515522e19973a636b05e28c01891dd2c1028172e7c3fb3
diff --git a/net-proxy/mitmproxy/mitmproxy-6.0.2.ebuild b/net-proxy/mitmproxy/mitmproxy-6.0.2.ebuild
index ec54ddf561d8..19fef3485eec 100644
--- a/net-proxy/mitmproxy/mitmproxy-6.0.2.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-6.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="libressl test"
 
 RDEPEND="
diff --git a/net-proxy/nutcracker/Manifest b/net-proxy/nutcracker/Manifest
index c3c44fb676c0..5d741d3edd0c 100644
--- a/net-proxy/nutcracker/Manifest
+++ b/net-proxy/nutcracker/Manifest
@@ -1,4 +1,3 @@
-AUX nutcracker-0.2.4-use-system-libyaml.patch 2570 BLAKE2B 74052f28294eeae1080a7f8afdb1c17c89147dd9c47289eb2fc0d3a90aaf31868c40c1462c1754d1f440580084606e978150720ef1d2bafaf1e3d1dfe06efd5c SHA512 a529872829318788d54b876800d940fdbb2d710bd092fe4b930bce3cfaf23116579d1a6f7ead8a181113713a654b34686ec7470d8198e7263aeb85e8b0f51d1d
 AUX nutcracker-0.3.0-use-system-libyaml.patch 2183 BLAKE2B ad2cdffe2f038bf6715714f02d66d4610abb0abed2b5664e501a00e0340c2f20d7a06835322fab0369fc4747cd08ff010f028ab705181f881eda0c5c7b1c0145 SHA512 b37037f9089f0bc3eec53916e204986674e14d806028672fa723a453e274fe64a6290c14aaaebcaabaf1237069a6563fb736af5919421573050fe1b006472937
 AUX nutcracker.confd 271 BLAKE2B 5f8a19edd4841cbc8b86f14ec48b72a46be95f34050619a6e1d75b12a348c11dab9890f1bbfaceff262256977888c378d2eee2ffb8c7b5c97e75bcc9c6e61502 SHA512 491b0330fda3994bedc15a77e7b4f601a2a0c234298ff04ee088f0e4a9676864e0eb01e1532f2cb6fdf95cefe0b0b0cf39d84b0993cadff774e7721f22d8c752
 AUX nutcracker.confd.2 272 BLAKE2B dfcfdfb4134ce0acfb126b1c7cb32062e47906dd68ed109a4e9edbae9c56f4b1ae17b20f593ef5af904bbe85837f5bb9ff91e0e068acfdff82e949b623abb55a SHA512 d208654b1e1fd20f456f340fabe25836c8ba948c96db8034d41710f9e0362936a24f0faec89e51c04d478c60de5255c9d238ab00d7d7b778a0619061a8cbce4c
diff --git a/net-proxy/nutcracker/files/nutcracker-0.2.4-use-system-libyaml.patch b/net-proxy/nutcracker/files/nutcracker-0.2.4-use-system-libyaml.patch
deleted file mode 100644
index 5cf7b3660bdf..000000000000
--- a/net-proxy/nutcracker/files/nutcracker-0.2.4-use-system-libyaml.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -uNr nutcracker-0.2.4.orig/Makefile.am nutcracker-0.2.4/Makefile.am
---- nutcracker-0.2.4.orig/Makefile.am	2013-09-11 10:11:19.869975912 -0400
-+++ nutcracker-0.2.4/Makefile.am	2013-09-11 10:11:36.709975757 -0400
-@@ -2,6 +2,6 @@
- 
- ACLOCAL_AMFLAGS = -I m4
- 
--SUBDIRS = contrib src
-+SUBDIRS = src
- 
- EXTRA_DIST = README.md NOTICE LICENSE ChangeLog conf scripts notes
-diff -uNr nutcracker-0.2.4.orig/src/Makefile.am nutcracker-0.2.4/src/Makefile.am
---- nutcracker-0.2.4.orig/src/Makefile.am	2013-09-11 10:16:16.449973187 -0400
-+++ nutcracker-0.2.4/src/Makefile.am	2013-09-11 10:16:44.019972934 -0400
-@@ -3,7 +3,6 @@
- AM_CPPFLAGS = -D_GNU_SOURCE -D_XOPEN_SOURCE
- AM_CPPFLAGS += -I $(top_srcdir)/src/hashkit
- AM_CPPFLAGS += -I $(top_srcdir)/src/proto
--AM_CPPFLAGS += -I $(top_srcdir)/contrib/yaml-0.1.4/include
- 
- AM_CFLAGS = -Wall -Wshadow
- AM_CFLAGS += -Wpointer-arith
-@@ -43,4 +42,3 @@
- 
- nutcracker_LDADD = $(top_builddir)/src/hashkit/libhashkit.a
- nutcracker_LDADD += $(top_builddir)/src/proto/libproto.a
--nutcracker_LDADD += $(top_builddir)/contrib/yaml-0.1.4/src/.libs/libyaml.a
-diff -uNr nutcracker-0.2.4.orig/configure.ac nutcracker-0.2.4/configure.ac
---- nutcracker-0.2.4.orig/configure.ac	2013-09-11 10:23:27.879969223 -0400
-+++ nutcracker-0.2.4/configure.ac	2013-09-11 10:24:28.729968664 -0400
-@@ -138,11 +138,7 @@
-   [AC_DEFINE([HAVE_STATS], [1], [Define to 1 if stats is not disabled])])
- AC_MSG_RESULT($disable_stats)
- 
--# Untar the yaml-0.1.4 in contrib/ before config.status is rerun
--AC_CONFIG_COMMANDS_PRE([tar xvfz contrib/yaml-0.1.4.tar.gz -C contrib])
--
--# Call yaml-0.1.4 ./configure recursively
--AC_CONFIG_SUBDIRS([contrib/yaml-0.1.4])
-+PKG_CHECK_MODULES([YAML], [yaml-0.1 >= 0.1])
- 
- # Define Makefiles
- AC_CONFIG_FILES([Makefile
-diff -uNr nutcracker-0.2.4.orig/src/Makefile.am nutcracker-0.2.4/src/Makefile.am
---- nutcracker-0.2.4.orig/src/Makefile.am	2013-09-11 10:23:27.879969223 -0400
-+++ nutcracker-0.2.4/src/Makefile.am	2013-09-11 10:26:16.549967674 -0400
-@@ -11,8 +11,9 @@
- AM_CFLAGS += -Wno-unused-parameter -Wno-unused-value
- AM_CFLAGS += -Wconversion -Wsign-compare
- AM_CFLAGS += -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations
-+AM_CFLAGS += $(YAML_CFLAGS)
- 
--AM_LDFLAGS = -lm -lpthread -rdynamic
-+AM_LDFLAGS = -lm -lpthread -rdynamic $(YAML_LIBS)
- 
- SUBDIRS = hashkit proto
- 
-@@ -40,5 +41,5 @@
- 	nc_queue.h			\
- 	nc.c
- 
--nutcracker_LDADD = $(top_builddir)/src/hashkit/libhashkit.a
-+nutcracker_LDADD = $(top_builddir)/src/hashkit/libhashkit.a 
- nutcracker_LDADD += $(top_builddir)/src/proto/libproto.a
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index 2520525bd538..f52a68bb9d5d 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -1,8 +1,11 @@
 AUX privoxy-3.0.28-strip.patch 1784 BLAKE2B 4f92d7a34a9023405cca813629bb9b200d802061c49d72c0aa413d16b3e714d723c4aba48640e050b0960559a0170bc688742deeb8bcd233eee96be0cfc1bb7b SHA512 78713e7bf1379a0e65c775e415e15ed140873cc48b388d46ce79a24acf64f5c777f1e0e489d912fa7bff8b6acc910fd074e0d755116e4e5d52194d483a30ed67
 AUX privoxy-3.0.29-gentoo.patch 4437 BLAKE2B 59578cd3df07a4d4e40e4b340a92fa174d0e492ef0352ae4456fc6715a3a171385306e3f3b2c9a441d3b28fda12b655bf6f397ba5b1c4e23878c1fe31dbc42c9 SHA512 779b998ecff335c48aaf7408a43ae4ef86486dae81a196ecc7cec72662eafcafb13d0b919c274387bc4217fce294582cef8bb1a697a67fe3dc64b797a786768b
+AUX privoxy-3.0.32-gentoo.patch 4309 BLAKE2B 609960b124bbd66d3246f071f93c43a552a48937b8c3540d2b0267845f64ce84d2daeefb0880895291b698f22660d86b2bb089621ccaf250a343b3b80dab1425 SHA512 fb6a0f4ea2b0d3ee22c605f25339c80a7b5448cd8cdfd3e7a50c825ddf6a887121771e475f1c17be4ba6fc5ac00b4524f3819e5ba6ae25e772fed68b3d879914
 AUX privoxy.initd-3 639 BLAKE2B 69d935e42ef4bf79868e0b457751b1dfb6a0b5805d19c74bdef007b54ad60adab784f98c4a9898306778cc41157f91b029978a6534aa00c0b00fcecdbc1ca11f SHA512 0bfd7ab2e42c4905f2542a4dbd93cf30d15a8808d527e6bcb6b14f75de226c94c0e0dea6ff69bbac37d3da605acfa2035e2d0e9fe0a41d7beb33cfea5ed2340b
 AUX privoxy.logrotate 191 BLAKE2B 587f6211d4938481a1dac77b79a1c32ea491c88514ed7dd42f1cdd7e2c344bfa1a4cde29010a5700f7a1847df1f91e9e59ffed45a386ba12a3cf29fac12a5488 SHA512 118caaeac3aba751584c5bdfc737bf5bfeddf1a62fda1f44bcd4654ae2e33183bc1ce6fc66d4a1bdd79766e42e669b1615a6d46d528a1bd49cabdf98385a3bb9
 AUX privoxy.service 248 BLAKE2B 4b39a4a55af8557458d3d087ab335431b39eb156bc5a3d32979627608f2a3926b2459822c827d557a86c20da5c8c6291941eb01db9adc7fb458e913672d574a0 SHA512 0f3484f06521a66b984fda7238f175a135b22fa5a00dc0c8caadd380d21bfecdae7a6c8d2c0d9a4a3c2858539913722be2b7d4fddd17ea2c95f4e151c3f74ca0
 DIST privoxy-3.0.31-stable-src.tar.gz 1839901 BLAKE2B 08564fb8de37d334844de10dfecc39b3f10cee996b3931be4e2d7e33eccd7ec115d7487353496de0fd645fc76ea237aa907eda2fb7fa8aad14050280fc083cc7 SHA512 0bea9973ac22e594a959452390c8612605dbf1fd55151632d35ecc7fe0ef9ca87cc1694a8bcb0511467445ec414b721b9d33651d917b2a8083768d8905ec68ed
+DIST privoxy-3.0.32-stable-src.tar.gz 1834528 BLAKE2B c846dada5fd34b80be9f7a75dc4177f3907241f6cf28b4120929687523d449d73b6a78bfe73f0a1086fbb3a8388103beb1e5a62becdffa24bf57d34cbb6cda56 SHA512 da41c0045bf593219df64718645eff984b5df43737811cc0fa12fce7e8ae1ab59eefbe20f23d6ce8f62216cfd81f1a9c319688d15693c25eed36010f3e1d5ffd
 EBUILD privoxy-3.0.31.ebuild 3974 BLAKE2B eea99412188d5fc31970baef82cf1397ab1cc763a6db4c6eb83fd50e55cd5afd2a0c72e4e2413c6f1b75216f30222cb4d50e28ae0a33bbacfd7ae056a59c8e23 SHA512 b0f1165f1817316ff2abb43b01f73d79f514648ba74bffba9de720fd69b9ccb1a9283c91f94759503210471a69c793da7cdf45f4186c588cd37cacb18cd91042
+EBUILD privoxy-3.0.32.ebuild 4005 BLAKE2B 1b12add7f2cceb804331609079b82f56feb5b477c69ab17dc3797bdf84bc2c50fd2376254305996924e2e110909e76ab63f3eb50e11b44fe9aa43f6888944a80 SHA512 02e6768bdb9266f0ed6d905f9f90a6a8e6af47d4063579fae0cab846982a150b23df94da5ab8131ff3bfe54ebf44a0225cca8524c2c2215fcb875a9c4f214047
 MISC metadata.xml 2796 BLAKE2B 2da7f1b6b5cbdd5a175d017b579b902fee758821b49e5d5cdc172f0b85fa41accd90c571e447867aa6324f1913b3fea90e2d9d9d981640ebe99735a5dabbd6ac SHA512 d1452008357be66b661c500f9f352afb94c1c221a3afbaa3e6b27d3e576232259ee50ea81890119d7c8dda153a3587f3de0f732fe097f4097293b06736ab921b
diff --git a/net-proxy/privoxy/files/privoxy-3.0.32-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.32-gentoo.patch
new file mode 100644
index 000000000000..4199b6e2a9cf
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.32-gentoo.patch
@@ -0,0 +1,121 @@
+diff --git a/GNUmakefile.in b/GNUmakefile.in
+index fcd44c4f..8cf2364a 100644
+--- a/GNUmakefile.in
++++ b/GNUmakefile.in
+@@ -62,8 +62,8 @@ MAN_DIR      = @mandir@
+ MAN_DEST     = $(MAN_DIR)/man8
+ MAN_PAGE     = privoxy.8
+ 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
+ 
+@@ -892,8 +892,6 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
+ 		$(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) LICENSE.GPLv3 $(DESTDIR)$$DOC;\
+ 		$(INSTALL) $(INSTALL_T) README $(DESTDIR)$$DOC;\
+ 		$(INSTALL) $(INSTALL_T) ChangeLog $(DESTDIR)$$DOC;\
+ 		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $(DESTDIR)$$DOC;\
+@@ -964,34 +962,8 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
+ 	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 "$(DESTDIR)$(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.in | \
+diff --git a/config b/config
+index da6d6b75..aefb55e1 100644
+--- a/config
++++ b/config
+@@ -259,7 +259,7 @@
+ #
+ #      No trailing "/", please.
+ #
+-confdir .
++confdir /etc/privoxy
+ #
+ #  2.2. templdir
+ #  ==============
+@@ -344,7 +344,7 @@ confdir .
+ #
+ #      No trailing "/", please.
+ #
+-logdir .
++logdir /var/log/privoxy
+ #
+ #  2.5. actionsfile
+ #  =================
+@@ -478,7 +478,7 @@ filterfile user.filter      # User customizations
+ #      require additional software to do it. For details, please
+ #      refer to the documentation for your operating system.
+ #
+-logfile logfile
++logfile privoxy.log
+ #
+ #  2.8. trustfile
+ #  ===============
+diff --git a/default.action.master b/default.action.master
+index 632984eb..8338431c 100644
+--- a/default.action.master
++++ b/default.action.master
+@@ -559,7 +559,7 @@ allow-ads   = -block -filter{banners-by-size} -filter{banners-by-link}
+ +client-header-tagger{image-requests} \
+ +client-header-tagger{range-requests} \
+ +hide-from-header{block} \
+-+set-image-blocker{pattern} \
+++set-image-blocker{blank} \
+ }
+ standard.Cautious
+ 
+@@ -582,7 +582,7 @@ standard.Cautious
+ +hide-from-header{block} \
+ +hide-referrer{conditional-block} \
+ +session-cookies-only \
+-+set-image-blocker{pattern} \
+++set-image-blocker{blank} \
+ }
+ standard.Medium
+ 
+@@ -622,7 +622,7 @@ standard.Medium
+ +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.32.ebuild b/net-proxy/privoxy/privoxy-3.0.32.ebuild
new file mode 100644
index 000000000000..18fa1136373c
--- /dev/null
+++ b/net-proxy/privoxy/privoxy-3.0.32.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd toolchain-funcs
+
+[ "${PV##*_}" = "beta" ] &&
+	PRIVOXY_STATUS="beta" ||
+	PRIVOXY_STATUS="stable"
+
+HOMEPAGE="https://www.privoxy.org https://sourceforge.net/projects/ijbswa/"
+DESCRIPTION="A web proxy with advanced filtering capabilities for enhancing privacy"
+SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"
+
+IUSE="+acl brotli client-tags compression editor extended-host-patterns
+extended-statistics external-filters +fast-redirects +force fuzz
+graceful-termination +image-blocking ipv6 lfs +mbedtls openssl
+png-images selinux ssl +stats +threads toggle tools whitelists
++zlib"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="GPL-2+"
+
+DEPEND="
+	acct-group/privoxy
+	acct-user/privoxy
+	dev-libs/libpcre
+	brotli? ( app-arch/brotli )
+	ssl? (
+		mbedtls? ( net-libs/mbedtls )
+		openssl? ( dev-libs/openssl )
+	)
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}
+	extended-host-patterns? ( dev-lang/perl )
+	selinux? ( sec-policy/selinux-privoxy )
+	tools? (
+		net-misc/curl
+		dev-lang/perl
+	)
+"
+REQUIRED_USE="
+	client-tags? ( threads )
+	toggle? ( editor )
+	compression? ( zlib )
+	brotli? ( zlib )
+	fuzz? ( zlib )
+	ssl? ( ^^ ( mbedtls openssl ) threads )
+"
+
+S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.32-gentoo.patch
+	"${FILESDIR}"/${PN}-3.0.28-strip.patch
+)
+
+pkg_pretend() {
+	if ! use threads; then
+		ewarn
+		ewarn "Privoxy may be very slow without threads support, consider to enable them."
+		ewarn "See also https://www.privoxy.org/faq/trouble.html#GENTOO-RICERS"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	sed -i "s|/p\.p/|/config.privoxy.org/|g" tools/privoxy-regression-test.pl || die
+
+	# autoreconf needs to be called even if we don't modify any autotools source files
+	# See main makefile
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--without-mbedtls --without-openssl"
+	if use ssl; then
+		myconf="$(use_with mbedtls) $(use_with openssl)"
+	fi
+
+	# --with-debug only enables debug CFLAGS
+	# --with-docbook and --with-db2html and their deps are useless,
+	#	since docs are already pregenerated in the source tarball
+	econf \
+		--sysconfdir=/etc/privoxy \
+		--enable-dynamic-pcre \
+		--without-assertions \
+		--with-user=privoxy \
+		--with-group=privoxy \
+		$(use_enable acl acl-support) \
+		$(use_enable compression) \
+		$(use_enable client-tags) \
+		$(use_enable editor) \
+		$(use_enable extended-host-patterns pcre-host-patterns) \
+		$(use_enable extended-statistics) \
+		$(use_enable fast-redirects) \
+		$(use_enable force) \
+		$(use_enable fuzz) \
+		$(use_enable graceful-termination) \
+		$(use_enable image-blocking) \
+		$(use_enable ipv6 ipv6-support) \
+		$(use_enable kernel_FreeBSD accept-filter) \
+		$(use_enable lfs large-file-support) \
+		$(use_enable png-images no-gifs) \
+		$(use_enable stats) \
+		$(use_enable threads pthread) \
+		$(use_enable toggle) \
+		$(use_enable whitelists trust-files) \
+		$(use_enable zlib) \
+		$(use_with brotli) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/privoxy.initd-3" privoxy
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/privoxy.logrotate" privoxy
+
+	diropts -m 0750 -g privoxy -o privoxy
+	keepdir /var/log/privoxy
+
+	use extended-host-patterns && newbin tools/url-pattern-translator.pl privoxy-url-pattern-translator.pl
+	if use tools; then
+		dobin tools/{privoxy-log-parser.pl,privoxy-regression-test.pl}
+		newbin tools/uagen.pl privoxy-uagen.pl
+	fi
+
+	rmdir "${ED}/var/run" || die
+	chown privoxy:root "${ED}/etc/privoxy" || die
+}
+
+pkg_postinst() {
+	if use extended-host-patterns; then
+		ewarn
+		ewarn "You enabled extended-host-patterns, now you *must* convert all action files in"
+		ewarn "PCRE-compatible format, or privoxy will fail to start. Helper tool"
+		ewarn "privoxy-url-pattern-translator.pl is available."
+		ewarn
+	fi
+}
diff --git a/net-proxy/shadowsocks-libev/Manifest b/net-proxy/shadowsocks-libev/Manifest
index 06f777248acb..cc2e247cbb3b 100644
--- a/net-proxy/shadowsocks-libev/Manifest
+++ b/net-proxy/shadowsocks-libev/Manifest
@@ -1,4 +1,3 @@
-AUX shadowsocks-libev-3.3.4-gcc10.patch 498 BLAKE2B 71bf107f6f285dbfe635475ddc8f2505624a90b22cd9b162a14a7138f3977563749fc2b3c5a1e189bd3a66bdbabdd62ea3d1c14c75d5c3f0f0ea38fe5ed7d9a7 SHA512 a5fd48927aec46d998227035a55cbcc706c305c0b9d00a4916e44c10d30f2783cb5e1d644ee1861f484b5dae60486783efa38ee9475af9ee42c57b0868ee6d66
 AUX shadowsocks.initd 1413 BLAKE2B 0a60cc154df3c26326d684fd3a9dbcc7beae50e2a8cb290e4caff013a338ef4fcf493be4be010573750f56c4bd9f339f3f0a98a506480fa2928dc6cb7e67ef8e SHA512 8edf2b09ee8fb48e2236447c640342132a188313956f10df73535c740934d5a610e2fd1b618b6822802d4fc7f3244933242434a0966ec2b4f8e3c4132caa3d43
 AUX shadowsocks.json 132 BLAKE2B 84f0dbdf0a7eb5d1c8d8ca26147b5dde872a78b128357fa4d3d1348afdc4bd3bdd87f73c564d030e9cdc19a0e5fe2d414a5430f2daeddd03c0a24b761460596a SHA512 6bc5c406bdb25123fd43e21784028dd331f729bc56fe7ac4d31e3b1d81d12048a6906db3fd79765a64fc7f8b651095695fd8cdcc60f6d3285231e94a90611cef
 DIST shadowsocks-libev-3.3.5.tar.gz 303368 BLAKE2B bb7d6e64596710402db94085044c20315028395723828fa82dfba419bc41a0c740ece1f79c6cf05dda395d9442d553429f66d7f7b2de3cdd188d5b6adb0b8edf SHA512 c0cc869b4b7661ebd348bd5559c6a17c44b66a5f42374d97023adcfb525d934da3ed96245ff792ebc74870d30dd8f71fadcd89c79b2cd8a98d551ff7592508d0
diff --git a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-3.3.4-gcc10.patch b/net-proxy/shadowsocks-libev/files/shadowsocks-libev-3.3.4-gcc10.patch
deleted file mode 100644
index 7a480f12b240..000000000000
--- a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-3.3.4-gcc10.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/http.h b/src/http.h
-index 914815a..e312dd3 100644
---- a/src/http.h
-+++ b/src/http.h
-@@ -29,6 +29,6 @@
- #include <stdio.h>
- #include "protocol.h"
- 
--const protocol_t *const http_protocol;
-+extern const protocol_t *const http_protocol;
- 
- #endif
-diff --git a/src/tls.h b/src/tls.h
-index 3998913..ddbee11 100644
---- a/src/tls.h
-+++ b/src/tls.h
-@@ -28,6 +28,6 @@
- 
- #include "protocol.h"
- 
--const protocol_t *const tls_protocol;
-+extern const protocol_t *const tls_protocol;
- 
- #endif
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index 2c32774dcab4..515194ff5c6c 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -1,9 +1,6 @@
 AUX tinyproxy-1.10.0.initd 855 BLAKE2B 4bd9a260a930958ea449a08edce1f9e8633429a5222a3ea7254b4bdc03808c5f9f87d9b33556f345e305d28e155834b33ff2a952c041af582cae3bedbae2034d SHA512 cd440ed686e8128ed46441ca29da8376c4d28e9e34ae9b85c18eb2f1681d60c0c04b79401a7368f917eeab6768965d6c867d0ac6578a7858557c11b356446c02
 AUX tinyproxy-1.10.0.service 181 BLAKE2B 1e5c14f607d0c54d215a6ffe5656bac288e48ca809aca67b658bb13917869e5203d66730f52670fb9030dd9f6cf249d09f357bbdd143436f6b358377d8f78036 SHA512 7721b986326f82b03d79983be33047fdf4b37b5c63992645a321bf8bd3edea63680a2bf81b2d51fbeab2a5884773a0598dba14f9d597d3db0eea7c7f6b4c79d3
-AUX tinyproxy.service 172 BLAKE2B d2e6199bfee2bac52e08d4c5506131f19e2630ebe1d9ed12f71d575cef37454c229e9e08b1fc89d9e26052a1192913289ed3602d69686d6894eb68b8639e7a5a SHA512 4c4cd36a7e34d9ee27c05475b72d1b61f90592ccb44c9deb96a1375bb681b7901702f078ed24b7c633074c83e450275a4a66829f3b270f75fc786a50d1ef393f
 AUX tinyproxy.tmpfiles.conf 48 BLAKE2B f2cd35878580eb198920f5db8493e3e266b4325160a9590a0b59bef1cf0577d0129bb636d99442cdb2154b444a8cdc1c6d01b4850b57df774be00338c61902e4 SHA512 24440cdaed0af6cbdb191acb1769e0a17871ef95e03e62a6621a413a2616e5d90d748d909bb5d18c029b25d7bf91485dbe46ee11e8703a1cb9008be470536715
-DIST tinyproxy-1.10.0.tar.xz 176060 BLAKE2B 58f9b443c731de6b74d689a80ebd422d3b6f51f643546ee144b37fb3262725246f6a5fa1015267a94f192f8715eaf71ffc078ead75e6225a210f58ec28ee8fcf SHA512 8d82598c5f9c89bc672f4632139ac52696d5c7788963de51688a8aeb576c69004f8338fe1e1897bf704a21dfd25ab1effb092003b6afaa9a88c2b5d0608310f5
 DIST tinyproxy-1.11.0-rc1.tar.xz 176732 BLAKE2B a448c90b17a8d3256aec1dba4307e9bce87ac421a67486e4987afbf22e49041971138f09e98a4a775cc05071b73b4f1b34e652eb2c0992b2a5fa1861a0df26b2 SHA512 e1d05777072d178c66d1f007163bcb4b3a0b1dfdf460881daaf962b5f1c0d0213ec5403bf50c161d811f46c8b50a476cd534f535962ec01b70fbb955471c1af1
-EBUILD tinyproxy-1.10.0-r1.ebuild 1653 BLAKE2B 30ee264b5f273c6a9902f2c9680acfe46fbddabe2e826d9255f4a9b9e210a08c37cd619e5b78a7b2d59a45e73685b7ac758dcce13d349a5c4788e2555d8bc2e2 SHA512 7c4606f12aa17a36dee5bcc4561f7fd0e5d104f646d1347f3de37abc9b7f8c788a3f0be6907b4fa58916cea4c2778851299396e9d1b2cd6c377a4690469ac2d8
 EBUILD tinyproxy-1.11.0_rc1.ebuild 1719 BLAKE2B b8a013fc7c996cca345f688f89f0017cbd8d3eb2eb6e62ad1f0ec9b2419a834c901dc45e68f2963906025870d76eb42b4f4fddf4fb8eb483319bca85608fd4aa SHA512 131ae575e82b52f495286c34b5accc8ed3902a83d91ed3d6ad159848ef2fc5e005d7ec06bd8afb0e296ae9294dbb519ea3d6e167eb7082606556342b962aa3e6
 MISC metadata.xml 562 BLAKE2B db41afc703d1338c10ef24e682a96b5a945bc80fd4a4e798fa7e74fdfbb9b1b8449a9126b8506e60524e733fc4810a1499e1320e565840798f8bea4722d46380 SHA512 ade2407ef37db41cef982bee16d02621813899fff1c4c3eaa00dd7517af254def7ecf08f508a1e873eaf5d2843df22154272bf58f84954e512614107d333805c
diff --git a/net-proxy/tinyproxy/files/tinyproxy.service b/net-proxy/tinyproxy/files/tinyproxy.service
deleted file mode 100644
index 4d860df76938..000000000000
--- a/net-proxy/tinyproxy/files/tinyproxy.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Tinyproxy Web Proxy Server
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/tinyproxy -d -c /etc/tinyproxy.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild b/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild
deleted file mode 100644
index 8bca4032ebe2..000000000000
--- a/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd tmpfiles user
-
-DESCRIPTION="A lightweight HTTP/SSL proxy"
-HOMEPAGE="https://github.com/tinyproxy/tinyproxy/"
-SRC_URI="https://github.com/tinyproxy/tinyproxy/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~sparc x86"
-
-IUSE="test debug +filter-proxy reverse-proxy transparent-proxy
-+upstream-proxy +xtinyproxy-header"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( xtinyproxy-header )"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} "" "" "" ${PN}
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s|nobody|${PN}|g" \
-		etc/${PN}.conf.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable filter-proxy filter) \
-		$(use_enable reverse-proxy reverse) \
-		$(use_enable transparent-proxy transparent) \
-		$(use_enable upstream-proxy upstream) \
-		$(use_enable xtinyproxy-header xtinyproxy) \
-		--localstatedir=/var
-}
-
-src_test() {
-	# The make check target does not run the test suite
-	emake test
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	diropts -m0775 -o ${PN} -g ${PN}
-	keepdir /var/log/${PN}
-
-	newinitd "${FILESDIR}"/${PN}-1.10.0.initd tinyproxy
-	systemd_newunit "${FILESDIR}"/${PN}-1.10.0.service tinyproxy.service
-	dotmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.tmpfiles.conf
-
-	elog "For filtering domains and URLs, enable filter option in the configuration"
-	elog "file and add them to the filter file (one domain or URL per line)."
-}