gentoo resync : 30.05.2020

9 files changed, 25 insertions, 290 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index afd03d7b62b6..1d44277fbc59 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 86b224168eb1..b17ffeca3a4b 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -12,10 +12,10 @@ EBUILD haproxy-1.8.9.ebuild 4885 BLAKE2B beb86eb5714d77b8dad4ac0abc55b46a0e4727c
 EBUILD haproxy-1.9.15-r1.ebuild 4997 BLAKE2B 72c880344b1c4b61f7a75fa8552d9bc4aea4c7eaeb5a158ea20a5f99a2d811e2c09dd553e70ef33ae0451079fb456ae8670f7ce25b41d53f7e620731bc3e62d0 SHA512 3ba9487968a62978abe58be3bbb2bcc6ab64a3991abb4aad49494b996715f0c69691a31d59b91e4a1601f990684bc05ca10ee8aace38015ada892abb30491c34
 EBUILD haproxy-1.9.15.ebuild 5018 BLAKE2B fa166d23ef442cba45d4362ff480946dda97f3fca49cfc11bdafbc82c2c6ffd158d788af4b8218983a17a604623b0b97d08b670382f807b3143ee51e25a7711b SHA512 7eb2b7e1010ae2e962db93aff0740c875dfacea4b976c5378b5f81e4f5406a5ab6b33a86945301e4520c8d120597fed632d798849a874be485a27faf81005ac7
 EBUILD haproxy-1.9.9999.ebuild 4997 BLAKE2B 72c880344b1c4b61f7a75fa8552d9bc4aea4c7eaeb5a158ea20a5f99a2d811e2c09dd553e70ef33ae0451079fb456ae8670f7ce25b41d53f7e620731bc3e62d0 SHA512 3ba9487968a62978abe58be3bbb2bcc6ab64a3991abb4aad49494b996715f0c69691a31d59b91e4a1601f990684bc05ca10ee8aace38015ada892abb30491c34
-EBUILD haproxy-2.0.14-r1.ebuild 5224 BLAKE2B 65616d45e46a318de40c7edd0a12843741784181a62f6991b49137fb2e04e479634851138b2ead576c82d3e8160d0e6706ce78da9bb81addf41ef6e2ecd18f4a SHA512 e6b4a5f154e17f96d124ccb723ab5bdcb389f89995a98e65d2f3199780d502b99da4defdba724c13ec6889bf82ec332e5757383c6b7cdd8b01786689e58e872b
+EBUILD haproxy-2.0.14-r1.ebuild 5345 BLAKE2B df4570054d3ed94729d8d1b7414a61798973c716f68631ce4f487902e4d0f04ab0fb93cf45b5104c8c4b9541787f12c1cb00e72809447b9a6484ca15322e00e7 SHA512 6bad2f674656e9ed6277c691962cab5add403d6b4ceb7a65f5b7d4e6da4fdf50888c6b9f9a6aee74b8de0dc8f433e93b7c1c0e337a90f64f9be2a3389190ca85
 EBUILD haproxy-2.0.14.ebuild 5242 BLAKE2B 208fe423b99ed61c827ff682764eabc638d60c9821b6a3bed62dca12c7573c9bd674a1aa52edd46d4b68611d89796c631bcb9e0a27ebfa69086abdcf37b77db6 SHA512 c52730946f4abd1414917dba166b867e897bcb7ac52e79a73777ed6b8c923289be54089559c92e1409e580a1b6123855545c09b8c4338d2f6f4fa39766e21235
 EBUILD haproxy-2.0.9999.ebuild 5224 BLAKE2B 65616d45e46a318de40c7edd0a12843741784181a62f6991b49137fb2e04e479634851138b2ead576c82d3e8160d0e6706ce78da9bb81addf41ef6e2ecd18f4a SHA512 e6b4a5f154e17f96d124ccb723ab5bdcb389f89995a98e65d2f3199780d502b99da4defdba724c13ec6889bf82ec332e5757383c6b7cdd8b01786689e58e872b
-EBUILD haproxy-2.1.4-r1.ebuild 5224 BLAKE2B 65616d45e46a318de40c7edd0a12843741784181a62f6991b49137fb2e04e479634851138b2ead576c82d3e8160d0e6706ce78da9bb81addf41ef6e2ecd18f4a SHA512 e6b4a5f154e17f96d124ccb723ab5bdcb389f89995a98e65d2f3199780d502b99da4defdba724c13ec6889bf82ec332e5757383c6b7cdd8b01786689e58e872b
+EBUILD haproxy-2.1.4-r1.ebuild 5345 BLAKE2B df4570054d3ed94729d8d1b7414a61798973c716f68631ce4f487902e4d0f04ab0fb93cf45b5104c8c4b9541787f12c1cb00e72809447b9a6484ca15322e00e7 SHA512 6bad2f674656e9ed6277c691962cab5add403d6b4ceb7a65f5b7d4e6da4fdf50888c6b9f9a6aee74b8de0dc8f433e93b7c1c0e337a90f64f9be2a3389190ca85
 EBUILD haproxy-2.1.4.ebuild 5242 BLAKE2B 208fe423b99ed61c827ff682764eabc638d60c9821b6a3bed62dca12c7573c9bd674a1aa52edd46d4b68611d89796c631bcb9e0a27ebfa69086abdcf37b77db6 SHA512 c52730946f4abd1414917dba166b867e897bcb7ac52e79a73777ed6b8c923289be54089559c92e1409e580a1b6123855545c09b8c4338d2f6f4fa39766e21235
 EBUILD haproxy-2.1.9999.ebuild 5224 BLAKE2B 65616d45e46a318de40c7edd0a12843741784181a62f6991b49137fb2e04e479634851138b2ead576c82d3e8160d0e6706ce78da9bb81addf41ef6e2ecd18f4a SHA512 e6b4a5f154e17f96d124ccb723ab5bdcb389f89995a98e65d2f3199780d502b99da4defdba724c13ec6889bf82ec332e5757383c6b7cdd8b01786689e58e872b
 MISC metadata.xml 2148 BLAKE2B 2f273c8d5c4704b482cf5b09e038415e0faa6ecba7297f99d0c55d96ba0b8f0bfa50b21dc857680951c3b4794be98f8781a6d1dcfb622ec5f6827648cfdd247e SHA512 91834d33a145ce6f887f83849ea90da984cf131e657824e63fb44b49761dc9999c00796fb20879cc670b83a2f4aae2263aeacc1dc6bf71b9db34a21ef9a3026d
diff --git a/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild b/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild
index 7e2cb38725c6..dbcd0d12bd9d 100644
--- a/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+	KEYWORDS="~amd64 ~arm ppc ~x86"
 else
 	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
 	EGIT_BRANCH=master
@@ -97,12 +97,17 @@ src_compile() {
 	# For now, until the strict-aliasing breakage will be fixed
 	append-cflags -fno-strict-aliasing
 
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
 	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 CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
 	emake -C contrib/systemd SBINDIR=/usr/sbin
 
 	if use tools ; then
diff --git a/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild b/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild
index 7e2cb38725c6..dbcd0d12bd9d 100644
--- a/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+	KEYWORDS="~amd64 ~arm ppc ~x86"
 else
 	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
 	EGIT_BRANCH=master
@@ -97,12 +97,17 @@ src_compile() {
 	# For now, until the strict-aliasing breakage will be fixed
 	append-cflags -fno-strict-aliasing
 
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
 	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 CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
 	emake -C contrib/systemd SBINDIR=/usr/sbin
 
 	if use tools ; then
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 49d4743ec723..830176730857 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -5,8 +5,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.10.tar.xz 2445848 BLAKE2B 8161626f0fc448f62c9afe13194e10a3ac21c1fe25cd6a9e6a85dcc3cebc2a84750ae78235134ada38f730923e7d1815ca5fb5a6aec7ae70623798c66beaf160 SHA512 033891f84789fe23a23fabcfb6f51a5b044c16892600f94380b5f0bcbceaef67b95c7047154d940511146248ca9846a949f00a609c6ed27f9af8829325eb08e0
 DIST squid-4.11.tar.xz 2447700 BLAKE2B 9080508caff683bffe3e2eb64a454c95f69ab47c0ca9b1a649e553daf0dde2391aa14c6631aa6ee617687b122beef691cbe9a8e49ac5e5ea8a9737847ece9444 SHA512 02d4bb4d5860124347670615e69b1b92be7ea4fc0131e54091a06cb2e67bd73583d8e6cbe472473f0c59764611a49561d02ab9fe2bf0305ce4652d4ec7714f26
-EBUILD squid-4.10.ebuild 8058 BLAKE2B 35a1e7e6899d723d99fcc67e93d454725b7e12862d4a666148b829902b38552671414cb54a0fce2a2bd8fdcc637dc8fbcbef96e224007732a158ac1f19fb2ec1 SHA512 457ee367ebcf2a8252ffd8039f07eb1e8430ac6039f3021507c063f590242c69a27b906609c07156d65d5af9aac4c27254824a6479a6b7978925f712d1a92bcf
-EBUILD squid-4.11.ebuild 8118 BLAKE2B ecbeaedc74f332332632142b765b4ae3734bfb7c3a142d6c8b828b739ef3f48c1237db3ccf8cea28c186f100d06ee937431d30d520cc89582d5ece22651bcd85 SHA512 fb57fc67029bd7475753ae2ee9351f991643d8202d8b15eb94f6a9ecc95eeb25beb86ddae62e32c57d2b24604e5694589ff24ba9961c5285dce6539eefdf633c
+EBUILD squid-4.11.ebuild 8204 BLAKE2B 4bd328eab6cb9c07987cb92d15d701db07907870e00742fa21614f4bb7f5a2e1193ed6f3be7e0845756ece5f7fe55910c705a55831e116a0d95cc8962b2c1169 SHA512 0a2bae992277a8913997cf82291651e39c617ad010841f7ffc7be3e7c21adf8cdaaa54ee3b532a38f541d60ecc6ad9ae11c323dd312b45950133244dd7125d08
 MISC metadata.xml 1472 BLAKE2B ba8020d30b7fb7740a160a06f2f4323f1ae181c79bc89fe390b25b156000a5c751a68333a634753cb1a96a9097577b379369226db8ee6e04c22c4b9f0e8626bc SHA512 19fce272b91077d6114ee400adc6360993558c02bc6595c50fdf43323eb7aebd0f2c0d7cb6d688fd8f1db6af06305de24a7c5a0cddce62d150391c50da46e056
diff --git a/net-proxy/squid/squid-4.10.ebuild b/net-proxy/squid/squid-4.10.ebuild
deleted file mode 100644
index 610eb4ea4231..000000000000
--- a/net-proxy/squid/squid-4.10.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools linux-info pam toolchain-funcs
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-
-# Upstream patch ID for the most recent bug-fixed update to the formal release.
-r=
-#r=-20181117-r0022167
-if [ -z "$r" ]; then
-	SRC_URI="http://www.squid-cache.org/Versions/v${PV%.*}/${P}.tar.xz"
-else
-	SRC_URI="http://www.squid-cache.org/Versions/v${PV%.*}/${P}${r}.tar.bz2"
-	S="${S}${r}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
-	ecap esi ssl-crtd \
-	mysql postgres sqlite \
-	perl qos tproxy \
-	+htcp +wccp +wccpv2 \
-	pf-transparent ipf-transparent kqueue \
-	elibc_uclibc kernel_linux"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-lang/perl"
-
-COMMON_DEPEND="acct-group/squid
-	acct-user/squid
-	caps? ( >=sys-libs/libcap-2.16 )
-	pam? ( sys-libs/pam )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	qos? ( net-libs/libnetfilter_conntrack )
-	ssl? (
-		!gnutls? ( 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 )
-	logrotate? ( app-admin/logrotate )
-	>=sys-libs/db-4:*
-	dev-libs/libltdl:0"
-
-DEPEND="${COMMON_DEPEND}
-	${BDEPEND}
-	ecap? ( virtual/pkgconfig )
-	test? ( dev-util/cppunit )"
-
-RDEPEND="${COMMON_DEPEND}
-	samba? ( net-fs/samba )
-	perl? ( dev-lang/perl )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	selinux? ( sec-policy/selinux-squid )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-REQUIRED_USE="tproxy? ( caps )
-		qos? ( caps )"
-
-pkg_pretend() {
-	if use tproxy; then
-		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-4.3-gentoo.patch"
-	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
-		INSTALL QUICKSTART \
-		scripts/fileno-to-pathname.pl \
-		scripts/check_cache.pl \
-		tools/cachemgr.cgi.8 \
-		tools/purge/conffile.hh \
-		tools/purge/purge.1  || die
-	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
-		INSTALL QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
-		QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
-		QUICKSTART \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
-		src/acl/external/unix_group/ext_unix_group_acl.8 \
-		src/acl/external/session/ext_session_acl.8 || die
-	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-		scripts/check_cache.pl || die
-	# /var/run/squid to /run/squid
-	sed -i -e 's:$(localstatedir)::' \
-		src/ipc/Makefile.am || die
-	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
-		libltdl/configure.ac || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local basic_modules="NCSA,POP3,getpwnam"
-	use samba && basic_modules+=",SMB"
-	use ldap && basic_modules+=",SMB_LM,LDAP"
-	use pam && basic_modules+=",PAM"
-	use sasl && basic_modules+=",SASL"
-	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
-	use radius && basic_modules+=",RADIUS"
-	if use mysql || use postgres || use sqlite ; then
-		basic_modules+=",DB"
-	fi
-
-	local digest_modules="file"
-	use ldap && digest_modules+=",LDAP,eDirectory"
-
-	local negotiate_modules="none"
-	local myconf="--without-mit-krb5 --without-heimdal-krb5"
-	if use kerberos ; then
-		negotiate_modules="kerberos,wrapper"
-		if has_version app-crypt/heimdal ; then
-			myconf="--without-mit-krb5 --with-heimdal-krb5"
-		else
-			myconf="--with-mit-krb5 --without-heimdal-krb5"
-		fi
-	fi
-
-	local ntlm_modules="none"
-	use samba && ntlm_modules="SMB_LM"
-
-	local ext_helpers="file_userip,session,unix_group,delayer,time_quota"
-	use samba && ext_helpers+=",wbinfo_group"
-	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-	if use mysql || use postgres || use sqlite ; then
-	    ext_helpers+=",SQL_session"
-	fi
-
-	local storeio_modules="aufs,diskd,rock,ufs"
-
-	local transparent
-	if use kernel_linux ; then
-		transparent+=" --enable-linux-netfilter"
-		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
-	fi
-
-	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		transparent+=" $(use_enable kqueue)"
-		if use pf-transparent; then
-			transparent+=" --enable-pf-transparent"
-		elif use ipf-transparent; then
-			transparent+=" --enable-ipf-transparent"
-		fi
-	fi
-
-	tc-export_build_env BUILD_CXX
-	export BUILDCXX=${BUILD_CXX}
-	export BUILDCXXFLAGS=${BUILD_CXXFLAGS}
-	tc-export CC AR
-
-	# Should be able to drop this workaround with newer versions.
-	# https://bugs.squid-cache.org/show_bug.cgi?id=4224
-	tc-is-cross-compiler && export squid_cv_gnu_atomics=no
-
-	econf \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/libexec/squid \
-		--localstatedir=/var \
-		--with-pidfile=/run/squid.pid \
-		--datadir=/usr/share/squid \
-		--with-logdir=/var/log/squid \
-		--with-default-user=squid \
-		--enable-removal-policies="lru,heap" \
-		--enable-storeio="${storeio_modules}" \
-		--enable-disk-io \
-		--enable-auth-basic="${basic_modules}" \
-		--enable-auth-digest="${digest_modules}" \
-		--enable-auth-ntlm="${ntlm_modules}" \
-		--enable-auth-negotiate="${negotiate_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-log-daemon-helpers \
-		--enable-url-rewrite-helpers \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-eui \
-		--enable-icmp \
-		--enable-follow-x-forwarded-for \
-		--with-large-files \
-		--with-build-environment=default \
-		--disable-strict-error-checking \
-		--disable-arch-native \
-		--with-included-ltdl=/usr/include \
-		--with-ltdl-libdir=/usr/$(get_libdir) \
-		$(use_with caps libcap) \
-		$(use_enable ipv6) \
-		$(use_enable snmp) \
-		$(use_with ssl openssl) \
-		$(use_with ssl nettle) \
-		$(use_with gnutls) \
-		$(use_enable ssl-crtd) \
-		$(use_enable ecap) \
-		$(use_enable esi) \
-		$(use_enable htcp) \
-		$(use_enable wccp) \
-		$(use_enable wccpv2) \
-		${transparent} \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	# need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
-	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
-	if use pam; then
-		fowners root:squid /usr/libexec/squid/basic_pam_auth
-		fperms 4750 /usr/libexec/squid/basic_pam_auth
-	fi
-	# pinger needs suid as well
-	fowners root:squid /usr/libexec/squid/pinger
-	fperms 4750 /usr/libexec/squid/pinger
-
-	# these scripts depend on perl
-	if ! use perl; then
-		for f in basic_pop3_auth \
-			ext_delayer_acl \
-			helper-mux \
-			log_db_daemon \
-			security_fake_certverify \
-			storeid_file_rewrite \
-			url_lfs_rewrite; do
-				rm "${D}"/usr/libexec/squid/${f} || die
-		done
-	fi
-
-	# cleanup
-	rm -r "${D}"/run "${D}"/var/cache || die
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
-	newdoc src/auth/negotiate/kerberos/README README.kerberos
-	newdoc src/auth/basic/RADIUS/README README.RADIUS
-	newdoc src/acl/external/kerberos_ldap_group/README README.kerberos_ldap_group
-	dodoc RELEASENOTES.html
-
-	newpamd "${FILESDIR}/squid.pam" squid
-	newconfd "${FILESDIR}/squid.confd-r2" squid
-	newinitd "${FILESDIR}/squid.initd-r5" squid
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	diropts -m0750 -o squid -g squid
-	keepdir /var/log/squid /etc/ssl/squid /var/lib/squid
-}
-
-pkg_postinst() {
-	elog "A good starting point to debug Squid issues is to use 'squidclient mgr:' commands such as 'squidclient mgr:info'."
-	if [ ${#r} -gt 0 ]; then
-		elog "You are using a release with the official ${r} patch! Make sure you mention that, or send the output of 'squidclient mgr:info' when asking for support."
-	fi
-}
diff --git a/net-proxy/squid/squid-4.11.ebuild b/net-proxy/squid/squid-4.11.ebuild
index b0fc4013b7d9..d46ef90915e9 100644
--- a/net-proxy/squid/squid-4.11.ebuild
+++ b/net-proxy/squid/squid-4.11.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 WANT_AUTOMAKE="1.15"
 
-inherit autotools linux-info pam toolchain-funcs
+inherit autotools flag-o-matic linux-info pam toolchain-funcs
 
 DESCRIPTION="A full-featured web proxy cache"
 HOMEPAGE="http://www.squid-cache.org/"
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
 	ecap esi ssl-crtd \
 	mysql postgres sqlite \
@@ -173,6 +173,9 @@ src_configure() {
 	# https://bugs.squid-cache.org/show_bug.cgi?id=4224
 	tc-is-cross-compiler && export squid_cv_gnu_atomics=no
 
+	# Bug #719662
+	(use ppc || use arm || use hppa) && append-libs -latomic
+
 	econf \
 		--sysconfdir=/etc/squid \
 		--libexecdir=/usr/libexec/squid \
diff --git a/net-proxy/torsocks/Manifest b/net-proxy/torsocks/Manifest
index 21b3d391175b..154cff8e28e4 100644
--- a/net-proxy/torsocks/Manifest
+++ b/net-proxy/torsocks/Manifest
@@ -2,5 +2,5 @@ AUX torsocks-2.3.0-fix-syscall.patch 2687 BLAKE2B 2ef527aa1618af20da02e2b08ddc59
 DIST torsocks-2.2.0.tar.gz 115269 BLAKE2B e6e376dbe9b248bcb51fb0c3c16346f4888310abd6e84942acca69f67ae15afe5dfeba9a6b3a8d1fa562f87548450af93cea3bea4d899980ca6acb651658cfaa SHA512 903d11d58ece76eaf75ff8fc11a27e4a29f94be530f2d77d1a6f0982d556a4b9c78677a43eed88f2451054d0e985672900ecf73b360fa09e80195c3b9006622b
 DIST torsocks-2.3.0.tar.gz 118033 BLAKE2B a4329ffa5e20204024c4f7dda8619ba2d3e2a5f370727acdc720527688bdb3f8735b0386dfa07758fe59e1890f9ce88bb148a1b0c401bbb5966d2fe17934ca61 SHA512 139f4cf60191632add8bc845b2d68d25a0285e9746988167d832e50cedb8083f2765571429d3a11350fa2d327a1ff0a0ead9b464dac90d897b13ab948f609114
 EBUILD torsocks-2.2.0.ebuild 1010 BLAKE2B 3a9fe259df34618bd7156b544051e09c13c957736803d78524bd9319328eebc408c663c732322f366dae443aa06386978d5f74e1b18e3ad3b05e96ab6d589a2d SHA512 bcb08ee5636cc37573f456c22af6e0a1b56ade236263e56a8392d2f267bf64819e80343088e8483a9353978d8d128a529a934bfdb30aba4e3caf11a1fcc01a79
-EBUILD torsocks-2.3.0.ebuild 1028 BLAKE2B 386b3080e83ab1d3deb2b95cda11fa9cc221f8ea96e482a9035c5ab27f91946f7530a891fd4b7b327682d8c446e24e0ffe00ce8f041c9031f68459687fe768de SHA512 44c3819cc1d9b1720cb487f84b3f33fb60fc81b822b3fe431991c1690deb39bb6a344e5c783c754b620d4601106caeaf5474123d79ea3c91f34be56cd5c39ae7
+EBUILD torsocks-2.3.0.ebuild 1026 BLAKE2B b7ec706ca0d001952893f21983f26fcf7dae8a7e694b9966dfafde1f11038dc6169a47443d36c1b5190117976ba7992c2cf10f49f9ade06d081783257f043a22 SHA512 1721265f13357ada138dd0a6768754e0ece133ebbe952bc8b8144461d2bf0f03cbb03252bb53a5153640bfa06e2ea038254e34f3c2529550ccacb1a3530688da
 MISC metadata.xml 386 BLAKE2B 60d3abc672f9d331157ddadf5d3c85cd14ef1eb6762f3caad0fa53af02b430c019bd9b879ee543a1ad9b84db5053a1fe3a200429bfc0ad95299c363cd4700f8c SHA512 3ab13f567b539e1b4e8dd45fc088bb2d83abbfc161647c4f50c3a8566d13d5b14b88c851f64933ee0940ab56ae9b7cd273dd4a5e8b47faae6441a6e237ce1079
diff --git a/net-proxy/torsocks/torsocks-2.3.0.ebuild b/net-proxy/torsocks/torsocks-2.3.0.ebuild
index 185229c5cf7e..60d7ee656ce1 100644
--- a/net-proxy/torsocks/torsocks-2.3.0.ebuild
+++ b/net-proxy/torsocks/torsocks-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/dgoulet/torsocks/archive/v${MY_PV}.tar.gz -> ${MY_PF
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="static-libs"
 
 # We do not depend on tor which might be running on a different box