gentoo resync : 28.04.2019

15 files changed, 39 insertions, 381 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index d790349a2e62..11fd8a901a14 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 8ec829293973..13da759532cd 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -8,9 +8,9 @@ DIST haproxy-1.7.11.tar.gz 1752129 BLAKE2B 1947ab837f6b81761eec931e97c7349462561
 DIST haproxy-1.8.13.tar.gz 2063046 BLAKE2B 9ebccf2520719cdf209bc9a87bf28d015b5b673e0d017d5387af4025f930ac401f6a2cfa851583ffe6b6645b7b91ad255bb5db737688a1f310958072a11c8a80 SHA512 54d4cb0721a3868267d7e085b3d3bb050384e4279eb49e88abb925bb3ea8cc39ef9069bdc99b7b18a23fd22e0d29e24dfcb8a0507ddca9243a845e4418be9cc5
 DIST haproxy-1.8.18.tar.gz 2080500 BLAKE2B fcc51fbe6c496dbf99e49add4b582ec9357c94daebaea6396e131b4e6f323fdcc11d40039b9de9b6e2762c46863a1efd5062524df3d42991eef73ae3a42a9787 SHA512 7bcdc8fd110bb77fa3b1f735474218fb766b7701b87e939249697cb780aedf039b3d8f59cbfb5fa271473ad789df4ac60a64cbb6c61330e1125a13676ad25fc0
 DIST haproxy-1.8.19.tar.gz 2080757 BLAKE2B 46a97620f3b5c3f205e8b9d6e49acca8e107a1e6918ac18c036b9c3408666348400f8d9f6f4a4103e7f206c6373b25a224536c0969e2dad1013c2320b07b0ced SHA512 f62b0a18f19295986d26c5c60b6b1ad55850a175bed67a359282cc37a4c630a0c2be51d608226b4316f2e69c3008c20a1cb91ce10f86311219355973a050e65b
-DIST haproxy-1.8.8.tar.gz 2054534 BLAKE2B 5eabd37dfb79783dc20425cbb16ca1e1afed23861f66c9e8a738dd56d9ca35b3ceb2604c308543ca99222aa867e11ff613fc09012669882a4bdaaff03cb76450 SHA512 8310f84b364348600273c295a3b315a79cba1f782b86b47d8d47b3ffd1e6fb62fd278c4f2dfa185d0a269f73c1067695a763733736877989a941162b625462a1
 DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd
-DIST haproxy-1.9.4.tar.gz 2357935 BLAKE2B 761118da39742eff07e3bc2772a9318a6aaddbeb706e684afa619a11e4a6f1e91f35212b22b58474334621daaec160a4f9183a65698343a4fbb64d9cb38ad049 SHA512 804baeb0493bfaedce59f04a5c7eedd703aec11fbfc9744c6d3f642e3200a5fccbfc92d9da9555a2b266534b9cd5bb81308c57c7627512b951e5a83cb1b24cb0
+DIST haproxy-1.9.6.tar.gz 2363063 BLAKE2B b3ccf1b7f9d82144b42f2ee5db7b4367a380d3d8d14145ed097b5329831fb9c9454023c04c3e542d9591e377f5f9c4e0630801414ce44b950b99718a971d88af SHA512 3b823005f02d035435838689ddbf50c4fd9fc14af20450c413526cda7a29eb01ee01f68d6867545ebf966235688eedeeb3d00f5e6011727486d53e881d8e73b6
+DIST haproxy-1.9.7.tar.gz 2373430 BLAKE2B 604eb99a15baa885c8956871a418b99a8ad1f6a08a9afb3d9c423ecf1d5dd0ba77e312bb325b09ede6471b1663619b77a2d9c25d66b52274f6c904bf1fa5ca85 SHA512 3a901849fa4db15676e22dd11f8309a810fcfc38519d1e8488c1e3cd8341c82dccbfe3b083c37920a0d04d5c8b7fa7a2f0910e488693c2e8ffda1511a307bc09
 EBUILD haproxy-1.6.11-r2.ebuild 4672 BLAKE2B 74b3adb390a7fa1d596e8e91f4ca5fbb46d7dfd201527956a514a3f0855f575b2fc1115b388126d8e54a1a80f13b5b62acb59f53eb92a5bd9ef3f02ab3867c38 SHA512 843c39796ab641d5036dc2f1d151da41acc5820713dd2c2857c551d684b0a5922abead4e9c2afb031bb75635842e9ead645ced6d9cebfa97ccc2f719caed8c58
 EBUILD haproxy-1.6.14.ebuild 4608 BLAKE2B d85f4160498f8af8fcc05ccdbe68d771b9d8b5cc71412be2c7430cf769c091f75030d678bf29f56d3bbb432c04f26fd45686333c8b2e282c25ae2dee7eceeb00 SHA512 32ae8badac30ea423613301815c4ccb07a6b81368dc92dc561f13d7432cde041048735cc4790659b4f1827a77e7009120e7977a54a15d164229a41d54d1b1e1b
 EBUILD haproxy-1.7.10.ebuild 4628 BLAKE2B 267e5228e4c1eb2386ab13a6f21d018e8f8643d9adcdb61851d150b281e2241eda97c701b4577fef8feee00c01409f8f2fc715a9681874fc05fc3f89c09da440 SHA512 941f9c3e0982ee44d51339b3feef43d93c7259413f2d77f8919e63056a0d0504468bd0637965141842af6c8dbb223f23155ffc0728f54bc1bbf539eef678c235
@@ -18,8 +18,8 @@ EBUILD haproxy-1.7.11.ebuild 4632 BLAKE2B 06dd613111ce7410ce9190b2cbd825f4b9acd1
 EBUILD haproxy-1.8.13.ebuild 4886 BLAKE2B 61bc37ea42b0dd5bc447b68cb45532c184f14ad40461faddb940e041682e88ac81af36ce44d961d1011bc54b788ad9baa4c9447950a97708ea33dcb9d677fc32 SHA512 5dad241368a64aba2b07e429ab82adff67df556fc2b5a447d4863a12d50098545127f30725887b447e6ed583e39177458267777c5b321636211aab5a61b85a65
 EBUILD haproxy-1.8.18.ebuild 4886 BLAKE2B 94d1654d71261f4d4e3d4984cf2afae1721c3f5d85f5caec1f7ba7be2a2f3c0889a2de02fd542b18f8a2fe0222debfd35f47c3fdcde0cbb8122dc493fec021a5 SHA512 a006987c4cf8f56bca0347537cf86e9282d5f0b5cb1864665104d1e93da53084711bac338dce99b1f6cdccfa1fec7534dc58cb7139c126fcc3b6131d371b7dce
 EBUILD haproxy-1.8.19.ebuild 4886 BLAKE2B 94d1654d71261f4d4e3d4984cf2afae1721c3f5d85f5caec1f7ba7be2a2f3c0889a2de02fd542b18f8a2fe0222debfd35f47c3fdcde0cbb8122dc493fec021a5 SHA512 a006987c4cf8f56bca0347537cf86e9282d5f0b5cb1864665104d1e93da53084711bac338dce99b1f6cdccfa1fec7534dc58cb7139c126fcc3b6131d371b7dce
-EBUILD haproxy-1.8.8.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
 EBUILD haproxy-1.8.9.ebuild 4885 BLAKE2B beb86eb5714d77b8dad4ac0abc55b46a0e4727ceae1a503ff1febe3943f6393f8ce99f97c098e4046c17de04a32c4f9d0a8708fd4c81eeb69e82f900f156285a SHA512 93290df98b67334d2c89ced563d15d25943a5c87c691fdce2ace423ca38acc364f9307f8a28a6654fb390d41c72ec627e005d0179d10138d92396365496ab8b8
-EBUILD haproxy-1.9.4.ebuild 4999 BLAKE2B 068dd442f30c7b815164143fbc33a7bd390d0684a68b3096dde76b31e68cccf662a33589180a81006794e1e0a477dbb6ec9c62faa002ec56beda02bc0d3b062e SHA512 56bd202b4c16c9ddd2e2aa13eeb953e5a00b3975e5427ba7d02db2d78ab7f71857a13b3122cae77fc3b7c33cb58c12a48220b408ebca57622f47b7d497395aff
-EBUILD haproxy-1.9.9999.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
+EBUILD haproxy-1.9.6-r1.ebuild 5017 BLAKE2B 233cbeaa89b0a689b27b2e134d2b47afd6ea06ac0b69adbe700ac4fd3e6fb32bfc98c297518a95c3cb56d1c26b201680e7aab5261cee0b3c83cd60c112e25286 SHA512 8f03e430049386fc115c9d62ca1b5d8ae2d060d45abcea72ccd81d5fb51063525bbc9eb16d1fe88e7afd81c9add9c9c1ecb4efd13fda431db48620125b11ce08
+EBUILD haproxy-1.9.7.ebuild 5017 BLAKE2B 233cbeaa89b0a689b27b2e134d2b47afd6ea06ac0b69adbe700ac4fd3e6fb32bfc98c297518a95c3cb56d1c26b201680e7aab5261cee0b3c83cd60c112e25286 SHA512 8f03e430049386fc115c9d62ca1b5d8ae2d060d45abcea72ccd81d5fb51063525bbc9eb16d1fe88e7afd81c9add9c9c1ecb4efd13fda431db48620125b11ce08
+EBUILD haproxy-1.9.9999.ebuild 5017 BLAKE2B 233cbeaa89b0a689b27b2e134d2b47afd6ea06ac0b69adbe700ac4fd3e6fb32bfc98c297518a95c3cb56d1c26b201680e7aab5261cee0b3c83cd60c112e25286 SHA512 8f03e430049386fc115c9d62ca1b5d8ae2d060d45abcea72ccd81d5fb51063525bbc9eb16d1fe88e7afd81c9add9c9c1ecb4efd13fda431db48620125b11ce08
 MISC metadata.xml 2071 BLAKE2B 303b68ae0788743ec5a8d893e69a87fd2d22188b2166f75c23cd2a47c06e69bfe43745016fafd64b5b298f7b56453fcbfb6b4d9bfede1e08e0c603bce7b0955f SHA512 4ac7fd3dcae2293fa3cdb54fba7dfd9cfbc28f5fca33442dd970861ca26672a0b21d825d36099fbf234831a403fb41eabe02d48eca2a971eaef857516427394b
diff --git a/net-proxy/haproxy/haproxy-1.9.4.ebuild b/net-proxy/haproxy/haproxy-1.9.6-r1.ebuild
index 2212a12930ac..ca0db852190f 100644
--- a/net-proxy/haproxy/haproxy-1.9.4.ebuild
+++ b/net-proxy/haproxy/haproxy-1.9.6-r1.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
+inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
 DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://www.haproxy.org"
 if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc ~x86"
 else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
 	EGIT_BRANCH=master
 fi
 
@@ -52,9 +52,9 @@ S="${WORKDIR}/${MY_P}"
 DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
 CONTRIBS=( halog iprange )
 # ip6range is present in 1.6, but broken.
-version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
+ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
 # TODO: mod_defender - requires apache / APR, modsecurity - the same
-version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
+ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack )
 
 haproxy_use() {
 	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
@@ -86,6 +86,8 @@ src_compile() {
 	args+=( $(haproxy_use net_ns NS) )
 	args+=( $(haproxy_use pcre PCRE) )
 	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
 	args+=( $(haproxy_use ssl OPENSSL) )
 	args+=( $(haproxy_use slz SLZ) )
 	args+=( $(haproxy_use zlib ZLIB) )
diff --git a/net-proxy/haproxy/haproxy-1.8.8.ebuild b/net-proxy/haproxy/haproxy-1.9.7.ebuild
index 44131da836d2..ca0db852190f 100644
--- a/net-proxy/haproxy/haproxy-1.8.8.ebuild
+++ b/net-proxy/haproxy/haproxy-1.9.7.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
+inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
 DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://www.haproxy.org"
 if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc ~x86"
 else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
 	EGIT_BRANCH=master
 fi
 
@@ -52,9 +52,9 @@ S="${WORKDIR}/${MY_P}"
 DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
 CONTRIBS=( halog iprange )
 # ip6range is present in 1.6, but broken.
-version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
+ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
 # TODO: mod_defender - requires apache / APR, modsecurity - the same
-version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
+ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack )
 
 haproxy_use() {
 	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
@@ -74,6 +74,7 @@ pkg_setup() {
 
 src_compile() {
 	local -a args=(
+		V=1
 		TARGET=linux2628
 		USE_GETADDRINFO=1
 		USE_TFO=1
@@ -85,6 +86,8 @@ src_compile() {
 	args+=( $(haproxy_use net_ns NS) )
 	args+=( $(haproxy_use pcre PCRE) )
 	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
 	args+=( $(haproxy_use ssl OPENSSL) )
 	args+=( $(haproxy_use slz SLZ) )
 	args+=( $(haproxy_use zlib ZLIB) )
@@ -102,8 +105,9 @@ src_compile() {
 
 	if use tools ; then
 		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
 			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
 		done
 	fi
 }
diff --git a/net-proxy/haproxy/haproxy-1.9.9999.ebuild b/net-proxy/haproxy/haproxy-1.9.9999.ebuild
index 44131da836d2..ca0db852190f 100644
--- a/net-proxy/haproxy/haproxy-1.9.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-1.9.9999.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
+inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
 DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://www.haproxy.org"
 if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc ~x86"
 else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
 	EGIT_BRANCH=master
 fi
 
@@ -52,9 +52,9 @@ S="${WORKDIR}/${MY_P}"
 DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
 CONTRIBS=( halog iprange )
 # ip6range is present in 1.6, but broken.
-version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
+ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
 # TODO: mod_defender - requires apache / APR, modsecurity - the same
-version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
+ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack )
 
 haproxy_use() {
 	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
@@ -74,6 +74,7 @@ pkg_setup() {
 
 src_compile() {
 	local -a args=(
+		V=1
 		TARGET=linux2628
 		USE_GETADDRINFO=1
 		USE_TFO=1
@@ -85,6 +86,8 @@ src_compile() {
 	args+=( $(haproxy_use net_ns NS) )
 	args+=( $(haproxy_use pcre PCRE) )
 	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
 	args+=( $(haproxy_use ssl OPENSSL) )
 	args+=( $(haproxy_use slz SLZ) )
 	args+=( $(haproxy_use zlib ZLIB) )
@@ -102,8 +105,9 @@ src_compile() {
 
 	if use tools ; then
 		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
 			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
 		done
 	fi
 }
diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index e53e562976ff..85d74032a3ff 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1,4 +1,4 @@
 AUX trojan.initd 542 BLAKE2B 2e5597381353f1aa8da392027b9a4179da08bb387a776f584bd508f9e7d20747317d78ed7506e97047eb809e0e9726f3f52a9f75a2aacf26d349ec8628b23acb SHA512 1e1f230c96c1d7f8c6f0dc23c40eb8895d004448d802c85d62b34e186bea964753e28e90978075dcbe9fbc2e73074564303f6e28cf12633e424230a2d415910e
 DIST trojan-1.10.0.tar.gz 38230 BLAKE2B 2cfa77ebfbae62edef983d1e57e3ce00a61118f6458cab353af60960e2586750fcd0c4237631481cfdfc8ed0ddad586e1d649046269c7e9177594869c187d8d1 SHA512 9d9a74218369f8094b292b8892e5f877ccec7d8912657491bb37da8e9ae4817f07a83fe401e33bbbdd2ac9c50c1440f3a021f93d85999b43df4849b0a04049cf
-EBUILD trojan-1.10.0.ebuild 1028 BLAKE2B 2ecbef8706b6f9243c073b9f3b87387c138a27fc0948d6b720e0d36150f9e615bf5320d350847757bd22e777889ded6e07a1b6916f680c6ca14113fe2072ffdf SHA512 577bd8b91b8ddef0f4eee215f30aa65f5245e70e3014ce1c6f6f441eb5ab2cf9633abf42c22e95e601e87b7c3ba4a428cbbe6de9a419bf61161abb782c1f559e
+EBUILD trojan-1.10.0.ebuild 1024 BLAKE2B 37744644fa8f9e38d54cdc08cbaf6174676e7b6fdc8521c62b403048fc827c62eb2fe8b9f611195a55463626d69835641c2245ebabf645dcfea46e185f2de662 SHA512 306cb838df2d05604940c1c519865829e3eb65a78e87df80b248cf93eb8d4628a69f65460cdf5e8537ef9f2622cae960bbfd0b4c82491fe369e477959283a118
 MISC metadata.xml 1023 BLAKE2B cea392d59eea944198e523e0dfdab0325180568d9f3f39e40fc7c94c43a1c8b9811e787da5174f4f0b85d932778b34dcf4a07afccc4cf02972de57e7a3004ad4 SHA512 b1a1a6bdb8ea7d62bce25a439753c85e5e340be804ac8a71a3fbbd4f671270c174f9db77b72c2d00cdc1ede7cea6f7a86d2401e6cb8c8f9e395573c9216dfa4b
diff --git a/net-proxy/trojan/trojan-1.10.0.ebuild b/net-proxy/trojan/trojan-1.10.0.ebuild
index fb823826e18d..cda661f9eaff 100644
--- a/net-proxy/trojan/trojan-1.10.0.ebuild
+++ b/net-proxy/trojan/trojan-1.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
 inherit cmake-utils python-any-r1 systemd
 
diff --git a/net-proxy/ufdbguard/Manifest b/net-proxy/ufdbguard/Manifest
deleted file mode 100644
index 313b99817ad8..000000000000
--- a/net-proxy/ufdbguard/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX ufdb.confd 558 BLAKE2B a1ddfe38ee6a3512084a0d645e8cd5741994688ff3887ddc9ff46e8991f2211d25567c9a075745785b6bb95c7f030c612ee1ae85ab4d8d841b3fd0c3615d8631 SHA512 1f010ae16ee196243b4515832fe8c1979c591b1a0f43368d6eeceda8348183f7e0c758eee403ef922276006cd8721d1b642fc08c0d46581c4912f6a6804d4ad5
-AUX ufdb.initd 1792 BLAKE2B fd5a6ddb41644a3ded774cee77cf12ff28b3cd86ec80d279d2655ce0c4e725c84519908b257f64606e5bf409d9ec08c3218c05562fb11ad2fb01499b4137ebd4 SHA512 3a4c8cd3f79242f46c3bb34019680db2502ff1d0c614814079dbba3cb9a0e6722727bb8ca23ceedd837d11b0a605b3d7612e0acb774d09c4c6579925da76c433
-AUX ufdb.initd.2 1510 BLAKE2B 3e936c7d0de84aec5fb5cea16bf07cba61770f072960f101801aef2858de74bb548cb680937924abf461f76633699301a0a5bf5d6b5d16bd3061afb5f32ef823 SHA512 aca83823cab027ae38a9e63f885c5ffecebf3c6352eeb672a90c92360168544691dfdb2a70b967b718856624a36435b0c9263693b4c7b90af06204f16ffe7309
-AUX ufdbUpdate.cron 351 BLAKE2B c84d40ec5ab80959b687498ae33e74094b814227bf5663bc77b933ac83a79d7a2a9f5c2ba459bf93823a05b48a30a43449f345bd4b459afa5427393d99524a34 SHA512 17a6b17e0bb1d6f0a80609d8341c6c803749d4d38f37f1bbc0ab01c5614d07fd3dae580222ed38825480bfeb74cb4af4f81448e843ab61f4044cf755602c3cf6
-AUX ufdbguard-1.24-gentoo.patch 536 BLAKE2B b13634ad226ca59d1d2a64349c958a0147b08b0b85d061ef35d21451c39264b8dd4a6c22667f0a88ee767ed59a249158d078b9aba1142b8a76bfb8deeaba134c SHA512 ddd39b4841d740df5102717dbe2eb41917e49d42338343f7f402e4049a5ab252841138541b7c659934d30cf9a31a7274bf226c108af80826b608fbc2e709f6e4
-DIST ufdbGuard-1.32.4.tar.gz 2499206 BLAKE2B 02070298cecdb93e189054d129235f391b7de94d1476f61b55cb7c1a38362b55817dfda1805d593a8939421889084135c3dfa7c3e72699d46667ad7263123aef SHA512 189cb67c533ab71ba1d3292a376d746e0565a3bf5de17f4407c5892ee24c20cd2574752bdcb08be19621a93114cc69a89767c581d531027ecbf6487ef3119d91
-DIST ufdbguard-1.32.4-manual.pdf 642626 BLAKE2B 335effd8443b005e4df067778bdbbd9fe2e4442009a8f59de70dec87aa265e3f134bed36006864bcea7381179d67619eeab6eb932815e3feb91e45fc492b3a89 SHA512 98444689c07da3ce9937675b45607ea88fc5a10c65051746cd821650788ec21cbc836a043a486de51813b85d836e255bb3a64a62252808dfe93310e6e169fdb1
-EBUILD ufdbguard-1.32.4.ebuild 3559 BLAKE2B 744cf557348cb26308432c4be64597684b09e1d0c17b182ca49e39856258ca0a7ead0fbdd07918cad036ecdc7b5e87981a5f5c30c624de82698bff32056ae0d1 SHA512 b73210979b0aa21293783ddf54b956ed4be257c89da4443fd3d887fb3b92931998da8456029e450c1f2e72230d398a91cec24ad432d3f909bd3b0965c2927c82
-MISC metadata.xml 766 BLAKE2B 89ce7f57ffc774db147a2f463f929466af5d2c5817d0839a7eb61ef8af7bb7c5bac883d0a5b7e3be0dba95c3be3b02ea65a63d2915d31ac6b3d23196090448eb SHA512 c01ba7f9fcea23fa66901809d2bef786ecf0ca6673d99ce082840d164a26870c388652ea6ba9764a62773c49f090a236824ae06f6bb36052ebb4767fef38edd9
diff --git a/net-proxy/ufdbguard/files/ufdb.confd b/net-proxy/ufdbguard/files/ufdb.confd
deleted file mode 100644
index 08c7e5f1a8fa..000000000000
--- a/net-proxy/ufdbguard/files/ufdb.confd
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- sh -*-
-
-# Tables to re-generate when starting or reloading ufdbguard
-UFDB_GT="alwaysallow alwaysdeny"
-
-# Options passed to ufdbGenTable when generating the tables listed in
-# UFDB_GT
-GENTABLE_OPTIONS="-W"
-
-# User under which to run ufdbguard; it should be the same as the
-# proxy server you're using, so by default it is squid.
-UFDB_USER="squid"
-
-# Options to pass to ufdbguardd; see /usr/libexec/ufdbguard/ufdbguardd
-# -h for a brief list.
-UFDB_OPTS=""
-
-# Options used by the modified ufdbUpdate script in Gentoo
-DOWNLOAD_USER=""
-DOWNLOAD_PASSWORD=""
diff --git a/net-proxy/ufdbguard/files/ufdb.initd b/net-proxy/ufdbguard/files/ufdb.initd
deleted file mode 100644
index e55c0e7d1a1e..000000000000
--- a/net-proxy/ufdbguard/files/ufdb.initd
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# reconfig is what the upstream documentation suggests, so let's
-# provide it for compatibility.
-extra_started_commands="reload reconfig"
-
-depend() {
-	need net
-	before squid
-	use logger
-}
-
-get_config() {
-	awk '$1 == "'$1'" { print $2 }' "/etc/ufdbGuard.conf"
-}
-
-gentables() {
-	local dbhome=$(get_config dbhome)
-
-	for gt in ${UFDB_GT} ; do
-		[ -f "${dbhome}/${gt}/domains" ] || continue
-
-		urls=
-		[ -f "${dbhome}/${gt}/urls" ] && urls="${dbhome}/${gt}/urls"
-
-		ebegin "Generating domainlist ${gt}"
-		ufdbGenTable ${GENTABLE_OPTIONS} -t "${gt}" -d "${dbhome}/${gt}/domains" ${urls:+-u "${urls}"}
-		eend $?
-	done
-}
-
-start() {
-	gentables
-
-    local logdir=$(get_config logdir)
-
-	if [ ! -d "${logdir}" ] ; then
-		mkdir -p ${logdir}
-		chown -R ${UFDB_USER} ${logdir}
-	fi
-
-	if [ ! -d /var/run/ufdbguardd ] ; then
-		mkdir -p /var/run/ufdbguard
-		chown -R ${UFDB_USER} /var/run/ufdbguard
-	fi
-
-	ebegin "Starting ufdbGuard"
-	start-stop-daemon --start \
-		--user ${UFDB_USER} \
-		--wait 1500 \
-		--exec /usr/libexec/ufdbguard/ufdbguardd \
-		--pidfile /var/run/ufdbguard/ufdbguardd.pid -- \
-		-c /etc/ufdbGuard.conf ${UFDB_OPTS}
-	eend $? "Failed to start ufdbGuard"
-}
-
-stop() {
-	ebegin "Stopping ufdbGuard"
-	start-stop-daemon --stop \
-		--exec /usr/libexec/ufdbguard/ufdbguardd \
-		--pidfile /var/run/ufdbguard/ufdbguardd.pid
-	eend $? "Failed to stop ufdbGuard"
-}
-
-reload() {
-	if ! [ -f /var/run/ufdbguard/ufdbguardd.pid ]; then
-		eerror "Unable to find PID file for ufdbguardd, was it just started?"
-		return 1
-	fi
-
-	gentables
-
-	ebegin "Reloading ufdbGuard"
-	kill -HUP "$(cat /var/run/ufdbguard/ufdbguardd.pid)"
-	eend $? "Failed to reload ufdbGuard"
-}
-
-reconfig() {
-	reload
-}
diff --git a/net-proxy/ufdbguard/files/ufdb.initd.2 b/net-proxy/ufdbguard/files/ufdb.initd.2
deleted file mode 100644
index 44a7f59026e0..000000000000
--- a/net-proxy/ufdbguard/files/ufdb.initd.2
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# reconfig is what the upstream documentation suggests, so let's
-# provide it for compatibility.
-extra_started_commands="reload reconfig"
-
-: ${configfile:=/etc/ufdbGuard.conf}
-
-pidfile=/var/run/ufdbguard/ufdbguardd.pid
-command=/usr/libexec/ufdbguard/ufdbguardd
-command_arguments="-c ${configfile} ${FUDB_OPTS}"
-
-start_stop_daemon_args="--user ${UFDB_USER} --wait 1500"
-
-name="ufdbGuard Daemon"
-
-depend() {
-	need localmount
-	before squid
-	use logger
-}
-
-get_config() {
-	# Okay this sounds silly, but it is important because the settings
-	# in ufdbGuard are quoted, so this unquotes them.
-	eval echo $(awk '$1 == "'$1'" { print $2 }' "${configfile}")
-}
-
-gentables() {
-	local dbhome=$(get_config dbhome)
-
-	for gt in ${UFDB_GT} ; do
-		[ -f "${dbhome}/${gt}/domains" ] || continue
-
-		urls=
-		[ -f "${dbhome}/${gt}/urls" ] && urls="${dbhome}/${gt}/urls"
-
-		ebegin "Generating domainlist ${gt}"
-		ufdbGenTable ${GENTABLE_OPTIONS} -t "${gt}" -d "${dbhome}/${gt}/domains" ${urls:+-u "${urls}"}
-		eend $?
-	done
-}
-
-start_pre() {
-	gentables
-
-	checkpath -d -m 0755 -o ${UFDB_USER} $(get_config logdir) "$(dirname "${pidfile}")"
-}
-
-reload() {
-	if ! [ -f ${pidfile} ]; then
-		eerror "Unable to find PID file for ufdbguardd, was it just started?"
-		return 1
-	fi
-
-	gentables
-
-	ebegin "Reloading ufdbGuard"
-	kill -HUP "$(cat ${pidfile})"
-	eend $? "Failed to reload ufdbGuard"
-}
-
-reconfig() {
-	reload
-}
diff --git a/net-proxy/ufdbguard/files/ufdbUpdate.cron b/net-proxy/ufdbguard/files/ufdbUpdate.cron
deleted file mode 100644
index f9147648c8b7..000000000000
--- a/net-proxy/ufdbguard/files/ufdbUpdate.cron
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# cron.daily file to update the ufdb database
-
-# Avoid doing anything if no download user is set in the configuration
-# file
-( . /etc/conf.d/ufdb ; [ -z "${DOWNLOAD_USER}" ]; ) && exit
-
-/usr/sbin/ufdbUpdate
-
-/etc/init.d/squid rotate
diff --git a/net-proxy/ufdbguard/files/ufdbguard-1.24-gentoo.patch b/net-proxy/ufdbguard/files/ufdbguard-1.24-gentoo.patch
deleted file mode 100644
index 63da98175a0e..000000000000
--- a/net-proxy/ufdbguard/files/ufdbguard-1.24-gentoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ufdbGuard-1.24/src/ufdbUpdate.in
-===================================================================
---- ufdbGuard-1.24.orig/src/ufdbUpdate.in
-+++ ufdbGuard-1.24/src/ufdbUpdate.in
-@@ -39,6 +39,8 @@ WGET_COMMAND="@WGET@"
- NOTIFY_UFDBGUARDD="yes"                 # send HUP signal to ufdbguardd
- SYSLOG_FACILITY="local6"                # errors/warnings in system log have this facility name
- 
-+source /etc/conf.d/ufdb
-+
- # end of user settings.
- # DO NOT EDIT ANYTHING BELOW THIS LINE.  ########################################
- 
diff --git a/net-proxy/ufdbguard/metadata.xml b/net-proxy/ufdbguard/metadata.xml
deleted file mode 100644
index 3914a0ffa999..000000000000
--- a/net-proxy/ufdbguard/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <longdescription>
-    The fastest URL filter with 25,000 URL verifications/sec to filter
-    unwanted web content. ufdbGuard is a redirector for the Squid
-    internet proxy.
-  </longdescription>
-  <use>
-    <flag name="httpd">
-      Build, install and start the provided mini-http daemon with the
-      redirect CGI integrated. Since there is no way to tell ufdbguard
-      to not start it, this is a build-time option.
-    </flag>
-    <flag name="doc">
-      Download and install the ufdbguard reference manual in PDF.
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">ufdbguard</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-proxy/ufdbguard/ufdbguard-1.32.4.ebuild b/net-proxy/ufdbguard/ufdbguard-1.32.4.ebuild
deleted file mode 100644
index 49efe94f7e60..000000000000
--- a/net-proxy/ufdbguard/ufdbguard-1.32.4.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic user
-
-MY_P="ufdbGuard-${PV}"
-
-DESCRIPTION="ufdbGuard is a redirector for the Squid internet proxy"
-HOMEPAGE="http://www.urlfilterdb.com/en/products/ufdbguard.html"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	doc? ( mirror://sourceforge/${PN}/${PV/\.?/}/ReferenceManual.pdf -> ${P}-manual.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +httpd"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	dev-libs/openssl:0=
-	net-misc/wget
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/openrc
-"
-
-DOCS=( CHANGELOG README src/sampleufdbGuard.conf )
-
-PATCHES=( "${FILESDIR}"/${PN}-1.24-gentoo.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup squid
-	enewuser squid -1 -1 /var/cache/squid squid
-}
-
-src_configure() {
-	# better safe than sorry, the code has a number of possible
-	# breakage, and at least one certain breakage.
-	append-flags -fno-strict-aliasing
-
-	econf \
-		--with-ufdb-user=squid \
-		--with-ufdb-config="${EPREFIX}"/etc \
-		--with-ufdb-bindir="${EPREFIX}"/usr/libexec/ufdbguard \
-		--with-ufdb-logdir="${EPREFIX}"/var/log/ufdbguard \
-		--with-ufdb-dbhome="${EPREFIX}"/usr/share/ufdbguard/blacklists \
-		--with-ufdb-images_dir="${EPREFIX}"/usr/share/ufdbguard/images
-}
-
-src_install() {
-	einstalldocs
-	doman doc/*.1
-
-	dobin src/ufdbAnalyse src/ufdbGenTable src/ufdbGrab \
-		src/ufdbConvertDB
-	dosbin src/ufdbUpdate
-
-	exeinto /usr/libexec/ufdbguard
-	doexe src/mtserver/ufdbguardd src/mtserver/ufdbgclient
-
-	if use httpd; then
-		exeinto /usr/libexec/ufdbguard
-		doexe src/ufdbhttpd
-	fi
-
-	keepdir /usr/share/ufdbguard/blacklists
-
-	insinto /etc
-	doins src/ufdbGuard.conf
-
-	insinto /usr/share/ufdbguard/images
-	doins -r src/images/.
-
-	newconfd "${FILESDIR}"/ufdb.confd ufdb
-	newinitd "${FILESDIR}"/ufdb.initd.2 ufdb
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/ufdbUpdate.cron ufdbUpdate
-
-	use doc && newdoc "${DISTDIR}"/${P}-manual.pdf ReferenceManual.pdf
-}
-
-pkg_postinst() {
-	elog "The default location for the blacklist database has been"
-	elog "moved to ${EROOT%/}/usr/share/ufdbguard/blacklists."
-	elog ""
-	elog "The configuration file is no longer configurable in the"
-	elog "service file, and now resides at ${EROOT%/}/etc/ufdbGuard.conf ."
-	elog ""
-	elog "The service script has been renamed from ufdbguad to simply"
-	elog "${EROOT%/}/etc/init.d/ufdb, to follow the official documentation, and"
-	elog "it gained a reload option with a reconfig alias."
-	elog ""
-	elog "You can configure the username and password parameters for"
-	elog "ufdbUpdate, to fetch the blacklist database provided by"
-	elog "URLfilterDB, directly in ${EROOT%/}/etc/conf.d/ufdb without touching"
-	elog "the script itself."
-	elog ""
-	elog "To enable ufdbguard in squid, you should add this to your"
-	elog "squid.conf:"
-	elog ""
-	elog "    url_rewrite_program ${EROOT%/}/usr/libexec/ufdbguard/ufdbgclient -l ${EROOT%/}/var/log/ufdbguard"
-	elog "    url_rewrite_children 64"
-	elog ""
-	if ! use httpd; then
-		elog "You chose to not install the lightweight http daemon that"
-		elog "comes with ufdbguard."
-	else
-		elog "The ufdb service will start both the ufdbguardd daemon and"
-		elog "the ufdbhttpd http daemon to provide a local redirect CGI."
-		elog "If you don't want this to happen, disable the httpd USE flag."
-	fi
-	if use doc; then
-		elog ""
-		elog "The reference manual has been installed as"
-		elog "    ${EROOT%/}/usr/share/doc/${PF}/ReferenceManual.pdf"
-	fi
-}