gentoo resync : 19.07.2019

12 files changed, 202 insertions, 72 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 95875d8ed92e..b9a3c23c8ee5 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 6537d8d29d82..9d2e172725af 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -13,6 +13,7 @@ DIST haproxy-1.9.6.tar.gz 2363063 BLAKE2B b3ccf1b7f9d82144b42f2ee5db7b4367a380d3
 DIST haproxy-1.9.7.tar.gz 2373430 BLAKE2B 604eb99a15baa885c8956871a418b99a8ad1f6a08a9afb3d9c423ecf1d5dd0ba77e312bb325b09ede6471b1663619b77a2d9c25d66b52274f6c904bf1fa5ca85 SHA512 3a901849fa4db15676e22dd11f8309a810fcfc38519d1e8488c1e3cd8341c82dccbfe3b083c37920a0d04d5c8b7fa7a2f0910e488693c2e8ffda1511a307bc09
 DIST haproxy-1.9.8.tar.gz 2376526 BLAKE2B b9c6a8dba6d5f4697e08eff5d80651b44d9f6e02fa3dd11b9e7fbcd622c8552971eb6f3b12d8cfcbcd075ab62c2b8c0b2f760807a7f5fe5c815c1b9bbf83f254 SHA512 c291bb25cb6163c789963d7e94ac8dd9bc4404f67937f4b2618e38baa1dbb8b6fa5a879a1b4348c86c0f4570e864afe77ec2498aad042bf6ff268c1b8b51780b
 DIST haproxy-2.0.1.tar.gz 2528926 BLAKE2B fc2dff3f62e5c5013804fb4ac2d85a34acf90d3251b645c1f02a50882910fa055e03b2bd211bafe36d9b23d806f13fad7762252e6210322a07ef1f72336c886c SHA512 bcc2c6fa1fe5699f110a2b2ce5abcec7f4ebff94a2850d731f6d86aadeb7f4048b6f372db6724a91191c2ecc2853f5ac576233e0ff84ffef3de6c80d1250f1b6
+DIST haproxy-2.0.2.tar.gz 2532693 BLAKE2B dcdf7900cabf4cd227f2b92d50c20253bc5bd3f9c3a37f78a89288f617c266489cb52eab369cb99e6ec4a79a34ccd7e4a2dd852d61b67ef3187aa3c70631ff67 SHA512 b41b9c0b33b4fdd0ba9e3a7a032e61dc18c046aa0f45bed5704488e0bdaba07a0660850c32720f2a90cc47cbfa8d6917fecdff0dce9f7acc349d184549d6d7a5
 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
@@ -26,5 +27,6 @@ EBUILD haproxy-1.9.7.ebuild 5017 BLAKE2B 233cbeaa89b0a689b27b2e134d2b47afd6ea06a
 EBUILD haproxy-1.9.8.ebuild 5017 BLAKE2B 233cbeaa89b0a689b27b2e134d2b47afd6ea06ac0b69adbe700ac4fd3e6fb32bfc98c297518a95c3cb56d1c26b201680e7aab5261cee0b3c83cd60c112e25286 SHA512 8f03e430049386fc115c9d62ca1b5d8ae2d060d45abcea72ccd81d5fb51063525bbc9eb16d1fe88e7afd81c9add9c9c1ecb4efd13fda431db48620125b11ce08
 EBUILD haproxy-1.9.9999.ebuild 5017 BLAKE2B 233cbeaa89b0a689b27b2e134d2b47afd6ea06ac0b69adbe700ac4fd3e6fb32bfc98c297518a95c3cb56d1c26b201680e7aab5261cee0b3c83cd60c112e25286 SHA512 8f03e430049386fc115c9d62ca1b5d8ae2d060d45abcea72ccd81d5fb51063525bbc9eb16d1fe88e7afd81c9add9c9c1ecb4efd13fda431db48620125b11ce08
 EBUILD haproxy-2.0.1.ebuild 5244 BLAKE2B 3d0d8bed8a58a6cd7473fa9845e97d37b38102937a4a644c4da7ba1c14f4086a85b66cee29089844e7d1379fbcec5cd2a027f50a5837ed0c1f5c070729deb88e SHA512 8336f07fdf6ce10a52461dea4307d6d0c0295c0690dc3fd0acb6363319e8beb882a4fe818b13021fb6252dcc0081f961c8b35e74fd6bf55ec479c71263b6e512
+EBUILD haproxy-2.0.2.ebuild 5244 BLAKE2B 3d0d8bed8a58a6cd7473fa9845e97d37b38102937a4a644c4da7ba1c14f4086a85b66cee29089844e7d1379fbcec5cd2a027f50a5837ed0c1f5c070729deb88e SHA512 8336f07fdf6ce10a52461dea4307d6d0c0295c0690dc3fd0acb6363319e8beb882a4fe818b13021fb6252dcc0081f961c8b35e74fd6bf55ec479c71263b6e512
 EBUILD haproxy-2.0.9999.ebuild 5094 BLAKE2B c0fdf13fc7ddb77e0ee6242368a00456893e641a9b723ef1e61a159d44f083c8d9f4c246f1a4e000b89ebcffae66c1457fb8da5a535100090ba5b9d172082bc3 SHA512 09ea9959281af079f4228290180ab53b1359b970203bfe223dc6dad081c110e67de2d1f7696a0b795b655261c0ae0dca3b9339e9815abb631ef4b24243d490fd
 MISC metadata.xml 2148 BLAKE2B 2f273c8d5c4704b482cf5b09e038415e0faa6ecba7297f99d0c55d96ba0b8f0bfa50b21dc857680951c3b4794be98f8781a6d1dcfb622ec5f6827648cfdd247e SHA512 91834d33a145ce6f887f83849ea90da984cf131e657824e63fb44b49761dc9999c00796fb20879cc670b83a2f4aae2263aeacc1dc6bf71b9db34a21ef9a3026d
diff --git a/net-proxy/haproxy/haproxy-2.0.2.ebuild b/net-proxy/haproxy/haproxy-2.0.2.ebuild
new file mode 100644
index 000000000000..3924975aade7
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.0.2.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+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/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	device-atlas? ( pcre )
+	?? ( slz zlib )"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre
+		pcre2-jit? ( dev-libs/libpcre2[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	slz? ( dev-libs/libslz:= )
+	zlib? ( sys-libs/zlib )
+	lua? ( dev-lang/lua:5.3 )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	enewgroup haproxy
+	enewuser haproxy -1 -1 -1 haproxy
+
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux-glibc
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	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) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	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} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/syntax-highlight/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/obfs4proxy/Manifest b/net-proxy/obfs4proxy/Manifest
index 3727a7be448d..aa8e61b3093b 100644
--- a/net-proxy/obfs4proxy/Manifest
+++ b/net-proxy/obfs4proxy/Manifest
@@ -1,16 +1,13 @@
 DIST git.schwanenlied.me-yawning-bsaes-26d1add596b6d800bdeeb3bc3b2c7b316c056b6d.tar.gz 18848 BLAKE2B 35458f0f2f674564813ea8f65246c8463fe1a89bd0e171c7d7ecda16e79fac4a7976d7c28e8b791e11afd61052538be00bb4f5a8601366fd5f638f78f4b9c03d SHA512 0bb32ea0a0a246406428786287701418d2b620a14de06828cd9a88de06ef61973fd01a42f9aabf396e74db94157cccdcb15afbf73f00a3d97ed224f7a86c4d39
 DIST github.com-dsnet-compress-v0.0.1.tar.gz 9962544 BLAKE2B 58e5bd8eb7a50071da2764e90051f18fb3e4237b684a2584daf6ef7f74d4509525f09678feba3d6e8b0233cfd7a995ddd01374b138dbd2beaa2eab76218220dc SHA512 24b545fdfa6e5dcd942c9fc09614f755db341a16734f95dead2d344f06c74ca1c14e0b2674977066dee6094fd4d3bd7581ed9fe0285aeb1c62d2c68e0a3a095b
 DIST github.com-golang-crypto-a5d413f7728c81fb97d96a2b722368945f651e78.tar.gz 1656797 BLAKE2B 6b7e3f776b396786125582332fcf90e6b2452a06856a8b13cb2d84a882c5c563af79b8c37232f15410ae90b309e93044dcb6e0a5948d4e25b9730cc541534d16 SHA512 57a9606845a27459703d3757e001303d2f67c88efa4d021d4aa09314ddcc85fe95c9db2ff4aa08639b6be49cc751d82c35134a587987a896f64bb103af89adee
-DIST github.com-golang-crypto-b8fe1690c61389d7d2a8074a507d1d40c5d30448.tar.gz 1645371 BLAKE2B 31d89c31fbe42df036b548e8b43245b385faa72f8c1a35331540d874bf4e99be60dcd24c2e3b969c96f489c33e138c45229cf5e5179ffa5cb48dcd809020b74e SHA512 5475b27a5e2413ead25b1405e979bdd9c7e853cfea46b17b2957ec08960a0727312442985eeee2186d04cc3de592ddf65145d54bc7c3e3c626fb14c9bebc6441
 DIST github.com-golang-net-74de082e2cca95839e88aa0aeee5aadf6ce7710f.tar.gz 976643 BLAKE2B 6a64e95b90379cc72f93391ebc46d064c22e980dffd788c438b87ed9bb7da4a6dbdbdb6865722bb274a03359ca745165adf73b24b50c3038dc7347abf873043c SHA512 afd0169a4de53a36ed87c4510e4bf02147bc10b2fb3de22b3608a05feb72b571e8a560ea1ce4b3953385b6627ba012e5da54dc8c264194e01ea9d83745c5e9da
-DIST github.com-golang-net-ed066c81e75eba56dd9bd2139ade88125b855585.tar.gz 968328 BLAKE2B 14d5542bd808b9571a8305a5d2054df3205419249724851e976e354dab653de2266b0b9d7b46b4fd846a7d810bbd510be54d0d98e6d6c5cfea5d19e8df5ae528 SHA512 f63654665e7221b089f1dd9b9603670481b1a59137cf0b5c4cbe7c77a6a66b7537dc03b7c412328d9186edb8a661e66a82ee9839b594d176bee6e7377f13cca4
+DIST github.com-golang-sys-9eb1bfa1ce65ae8a6ff3114b0aaf9a41a6cf3560.tar.gz 1262620 BLAKE2B ffa03ba8cb0fbdb9d2b68bf00920dd7695a0dcbfc190f26cff2045b0612103dee8fa1ede2b64ed384d59889b0af11088c6e7586d1314ec2265a028e63d0641a3 SHA512 eee9be21a6be3c84127e1bb0c90f6c872aec2b3dc88d1dffd9421b8ff18e1e517b3d1f39f06f47339a21aa78a9570884c64a37d31b1816ac67ba0dc0b3f15cce
 DIST github.com-golang-sys-afcc84fd7533758f95a6e93ae710aa945a0b7e73.tar.gz 1244035 BLAKE2B 5e32e26aca844d6d21b17b60546f908b0f881283d59357d1891417b8f221af42182f0a767e01a806e0d81f4283511e12028f654e505db7522f04c84f5546baac SHA512 87e4333e7ba519fe6e222c15ac8185151af3dc9be902112ae3e06e2a64d0ae05dfd37055c9493e9698a4f5fafed3ed45c44d18c4ebf6821d35bff351b2741f2b
 DIST gitlab.com-yawning-utls---v0.0.10-1.tar.gz 533464 BLAKE2B 0f07d30768fb92ec274a98477be087b6c1724458641c63571ff2b46a217ed0611a902e45cc0ae9626a47c2572b7a785465bc808c8208005110a262739b7b0daf SHA512 e286f1b2007852ad8a4ef006be528fc6c885beba841509cc8a88ca08b8c2c8a608098ef1a39bb563d7a3dd0b402d12e1fb8b00095e706e5e2193348e02cafc6d
-DIST gitlab.com-yawning-utls---v0.0.9-2.tar.gz 523515 BLAKE2B a56a95be268c094d9498f88c8e68d16403f26108db7b00dc8a4c8ab113654e47f2cae61f5d6d49ebd86e3057be293d3c9ba88d31ed91ef97a41901e5feaa61cb SHA512 1d9bdd0f27938e4a4cbb1a8ecc8f0aa5bb46270a267437e356a9fafceed36e0e28932ddac1a3807cecfddbe36b2c3190e7ca1d4edb02bda539560b506807281c
+DIST gitlab.com-yawning-utls---v0.0.11-1.tar.gz 560616 BLAKE2B 68fa15c07bccbf58ca7666453d53cb892777160ea2843095024d4811891803d0a1a4f876247ca2fe5ff08cac24e96d50ada838bde9afbaf34a7208f8b30b8f01 SHA512 debea4bfe2b2686d181fa0f6a583833728d154b4262c6a7fe9354d3d953739355aade92c927fa3a10d5b78efe37d9707ab4c59beaa765c64b6fe99dbc54f1722
 DIST obfs4proxy-0.0.10.tar.gz 85538 BLAKE2B 37ffb9805f64a10c4cfb8cc0e95ee5ee341d63dc116c93487802f02f11919acf44dea96207c49a2d17a87a8c78fc35ec13cba24511fd205cf9196754566c1ae7 SHA512 ee8a0a4cce1d4cf21427f91af73b6ff50c83c03cf42587600135c8540edde20343c226c68d38725d53a69e4cc69bb3a7310d9f81ff76a67d9602148f10f3634a
-DIST obfs4proxy-0.0.7.tar.gz 67479 BLAKE2B 00a9df9e004b4b18ac4703504f5f246fdece0b70ad85de9eeca6d814d78a8653d26b4c51867e361ef03e0f2cd23bc775b6117d7e46be4547ae6e0fa003b05d55 SHA512 57b71138a139b1821cf58c8e1965f207a6164a046bbfc8d6da828351d4f5bf4ecfb63ca5c69dba834c4e3a72362089d2a7fd296278115c0cae1c53c51d1b124d
-DIST obfs4proxy-0.0.9.tar.gz 84896 BLAKE2B 39a81fc7a9f7701f5b8aa09d78fea48c3bf9b81febabd7aa9634b5e86bfa063479053f00b3a3f48fd3661ad3e4dee7e5165567acc06952e20d3d397c633a08a6 SHA512 a3c80f72519a39947a3ebf36c029eeed2fbc652e0d825b25510f1817ebde505d65c83e1248e38912553e84c7e73b0d733a32b625f501a53f74be12711eba0009
+DIST obfs4proxy-0.0.11.tar.gz 85557 BLAKE2B 9b56433fa4a1023ce2c2b75cec598a1f55fb8229659ee66604b636d2269b243d347e34eb1b539b71db5ac0cb45c868d249844a82e04b20faa6dc1785fe4b78dc SHA512 3eb50bc8067802f8260e0926999a659919e55cb34247f443f66a4852c9ceceacae361602a57ad1fd28a84e4ed54f3800c3258e67266eb23d45b1d09e31c5d869
 EBUILD obfs4proxy-0.0.10.ebuild 1551 BLAKE2B cb342f5e7c5922756cc0997a11a4fd1536588dfc83a6a2dd9c4a33a79810f57c341816d99f69fe159a78ffbc8a5607ec1df19963085465e66a5311ef74c979cb SHA512 3375c6ee64ab0b7c9c6b1e70e0650bc0578682e5c66a0b868694491eb891b73ec7a7901a7f2a8045f8825286c950ca26dcdb96f8c4c428c9bda6251739c9e28f
-EBUILD obfs4proxy-0.0.7.ebuild 1069 BLAKE2B 06179fa004c2f75123b8e3feb2d92b92698333b6819c4f10527e2d3b9a3ded7d36be54d4d57f19ee181910498e3b261daa602d1e9455605e7de1e7a6d5e3f25f SHA512 fa8d46550b22999d19bc32e1edcc5818af539524d4db196822c4f6e3f50386ee6b7769d8fe680ab3403ba46cc037ed153e63e2b559a22b5887457fb15a3e4481
-EBUILD obfs4proxy-0.0.9.ebuild 1434 BLAKE2B 2b1195fea772ed23736d8336c437c3141fb1687cfd38a2e94d8ef565a484712a5437f56753bd83842777fa89a3c1fe76329775125fc08d77664efb4132e8e504 SHA512 36cdec692fae6b9618eb09efba8be6c10e73b27d0e34a00cbecedd895cdfd8a440691447ed816cdbc8a750b9e4eaa49972118580afea560ed112260acdd861f4
+EBUILD obfs4proxy-0.0.11.ebuild 1551 BLAKE2B 5fa0ad9335e558ba56133c6e56728dd22d96b70517d5d1d75faf50cdb1ed68c4c333906bc92854d1aa46fa42be7aa4ba6d7dc528c458dfc7f1287f6df5d4a6a0 SHA512 419314ebc843ee2d51cfc2cab39ac7f49cbcf6b675be33e820fe273e7ce114662bf52ce805a6c3cfd95229d5f847acad0830f95f55761cc7f72fab3242cfdf96
 MISC metadata.xml 436 BLAKE2B a31742b53be9467a5b916219f3d76ce32f4c59d6d72c867f0d8cec5669b1fba84453efea7fa886ac4dc5d0528c3763188fe6736c5b76b4475a31ecd44d78a1a3 SHA512 0077fbce7545acc98c3964643cc51be782d7aa0fe82fc1b3b44b89a6611e9b95bd579ae143c57a5c16f58c16c406f7fcbdd79e8b4e50f433092903ba6e2d3989
diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.9.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild
index 57404950600c..32e2050e9221 100644
--- a/net-proxy/obfs4proxy/obfs4proxy-0.0.9.ebuild
+++ b/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild
@@ -8,11 +8,12 @@ EGO_PN=${EGO_SRC}/...
 
 EGO_VENDOR=(
 	"github.com/dsnet/compress v0.0.1"
-	"gitlab.com/yawning/utls.git v0.0.9-2 gitlab.com/yawning/utls/-"
+	"gitlab.com/yawning/utls.git v0.0.11-1 gitlab.com/yawning/utls/-"
+	"git.schwanenlied.me/yawning/bsaes.git 26d1add596b6d800bdeeb3bc3b2c7b316c056b6d git.schwanenlied.me/yawning/bsaes"
 	# Newer versions of packages which are in the tree
-	"golang.org/x/crypto b8fe1690c61389d7d2a8074a507d1d40c5d30448 github.com/golang/crypto"
-	"golang.org/x/net ed066c81e75eba56dd9bd2139ade88125b855585 github.com/golang/net"
-	"golang.org/x/sys afcc84fd7533758f95a6e93ae710aa945a0b7e73 github.com/golang/sys"
+	"golang.org/x/crypto a5d413f7728c81fb97d96a2b722368945f651e78 github.com/golang/crypto"
+	"golang.org/x/net 74de082e2cca95839e88aa0aeee5aadf6ce7710f github.com/golang/net"
+	"golang.org/x/sys 9eb1bfa1ce65ae8a6ff3114b0aaf9a41a6cf3560 github.com/golang/sys"
 )
 
 inherit golang-build golang-vcs-snapshot
diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.7.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.7.ebuild
deleted file mode 100644
index bc277f9039df..000000000000
--- a/net-proxy/obfs4proxy/obfs4proxy-0.0.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_SRC=git.torproject.org/pluggable-transports/obfs4.git
-EGO_PN=${EGO_SRC}/...
-
-if [[ ${PV} == "9999" ]];
-then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64 ~arm ~x86"
-	EGIT_COMMIT="${P}"
-	SRC_URI="https://github.com/Yawning/obfs4/archive/${P}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="An obfuscating proxy supporting Tor's pluggable transport protocol obfs4"
-HOMEPAGE="https://github.com/Yawning/obfs4"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/ed25519
-	dev-go/go-crypto
-	dev-go/go-net
-	dev-go/goptlib
-	dev-go/siphash"
-RDEPEND=""
-
-src_compile() {
-	golang-build_src_compile
-	local binfile=$(find "${T}" -name a.out)
-	[[ -x ${binfile} ]] || die "a.out not found"
-	cp -a ${binfile} obfs4proxy
-}
-
-src_install() {
-	default
-	dobin obfs4proxy || die "install failed"
-	cd src/${EGO_SRC}
-	doman doc/obfs4proxy.1 || die "install failed"
-	dodoc README.md ChangeLog doc/obfs4-spec.txt || die "install failed"
-}
diff --git a/net-proxy/piper/Manifest b/net-proxy/piper/Manifest
index 306654032e52..3e4fbe1c171f 100644
--- a/net-proxy/piper/Manifest
+++ b/net-proxy/piper/Manifest
@@ -1,3 +1,3 @@
 DIST piper-1.14.tar.gz 20121 BLAKE2B 3036ea949ab02b5e21bfc485a507aaedf1200bec8fcae097f400246c9ed6518b5b81e886d1b5fc2bf0a159efddb78eb30a3eed140e38a33e86efbf408e8c7a1f SHA512 5e436a13f93adbdbebe6df6b6113d94c4e4c2ae0b7a8ad1c526d378b9e919aedc8e005ebabe84b5682fe75e066fc786da861ec5d28572e9f235349c8b106544e
-EBUILD piper-1.14.ebuild 511 BLAKE2B 89178a9c33d63b7a88527ce2f62066f5691047cdae8963384711825c6908f0be58e605fb3891b9fb4e6ecd73c44247b52ce45a318d70ad300bfc41a0459687ee SHA512 31636f81a27c8bb5df6447e9d2418c6a1f4d4fe66cd0b05c284e6832cf97676e9a1cc9e1d02d759a73174957f4d2a89567e3ff970b269d78149db9a2fcf80e18
+EBUILD piper-1.14.ebuild 508 BLAKE2B 9813eabc2f6cb9cb9949de24935473dacf29c163635ff9522ca6c1fa86f15a4760dd39f7124dc9e16381c55ef41fa56f5381501ef8d3962d4287c8fa8c49f0e8 SHA512 471f61cc87e7e02c334fd2db34b8019b03f6e67357550a665c7e4aeb217d1ddee965b3404959fcaae35d58e6c5549e363ae055c3c297ac0b84ca69b7ce6151ba
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-proxy/piper/piper-1.14.ebuild b/net-proxy/piper/piper-1.14.ebuild
index ee0f787f4bd9..1c3e950d7eff 100644
--- a/net-proxy/piper/piper-1.14.ebuild
+++ b/net-proxy/piper/piper-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.qwirx.com/"
 SRC_URI="http://www.qwirx.com/piper/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 DEPEND=""
 #RDEPEND=""
diff --git a/net-proxy/rejik/Manifest b/net-proxy/rejik/Manifest
index a43da34f335c..ec5430a2db6d 100644
--- a/net-proxy/rejik/Manifest
+++ b/net-proxy/rejik/Manifest
@@ -1,4 +1,4 @@
 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 2322 BLAKE2B 983c83007c63a2fbca3901bc92b3a4c98a67d05722e98d1d2d84baf02a877e1a9bbca449fac2cb3e62ebb5788ff020629f730d357c1ba0178998aa28f609b52b SHA512 ecbc30a7595a5c3d6ce4173a06a9f7c5828c7bfd4230877f20d31e95bffc0020364bc8cafecaae58ac791af2e21bbdeeb8b10054348b791027c7a8487eb0fff7
+EBUILD rejik-3.2.10.ebuild 2319 BLAKE2B ee8f1987add7220f92e7cbb706efeaca3b889b770df37a015836e557f513d88871a0ed9a5b3152100e9dbfca753d1a39e7e88adb72ebf6373619545fb6bc8c2a SHA512 65cfce70cf0562e9b3efaf0eb8b83a1774e811c03bc77b964489e35cef81dae3c189e6f8de98f3e300ccc76e9bc0cc43f8444db4f98a1ef34edd75701b26ffbe
 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 1a14f53834da..f5fc802fb246 100644
--- a/net-proxy/rejik/rejik-3.2.10.ebuild
+++ b/net-proxy/rejik/rejik-3.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="http://rejik.ru/download/redirector-${PV}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="banlists"
 
 DEPEND="dev-libs/libpcre"
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index ec3a3c1d0296..d77fdee0fb78 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -4,6 +4,6 @@ AUX squid.cron 143 BLAKE2B 17b1bccea20771a481a5b4745c9832a4b762132a500eaeb091349
 AUX squid.initd-r5 4339 BLAKE2B 3529ddaab2e708215e6674514ce8e20e9d28d26e45860e19b59c7c3566550b298c71a20a9b62c2c89fd621f4ca67698d03af43586ac75cf16eee3b342c6a5a2c SHA512 e761500fb208954c92e0e83a6314688b29f1379855bf78195a72b12984c8fc7fdd09f5823729e90515bb7a382903fdcb42b79488d7f73474f8244311137b3e18
 AUX squid.logrotate 103 BLAKE2B f6d190d1914b76b08d90a2c3b3b07ff9cd332cdb2e595f4849537d1f1d32d8be1386fcdfffb40d073bcdd715a62c1c44727f1e10b75cfaff69c0d042c2a7e904 SHA512 d75a667c3ffa32fdd938ef40df8813a467d9f10b2363107bf915cb0c99834fbe8d0eb502a18a816875b67b0db1b27806ed3caf620c38516040cb644b225f5a55
 AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdbb8d4c6a0248ec9fa1a0f5f1d6136643c9abc4c5f67e8ef75305414b374763e2055272950d5 SHA512 5501e3d9319aea99f0deed98748366d4dfbeccdde96d842474fe144a4584394d8f5563372cd7b2437a389378c49b61b646403cca1be4362c888750d027b2f594
-DIST squid-4.6.tar.xz 2439792 BLAKE2B 1344acfd4ba135d5ec6881612614f735c6e4791f9b15dcc2f572b93e7f7c9e39585aa0b30aef5b09e40a9599e7fe7d3a118f878adac8f272b014ac3d65a83fae SHA512 dbe2b02b83d53d67459e22a19e71cbf99b66d74a2ddc4bc69310f03a0a6092e5840766ad699fc43893516e97ef89799ef2147dd40f76b0bd688c1e271fd20d06
-EBUILD squid-4.6.ebuild 8158 BLAKE2B 60aab2b0202c2e2b2dcdaf4dc85cc99d1abc1347afee0972433566ec151e030762e31bf563cd7e31c7619d401e30eed3085353ed032c3cb47d60b87a469976ad SHA512 8c3164f4fed13cfeec103c02cce44d8624783107d8d86bfe84ae7bdf9ed174f5af1b8a9f5f4749b915a8d22389e3ac86a0e19f3cf726f97724eaf91566afd29a
+DIST squid-4.8.tar.xz 2440888 BLAKE2B c84b278183d49981f20aa08a745a096d017ae38f3b3c6fce8f334f6c1e4df1088860827f21a1ef8190061a6d121f99a56fb0e2ea727df1954f34b6eb2cbcb93f SHA512 2223f299950ded074faca6e3d09c15bc26e8644c3019b36a612f5d424e25b02a528c4b3c8a9463864f71edc29f17c5662f16ffda18c76317405cb97657e5e823
+EBUILD squid-4.8.ebuild 8193 BLAKE2B b8294cabe7004130a38a337b01467e478c2edc304620e0fb1d634d0c0e033723c309a5b2bedf7d4dd1fc19dde8f7587e339592d3ea2ba26a9d85e937e22b2e07 SHA512 235437268708f1d726a6dae0a9dae5e0858bd0a1a9f835c3fd9829ee98d50e0241d26367ffb33370d5c8e4b5596f7a8be0d26694946d2be32df1e5ad88b6103c
 MISC metadata.xml 1541 BLAKE2B c04b0900be1711860ab53658c9ed7f3200da64fcd8f866a54d3a02c4576b5942afad4d8666eb950e19426beead7a40f5f03e04bca734cf9b5fedf4633f16087e SHA512 fb81b62b425f571f8f01f505f3b9d69186358180c1fcca80c61ad8e7b3d0397250292e9ea3bfa8bb1a93a9ade3293abdd7bb19ef6485df6244e016e21a3b56d5
diff --git a/net-proxy/squid/squid-4.6.ebuild b/net-proxy/squid/squid-4.8.ebuild
index ae8dca64ad4f..e6c323cbaecd 100644
--- a/net-proxy/squid/squid-4.6.ebuild
+++ b/net-proxy/squid/squid-4.8.ebuild
@@ -23,7 +23,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test \
+IUSE="caps gnutls ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test \
 	ecap esi ssl-crtd \
 	mysql postgres sqlite \
 	perl qos tproxy \
@@ -39,12 +39,14 @@ COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
 	kerberos? ( virtual/krb5 )
 	qos? ( net-libs/libnetfilter_conntrack )
 	ssl? (
-		libressl? ( dev-libs/libressl:0 )
-		!libressl? ( dev-libs/openssl:0 )
-		dev-libs/nettle >=net-libs/gnutls-3.1.5 )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:0 )
+			!libressl? ( dev-libs/openssl:0 ) )
+		dev-libs/nettle:= )
 	sasl? ( dev-libs/cyrus-sasl )
 	ecap? ( net-libs/libecap:1 )
 	esi? ( dev-libs/expat dev-libs/libxml2 )
+	gnutls? ( >=net-libs/gnutls-3.1.5 )
 	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
 	>=sys-libs/db-4:*
 	dev-libs/libltdl:0"
@@ -206,7 +208,7 @@ src_configure() {
 		$(use_enable snmp) \
 		$(use_with ssl openssl) \
 		$(use_with ssl nettle) \
-		$(use_with ssl gnutls) \
+		$(use_with gnutls) \
 		$(use_enable ssl-crtd) \
 		$(use_enable ecap) \
 		$(use_enable esi) \