gentoo resync : 05.04.2019

16 files changed, 197 insertions, 245 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index d8728dda7000..d790349a2e62 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/obfs4proxy/Manifest b/net-proxy/obfs4proxy/Manifest
index 36d2819f87ee..90deb4b753b7 100644
--- a/net-proxy/obfs4proxy/Manifest
+++ b/net-proxy/obfs4proxy/Manifest
@@ -1,6 +1,10 @@
-DIST obfs4proxy-0.0.6.tar.gz 67151 BLAKE2B 725dcbe3047f658d489af0ac0c48990b68edbd232c38bdc3b3e681e8bc22c4ed1affd5d6b5036a1bd4dbdd0f6d9786193c89731f5f81d826073d92480e82b9cc SHA512 fb1584cec5db09ffc1124497daffd1cab1f9895eb080334004356cd08ec463a65226187c8462d8fe60df30f4c8c321ae8fb38e0c7b8a64216ed9413927bcd303
+DIST github.com-dsnet-compress-v0.0.1.tar.gz 9962544 BLAKE2B 58e5bd8eb7a50071da2764e90051f18fb3e4237b684a2584daf6ef7f74d4509525f09678feba3d6e8b0233cfd7a995ddd01374b138dbd2beaa2eab76218220dc SHA512 24b545fdfa6e5dcd942c9fc09614f755db341a16734f95dead2d344f06c74ca1c14e0b2674977066dee6094fd4d3bd7581ed9fe0285aeb1c62d2c68e0a3a095b
+DIST github.com-golang-crypto-b8fe1690c61389d7d2a8074a507d1d40c5d30448.tar.gz 1645371 BLAKE2B 31d89c31fbe42df036b548e8b43245b385faa72f8c1a35331540d874bf4e99be60dcd24c2e3b969c96f489c33e138c45229cf5e5179ffa5cb48dcd809020b74e SHA512 5475b27a5e2413ead25b1405e979bdd9c7e853cfea46b17b2957ec08960a0727312442985eeee2186d04cc3de592ddf65145d54bc7c3e3c626fb14c9bebc6441
+DIST github.com-golang-net-ed066c81e75eba56dd9bd2139ade88125b855585.tar.gz 968328 BLAKE2B 14d5542bd808b9571a8305a5d2054df3205419249724851e976e354dab653de2266b0b9d7b46b4fd846a7d810bbd510be54d0d98e6d6c5cfea5d19e8df5ae528 SHA512 f63654665e7221b089f1dd9b9603670481b1a59137cf0b5c4cbe7c77a6a66b7537dc03b7c412328d9186edb8a661e66a82ee9839b594d176bee6e7377f13cca4
+DIST github.com-golang-sys-afcc84fd7533758f95a6e93ae710aa945a0b7e73.tar.gz 1244035 BLAKE2B 5e32e26aca844d6d21b17b60546f908b0f881283d59357d1891417b8f221af42182f0a767e01a806e0d81f4283511e12028f654e505db7522f04c84f5546baac SHA512 87e4333e7ba519fe6e222c15ac8185151af3dc9be902112ae3e06e2a64d0ae05dfd37055c9493e9698a4f5fafed3ed45c44d18c4ebf6821d35bff351b2741f2b
+DIST gitlab.com-yawning-utls---v0.0.9-2.tar.gz 523515 BLAKE2B a56a95be268c094d9498f88c8e68d16403f26108db7b00dc8a4c8ab113654e47f2cae61f5d6d49ebd86e3057be293d3c9ba88d31ed91ef97a41901e5feaa61cb SHA512 1d9bdd0f27938e4a4cbb1a8ecc8f0aa5bb46270a267437e356a9fafceed36e0e28932ddac1a3807cecfddbe36b2c3190e7ca1d4edb02bda539560b506807281c
 DIST obfs4proxy-0.0.7.tar.gz 67479 BLAKE2B 00a9df9e004b4b18ac4703504f5f246fdece0b70ad85de9eeca6d814d78a8653d26b4c51867e361ef03e0f2cd23bc775b6117d7e46be4547ae6e0fa003b05d55 SHA512 57b71138a139b1821cf58c8e1965f207a6164a046bbfc8d6da828351d4f5bf4ecfb63ca5c69dba834c4e3a72362089d2a7fd296278115c0cae1c53c51d1b124d
-EBUILD obfs4proxy-0.0.6.ebuild 1069 BLAKE2B 06179fa004c2f75123b8e3feb2d92b92698333b6819c4f10527e2d3b9a3ded7d36be54d4d57f19ee181910498e3b261daa602d1e9455605e7de1e7a6d5e3f25f SHA512 fa8d46550b22999d19bc32e1edcc5818af539524d4db196822c4f6e3f50386ee6b7769d8fe680ab3403ba46cc037ed153e63e2b559a22b5887457fb15a3e4481
+DIST obfs4proxy-0.0.9.tar.gz 84896 BLAKE2B 39a81fc7a9f7701f5b8aa09d78fea48c3bf9b81febabd7aa9634b5e86bfa063479053f00b3a3f48fd3661ad3e4dee7e5165567acc06952e20d3d397c633a08a6 SHA512 a3c80f72519a39947a3ebf36c029eeed2fbc652e0d825b25510f1817ebde505d65c83e1248e38912553e84c7e73b0d733a32b625f501a53f74be12711eba0009
 EBUILD obfs4proxy-0.0.7.ebuild 1069 BLAKE2B 06179fa004c2f75123b8e3feb2d92b92698333b6819c4f10527e2d3b9a3ded7d36be54d4d57f19ee181910498e3b261daa602d1e9455605e7de1e7a6d5e3f25f SHA512 fa8d46550b22999d19bc32e1edcc5818af539524d4db196822c4f6e3f50386ee6b7769d8fe680ab3403ba46cc037ed153e63e2b559a22b5887457fb15a3e4481
-EBUILD obfs4proxy-9999.ebuild 1059 BLAKE2B 87409756c76f72ea3d73a628a7d4e35537596eb803f78379124fd9a991ec7b3951018191ff1f499e4ac6f1fb7b2321b667e7ec8c68842ed2fcd568448e8ef923 SHA512 684941e22024940353dc8e558556093fc6939d03b8d050a641b6f8f4126440ea9418a1487a2a9c50b01a78d1e23d63eae26eed7f8855f3f928a0c2fabf1db981
+EBUILD obfs4proxy-0.0.9.ebuild 1434 BLAKE2B 2b1195fea772ed23736d8336c437c3141fb1687cfd38a2e94d8ef565a484712a5437f56753bd83842777fa89a3c1fe76329775125fc08d77664efb4132e8e504 SHA512 36cdec692fae6b9618eb09efba8be6c10e73b27d0e34a00cbecedd895cdfd8a440691447ed816cdbc8a750b9e4eaa49972118580afea560ed112260acdd861f4
 MISC metadata.xml 436 BLAKE2B a31742b53be9467a5b916219f3d76ce32f4c59d6d72c867f0d8cec5669b1fba84453efea7fa886ac4dc5d0528c3763188fe6736c5b76b4475a31ecd44d78a1a3 SHA512 0077fbce7545acc98c3964643cc51be782d7aa0fe82fc1b3b44b89a6611e9b95bd579ae143c57a5c16f58c16c406f7fcbdd79e8b4e50f433092903ba6e2d3989
diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.6.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.6.ebuild
deleted file mode 100644
index bc277f9039df..000000000000
--- a/net-proxy/obfs4proxy/obfs4proxy-0.0.6.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/obfs4proxy/obfs4proxy-0.0.9.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.9.ebuild
new file mode 100644
index 000000000000..57404950600c
--- /dev/null
+++ b/net-proxy/obfs4proxy/obfs4proxy-0.0.9.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_SRC=gitlab.com/yawning/obfs4.git
+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/-"
+	# 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"
+)
+
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="An obfuscating proxy supporting Tor's pluggable transport protocol obfs4"
+HOMEPAGE="https://gitlab.com/yawning/obfs4"
+SRC_URI="https://gitlab.com/yawning/obfs4/-/archive/${P}/obfs4-${P}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=">=dev-go/ed25519-0_pre20170117
+	>=dev-go/go-text-0.3.0
+	>=dev-go/goptlib-1.0.0
+	>=dev-go/siphash-1.2.1"
+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/obfs4proxy/obfs4proxy-9999.ebuild b/net-proxy/obfs4proxy/obfs4proxy-9999.ebuild
deleted file mode 100644
index d3b71a94e5cf..000000000000
--- a/net-proxy/obfs4proxy/obfs4proxy-9999.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"
-	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/shadowsocks-libev/Manifest b/net-proxy/shadowsocks-libev/Manifest
index a99a8f23f13d..b2125b78ca35 100644
--- a/net-proxy/shadowsocks-libev/Manifest
+++ b/net-proxy/shadowsocks-libev/Manifest
@@ -4,10 +4,8 @@ AUX shadowsocks-libev-server_at.service 247 BLAKE2B cce6eb70b580f3f0918755956249
 AUX shadowsocks-libev-tunnel_at.service 259 BLAKE2B 6881120dd27e057046aaa081811de85f64b8b57e02badce7f34984be008b86053eb3912a3e84be821b450c184700bc5d8c393970ee32c5288108fbb72953582d SHA512 d68d5d0f96ba8269d5ea93e8c429936de35929592e7716eb1752e5604bd46fc92e417a2e89d0fd5e4bcd195c0cd2ac7f501c6f43776459fc8d4447fc44821c32
 AUX shadowsocks.initd 1352 BLAKE2B 073135c9a0f56891e391fc357a4084069863976a780f3676041b7649b13a285778e1ea4a4893ca7ec3a238770392b9fa71fd68afbd2f50a8c7bda18fc8193df3 SHA512 12b901ff23b445744e485e59a18c0c1ac63c6785038dff75d4c47c91a644185abe56b0256acdcd5015d3dc2af87fb254c9e4ad3846763f7430db44138c05cfc1
 AUX shadowsocks.json 132 BLAKE2B 84f0dbdf0a7eb5d1c8d8ca26147b5dde872a78b128357fa4d3d1348afdc4bd3bdd87f73c564d030e9cdc19a0e5fe2d414a5430f2daeddd03c0a24b761460596a SHA512 6bc5c406bdb25123fd43e21784028dd331f729bc56fe7ac4d31e3b1d81d12048a6906db3fd79765a64fc7f8b651095695fd8cdcc60f6d3285231e94a90611cef
-DIST shadowsocks-libev-3.2.3.tar.gz 276992 BLAKE2B 17b26dce7b26d914612b178c635fa23d6847713fdb4793563ad10a90414f62feb71b94830a58596e1e1d019fe1bb93fcd7da745eb4825ca2f97b7919b522ff2c SHA512 41d6c3e103a028ae49b9667f9c21663dc475a9d36f562f97468521b916a1917479d099e6814dcc680a2ee2d526177d6e0ac441bf684a41de891c5a1fc2fbddfe
 DIST shadowsocks-libev-3.2.4.tar.gz 277679 BLAKE2B 32d4d48c22951894e9aa64cd6d34f7586c61ab5ae994b263b272c07a05a019f9c493909f50f3ec027af29681885a65f51afe97dc959c508f107a5010974c8e11 SHA512 f8bd19d4f3f70cedd0f34a6a16975c3694ef36e85b278d4a7bb10520a43d71c83f81ceebcf20530cdd04b5000a8c742e0789fdbefa70fef6b5d1dc799ce34528
 DIST shadowsocks-libev-3.2.5.tar.gz 278138 BLAKE2B 874471f134371d274ce274c096286dfe8a755e5423624df80df70321f017d9344516fd38f82df43033870588664dc626595157ab6c5022c9953bd9ce59dee2b8 SHA512 b4ca9f7c303c85a5bba9bf5d7a093c6dfde7a147d0335b449d4ee213cd3b9004c5220a099dcc78464a35c55f9cfe280d817daf934e2fda100f5e784f70091c0b
-EBUILD shadowsocks-libev-3.2.3.ebuild 2199 BLAKE2B 8a44777732a46aa562def39e08c552e97a0d586d6c445298d692736707797bf4dde0ad519699fb199cad6284676855662a1d6080395477d2e0a6e41b7811ec97 SHA512 aed836e55f5656c7fa68b679df1fba8f3163f06cfe8738049909d2dd77149efd516d8d8a9384244b303868002cf501266c39f9633513c35e2e48b8ed9edc6b58
 EBUILD shadowsocks-libev-3.2.4.ebuild 2199 BLAKE2B 8a44777732a46aa562def39e08c552e97a0d586d6c445298d692736707797bf4dde0ad519699fb199cad6284676855662a1d6080395477d2e0a6e41b7811ec97 SHA512 aed836e55f5656c7fa68b679df1fba8f3163f06cfe8738049909d2dd77149efd516d8d8a9384244b303868002cf501266c39f9633513c35e2e48b8ed9edc6b58
 EBUILD shadowsocks-libev-3.2.5.ebuild 2222 BLAKE2B 7bc54c6a01331d76f786df11b1df9dec7eb14eec1a8f8f2c499885a54686f934b70c6ab04127c71eadfa47a17ea7a496012bdda9d7ff1d97bce68749dc16a534 SHA512 9d0b697bc6b415c8a56c6e41cc4e6c8825fbd8609040c78cecebd8c23b83046ae8820b9131744d20eafb31092f9399ec14098c842d36d8ec34d52dccac67aba9
 MISC metadata.xml 334 BLAKE2B 1217232e3b08c238795607fa0281c81feb34ed794005d1e5c1522b3380a9d1f3877ccf787ab88ee95a4cd4db85a11163395e4a3a449d4a862634e5a8cdfbe0e2 SHA512 a1e5349204ad41815cdf8772c760c0e1085749863c71d30fddfa8958d8c6d388575288da4dcd60acdaf00288b5a52a731aa21512a1c7ef9622fd0b2de162086f
diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.2.3.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.2.3.ebuild
deleted file mode 100644
index 03fc22b936a0..000000000000
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.2.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~x86"
-IUSE="debug doc"
-
-RDEPEND="net-libs/mbedtls:=
-	net-libs/libbloom
-	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 '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
-	prune_libtool_files --all
-
-	dodir "/etc/${PN}"
-	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
-
-	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"
-}
-
-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/squid/Manifest b/net-proxy/squid/Manifest
index 4161aad52f00..ff48ed9f6b92 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -4,7 +4,7 @@ AUX squid-3.5.7-gentoo.patch 3414 BLAKE2B cf2ab263d7578736c4bb3954288375297aadc4
 AUX squid-4.3-gentoo.patch 2767 BLAKE2B fbf424bec42a8bd29f54431107e73db1d1acd7612c8acc4d38022419a72ccabc9d0287fb34cbd26e96df2b6e2aaceae929c1005ef2ad4f731cf28edf66ac569a SHA512 eaf076cef4b60c1f5e9985a69f5ae674082b04a6f70d5b484ad13e9e397a8c67cb1780960a11fd943dc2500ec9f0590192b276bf36451d3063537661200487bf
 AUX squid-cppunit-1.14.patch 11414 BLAKE2B 58f583390f9d899e70e56e7109cb3b88bf23ba0bd8ec6d065eb5f28ef9762f4a6eb25807e24a102852538eb2709167284e529b14d43605bbe49f85eff4824169 SHA512 2fb02c8c92dc524c19cbbaad4dad03bddc8c18046e37f86562dcaa73a9cea0cb2af352ca0701438d2f77a55b448b34e68678961d721812135b9f7d4799cbe94a
 AUX squid.confd-r1 384 BLAKE2B bbbf02d98ad4552acee224b67c41530fc63f7ee6d099cfa309b982563004f375dd881a079ec3d2ec161ed3a48dc58fb5a1d9e16438d9806d2e83a3af0a900611 SHA512 018418d0ef66c9ab5d67a8e68ed6f95c7a04ad2a8a073747f39d9db8e83cf72c685d388a727363788042e45d440a69651ec928ccdeed835915ebc8c676b43519
-AUX squid.confd-r2 714 BLAKE2B c60c6ece0654f5a350ef955787b003eb4920bdf68d0bfb394c02187d440b7c31785bcd638f62729d7a658ed43fc94eb5844af5ddc24c93a18f5b5be35552b48b SHA512 9d14c927535610f40ad0b3f1c851f6587afe7aee3186238c9351528b9ad0999d676e7ec2c4a2d6febedb7f14f71c10896d6f4eb6bf4de860ef59e4e4c31a240b
+AUX squid.confd-r2 707 BLAKE2B 9fce12f6c6d395448b1e70c95ef75418d1844e7409738df60bee7c1adab786ca7e504070eacdd2b6e30a35df8a7322cccdfb950e60bcde352d35d090d55c6be9 SHA512 37435f808b1dab1ca3ceecafd6cd9007c44e10d257f135ba6baf1a51b1e3408f2a76b71d85a08ce6dcb7f86b9841b7bfcd870b0d312a2365699290e28f72314a
 AUX squid.cron 143 BLAKE2B 17b1bccea20771a481a5b4745c9832a4b762132a500eaeb091349a59b870c14b680d8ea97e03bb7a0b2d67e1ca1d4ee1db31dc43b9dbf02be8953d15f214b033 SHA512 cec563c20799ffea8b4fb418d5015d6dc437bd38c35e7150ed01bc298dab5214132e10f4e7b8176da1966e16a7f53f423c36e8419642cb16716f5c346c30d749
 AUX squid.initd-r4 3262 BLAKE2B d67a26ed4e3e7a1c8f97fb65368ad8a0b8e014d86e0f07c9a44ab87f2e48f3330ff669742fbeea56bf5554b09a8fe2f827ca3892dea4cc5f4a86fa4e228ebdc9 SHA512 d1edeeafef69730429c19e07b4b39ff388047042880c61907fb2e6d8a907011edb78a29faa265f8e07d2c3bb18d63d62dd384338729e2549995f7f2a0903783d
 AUX squid.initd-r5 4339 BLAKE2B 3529ddaab2e708215e6674514ce8e20e9d28d26e45860e19b59c7c3566550b298c71a20a9b62c2c89fd621f4ca67698d03af43586ac75cf16eee3b342c6a5a2c SHA512 e761500fb208954c92e0e83a6314688b29f1379855bf78195a72b12984c8fc7fdd09f5823729e90515bb7a382903fdcb42b79488d7f73474f8244311137b3e18
@@ -13,7 +13,7 @@ AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdb
 DIST squid-3.5.27.tar.xz 2303468 BLAKE2B 448dbb703469bdd38a0e88da8e473510e9652fc7c7ae2e48bf687a4c2e1698f3baa92c212631fd3734ee51bead89980d31af58d64654418a7c4c4a16e1be751e SHA512 4172a053c3b7ffe7a12dfb3febac96942d0fbbe7e98e3f797f22cd75b0a3a89cbbfe7260b5daad099e79d5e9303bb5dfbfee7499cb30a90590aa1bd242ff4817
 DIST squid-3.5.28.tar.xz 2304680 BLAKE2B 9b41a191210ea441ebd2847e9dc2cfacf3ba9fa8ceb81513b4cb449b13f7e81d28e3f3c9c46003db6d3d8a936fbd2275e42e18c23bd9d7667b9bd6890a1627a8 SHA512 da8367d364725c7fd6330e7588b0ff70d32978a17ca0bc5fe58fa6d12c9d2adb42ade0a492c835761bc7fd67c1a55300b4b7402ad939cf2a2aa5104233bbb74b
 DIST squid-4.6.tar.xz 2439792 BLAKE2B 1344acfd4ba135d5ec6881612614f735c6e4791f9b15dcc2f572b93e7f7c9e39585aa0b30aef5b09e40a9599e7fe7d3a118f878adac8f272b014ac3d65a83fae SHA512 dbe2b02b83d53d67459e22a19e71cbf99b66d74a2ddc4bc69310f03a0a6092e5840766ad699fc43893516e97ef89799ef2147dd40f76b0bd688c1e271fd20d06
-EBUILD squid-3.5.27-r1.ebuild 8191 BLAKE2B a4c97840af4cdf4260492f4d53d266a4a2b801820df70c9c9069f6a979d275560687a4bc860b8e7f99b07ab7f016df8a5aa96d79278052db587185490ee6e9bf SHA512 6443c33044685fa13686c52a1892fca8e920222e3051ed8899082545d84de8a32c836bd65d5747993f9c17c0e92628ca44c407db281aadcd0eac00d89c310c1d
+EBUILD squid-3.5.27-r1.ebuild 8211 BLAKE2B 491a19b334d473f097e676afb235ace41729f9f7e133cc2b7668e4e3c568893a1c7186c5a6a09803bf930d1732d274801996fd411cf4423ef8e3422a80cc3930 SHA512 5e90caafae0ffe81dee18f5cbda33a196f6ab0cdfb439aa2549fd8eca1379e609ff781a2d8ed0f26fdd49faf709f15c794da2e55fdf528a8251f4a06f1cf5f76
 EBUILD squid-3.5.28.ebuild 8201 BLAKE2B a4d1d87702fe8555e913dde8a006a59290522978b3c2e90da78f39dc6dfe86922c1fe4901d3eb6219896289a8f2680b55e4ef8297df4cfba66cef8a0dd761f8a SHA512 709e28fb06e8e1102a9e265536652919d19e830f85c589b9ddd4c85edbf0405909dbf908eba9bc9200f8942e235c97fb9d23a1347d98a6056764eeb4b6d1dc83
 EBUILD squid-4.6.ebuild 8165 BLAKE2B cab29914fbdb459303e5594bebb6380f2b81077de5f02ec80492efdfea95b5620de85e3c9c56cf84df96a0f4afc4c03b4329b1d8d5ac3e8795669280332f770f SHA512 082ed74fe0a23596610855fa02750bbcbd44c137f07f6346332ca608504236d3e00e3ac0bc59289350cd5e50e6484dac0e4234ac5328f00fa34212a576411dea
 MISC metadata.xml 1541 BLAKE2B c04b0900be1711860ab53658c9ed7f3200da64fcd8f866a54d3a02c4576b5942afad4d8666eb950e19426beead7a40f5f03e04bca734cf9b5fedf4633f16087e SHA512 fb81b62b425f571f8f01f505f3b9d69186358180c1fcca80c61ad8e7b3d0397250292e9ea3bfa8bb1a93a9ade3293abdd7bb19ef6485df6244e016e21a3b56d5
diff --git a/net-proxy/squid/files/squid.confd-r2 b/net-proxy/squid/files/squid.confd-r2
index a43a86e3bce9..fea9a067a83b 100644
--- a/net-proxy/squid/files/squid.confd-r2
+++ b/net-proxy/squid/files/squid.confd-r2
@@ -1,6 +1,5 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # Config file for /etc/init.d/squid
 
diff --git a/net-proxy/squid/squid-3.5.27-r1.ebuild b/net-proxy/squid/squid-3.5.27-r1.ebuild
index a81007e75347..ff2d870e4cce 100644
--- a/net-proxy/squid/squid-3.5.27-r1.ebuild
+++ b/net-proxy/squid/squid-3.5.27-r1.ebuild
@@ -1,7 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
+WANT_AUTOMAKE="1.15"
+
 inherit autotools linux-info pam toolchain-funcs user
 
 DESCRIPTION="A full-featured web proxy cache"
diff --git a/net-proxy/sshuttle/Manifest b/net-proxy/sshuttle/Manifest
index 575fc9416fc7..fd27d334af1b 100644
--- a/net-proxy/sshuttle/Manifest
+++ b/net-proxy/sshuttle/Manifest
@@ -1,5 +1,3 @@
-DIST sshuttle-0.78.4.tar.gz 72465 BLAKE2B 655df610757e245b66db61955306908c8d1e41db7d093dc44d55260a34b30d4605973815c64d59a860974e9a268e3fcefbba41a104da5ad73f6a8a292bc64b80 SHA512 6e3e49a638ad56fbb00b197d33426f9ccb9afe3d71f8109eb886bc9047083100c910fef7cb42f0426246e585138ce996872179d23fca98afd9e9ccca376da1e6
 DIST sshuttle-0.78.5.tar.gz 74663 BLAKE2B 47e295219c1ada7bee4f0340cc169620c5b91abd1f72b933289ef2dea0c5ba088673f2d1348d444f662e9f6c2638ee6dfd3e8df1fa8344bc7c48adf1a3a96d3f SHA512 562acbf0e825ad41458c5b6065592a45b8bac92cd64b20619027fe4d0bec60a22c5191c7a7ed6b216d8cf5c9e027f58a6cdca69dd3a11ec6f6d348ef2f13bb38
-EBUILD sshuttle-0.78.4.ebuild 1278 BLAKE2B 943cb741fdba4de960022d341e64eb75e9b78fea65c46c243b85321faf6d81d0c41ead95db8a766c5b7879f9bb71eddd6114a5653f2ea2d9d53d7895088e2230 SHA512 35df645c112c1a2b5cf2f055e321cac5ed699d051590aff9e132814a64f8eea7c312353ca2e439582d163925fe2448585081bac1240ce8df5dfaf60a32396084
-EBUILD sshuttle-0.78.5.ebuild 1266 BLAKE2B cd60e5d6f3a1e643f155f3b295a800de61e9a66663460ee70d6fab4256a7418280a2a28b9219044601e4258d47fe4f3bf97d102231f62ffa50a430d1fba7ce25 SHA512 fb306acd5f666db91e4e1227de4033bbad97609e64dcdad00c4937f0b8ead9d606770bf087b947ecef4a9dffa493869daac40ee0d2fb1ef71bcb3cf31d4d322c
+EBUILD sshuttle-0.78.5.ebuild 1264 BLAKE2B f96875c9f6871f39d622c11039d7876df92511faa57f63163af2151a19edeca0d1a3e46fcc9552034e85a4cd5c2ad80471d1e5358ae5267f4647d56490653b13 SHA512 a8a1344c5368ce411eb58df89f059f5874ead0109bbb3ee46c4c520f8fcb0a3e2522560bc8dcb988d4b3f1189be75968d0bae4b3524d15e3d667dea1429ba733
 MISC metadata.xml 386 BLAKE2B 5a94094f59d57f94569067c3ef424b46cec97b8c6f552422ca4b5baa910f9b5f547215c49647f8e2b4ab7f008abc57e4fc407f38f8fab252d17dfb072993a496 SHA512 988f65a4a15eac0630b83d0e090749c12ef58ca1284ed94f45f6eb9c4a5ff0678a481519f435a992f572b98a8878fbfeb7bf573443c128cd29e5c365a8eb2e32
diff --git a/net-proxy/sshuttle/sshuttle-0.78.4.ebuild b/net-proxy/sshuttle/sshuttle-0.78.4.ebuild
deleted file mode 100644
index a4f04e43049b..000000000000
--- a/net-proxy/sshuttle/sshuttle-0.78.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit linux-info distutils-r1
-
-DESCRIPTION="Transparent proxy server that works as a poor man's VPN using ssh"
-HOMEPAGE="https://github.com/sshuttle/sshuttle https://pypi.org/project/sshuttle/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	|| ( net-firewall/iptables net-firewall/nftables )
-"
-DEPEND="
-	dev-python/sphinx
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-CONFIG_CHECK="~NETFILTER_XT_TARGET_HL ~IP_NF_TARGET_REDIRECT ~IP_NF_MATCH_TTL ~NF_NAT"
-
-python_prepare_all() {
-	# don't run tests via setup.py pytest
-	sed -i "/setup_requires=/s/'pytest-runner'//" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -j1 -C docs html man
-}
-
-python_test() {
-	py.test -v || die "Tests fail under ${EPYTHON}"
-}
-
-python_install_all() {
-	HTML_DOCS=( "${S}"/docs/_build/html/. )
-	doman "${S}"/docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/net-proxy/sshuttle/sshuttle-0.78.5.ebuild b/net-proxy/sshuttle/sshuttle-0.78.5.ebuild
index ef640caf7803..5d058b48df7e 100644
--- a/net-proxy/sshuttle/sshuttle-0.78.5.ebuild
+++ b/net-proxy/sshuttle/sshuttle-0.78.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/net-proxy/tsocks/Manifest b/net-proxy/tsocks/Manifest
index 0e260b3e4b67..9bfeb612663c 100644
--- a/net-proxy/tsocks/Manifest
+++ b/net-proxy/tsocks/Manifest
@@ -1,9 +1,12 @@
 AUX tsocks-1.8_beta5-bsd.patch 932 BLAKE2B f38baf5c331fb13a2a7ff12426f1e2187c5165a5d626a223d831e271b438388b58accc70578c2306d56fd950f068f2ec6ecc71ec4113eade1a9cc5ac2f04b929 SHA512 15e126ccc183f4217b4862bb0cb0d5da49c7895b1a51e00ff43fadb3e66cc9f9dc70208672f92c10da438fa4af17506a8dade9517b5eeae29fea171d04b90093
 AUX tsocks-1.8_beta5-flags.patch 1339 BLAKE2B 8e9c5fd3152418e2e2a0053242538d02bd22246e28cff608c0cc223052729ef2c1006c55dbc3974abdd37710d9e63eed99fdab7da70038ff08c819d2dea6bc35 SHA512 a25acc848a7fa29479109a49147d3a1e6332fa90ed00ab5fc0c99ca546e7f7c4d9b45662ba4ece9c03cc970438d86ead79ed64c6d244d76d98d7fc8dde4060bf
 AUX tsocks-1.8_beta5-ld_preload.patch 1127 BLAKE2B d5781ae260b66aed97193d6ef73d7862555d39b8c442d771f70e329971bb3532d12961abc451e88f7eaced2fc6e6108ce7a9c758c245c0b6b3d9baf358ec9663 SHA512 a202c7a2db1f0b98f6fc6bf36ab56906be7b3516726a4ae002916a91b6fc67e6630876eadfb970a91465b3526dc00249f5b9222dd90f96a1b9cdf4f2aff13e22
+AUX tsocks-1.8_beta5-options.patch 1468 BLAKE2B b6eae3f2d0a51b2de68b47623c6c527e895e6637d30e1dccdc16adf53e8caaac029a944812810f0aa094a1ddf700ef3ceaa8ace663911ed2f208d4571dc524bb SHA512 9ffbe5cfdce9fb87cec739cd6de611c5acd2f79b73396355f7302366fa178ddbf92499c7c2801245cbe2f2a3448df27c67d57753c645f5c2622535cd8b1ea08f
 AUX tsocks-1.8_beta5-poll.patch 617 BLAKE2B 974277a260d0947e16b096eb38a0234d0fd40bbf9a4e0f212a4741994e5bee859080d455328979373c290ca9d5856db4fe4af116595a84a6fa6f70582045f10f SHA512 931a50b2c62c6fead52073dbe8287bfeda807f1c2e6ef3f9a3798cd79754e2fcd06e4d88c49bc0d748ee7a42eca3727503b2c1f261bd994b1a63e5eefac73956
 AUX tsocks-1.8_beta5-rename.patch 3104 BLAKE2B 6eec6173d8bd4cbb2e4b78096521abbfc5a57b37c6a492ef6de2de7d55d99a621e2641764038c0fe0a4ec3166c268b8eaa652ae25d86085655756471af5cf23b SHA512 d9c4b015c9408a455b357718fd40cf07f40430aef45acb1680a939b414e75ccdef43bac6e3d046268990c228aa402e9917dcf08a13d605264925c5766e9f0758
 DIST tsocks-1.8b5-tordns1-gentoo-r3.patch.xz 18468 BLAKE2B 6e786a2a5cbf37bce743aa2f934884fd7ba3abcb0c675d9cb61a0c8ab078cde1eb96a11bf8b2acf102a9637c78654e519e186a7558a3af496eaf86c0d65bd51c SHA512 86cbc7a8733e9f9e19e0924d2a2b8481a66eb67a8d548b90c7bd02cc6ae42064a295ee6a002cf19a7b3d7d811388db2a34b641d9dbe239f4c0bc8a1f78c90682
+DIST tsocks-1.8b5-tordns1-gentoo-r4.patch.xz 18464 BLAKE2B 99bd4c210c2fa4c797c4d827df4ae53d13198b91083975b9f6d327bd762193663c1a0c8530ea5e65e82d54ccf6900a11aba50e19a2fb6209e0e8f1131985374b SHA512 711b2e3f5ac9b1a4fd63e32b6cb8090066ece8882e2ec0048bee6cba868712c80ca7f601f79405be40404af625c2ff6fefa8cba98b8a6ced95abe6becf34954f
 DIST tsocks-1.8beta5.tar.gz 83928 BLAKE2B a58b4866154deb72b551961578f90b270a7cc1fd2c5b4c08a5ddf99472e3c8e338cc9116c0c9d2d2e1e1c350a077b46cd08fb24390156eb1e60c4d7a10510e6d SHA512 b41636ea6b77abf0d1e3cda7bbca4e7ee96f3cdb1843f3a2c530650931e5567f67921de67b28ba9bab0f51df39770a3f7fb458cf7ac78aad7aa861923df2c4a9
 EBUILD tsocks-1.8_beta5-r8.ebuild 2231 BLAKE2B 5c0b0193d17c63a14de0abbc27c2aab65c8e37a539edf5e4db96b90aee8c7112f37468b73e2176513ab8370afd0e119159eb0ef15d23a53fb08b343e500ed222 SHA512 8805ced695c03c23bd908e0ad427596804461ca32f1a4183748d968c517b1d56ffd0e4b9fa0d985425943bdbdedd3b03f2c5af99e8f6ef050200447d446f19c6
+EBUILD tsocks-1.8_beta5-r9.ebuild 2285 BLAKE2B d5b31359c75faea39ecdd10f0b2b307ed87ed0c08f419e90ba6118d5e39806e23dcd0f3274ddae3cef7b04b18b697fa64f68bd6ab7ebc995387ecc7c84576c4f SHA512 518d8cd766fd136c0376d99c8e187834279b3126d88366804fc732a22e6f0547be2cb7d0bd38bf98e467cc690df7ad0d436de6c2ca231e67a0b0e665db2db182
 MISC metadata.xml 981 BLAKE2B 9fbeb51e30b15ddc223aa7d239f9e5d9a51fed44b5ea905dfe07c7f996410cfb09c0019730cf4d26cf7ec26aac1bd63ac5eca1025efaff4ad20dfdce90435fd9 SHA512 483a93183cdedf77df2dbefff201c35d36f755969e28c6fefc6a44cfb56b0464ed78dfa7100ccbb3519a8ae30322c1346fb0d4cf2b1cbfa79dded237aff22d73
diff --git a/net-proxy/tsocks/files/tsocks-1.8_beta5-options.patch b/net-proxy/tsocks/files/tsocks-1.8_beta5-options.patch
new file mode 100644
index 000000000000..d1f524b3147c
--- /dev/null
+++ b/net-proxy/tsocks/files/tsocks-1.8_beta5-options.patch
@@ -0,0 +1,47 @@
+--- tsocks-1.8/configure.in.orig	2002-07-16 02:51:03.000000000 +0400
++++ tsocks-1.8/configure.in	2019-03-22 01:38:19.065438275 +0300
+@@ -154,36 +154,36 @@
+   ])    
+ ])
+ 
+-if test "${enable_socksdns}" = "yes"; then
++if test "x${enable_socksdns}" = "xyes"; then
+   AC_DEFINE(USE_SOCKS_DNS)
+ fi
+ 
+-if test "x${enable_envconf}" = "x"; then
++if test "x${enable_envconf}" = "xyes"; then
+   AC_DEFINE(ALLOW_ENV_CONFIG)
+ fi
+ 
+-if test "${enable_oldmethod}" = "yes"; then
++if test "x${enable_oldmethod}" = "xyes"; then
+   AC_DEFINE(USE_OLD_DLSYM)
+   oldmethod="yes"
+ fi
+ 
+-if test "x${enable_debug}" = "x"; then
++if test "x${enable_debug}" = "xyes"; then
+   AC_DEFINE(ALLOW_MSG_OUTPUT)
+ fi
+ 
+-if test "x${enable_hostnames}" = "x"; then
++if test "x${enable_hostnames}" = "xyes"; then
+   AC_DEFINE(HOSTNAMES)
+ fi
+ 
+-if test "${enable_socksdns}" = "yes" -a \
+-        "x${enable_hostnames}" = "x" ; then
++if test "x${enable_socksdns}" = "xyes" -a \
++        "x${enable_hostnames}" != "xno" ; then
+   AC_MSG_ERROR("--enable-socksdns is not valid without --disable-hostnames")
+ fi
+ 
+ dnl If we have to use the old method of overriding connect (i.e no
+ dnl RTLD_NEXT) we need to know the location of the library that
+ dnl contains connect(), select(), poll() and close()
+-if test "${oldmethod}" = "yes"; then 
++if test "x${oldmethod}" = "xyes"; then 
+   dnl We need to find the path to the library, to do 
+   dnl this we use find on the usual suspects, i.e /lib and
+   dnl /usr/lib
diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild
new file mode 100644
index 000000000000..63bfc1fbe7c9
--- /dev/null
+++ b/net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs multilib-minimal
+
+DESCRIPTION="Transparent SOCKS v4 proxying library"
+HOMEPAGE="http://tsocks.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tsocks/${PN}-${PV/_}.tar.gz
+	tordns? ( https://dev.gentoo.org/~bircoph/patches/${PN}-${PV/_beta/b}-tordns1-gentoo-r4.patch.xz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug dns envconf tordns server-lookups"
+
+REQUIRED_USE="
+	dns? ( !tordns !server-lookups )
+	tordns? ( !dns !server-lookups )
+"
+
+S="${WORKDIR}/${P%%_*}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-flags.patch"
+	"${FILESDIR}/${P}-ld_preload.patch"
+	"${FILESDIR}/${P}-rename.patch"
+	"${FILESDIR}/${P}-bsd.patch"
+	"${FILESDIR}/${P}-poll.patch"
+	"${FILESDIR}/${P}-options.patch"
+)
+
+src_prepare() {
+	default
+	use tordns && eapply "../${PN}-${PV/_beta/b}-tordns1-gentoo-r4.patch"
+
+	sed -i 's/TSOCKS_CONFFILE/TSOCKS_CONF_FILE/' tsocks.8 || die "sed tsocks.8 failed"
+
+	mv configure.in configure.ac || die
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	tc-export CC
+
+	# NOTE: the docs say to install it into /lib. If you put it into
+	# /usr/lib and add it to /etc/ld.so.preload on many systems /usr isn't
+	# mounted in time :-( (Ben Lutgens) <lamer@gentoo.org>
+	econf \
+		$(use_enable debug) \
+		$(use_enable dns socksdns) \
+		$(use_enable envconf) \
+		$(use_enable server-lookups hostnames) \
+		--with-conf="${EPREFIX}"/etc/socks/tsocks.conf \
+		--libdir="${EPREFIX}"/$(get_libdir)
+}
+
+multilib_src_compile() {
+	# Fix QA notice lack of SONAME
+	emake DYNLIB_FLAGS=-Wl,--soname,libtsocks.so.${PV/_beta*}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if multilib_is_native_abi; then
+		newbin validateconf tsocks-validateconf
+		newbin saveme tsocks-saveme
+		dobin inspectsocks
+		insinto /etc/socks
+		doins tsocks.conf.*.example
+		dodoc FAQ
+		use tordns && dodoc README*
+	fi
+}
+
+pkg_postinst() {
+	einfo "Make sure you create /etc/socks/tsocks.conf from one of the examples in that directory"
+	einfo "The following executables have been renamed:"
+	einfo "    /usr/bin/saveme renamed to tsocks-saveme"
+	einfo "    /usr/bin/validateconf renamed to tsocks-validateconf"
+}