gentoo resync : 30.09.2020

18 files changed, 290 insertions, 147 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 9484a87fcf82..6ce2afbb4c35 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/rejik/Manifest b/net-proxy/rejik/Manifest
index 9b1062ac9e14..fa82b8ea2e01 100644
--- a/net-proxy/rejik/Manifest
+++ b/net-proxy/rejik/Manifest
@@ -1,4 +1,6 @@
 DIST banlists-2.x.x.tgz 116100 BLAKE2B 401d3cd995b7e2adcb28055c4f107799a87397a1ed06c698d70b2a4b755565759d7f56eb70a8d59a5ea04cdc51c6142d6bd03ebdd414133fd71792c66c5fe54e SHA512 068d01685e01679b2726da1cbc5f31f6aba54ab2194e8ab145bd2409e7fc71e3662445a8274b08746e5cdeadea2197f5a72a1abef98ec91267df851615b188b3
 DIST redirector-3.2.10.tgz 45407 BLAKE2B 735cab04b58d62a5772b2da540f1f358d20a1bf4612ab1d838066e9319bf28e3288a988e2fbebd5a7f7e6ad3912a59f3fadbed3bddf99b557ee562cd45779751 SHA512 6e82341e402b149464b048e763cfa6f7bc514bae48514b482eded9288af9705942fbfd2e11b5701d3540489ec5ccab358848108fe15f25c5ab2915e44f3f1033
-EBUILD rejik-3.2.10.ebuild 2321 BLAKE2B a1ba8d0b9de4bbf51f59cb772658fc83341001aa070d36b2456149e924d52ece8fe555094eb2bf1ebaa4dba37b9c4a1f2efcbd9a0d94cf06df2535eb79c7887c SHA512 5242e4266c01094dbd75e44ceee73292a07836d17cb586cf41c13c2af814d2d466d83db489d87c218c7c1491c18f419c3a287b4f1b186b2ccc5bcecd2c99b7ba
+DIST redirector-3.2.11.tgz 45758 BLAKE2B 39f83c8245d8a24c7454d40d607c851250bd9844f56ee8e9f43d64f32ac3cb52d9c1d9091e3d5126133d94fe59d5be8e8d99b7f2cb253c7731a73e344604a1ce SHA512 e4b20f11a46a84d47c8e6adc74f88f6092f9791e1b6050a3e3b4685cf4c510b55f32ea3d4c9a334dbe5753ee486b98ca73bb7e2d9854e2c8d299b7fd50fce2f8
+EBUILD rejik-3.2.10.ebuild 2290 BLAKE2B 3723f29be3740d3e937c8c1433f1bfb27b555c31a18a06c49443efa59c932670a4a3b9b11ddc385cc302f8de58535fdf03afbbca8d4b80cc328f7bc6bc394998 SHA512 1052da6d1d2bac007f11a39810dcd7d53aae659efd12312839d76ca65e113914cf598bff3f2d2c5ebb85718cc4cb5f63210cbe313a2bed474f5ef1a22143f307
+EBUILD rejik-3.2.11.ebuild 2374 BLAKE2B 14283a74cfef4686ecb0bb35d793376c9be59631be67515a86501d26f2b13fdb8c638b413e568bf99d187e0868cf1bf5a01f1724e0f9952bb9de5142ea020b92 SHA512 bcc318e80da39475396632e91dba1d3397af744d0659af43d67b0b4b3552f25141330b22506f0d9ba65b2a877d6e780d7dc63da6874e038e42ed4bda36b7527a
 MISC metadata.xml 345 BLAKE2B ced7a93f69f79d0f576c3249172a0557eca3002ba2b2c4bfeaed9f24d9bdce2e0cd10081ca67e96e3f2b944fe1a5c16bc2de4aba1a5ab14e274d89362be2089e SHA512 c45ec66f94f72f5a1faae645214953c4941e98e442625775fc25a2010345a31e61db086f1498344a64dd026764037a7a6d277655ab578ff32d7e9167d5eece57
diff --git a/net-proxy/rejik/rejik-3.2.10.ebuild b/net-proxy/rejik/rejik-3.2.10.ebuild
index 2c60bc8a830f..e566d009210b 100644
--- a/net-proxy/rejik/rejik-3.2.10.ebuild
+++ b/net-proxy/rejik/rejik-3.2.10.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A squid redirector used for blocking unwanted content"
 HOMEPAGE="https://rejik.ru/"
 SRC_URI="https://rejik.ru/download/redirector-${PV}.tgz
 	banlists? ( http://rejik.ru/download/banlists-2.x.x.tgz )"
+S="${WORKDIR}/redirector-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,25 +22,24 @@ RDEPEND="${DEPEND}
 	dev-perl/XML-Parser
 	net-proxy/squid"
 
-S=${WORKDIR}/redirector-${PV}
-
 src_prepare() {
-	sed -i -e "s:INSTALL_PATH=/usr/local/rejik3:INSTALL_PATH=${D}/opt/rejik:g" Makefile
-	sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" vars.h
-	sed -i -e "s:SQUID_USER=nobody:SQUID_USER=squid:g" Makefile
-	sed -i -e "s:SQUID_GROUP=nogroup:SQUID_GROUP=squid:g" Makefile
+	sed -i -e "s:INSTALL_PATH=/usr/local/rejik3:INSTALL_PATH=${ED}/opt/rejik:g" Makefile || die
+	sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" vars.h || die
+	sed -i -e "s:SQUID_USER=nobody:SQUID_USER=squid:g" Makefile || die
+	sed -i -e "s:SQUID_GROUP=nogroup:SQUID_GROUP=squid:g" Makefile || die
 	# Respect CFLAGS
-	sed -i -e "s:CC=gcc -Wall:CC=$(tc-getCC) $CFLAGS:" Makefile
+	sed -i -e "s;CC=gcc -Wall;CC=$(tc-getCC) $CFLAGS;" Makefile || die
 	# Respect LDFLAGS
-	sed -i -e "s:LIBS=-L/lib \`pcre-config --libs\`:LIBS=-L/lib \`pcre-config --libs\` $LDFLAGS:" Makefile
+	sed -i -e "s:LIBS=-L/lib \`pcre-config --libs\`:LIBS=-L/lib \`pcre-config --libs\` $LDFLAGS:" Makefile || die
 	#
-	sed -i -e "s:error_log /usr/local/rejik3:error_log /var/log/rejik:g" redirector.conf.dist
-	sed -i -e "s:change_log /usr/local/rejik3:change_log /var/log/rejik:g" redirector.conf.dist
-	sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" redirector.conf.dist
+	sed -i -e "s:error_log /usr/local/rejik3:error_log /var/log/rejik:g" redirector.conf.dist || die
+	sed -i -e "s:change_log /usr/local/rejik3:change_log /var/log/rejik:g" redirector.conf.dist || die
+	sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" redirector.conf.dist || die
+
+	default
 }
 
 src_install() {
-	dodir /opt/rejik
 	exeinto /opt/rejik
 	insinto /opt/rejik
 
@@ -47,13 +47,9 @@ src_install() {
 	doexe redirector
 	doins redirector.conf.dist
 
-	dodir /opt/rejik/tools
 	insinto /opt/rejik/tools
 	exeinto /opt/rejik/tools
 
-	fperms +x tools/kill-cache
-	fperms +x tools/benchmark
-
 	doexe tools/kill-cache
 	doexe tools/benchmark
 	doins tools/IN.gz
@@ -79,6 +75,6 @@ pkg_postinst() {
 	einfo "redirect_program /opt/rejik/redirector /opt/rejik/redirector.conf"
 	einfo "to /etc/squid/squid.conf"
 	einfo ""
-	einfo "Dont forget to edit /opt/rejik/redirector.conf"
+	einfo "Don't forget to edit /opt/rejik/redirector.conf"
 	einfo "Be sure redirector.conf has right permissions"
 }
diff --git a/net-proxy/rejik/rejik-3.2.11.ebuild b/net-proxy/rejik/rejik-3.2.11.ebuild
new file mode 100644
index 000000000000..da5a1a17a739
--- /dev/null
+++ b/net-proxy/rejik/rejik-3.2.11.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A squid redirector used for blocking unwanted content"
+HOMEPAGE="https://rejik.ru/"
+SRC_URI="https://rejik.ru/download/redirector-${PV}.tgz
+	banlists? ( http://rejik.ru/download/banlists-2.x.x.tgz )"
+S="${WORKDIR}/redirector-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="banlists"
+
+DEPEND="dev-libs/libpcre"
+RDEPEND="${DEPEND}
+	dev-perl/Text-Iconv
+	dev-perl/XML-Parser
+	net-proxy/squid"
+
+src_prepare() {
+	# Workaround for GCC 10 failure, bug #706766
+	append-cflags -fcommon
+
+	sed -i -e "s:INSTALL_PATH=/usr/local/rejik3:INSTALL_PATH=${ED}/opt/rejik:g" Makefile || die
+	sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" vars.h || die
+	sed -i -e "s:SQUID_USER=nobody:SQUID_USER=squid:g" Makefile || die
+	sed -i -e "s:SQUID_GROUP=nogroup:SQUID_GROUP=squid:g" Makefile || die
+	# Respect CFLAGS
+	sed -i -e "s;CC=gcc -Wall;CC=$(tc-getCC) $CFLAGS;" Makefile || die
+	# Respect LDFLAGS
+	sed -i -e "s:LIBS=-L/lib \`pcre-config --libs\`:LIBS=-L/lib \`pcre-config --libs\` $LDFLAGS:" Makefile || die
+	#
+	sed -i -e "s:error_log /usr/local/rejik3:error_log /var/log/rejik:g" redirector.conf.dist || die
+	sed -i -e "s:change_log /usr/local/rejik3:change_log /var/log/rejik:g" redirector.conf.dist || die
+	sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" redirector.conf.dist || die
+
+	default
+}
+
+src_install() {
+	exeinto /opt/rejik
+	insinto /opt/rejik
+
+	doexe make-cache
+	doexe redirector
+	doins redirector.conf.dist
+
+	insinto /opt/rejik/tools
+	exeinto /opt/rejik/tools
+
+	doexe tools/kill-cache
+	doexe tools/benchmark
+	doins tools/IN.gz
+
+	fowners -R squid:squid /opt/rejik
+	fperms 750 /opt/rejik
+
+	keepdir /var/log/rejik
+	fowners -R squid:squid /var/log/rejik
+
+	if use banlists; then
+		insinto /opt/rejik
+		doins -r "${WORKDIR}/banlists"
+	fi
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "Copy /opt/rejik/redirector.conf.dist to /opt/rejik/redirector.conf and add line"
+	einfo "for squid 3.*"
+	einfo "url_rewrite_program /opt/rejik/redirector /opt/rejik/redirector.conf "
+	einfo "for squid 2.*"
+	einfo "redirect_program /opt/rejik/redirector /opt/rejik/redirector.conf"
+	einfo "to /etc/squid/squid.conf"
+	einfo ""
+	einfo "Don't forget to edit /opt/rejik/redirector.conf"
+	einfo "Be sure redirector.conf has right permissions"
+}
diff --git a/net-proxy/shadowsocks-libev/Manifest b/net-proxy/shadowsocks-libev/Manifest
index dc7ab5a30665..760c3c73d1f3 100644
--- a/net-proxy/shadowsocks-libev/Manifest
+++ b/net-proxy/shadowsocks-libev/Manifest
@@ -1,10 +1,8 @@
 AUX shadowsocks-libev-3.3.4-gcc10.patch 498 BLAKE2B 71bf107f6f285dbfe635475ddc8f2505624a90b22cd9b162a14a7138f3977563749fc2b3c5a1e189bd3a66bdbabdd62ea3d1c14c75d5c3f0f0ea38fe5ed7d9a7 SHA512 a5fd48927aec46d998227035a55cbcc706c305c0b9d00a4916e44c10d30f2783cb5e1d644ee1861f484b5dae60486783efa38ee9475af9ee42c57b0868ee6d66
-AUX shadowsocks-libev-local_at.service 246 BLAKE2B 65bb1410be1812a8a3b5a81f1bb19bce33dd7da2d2c9a924ee41c7aa44fcfd6f24f8449c6d7222bff0b9d3b0c66cb5413e7dc62be70515228ffb914bbd7e5670 SHA512 77154a67f86894f0cde6bed737ecb537fc5cfb12b517ebbc4b9f1d210daf28e9f2bcb7d1795500d31c00aed5a3a16603d65d4c241d2d7d71fddde0de0dae883b
-AUX shadowsocks-libev-redir_at.service 257 BLAKE2B 308ff3d3e2a06208ae681322f6fecc4589e81416ec6f4b694b377f1a40b348076c673d05f7fbfa64ee7805cd91cc305b33c87da30620bfc37148a11df5f7aa3d SHA512 a94924c85f29ef0886f2dd72fc983974fffab7955d2a008154f080d04fb5e93354f73af0ba7817c8b14348428256a261b79e0712f5ae89d81fe95ecfb728e063
-AUX shadowsocks-libev-server_at.service 247 BLAKE2B cce6eb70b580f3f0918755956249a1ced7a0e771a46f345fb82ce793c132c60ee14cd3a9e3a864d564d32e9ba56330cd58718f4f7b163b751244a2b6f7f5c7ca SHA512 6d271d8fac26c697307c18f0a2637624b2c45c619340fa61850704a3cc716758c11743f249d38be4ae344bd8d872eefe6e8cb700b0b6b9183c650bc600f8e0c6
-AUX shadowsocks-libev-tunnel_at.service 259 BLAKE2B 6881120dd27e057046aaa081811de85f64b8b57e02badce7f34984be008b86053eb3912a3e84be821b450c184700bc5d8c393970ee32c5288108fbb72953582d SHA512 d68d5d0f96ba8269d5ea93e8c429936de35929592e7716eb1752e5604bd46fc92e417a2e89d0fd5e4bcd195c0cd2ac7f501c6f43776459fc8d4447fc44821c32
-AUX shadowsocks.initd 1349 BLAKE2B ec1f4bd395803c6a23ff16c6040ecfe70eae2aa840f056ebf035898485cdfb84d9207bda49c1f4c5f3ee18c51b46b706fb73bd6b4d52b7cc1fecb1930ff72ad6 SHA512 1c3d09c8a949aa70896591f1f0bd59e9729c37d9888ef6afaf0e23ea1da50ee9a75a724d81e035a609ece390e6b723db9047f1524ff71de3d9b9267c00cb08c1
+AUX shadowsocks.initd 1413 BLAKE2B 0a60cc154df3c26326d684fd3a9dbcc7beae50e2a8cb290e4caff013a338ef4fcf493be4be010573750f56c4bd9f339f3f0a98a506480fa2928dc6cb7e67ef8e SHA512 8edf2b09ee8fb48e2236447c640342132a188313956f10df73535c740934d5a610e2fd1b618b6822802d4fc7f3244933242434a0966ec2b4f8e3c4132caa3d43
 AUX shadowsocks.json 132 BLAKE2B 84f0dbdf0a7eb5d1c8d8ca26147b5dde872a78b128357fa4d3d1348afdc4bd3bdd87f73c564d030e9cdc19a0e5fe2d414a5430f2daeddd03c0a24b761460596a SHA512 6bc5c406bdb25123fd43e21784028dd331f729bc56fe7ac4d31e3b1d81d12048a6906db3fd79765a64fc7f8b651095695fd8cdcc60f6d3285231e94a90611cef
 DIST shadowsocks-libev-3.3.4.tar.gz 279666 BLAKE2B ea698a3cf29ed0b1268d17e25a492712cb90f515068de2f74d200ab04bb0d5ca859ea1d7f071714cc1c8dced0e566df4bfea0d780e24c9398f93ab1e362ec466 SHA512 4fb9e4a62f86f1504aab71022b5078a1f97b1f14da82c7b456dc9eaed23be990430769f37b7c2855c266be40ec215237bb0a40d254dffac8556ec4719cc9aa6d
-EBUILD shadowsocks-libev-3.3.4.ebuild 2258 BLAKE2B 7c85cb1e414c15523b5642a5155eae972d256052eea9285ba382d53371f8b540a1aa9ddcf54634680240e70aacc6b43d4cbe871be2f0227c580b37bc63369723 SHA512 84bb6b4d5850cf814b5b43059c91e471f323e5f748b767d414a1065554f116d1fda1d3a39c616dae0788046f42e3d92fd6b49bee9307dea157da04544cfc53d4
+DIST shadowsocks-libev-3.3.5.tar.gz 303368 BLAKE2B bb7d6e64596710402db94085044c20315028395723828fa82dfba419bc41a0c740ece1f79c6cf05dda395d9442d553429f66d7f7b2de3cdd188d5b6adb0b8edf SHA512 c0cc869b4b7661ebd348bd5559c6a17c44b66a5f42374d97023adcfb525d934da3ed96245ff792ebc74870d30dd8f71fadcd89c79b2cd8a98d551ff7592508d0
+EBUILD shadowsocks-libev-3.3.4-r1.ebuild 2113 BLAKE2B ea3ceed1ffafba1200a5327998d95b9ad780564aba4d6370a9911aa09a22e8a4a12fff9f703dadb42d85d5b1d16c8b867198d975f9e0ab6b2cd63928c36a11b0 SHA512 69599842475134f0921fd40eb873d1c87ce731fd5c8d0ef98e63ee6e3ed2e6fe119af029d46f229ed381875619e00a106b30a14688f64f8cde65fec06c2a9eb4
+EBUILD shadowsocks-libev-3.3.5.ebuild 1989 BLAKE2B bd3f5c9965126c7216b3cf2b225415ccf70e626f1503e6e97e94a63eaf6589c9b0bf781ffa68b559b9cee92e7859dc818e7f470ea1d27616d7841baadbd5c78d SHA512 81c2e55f5c2b04f60f3e94d3150651b0ac3a26e80dad7f56c626b056496ea53a07243a9d4e2d994ab2f5a5e6371921090bf91b01f9450f156e1bf57423f8d25b
 MISC metadata.xml 334 BLAKE2B 1217232e3b08c238795607fa0281c81feb34ed794005d1e5c1522b3380a9d1f3877ccf787ab88ee95a4cd4db85a11163395e4a3a449d4a862634e5a8cdfbe0e2 SHA512 a1e5349204ad41815cdf8772c760c0e1085749863c71d30fddfa8958d8c6d388575288da4dcd60acdaf00288b5a52a731aa21512a1c7ef9622fd0b2de162086f
diff --git a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-local_at.service b/net-proxy/shadowsocks-libev/files/shadowsocks-libev-local_at.service
deleted file mode 100644
index af137178380f..000000000000
--- a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-local_at.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Shadowsocks-Libev Client Service for %I
-After=network.target
-
-[Service]
-Type=simple
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/ss-local -c /etc/shadowsocks-libev/%i.json
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-redir_at.service b/net-proxy/shadowsocks-libev/files/shadowsocks-libev-redir_at.service
deleted file mode 100644
index 1ced8f454408..000000000000
--- a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-redir_at.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Shadowsocks-Libev Client Service Redir Mode for %I
-After=network.target
-
-[Service]
-Type=simple
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/ss-redir -c /etc/shadowsocks-libev/%i.json
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-server_at.service b/net-proxy/shadowsocks-libev/files/shadowsocks-libev-server_at.service
deleted file mode 100644
index 58d934bdb1d1..000000000000
--- a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-server_at.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Shadowsocks-Libev Server Service for %I
-After=network.target
-
-[Service]
-Type=simple
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/ss-server -c /etc/shadowsocks-libev/%i.json
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-tunnel_at.service b/net-proxy/shadowsocks-libev/files/shadowsocks-libev-tunnel_at.service
deleted file mode 100644
index 24b31d5a1cd9..000000000000
--- a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-tunnel_at.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Shadowsocks-Libev Client Service Tunnel Mode for %I
-After=network.target
-
-[Service]
-Type=simple
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/ss-tunnel -c /etc/shadowsocks-libev/%i.json
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-proxy/shadowsocks-libev/files/shadowsocks.initd b/net-proxy/shadowsocks-libev/files/shadowsocks.initd
index 2ccd114485bb..994ba23e3b8b 100644
--- a/net-proxy/shadowsocks-libev/files/shadowsocks.initd
+++ b/net-proxy/shadowsocks-libev/files/shadowsocks.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 SS_CONFIG="/etc/shadowsocks-libev/shadowsocks.json"
@@ -49,13 +49,16 @@ start() {
 
     ebegin "Starting Shadowsocks: ${SS_SVCNAME} mode"
     start-stop-daemon --start --exec ${SS_COMMAND} \
-    -- -c ${SS_CONFIG} -f ${SS_PIDFILE} >/dev/null 2>&1 &
+	--user nobody --group nobody \
+	-- -c ${SS_CONFIG} -f ${SS_PIDFILE} >/dev/null 2>&1 &
     eend $?
 }
 
 stop() {
     ebegin "Stopping Shadowsocks"
-    start-stop-daemon --stop --pidfile ${SS_PIDFILE}
+    start-stop-daemon --stop \
+	--user nobody --group nobody \
+	--pidfile ${SS_PIDFILE}
     eend $?
 }
 
diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4-r1.ebuild
index 353791fc2639..e10f0e72b1ac 100644
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4.ebuild
+++ b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4-r1.ebuild
@@ -40,8 +40,10 @@ PATCHES=(
 	"${FILESDIR}/${P}-gcc10.patch"
 )
 src_prepare() {
-	sed -i 's|AC_CONFIG_FILES(\[libbloom/Makefile libcork/Makefile libipset/Makefile\])||' \
+	sed -i -e 's|AC_CONFIG_FILES(\[libbloom/Makefile libcork/Makefile libipset/Makefile\])||' \
 		configure.ac || die
+	sed -i -e "/\[Service\]/a\\User=nobody" \
+		debian/shadowsocks-libev*.service || die
 	default
 	eautoreconf
 }
@@ -71,10 +73,9 @@ src_install() {
 
 	dodoc -r acl
 
-	systemd_newunit "${FILESDIR}/${PN}-local_at.service" "${PN}-local@.service"
-	systemd_newunit "${FILESDIR}/${PN}-server_at.service" "${PN}-server@.service"
-	systemd_newunit "${FILESDIR}/${PN}-redir_at.service" "${PN}-redir@.service"
-	systemd_newunit "${FILESDIR}/${PN}-tunnel_at.service" "${PN}-tunnel@.service"
+	for i in debian/${PN}*.service; do
+		systemd_newunit $i $(basename $i)
+	done
 }
 
 pkg_setup() {
diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.5.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.5.ebuild
new file mode 100644
index 000000000000..5349e2ab8407
--- /dev/null
+++ b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="v${PV}"
+inherit autotools eutils systemd
+
+DESCRIPTION="A lightweight secured SOCKS5 proxy for embedded devices and low end boxes"
+HOMEPAGE="https://github.com/shadowsocks/shadowsocks-libev"
+
+#repack with git submodule populated: libbloom, libcork, libipset
+#SRC_URI="https://dev.gentoo.org/~dlan/distfiles/${P}.tar.xz"
+
+SRC_URI="https://github.com/shadowsocks/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug doc"
+
+RDEPEND="net-libs/mbedtls:=
+	>=net-libs/libbloom-1.6
+	net-libs/libcork
+	net-libs/libcorkipset
+	>=dev-libs/libsodium-1.0.8:=
+	dev-libs/libev
+	net-dns/c-ares
+	dev-libs/libpcre
+	"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)
+	"
+
+src_prepare() {
+	sed -i -e 's|AC_CONFIG_FILES(\[libbloom/Makefile libcork/Makefile libipset/Makefile\])||' \
+		configure.ac || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="
+		$(use_enable debug assert)
+		--enable-system-shared-lib
+	"
+	use doc || myconf+="--disable-documentation"
+	econf ${myconf}
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	insinto "/etc/${PN}"
+	newins "${FILESDIR}/shadowsocks.json" shadowsocks.json
+
+	newinitd "${FILESDIR}/shadowsocks.initd" shadowsocks
+	dosym shadowsocks /etc/init.d/shadowsocks.server
+	dosym shadowsocks /etc/init.d/shadowsocks.client
+	dosym shadowsocks /etc/init.d/shadowsocks.redir
+	dosym shadowsocks /etc/init.d/shadowsocks.tunnel
+
+	dodoc -r acl
+
+	for i in debian/${PN}*.service; do
+		systemd_newunit $i $(basename $i)
+	done
+}
+
+pkg_setup() {
+	elog "You need to choose the mode"
+	elog "  server: rc-update add shadowsocks.server default"
+	elog "  client: rc-update add shadowsocks.client default"
+	elog "  redir:  rc-update add shadowsocks.redir default"
+	elog "  tunnel: rc-update add shadowsocks.tunnel default"
+}
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index e368e0bb39c4..635e5fb38f34 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -3,5 +3,7 @@ AUX tinyproxy-1.10.0.service 181 BLAKE2B 1e5c14f607d0c54d215a6ffe5656bac288e48ca
 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 1722 BLAKE2B 5bbb0718f57f8b690aa7f309f4ed23225e75613a1ff3bf831ca86d466ee0370a4e82874db0b85c41bf2200aa65b72e681c4808f29767dbae61eebde5268dfc76 SHA512 d1c350ece4642aed0ceaf1c449a4a286e701b030b03d546b3865d6d32fcd2468316a1c8eba2a74e604b6ec21bd53498f10148f00d5de71937f3e66ad1580ff13
 MISC metadata.xml 562 BLAKE2B db41afc703d1338c10ef24e682a96b5a945bc80fd4a4e798fa7e74fdfbb9b1b8449a9126b8506e60524e733fc4810a1499e1320e565840798f8bea4722d46380 SHA512 ade2407ef37db41cef982bee16d02621813899fff1c4c3eaa00dd7517af254def7ecf08f508a1e873eaf5d2843df22154272bf58f84954e512614107d333805c
diff --git a/net-proxy/tinyproxy/tinyproxy-1.11.0_rc1.ebuild b/net-proxy/tinyproxy/tinyproxy-1.11.0_rc1.ebuild
new file mode 100644
index 000000000000..7c0e27a1928d
--- /dev/null
+++ b/net-proxy/tinyproxy/tinyproxy-1.11.0_rc1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd tmpfiles
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A lightweight HTTP/SSL proxy"
+HOMEPAGE="https://github.com/tinyproxy/tinyproxy/"
+SRC_URI="https://github.com/tinyproxy/tinyproxy/releases/download/${MY_PV}/${PN}-${MY_PV}.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 )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+DEPEND="
+	acct-group/tinyproxy
+	acct-user/tinyproxy
+"
+
+RDEPEND="${DEPEND}"
+
+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)."
+}
diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index 4fc038e5da07..362f7675b855 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1,7 +1,5 @@
-AUX trojan.initd 753 BLAKE2B a0dab04f6abe08a00bfcf4e8eb2f7c2f1368e346c485d5ccec40f9aeb798ee9e3b838ac06b98d252a9823f3ad96d798fec193791c042c041b49999cd0e46fa08 SHA512 73e84faa009436215793a39e19f5664bc7b1ddcd9d82a205b98ff16378f13cfc1dfb4380ab58804cbae988b7796b51149c11c4cd227ee0e4b15a6ca68e888b7f
-DIST trojan-1.15.1.tar.gz 48121 BLAKE2B 38f288d8b9a6c7a98ada85b6b2dd2448604f54068334380c2e6b49d6ee015a1fad2847747734ef1e670d201d9625e64859ccddde5b924ea09c4e87e206997431 SHA512 5e0dfb46116b9de54f5d4e6d0646ab5ba3746143c5ad0f275c894929ba7fc840cacb187e514bbfaa770f0651fc4d3ff9e662f648f515a972ddf72ad0e93d616f
+AUX trojan.initd 981 BLAKE2B fd66aa23bed621362d28d27125388de413dc554180283337f49feacbab3f2bae8b28409b0c2e8d980ff79d1082ac0a56657bb7d089262c99658afba0f3d28eff SHA512 d6c79b5705da095173e6a590d128d77d68036e20916ce17144d6889d45ccb9cf5422665a22f192019e0624d60998dfd077587c2ebc2f7b0d4078e33113a8a462
 DIST trojan-1.16.0.tar.gz 51669 BLAKE2B 9238f9886820ca3625a894ac8de1e199e238029593634436f3aa529d5c576f2636d5183b64a2e6155a888fe8f45629c94625f02119fbfb4ada01b1bd9e502fcf SHA512 60aa8539731eee6f15cbcb18b20b45435fc2dfe439a2f67fe9770257c3b6ffe219efe376cfd909f748d523a18645c96f6859b8487cacaba04ac7d93cf762f153
-EBUILD trojan-1.15.1.ebuild 1318 BLAKE2B 82970b3afbef707e54a9f4612a8632edff3ecbcece6658537e6930a65eee8aadee14e413436f123108949c50378a41f4e88dc718e272fb8157bd11e1df144adc SHA512 fb2938164b0be2248b0143d6d3b67ea434aa973e72bda6bdc1a0dbfc3edb7844ebdd05004183306c21c26336bf9187022283ccf9e6d13be2ef55fc3b9e7e958f
-EBUILD trojan-1.16.0.ebuild 1318 BLAKE2B 82970b3afbef707e54a9f4612a8632edff3ecbcece6658537e6930a65eee8aadee14e413436f123108949c50378a41f4e88dc718e272fb8157bd11e1df144adc SHA512 fb2938164b0be2248b0143d6d3b67ea434aa973e72bda6bdc1a0dbfc3edb7844ebdd05004183306c21c26336bf9187022283ccf9e6d13be2ef55fc3b9e7e958f
+EBUILD trojan-1.16.0-r1.ebuild 1318 BLAKE2B 82970b3afbef707e54a9f4612a8632edff3ecbcece6658537e6930a65eee8aadee14e413436f123108949c50378a41f4e88dc718e272fb8157bd11e1df144adc SHA512 fb2938164b0be2248b0143d6d3b67ea434aa973e72bda6bdc1a0dbfc3edb7844ebdd05004183306c21c26336bf9187022283ccf9e6d13be2ef55fc3b9e7e958f
 EBUILD trojan-9999.ebuild 1276 BLAKE2B b8163baf4c01ecbc56fe1f3c541b47d8f6c9c73a89fcb254a3411780bda12bfa9d3bf750f6929762f8cccb6956b20af2de262ba3220b7bf9a519e1202263c628 SHA512 76ec4e382c7def17b21715b4e9745c67998f88272418beef495c8c3351c0fcfbc57bda966ecb9ca1543823bcb8a9e650117ea8ac180a7b1d893ddaec568dcdfa
 MISC metadata.xml 1124 BLAKE2B 0d11d3625f824da33597ff489cb1170cac018279c80ce230c0b0233c7bc1e19a279adbea4f2aa9d83077ac8359d37714326dddb3c8f7f8503dbc9e17857a08d5 SHA512 2c912d390ff5483dc5458ff887958e259bdd6897754a3374d5d978729b692d0fc99768bd12975dc6c9e44b4080046914d9f55bc67045f68e792e2712cc513f30
diff --git a/net-proxy/trojan/files/trojan.initd b/net-proxy/trojan/files/trojan.initd
index 2990245430db..348d307c5264 100644
--- a/net-proxy/trojan/files/trojan.initd
+++ b/net-proxy/trojan/files/trojan.initd
@@ -2,6 +2,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+TJ_USER=nobody
+TJ_GROUP=nobody
+
 TJ_NAME=${SVCNAME##*.}
 if [ -n "${TJ_NAME}" -a "${SVCNAME}" != "trojan" ]; then
 	TJ_PIDFILE="/run/trojan.${TJ_NAME}.pid"
@@ -19,15 +22,19 @@ depend() {
 
 start() {
 	ebegin "Starting Trojan, Log File: ${TJ_LOG}"
-	start-stop-daemon --start -b \
-		-1 "${TJ_LOG}" -2 "${TJ_LOG}" \
-		-m -p "${TJ_PIDFILE}" \
+	checkpath -f -m 0600 -o ${TJ_USER}:${TJ_GROUP} "${TJ_LOG}"
+	start-stop-daemon --start --background \
+		--user ${TJ_USER} --group ${TJ_GROUP} \
+		--stdout "${TJ_LOG}" --stderr "${TJ_LOG}" \
+		--make-pidfile --pidfile "${TJ_PIDFILE}" \
 		--exec /usr/bin/trojan  -- "${TJ_CONFIG}"
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Trojan"
-	start-stop-daemon --stop -p "${TJ_PIDFILE}"
+	start-stop-daemon --stop \
+		--user ${TJ_USER} --group ${TJ_GROUP} \
+		--pidfile "${TJ_PIDFILE}"
 	eend $?
 }
diff --git a/net-proxy/trojan/trojan-1.15.1.ebuild b/net-proxy/trojan/trojan-1.16.0-r1.ebuild
index 21f494f1364d..21f494f1364d 100644
--- a/net-proxy/trojan/trojan-1.15.1.ebuild
+++ b/net-proxy/trojan/trojan-1.16.0-r1.ebuild
diff --git a/net-proxy/trojan/trojan-1.16.0.ebuild b/net-proxy/trojan/trojan-1.16.0.ebuild
deleted file mode 100644
index 21f494f1364d..000000000000
--- a/net-proxy/trojan/trojan-1.16.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake python-any-r1 systemd
-
-DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
-HOMEPAGE="https://github.com/trojan-gfw/trojan"
-SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="mysql test"
-
-# Some hiccups setting up local network server.
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/boost-1.66.0:=
-	dev-libs/openssl:0=
-	mysql? ( dev-db/mysql-connector-c:= )
-"
-DEPEND="${RDEPEND}
-	test? ( net-misc/curl ${PYTHON_DEPS} )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_MYSQL=$(usex mysql)
-		-DSYSTEMD_SERVICE=ON
-		-DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	newinitd "${FILESDIR}/trojan.initd" trojan
-}
-
-src_test() {
-	cmake_src_test -j1
-}
-
-pkg_postinst() {
-	elog "Running Trojan with multi instances"
-	elog ""
-
-	elog "Prepare /etc/trojan/\${blah}.json first"
-	elog "Config with Openrc"
-	elog "   ln -s /etc/init.d/trojan{,.\${blah}}"
-	elog "   rc-update add trojan.\${blah} default"
-	elog ""
-	elog "Config with Systemd"
-	elog "   systemctl enable trojan.\${blah}"
-	elog ""
-}