[gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/, net-proxy/squid/files/

Eray Aslan Mon, 23 May 2016 23:57:07 -0700

commit:     4888b6cd5b8f72753e30f7a6f22fdd2549a14214
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 06:55:39 2016 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Tue May 24 06:56:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4888b6cd


net-proxy/squid: remove old

Package-Manager: portage-2.3.0_rc1

 net-proxy/squid/Manifest                           |   9 -
 net-proxy/squid/files/squid-3.3.4-gentoo.patch     | 131 -----------
 .../squid/files/squid-kernel-headers-4.2.patch     |  14 --
 net-proxy/squid/squid-3.5.10.ebuild                | 249 --------------------
 net-proxy/squid/squid-3.5.11.ebuild                | 249 --------------------
 net-proxy/squid/squid-3.5.12.ebuild                | 249 --------------------
 net-proxy/squid/squid-3.5.14.ebuild                | 249 --------------------
 net-proxy/squid/squid-3.5.16-r1.ebuild             | 250 ---------------------
 net-proxy/squid/squid-3.5.16.ebuild                | 249 --------------------
 net-proxy/squid/squid-3.5.6.ebuild                 | 247 --------------------
 net-proxy/squid/squid-3.5.7.ebuild                 | 247 --------------------
 net-proxy/squid/squid-3.5.8.ebuild                 | 250 ---------------------
 net-proxy/squid/squid-3.5.9.ebuild                 | 250 ---------------------
 13 files changed, 2643 deletions(-)

diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 10b6759..b0452a5 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,12 +1,3 @@
-DIST squid-3.5.10.tar.xz 2297452 SHA256 
736e69fbddd6e985d2f85c995526f0a2bc4294c46dfb6737c0ccf09274a458b3 SHA512 
b577cf90ccc240ae7be42df36cb592399a5f43b7a38df47f3df404aa4b6fb8ceaf568696251376fbc5e30686e6d5b77942852fb94e79d71676aaf35ffde17d21
 WHIRLPOOL 
d422fcbf6d274fa4535c7bb2b8845e1f2f0d5ea42776a6ec517a34ceb87947b01c5412bec332fd634ed2fcef77e7de64fb138ef044fecfd00f3073c71c25513a
-DIST squid-3.5.11.tar.xz 2298436 SHA256 
c26211b8e349fd9a5fd357da33074ff6523c111024dd3a5a1f77153538aa40cf SHA512 
7d7557f949d7a5995eff4745f6bf58d3c4899b882828a83332e269c4396de8470d7847d76701f383fd889cf7990b8d5c9ace6d557d00a9dd4a8d326f9b116c09
 WHIRLPOOL 
47acb40ecdaee9ce166e8db0da8a9642125a6af8306b3fd47e29c2edb7e96242a9535f1dfb028310334863fe914458c8b3d6f0f0f9c26c1c44cf4fdea0b2ed02
-DIST squid-3.5.12.tar.xz 2299644 SHA256 
8bc83f3869f7404aefb10883109e28443255cf6dde50a13904c7954619707a42 SHA512 
2620f2b560df58c9a6ca5be38e91e7b67ee04a5a28de133ecd0fed232094570c453690a08a4835ad59ebf1cd002a6e6d7c7c4ea502b6d719d74f97111a5302d1
 WHIRLPOOL 
758c5f9d0a7dd8c87052008ec994966263f6fc956fdd9a254977f79bc2cccabe22e1dda6c6119f4e411ecec8ace9af8a5b86430ceccc075481e46955cc69dd25
-DIST squid-3.5.14.tar.xz 2315320 SHA256 
79ec4cdd4f965314e6db8e3f6ddcebf2d24518edd790a68e0bd4d0a7735ace1b SHA512 
0b500dbe36fb9cd487e6954244bad7fbebd2bd6af442d1c5f7ebf9c73d846a1b1c061b035afa3bf34709e41e0fef4c8023f0d1114e21b794591ee49fe8843a1f
 WHIRLPOOL 
1c89b4aa961aa8c6b3c8f68662f506432b5f54922f49749d7977708f186bb4a842ef7182190c0ad403f4d3b0ac670d940044556db60dbcffae04dcb9b5b35738
 DIST squid-3.5.15.tar.xz 2315628 SHA256 
9cfce3231c7b3b33816fc54414d8720a51ac5e723663e0685a8bb995b9f450d2 SHA512 
b5a6b4bc94d007f475419123b7ff4cdf7d47a024b859d2f7de0952115285114f06fd389fc6f463c21a1ce7d41e06227972bd802bafd2704cf0814afdee893dde
 WHIRLPOOL 
a8c73ac1a9a36b405cfb2d804ad51e673ffc812e561860f5b2775b468fcebc84834842ae4f55d4be928936f1750ea54b54d788149758a362282e1287696fe094
-DIST squid-3.5.16.tar.xz 2317320 SHA256 
e73d821180eed8bed230f357c680c0b19f1efa51a24725e810f2b48a2079d385 SHA512 
117cf70dd87aff0c0db209648c43a8c2f056c87331133948a799715748a28133df32cf6982251a8c1366c960bbda2bd2d33287df0df7c642632723c6dbedc8cf
 WHIRLPOOL 
2b44e2066f728a5b5218969896aaf2373a468a94ac1f0e9d23947b5bcf0933f6af72c219f822e34f88fdc90423b7619de81c6fa9130ed6f7539055e88e546006
 DIST squid-3.5.17.tar.xz 2318216 SHA256 
cb04e34f6ec80a5ae6caaef042703c841d3803c4c280e75eff12a5a6c84951a2 SHA512 
7531c208278ee42b9e34b4e49a249bb033389207546cf0172a2657d60d08146d36ee8f9296e16eea13c552bad01f3ef8592b1486556756edb0b3304b17306661
 WHIRLPOOL 
4aaf4108c1223f16e1b544244d26288cc96ee5f17b3322070fa35dc3069e588a1270df1531104554e7ac8b0316bc722edb812d0a41b871ec50020e514ef0d411
 DIST squid-3.5.19.tar.xz 2318720 SHA256 
c4b8a2efb85acc600e506605f175298ce3324048e60f4708926d354fe4b5c7a0 SHA512 
b2e70845d87a3a3d57b8ff08c6fb21137cedc75c8076a8e004a4b4031a7045d13f13de2b2aa98435e39770aefe1db838538ed62fc4169f83797c99fc0883f650
 WHIRLPOOL 
73ce9e63bbf5d494ff40b2379930e2723f01507782b3c332ea0e2b3d1c813c914fdfea47d22f9b004d0bac5a826928b5e47fa0fdb190c2be5235e1c51c25c575
-DIST squid-3.5.6.tar.xz 2291152 SHA256 
cd080e8d5eaabebf6808792751322bd05f2a9c8fe4377f54c7155682ef6c38d5 SHA512 
f6c2550cdb5b2f3317105c986caddf06d010bffa0c61d065cffcde72e5bc30c4608486c79c4b25418dfb9f0a8d7ef1d2fabb6b07d1f0262a19fafc945af98bef
 WHIRLPOOL 
863c6f73c3c26737d98cbff15afa5b6630310226ee9ec10a3e38f646b1416137e998f9bb1e5b492e5871129aed3c98e729b3a757d35088162e671d310a887336
-DIST squid-3.5.7.tar.xz 2294580 SHA256 
ec6f861bddee007b1dd320667a26ddc9ff76847bbe4cbb59c0134588e65c8699 SHA512 
13757da759c1a64fe13d451cff40c4ae30b18c2939f6971b4ef25e24b771ea973e3357f05ec89fccff51acc9e2c77418880b05f6020d58b7633141b928aaf349
 WHIRLPOOL 
9ce722647f6144ae5192a0a177d5d085252039eed3a7cbdf1fcb638c32097bf21710db71044448fc98bdba7c15daefb79dee5912b4d0c41cbc0e0b0fda695ee1
-DIST squid-3.5.8.tar.xz 2295644 SHA256 
f402a21d4fae8b3e9df13683dc530366e4b1753df21e91c05a0a9514a1abfc62 SHA512 
df371934b141fd0e57223ef2a801b71ae2c88c918e1ebd17a82105d33a8f6d439da65cd6437b42a3857f0d64ce461ea31d01299d452ede3650a44cf6826e16e1
 WHIRLPOOL 
9ca3f07b3068a439299b30e8be924208bc36e336f7929c593563bf6dadf9eaaa051c213e34eafc1ec6db43540b61367bd666c7c172e370d600aa6823779bd192
-DIST squid-3.5.9.tar.xz 2296384 SHA256 
9e9a3dc16e6f97258f2c3589dc6163bec20fb9369aec1fe03612dbca76d185d3 SHA512 
e9db2eb1674feb4242c5498d24c44ba53eb1ac8df71465301a6e2462051788b45d38e779edc38a944c7ac903bfef0dde52a9b0e167ef15d71084b7b6e405c666
 WHIRLPOOL 
48c9866f36882051072fde81521189c463d35a72954f0d891b0f65f7caa49f078b1ad5229244b3c9bd51e8c4f07c947313eacffc3d94ac211c95f432deed3657

diff --git a/net-proxy/squid/files/squid-3.3.4-gentoo.patch 
b/net-proxy/squid/files/squid-3.3.4-gentoo.patch
deleted file mode 100644
index fb049e9..0000000
--- a/net-proxy/squid/files/squid-3.3.4-gentoo.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a863327..deb44ed 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -26,9 +26,9 @@ PRESET_CFLAGS="$CFLAGS"
- PRESET_LDFLAGS="$LDFLAGS"
- 
- dnl Set default LDFLAGS
--if test "x$LDFLAGS" = "x" ; then
--  LDFLAGS="-g"
--fi
-+dnl if test "x$LDFLAGS" = "x" ; then
-+dnl   LDFLAGS="-g"
-+dnl fi
- 
- # Check for GNU cc
- AC_PROG_CC
-diff --git a/helpers/basic_auth/SMB/basic_smb_auth.sh 
b/helpers/basic_auth/SMB/basic_smb_auth.sh
-index 2a1abb3..b3ebb7a 100755
---- a/helpers/basic_auth/SMB/basic_smb_auth.sh
-+++ b/helpers/basic_auth/SMB/basic_smb_auth.sh
-@@ -24,7 +24,7 @@ read NMBCAST
- read AUTHSHARE
- read AUTHFILE
- read SMBUSER
--read SMBPASS
-+read -r SMBPASS
- 
- # Find domain controller
- echo "Domain name: $DOMAINNAME"
-@@ -47,7 +47,7 @@ else
-   addropt=""
- fi
- echo "Query address options: $addropt"
--dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; 
exit }'`
-+dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 
; exit }'`
- echo "Domain controller IP address: $dcip"
- [ -n "$dcip" ] || exit 1
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6b69267..10f506a 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -867,8 +867,8 @@ DEFAULT_LOG_PREFIX = $(DEFAULT_LOG_DIR)
- DEFAULT_CACHE_LOG     = $(DEFAULT_LOG_PREFIX)/cache.log
- DEFAULT_ACCESS_LOG    = $(DEFAULT_LOG_PREFIX)/access.log
- DEFAULT_STORE_LOG     = $(DEFAULT_LOG_PREFIX)/store.log
--DEFAULT_NETDB_FILE    = $(DEFAULT_LOG_PREFIX)/netdb.state
--DEFAULT_SSL_DB_DIR    = $(localstatedir)/lib/ssl_db
-+DEFAULT_NETDB_FILE    = $(localstatedir)/lib/squid/netdb.state
-+DEFAULT_SSL_DB_DIR    = $(localstatedir)/lib/squid/ssl_db
- DEFAULT_PINGER                = $(libexecdir)/`echo pinger | sed 
'$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_UNLINKD               = $(libexecdir)/`echo unlinkd | sed 
'$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_LOGFILED      = $(libexecdir)/`echo log_file_daemon | sed 
'$(transform);s/$$/$(EXEEXT)/'`
-diff --git a/src/debug.cc b/src/debug.cc
-index 64ab0ba..062119a 100644
---- a/src/debug.cc
-+++ b/src/debug.cc
-@@ -450,7 +450,7 @@ _db_init(const char *logfile, const char *options)
- #if HAVE_SYSLOG && defined(LOG_LOCAL4)
- 
-     if (Debug::log_syslog)
--        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, 
syslog_facility);
-+        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility);
- 
- #endif /* HAVE_SYSLOG */
- 
-diff --git a/src/main.cc b/src/main.cc
-index d6eb01a..0b93f0e 100644
---- a/src/main.cc
-+++ b/src/main.cc
-@@ -1657,7 +1657,7 @@ watch_child(char *argv[])
-     if (!IamMasterProcess())
-         return;
- 
--    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
- 
-     if ((pid = fork()) < 0)
-         syslog(LOG_ALERT, "fork failed: %s", xstrerror());
-@@ -1720,7 +1720,7 @@ watch_child(char *argv[])
- 
-             if ((pid = fork()) == 0) {
-                 /* child */
--                openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, 
LOG_LOCAL4);
-+                openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
-                 prog = argv[0];
-                 argv[0] = const_cast<char*>(kid.name().termedBuf());
-                 execvp(prog, argv);
-@@ -1733,7 +1733,7 @@ watch_child(char *argv[])
-         }
- 
-         /* parent */
--        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
- 
-         squid_signal(SIGINT, SIG_IGN, SA_RESTART);
- 
---- a/src/cf.data.pre  2013-04-29 11:17:59.256167134 +0300
-+++ b/src/cf.data.pre  2013-04-29 11:20:17.043924313 +0300
-@@ -1019,6 +1019,7 @@
- acl Safe_ports port 488               # gss-http
- acl Safe_ports port 591               # filemaker
- acl Safe_ports port 777               # multiling http
-+acl Safe_ports port 901               # SWAT
- acl CONNECT method CONNECT
- NOCOMMENT_END
- DOC_END
-@@ -5300,11 +5301,11 @@
- 
- NAME: cache_mgr
- TYPE: string
--DEFAULT: webmaster
-+DEFAULT: root
- LOC: Config.adminEmail
- DOC_START
-       Email-address of local cache manager who will receive
--      mail if the cache dies.  The default is "webmaster".
-+      mail if the cache dies.  The default is "root".
- DOC_END
- 
- NAME: mail_from
-@@ -8052,7 +8053,7 @@
- NAME: forwarded_for
- COMMENT: on|off|transparent|truncate|delete
- TYPE: string
--DEFAULT: on
-+DEFAULT: delete
- LOC: opt_forwarded_for
- DOC_START
-       If set to "on", Squid will append your client's IP address

diff --git a/net-proxy/squid/files/squid-kernel-headers-4.2.patch 
b/net-proxy/squid/files/squid-kernel-headers-4.2.patch
deleted file mode 100644
index f56a57e..0000000
--- a/net-proxy/squid/files/squid-kernel-headers-4.2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/ip/Intercept.cc       2015-08-01 09:08:17.000000000 +0300
-+++ b/src/ip/Intercept.cc       2015-09-12 10:03:37.000000000 +0300
-@@ -88,7 +88,10 @@
- /* <climits> must be before including netfilter_ipv4.h */
- #include <climits>
- #include <linux/if.h>
--#include <linux/netfilter_ipv4.h>
-+//#include <linux/netfilter_ipv4.h>
-+#if !defined(SO_ORIGINAL_DST)
-+#define SO_ORIGINAL_DST 80
-+#endif
- #if HAVE_LINUX_NETFILTER_IPV6_IP6_TABLES_H
- /* 2013-07-01: Pablo the Netfilter maintainer is rejecting patches
-  * which will enable C++ compilers to build the Netfilter public headers.

diff --git a/net-proxy/squid/squid-3.5.10.ebuild 
b/net-proxy/squid/squid-3.5.10.ebuild
deleted file mode 100644
index 141bd8d..0000000
--- a/net-proxy/squid/squid-3.5.10.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/";
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux 
logrotate test \
-       ecap esi ssl-crtd \
-       mysql postgres sqlite \
-       qos tproxy \
-       +htcp +wccp +wccpv2 \
-       pf-transparent ipf-transparent kqueue \
-       elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-       pam? ( virtual/pam )
-       ldap? ( net-nds/openldap )
-       kerberos? ( virtual/krb5 )
-       qos? ( net-libs/libnetfilter_conntrack )
-       ssl? ( dev-libs/openssl:0 dev-libs/nettle >=net-libs/gnutls-3.1.5 )
-       sasl? ( dev-libs/cyrus-sasl )
-       ecap? ( net-libs/libecap:1 )
-       esi? ( dev-libs/expat dev-libs/libxml2 )
-       !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-       >=sys-libs/db-4:*
-       dev-lang/perl
-       dev-libs/libltdl:0"
-DEPEND="${COMMON_DEPEND}
-       ecap? ( virtual/pkgconfig )
-       sys-apps/ed
-       test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-       samba? ( net-fs/samba )
-       mysql? ( dev-perl/DBD-mysql )
-       postgres? ( dev-perl/DBD-Pg )
-       selinux? ( sec-policy/selinux-squid )
-       sqlite? ( dev-perl/DBD-SQLite )
-       !<=sci-biology/meme-4.8.1-r1"
-
-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
-}
-
-pkg_setup() {
-       enewgroup squid
-       enewuser squid -1 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-3.5.7-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/README  || 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:' \
-               helpers/external_acl/unix_group/ext_unix_group_acl.8 \
-               helpers/external_acl/session/ext_session_acl.8 \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-               scripts/check_cache.pl || die
-       sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || 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
-
-       epatch_user
-
-       eautoreconf
-}
-
-src_configure() {
-       local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam"
-       use samba && basic_modules+=",SMB"
-       use ldap && basic_modules+=",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"
-       use samba && ext_helpers+=",wbinfo_group"
-       use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-       use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
-       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 CC AR
-
-       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 \
-               --disable-strict-error-checking \
-               --disable-arch-native \
-               --with-ltdl-includedir=/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 ssl gnutls) \
-               $(use_enable ssl-crtd) \
-               $(use_enable ecap) \
-               $(use_enable esi) \
-               $(use_enable htcp) \
-               $(use_enable wccp) \
-               $(use_enable wccpv2) \
-               ${transparent} \
-               ${myconf}
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-
-       # 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
-
-       # cleanup
-       rm -f "${D}"/usr/bin/Run*
-       rm -rf "${D}"/run/squid "${D}"/var/cache/squid
-
-       dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS 
doc/*.txt
-       newdoc helpers/negotiate_auth/kerberos/README README.kerberos
-       newdoc helpers/basic_auth/RADIUS/README README.RADIUS
-       newdoc helpers/external_acl/kerberos_ldap_group/README 
README.kerberos_ldap_group
-       newdoc tools/purge/README README.purge
-       newdoc tools/helper-mux.README README.helper-mux
-       dohtml RELEASENOTES.html
-
-       newpamd "${FILESDIR}/squid.pam" squid
-       newconfd "${FILESDIR}/squid.confd-r1" squid
-       newinitd "${FILESDIR}/squid.initd-r4" 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() {
-       if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] 
|| \
-               [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 5 
]]; then
-               elog "Please read the release notes at:"
-               elog "  
http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html";
-               echo
-       fi
-}

diff --git a/net-proxy/squid/squid-3.5.11.ebuild 
b/net-proxy/squid/squid-3.5.11.ebuild
deleted file mode 100644
index 141bd8d..0000000
--- a/net-proxy/squid/squid-3.5.11.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/";
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux 
logrotate test \
-       ecap esi ssl-crtd \
-       mysql postgres sqlite \
-       qos tproxy \
-       +htcp +wccp +wccpv2 \
-       pf-transparent ipf-transparent kqueue \
-       elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-       pam? ( virtual/pam )
-       ldap? ( net-nds/openldap )
-       kerberos? ( virtual/krb5 )
-       qos? ( net-libs/libnetfilter_conntrack )
-       ssl? ( dev-libs/openssl:0 dev-libs/nettle >=net-libs/gnutls-3.1.5 )
-       sasl? ( dev-libs/cyrus-sasl )
-       ecap? ( net-libs/libecap:1 )
-       esi? ( dev-libs/expat dev-libs/libxml2 )
-       !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-       >=sys-libs/db-4:*
-       dev-lang/perl
-       dev-libs/libltdl:0"
-DEPEND="${COMMON_DEPEND}
-       ecap? ( virtual/pkgconfig )
-       sys-apps/ed
-       test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-       samba? ( net-fs/samba )
-       mysql? ( dev-perl/DBD-mysql )
-       postgres? ( dev-perl/DBD-Pg )
-       selinux? ( sec-policy/selinux-squid )
-       sqlite? ( dev-perl/DBD-SQLite )
-       !<=sci-biology/meme-4.8.1-r1"
-
-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
-}
-
-pkg_setup() {
-       enewgroup squid
-       enewuser squid -1 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-3.5.7-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/README  || 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:' \
-               helpers/external_acl/unix_group/ext_unix_group_acl.8 \
-               helpers/external_acl/session/ext_session_acl.8 \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-               scripts/check_cache.pl || die
-       sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || 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
-
-       epatch_user
-
-       eautoreconf
-}
-
-src_configure() {
-       local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam"
-       use samba && basic_modules+=",SMB"
-       use ldap && basic_modules+=",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"
-       use samba && ext_helpers+=",wbinfo_group"
-       use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-       use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
-       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 CC AR
-
-       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 \
-               --disable-strict-error-checking \
-               --disable-arch-native \
-               --with-ltdl-includedir=/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 ssl gnutls) \
-               $(use_enable ssl-crtd) \
-               $(use_enable ecap) \
-               $(use_enable esi) \
-               $(use_enable htcp) \
-               $(use_enable wccp) \
-               $(use_enable wccpv2) \
-               ${transparent} \
-               ${myconf}
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-
-       # 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
-
-       # cleanup
-       rm -f "${D}"/usr/bin/Run*
-       rm -rf "${D}"/run/squid "${D}"/var/cache/squid
-
-       dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS 
doc/*.txt
-       newdoc helpers/negotiate_auth/kerberos/README README.kerberos
-       newdoc helpers/basic_auth/RADIUS/README README.RADIUS
-       newdoc helpers/external_acl/kerberos_ldap_group/README 
README.kerberos_ldap_group
-       newdoc tools/purge/README README.purge
-       newdoc tools/helper-mux.README README.helper-mux
-       dohtml RELEASENOTES.html
-
-       newpamd "${FILESDIR}/squid.pam" squid
-       newconfd "${FILESDIR}/squid.confd-r1" squid
-       newinitd "${FILESDIR}/squid.initd-r4" 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() {
-       if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] 
|| \
-               [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 5 
]]; then
-               elog "Please read the release notes at:"
-               elog "  
http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html";
-               echo
-       fi
-}

diff --git a/net-proxy/squid/squid-3.5.12.ebuild 
b/net-proxy/squid/squid-3.5.12.ebuild
deleted file mode 100644
index 5b02352..0000000
--- a/net-proxy/squid/squid-3.5.12.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/";
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux 
logrotate test \
-       ecap esi ssl-crtd \
-       mysql postgres sqlite \
-       qos tproxy \
-       +htcp +wccp +wccpv2 \
-       pf-transparent ipf-transparent kqueue \
-       elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-       pam? ( virtual/pam )
-       ldap? ( net-nds/openldap )
-       kerberos? ( virtual/krb5 )
-       qos? ( net-libs/libnetfilter_conntrack )
-       ssl? ( dev-libs/openssl:0 dev-libs/nettle >=net-libs/gnutls-3.1.5 )
-       sasl? ( dev-libs/cyrus-sasl )
-       ecap? ( net-libs/libecap:1 )
-       esi? ( dev-libs/expat dev-libs/libxml2 )
-       !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-       >=sys-libs/db-4:*
-       dev-lang/perl
-       dev-libs/libltdl:0"
-DEPEND="${COMMON_DEPEND}
-       ecap? ( virtual/pkgconfig )
-       sys-apps/ed
-       test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-       samba? ( net-fs/samba )
-       mysql? ( dev-perl/DBD-mysql )
-       postgres? ( dev-perl/DBD-Pg )
-       selinux? ( sec-policy/selinux-squid )
-       sqlite? ( dev-perl/DBD-SQLite )
-       !<=sci-biology/meme-4.8.1-r1"
-
-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
-}
-
-pkg_setup() {
-       enewgroup squid
-       enewuser squid -1 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-3.5.7-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/README  || 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:' \
-               helpers/external_acl/unix_group/ext_unix_group_acl.8 \
-               helpers/external_acl/session/ext_session_acl.8 \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-               scripts/check_cache.pl || die
-       sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || 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
-
-       epatch_user
-
-       eautoreconf
-}
-
-src_configure() {
-       local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam"
-       use samba && basic_modules+=",SMB"
-       use ldap && basic_modules+=",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"
-       use samba && ext_helpers+=",wbinfo_group"
-       use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-       use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
-       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 CC AR
-
-       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 \
-               --disable-strict-error-checking \
-               --disable-arch-native \
-               --with-ltdl-includedir=/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 ssl gnutls) \
-               $(use_enable ssl-crtd) \
-               $(use_enable ecap) \
-               $(use_enable esi) \
-               $(use_enable htcp) \
-               $(use_enable wccp) \
-               $(use_enable wccpv2) \
-               ${transparent} \
-               ${myconf}
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-
-       # 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
-
-       # cleanup
-       rm -f "${D}"/usr/bin/Run*
-       rm -rf "${D}"/run/squid "${D}"/var/cache/squid
-
-       dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS 
doc/*.txt
-       newdoc helpers/negotiate_auth/kerberos/README README.kerberos
-       newdoc helpers/basic_auth/RADIUS/README README.RADIUS
-       newdoc helpers/external_acl/kerberos_ldap_group/README 
README.kerberos_ldap_group
-       newdoc tools/purge/README README.purge
-       newdoc tools/helper-mux.README README.helper-mux
-       dohtml RELEASENOTES.html
-
-       newpamd "${FILESDIR}/squid.pam" squid
-       newconfd "${FILESDIR}/squid.confd-r1" squid
-       newinitd "${FILESDIR}/squid.initd-r4" 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() {
-       if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] 
|| \
-               [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 5 
]]; then
-               elog "Please read the release notes at:"
-               elog "  
http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html";
-               echo
-       fi
-}

diff --git a/net-proxy/squid/squid-3.5.14.ebuild 
b/net-proxy/squid/squid-3.5.14.ebuild
deleted file mode 100644
index f92b88f..0000000
--- a/net-proxy/squid/squid-3.5.14.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/";
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux 
logrotate test \
-       ecap esi ssl-crtd \
-       mysql postgres sqlite \
-       qos tproxy \
-       +htcp +wccp +wccpv2 \
-       pf-transparent ipf-transparent kqueue \
-       elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-       pam? ( virtual/pam )
-       ldap? ( net-nds/openldap )
-       kerberos? ( virtual/krb5 )
-       qos? ( net-libs/libnetfilter_conntrack )
-       ssl? ( dev-libs/openssl:0 dev-libs/nettle >=net-libs/gnutls-3.1.5 )
-       sasl? ( dev-libs/cyrus-sasl )
-       ecap? ( net-libs/libecap:1 )
-       esi? ( dev-libs/expat dev-libs/libxml2 )
-       !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-       >=sys-libs/db-4:*
-       dev-lang/perl
-       dev-libs/libltdl:0"
-DEPEND="${COMMON_DEPEND}
-       ecap? ( virtual/pkgconfig )
-       sys-apps/ed
-       test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-       samba? ( net-fs/samba )
-       mysql? ( dev-perl/DBD-mysql )
-       postgres? ( dev-perl/DBD-Pg )
-       selinux? ( sec-policy/selinux-squid )
-       sqlite? ( dev-perl/DBD-SQLite )
-       !<=sci-biology/meme-4.8.1-r1"
-
-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
-}
-
-pkg_setup() {
-       enewgroup squid
-       enewuser squid -1 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-3.5.7-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/README  || 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:' \
-               helpers/external_acl/unix_group/ext_unix_group_acl.8 \
-               helpers/external_acl/session/ext_session_acl.8 \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-               scripts/check_cache.pl || die
-       sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || 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
-
-       epatch_user
-
-       eautoreconf
-}
-
-src_configure() {
-       local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam"
-       use samba && basic_modules+=",SMB"
-       use ldap && basic_modules+=",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"
-       use samba && ext_helpers+=",wbinfo_group"
-       use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-       use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
-       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 CC AR
-
-       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 \
-               --disable-strict-error-checking \
-               --disable-arch-native \
-               --with-ltdl-includedir=/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 ssl gnutls) \
-               $(use_enable ssl-crtd) \
-               $(use_enable ecap) \
-               $(use_enable esi) \
-               $(use_enable htcp) \
-               $(use_enable wccp) \
-               $(use_enable wccpv2) \
-               ${transparent} \
-               ${myconf}
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-
-       # 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
-
-       # cleanup
-       rm -f "${D}"/usr/bin/Run*
-       rm -rf "${D}"/run/squid "${D}"/var/cache/squid
-
-       dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS 
doc/*.txt
-       newdoc helpers/negotiate_auth/kerberos/README README.kerberos
-       newdoc helpers/basic_auth/RADIUS/README README.RADIUS
-       newdoc helpers/external_acl/kerberos_ldap_group/README 
README.kerberos_ldap_group
-       newdoc tools/purge/README README.purge
-       newdoc tools/helper-mux.README README.helper-mux
-       dohtml RELEASENOTES.html
-
-       newpamd "${FILESDIR}/squid.pam" squid
-       newconfd "${FILESDIR}/squid.confd-r1" squid
-       newinitd "${FILESDIR}/squid.initd-r4" 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() {
-       if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] 
|| \
-               [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 5 
]]; then
-               elog "Please read the release notes at:"
-               elog "  
http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html";
-               echo
-       fi
-}

diff --git a/net-proxy/squid/squid-3.5.16-r1.ebuild 
b/net-proxy/squid/squid-3.5.16-r1.ebuild
deleted file mode 100644
index e684e5f..0000000
--- a/net-proxy/squid/squid-3.5.16-r1.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/";
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux 
logrotate test \
-       ecap esi ssl-crtd \
-       mysql postgres sqlite \
-       qos tproxy \
-       +htcp +wccp +wccpv2 \
-       pf-transparent ipf-transparent kqueue \
-       elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-       pam? ( virtual/pam )
-       ldap? ( net-nds/openldap )
-       kerberos? ( virtual/krb5 )
-       qos? ( net-libs/libnetfilter_conntrack )
-       ssl? ( dev-libs/openssl:0 dev-libs/nettle >=net-libs/gnutls-3.1.5 )
-       sasl? ( dev-libs/cyrus-sasl )
-       ecap? ( net-libs/libecap:1 )
-       esi? ( dev-libs/expat dev-libs/libxml2 )
-       !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-       >=sys-libs/db-4:*
-       dev-lang/perl
-       dev-libs/libltdl:0"
-DEPEND="${COMMON_DEPEND}
-       ecap? ( virtual/pkgconfig )
-       sys-apps/ed
-       test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-       samba? ( net-fs/samba )
-       mysql? ( dev-perl/DBD-mysql )
-       postgres? ( dev-perl/DBD-Pg )
-       selinux? ( sec-policy/selinux-squid )
-       sqlite? ( dev-perl/DBD-SQLite )
-       !<=sci-biology/meme-4.8.1-r1"
-
-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
-}
-
-pkg_setup() {
-       enewgroup squid
-       enewuser squid -1 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-3.5-14022.patch"
-       epatch "${FILESDIR}/${PN}-3.5.7-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/README  || 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:' \
-               helpers/external_acl/unix_group/ext_unix_group_acl.8 \
-               helpers/external_acl/session/ext_session_acl.8 \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-               scripts/check_cache.pl || die
-       sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || 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
-
-       epatch_user
-
-       eautoreconf
-}
-
-src_configure() {
-       local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam"
-       use samba && basic_modules+=",SMB"
-       use ldap && basic_modules+=",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"
-       use samba && ext_helpers+=",wbinfo_group"
-       use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-       use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
-       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 CC AR
-
-       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 \
-               --disable-strict-error-checking \
-               --disable-arch-native \
-               --with-ltdl-includedir=/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 ssl gnutls) \
-               $(use_enable ssl-crtd) \
-               $(use_enable ecap) \
-               $(use_enable esi) \
-               $(use_enable htcp) \
-               $(use_enable wccp) \
-               $(use_enable wccpv2) \
-               ${transparent} \
-               ${myconf}
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-
-       # 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
-
-       # cleanup
-       rm -f "${D}"/usr/bin/Run*
-       rm -rf "${D}"/run/squid "${D}"/var/cache/squid
-
-       dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS 
doc/*.txt
-       newdoc helpers/negotiate_auth/kerberos/README README.kerberos
-       newdoc helpers/basic_auth/RADIUS/README README.RADIUS
-       newdoc helpers/external_acl/kerberos_ldap_group/README 
README.kerberos_ldap_group
-       newdoc tools/purge/README README.purge
-       newdoc tools/helper-mux.README README.helper-mux
-       dohtml RELEASENOTES.html
-
-       newpamd "${FILESDIR}/squid.pam" squid
-       newconfd "${FILESDIR}/squid.confd-r1" squid
-       newinitd "${FILESDIR}/squid.initd-r4" 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() {
-       if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] 
|| \
-               [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 5 
]]; then
-               elog "Please read the release notes at:"
-               elog "  
http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html";
-               echo
-       fi
-}

diff --git a/net-proxy/squid/squid-3.5.16.ebuild 
b/net-proxy/squid/squid-3.5.16.ebuild
deleted file mode 100644
index f92b88f..0000000
--- a/net-proxy/squid/squid-3.5.16.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/";
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux 
logrotate test \
-       ecap esi ssl-crtd \
-       mysql postgres sqlite \
-       qos tproxy \
-       +htcp +wccp +wccpv2 \
-       pf-transparent ipf-transparent kqueue \
-       elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-       pam? ( virtual/pam )
-       ldap? ( net-nds/openldap )
-       kerberos? ( virtual/krb5 )
-       qos? ( net-libs/libnetfilter_conntrack )
-       ssl? ( dev-libs/openssl:0 dev-libs/nettle >=net-libs/gnutls-3.1.5 )
-       sasl? ( dev-libs/cyrus-sasl )
-       ecap? ( net-libs/libecap:1 )
-       esi? ( dev-libs/expat dev-libs/libxml2 )
-       !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-       >=sys-libs/db-4:*
-       dev-lang/perl
-       dev-libs/libltdl:0"
-DEPEND="${COMMON_DEPEND}
-       ecap? ( virtual/pkgconfig )
-       sys-apps/ed
-       test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-       samba? ( net-fs/samba )
-       mysql? ( dev-perl/DBD-mysql )
-       postgres? ( dev-perl/DBD-Pg )
-       selinux? ( sec-policy/selinux-squid )
-       sqlite? ( dev-perl/DBD-SQLite )
-       !<=sci-biology/meme-4.8.1-r1"
-
-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
-}
-
-pkg_setup() {
-       enewgroup squid
-       enewuser squid -1 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-3.5.7-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/README  || 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:' \
-               helpers/external_acl/unix_group/ext_unix_group_acl.8 \
-               helpers/external_acl/session/ext_session_acl.8 \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-               scripts/check_cache.pl || die
-       sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || 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
-
-       epatch_user
-
-       eautoreconf
-}
-
-src_configure() {
-       local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam"
-       use samba && basic_modules+=",SMB"
-       use ldap && basic_modules+=",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"
-       use samba && ext_helpers+=",wbinfo_group"
-       use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-       use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
-       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 CC AR
-
-       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 \
-               --disable-strict-error-checking \
-               --disable-arch-native \
-               --with-ltdl-includedir=/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 ssl gnutls) \
-               $(use_enable ssl-crtd) \
-               $(use_enable ecap) \
-               $(use_enable esi) \
-               $(use_enable htcp) \
-               $(use_enable wccp) \
-               $(use_enable wccpv2) \
-               ${transparent} \
-               ${myconf}
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-
-       # 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
-
-       # cleanup
-       rm -f "${D}"/usr/bin/Run*
-       rm -rf "${D}"/run/squid "${D}"/var/cache/squid
-
-       dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS 
doc/*.txt
-       newdoc helpers/negotiate_auth/kerberos/README README.kerberos
-       newdoc helpers/basic_auth/RADIUS/README README.RADIUS
-       newdoc helpers/external_acl/kerberos_ldap_group/README 
README.kerberos_ldap_group
-       newdoc tools/purge/README README.purge
-       newdoc tools/helper-mux.README README.helper-mux
-       dohtml RELEASENOTES.html
-
-       newpamd "${FILESDIR}/squid.pam" squid
-       newconfd "${FILESDIR}/squid.confd-r1" squid
-       newinitd "${FILESDIR}/squid.initd-r4" 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() {
-       if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] 
|| \
-               [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 5 
]]; then
-               elog "Please read the release notes at:"
-               elog "  
http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html";
-               echo
-       fi
-}

diff --git a/net-proxy/squid/squid-3.5.6.ebuild 
b/net-proxy/squid/squid-3.5.6.ebuild
deleted file mode 100644
index 9598d04..0000000
--- a/net-proxy/squid/squid-3.5.6.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/";
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux 
logrotate test \
-       ecap esi ssl-crtd \
-       mysql postgres sqlite \
-       qos tproxy \
-       +htcp +wccp +wccpv2 \
-       pf-transparent ipf-transparent kqueue \
-       elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-       pam? ( virtual/pam )
-       ldap? ( net-nds/openldap )
-       kerberos? ( virtual/krb5 )
-       qos? ( net-libs/libnetfilter_conntrack )
-       ssl? ( dev-libs/openssl:* dev-libs/nettle >=net-libs/gnutls-3.1.5 )
-       sasl? ( dev-libs/cyrus-sasl )
-       ecap? ( net-libs/libecap:1 )
-       esi? ( dev-libs/expat dev-libs/libxml2 )
-       !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-       >=sys-libs/db-4:*
-       dev-lang/perl
-       dev-libs/libltdl:0"
-DEPEND="${COMMON_DEPEND}
-       ecap? ( virtual/pkgconfig )
-       sys-apps/ed
-       test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-       samba? ( net-fs/samba )
-       mysql? ( dev-perl/DBD-mysql )
-       postgres? ( dev-perl/DBD-Pg )
-       selinux? ( sec-policy/selinux-squid )
-       sqlite? ( dev-perl/DBD-SQLite )
-       !<=sci-biology/meme-4.8.1-r1"
-
-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
-}
-
-pkg_setup() {
-       enewgroup squid
-       enewuser squid -1 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-3.3.4-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/README  || 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:' \
-               helpers/external_acl/unix_group/ext_unix_group_acl.8 \
-               helpers/external_acl/session/ext_session_acl.8 \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-               scripts/check_cache.pl || die
-       sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || 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
-
-       epatch_user
-
-       eautoreconf
-}
-
-src_configure() {
-       local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam"
-       use samba && basic_modules+=",SMB"
-       use ldap && basic_modules+=",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"
-       use samba && ext_helpers+=",wbinfo_group"
-       use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-       use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
-       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 CC AR
-
-       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 \
-               --disable-strict-error-checking \
-               --disable-arch-native \
-               $(use_with caps libcap) \
-               $(use_enable ipv6) \
-               $(use_enable snmp) \
-               $(use_with ssl openssl) \
-               $(use_with ssl nettle) \
-               $(use_with ssl gnutls) \
-               $(use_enable ssl-crtd) \
-               $(use_enable ecap) \
-               $(use_enable esi) \
-               $(use_enable htcp) \
-               $(use_enable wccp) \
-               $(use_enable wccpv2) \
-               ${transparent} \
-               ${myconf}
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-
-       # 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
-
-       # cleanup
-       rm -f "${D}"/usr/bin/Run*
-       rm -rf "${D}"/run/squid "${D}"/var/cache/squid
-
-       dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS 
doc/*.txt
-       newdoc helpers/negotiate_auth/kerberos/README README.kerberos
-       newdoc helpers/basic_auth/RADIUS/README README.RADIUS
-       newdoc helpers/external_acl/kerberos_ldap_group/README 
README.kerberos_ldap_group
-       newdoc tools/purge/README README.purge
-       newdoc tools/helper-mux.README README.helper-mux
-       dohtml RELEASENOTES.html
-
-       newpamd "${FILESDIR}/squid.pam" squid
-       newconfd "${FILESDIR}/squid.confd-r1" squid
-       newinitd "${FILESDIR}/squid.initd-r4" 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() {
-       if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] 
|| \
-               [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 5 
]]; then
-               elog "Please read the release notes at:"
-               elog "  
http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html";
-               echo
-       fi
-}

diff --git a/net-proxy/squid/squid-3.5.7.ebuild 
b/net-proxy/squid/squid-3.5.7.ebuild
deleted file mode 100644
index f0c50da..0000000
--- a/net-proxy/squid/squid-3.5.7.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/";
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux 
logrotate test \
-       ecap esi ssl-crtd \
-       mysql postgres sqlite \
-       qos tproxy \
-       +htcp +wccp +wccpv2 \
-       pf-transparent ipf-transparent kqueue \
-       elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-       pam? ( virtual/pam )
-       ldap? ( net-nds/openldap )
-       kerberos? ( virtual/krb5 )
-       qos? ( net-libs/libnetfilter_conntrack )
-       ssl? ( dev-libs/openssl:* dev-libs/nettle >=net-libs/gnutls-3.1.5 )
-       sasl? ( dev-libs/cyrus-sasl )
-       ecap? ( net-libs/libecap:1 )
-       esi? ( dev-libs/expat dev-libs/libxml2 )
-       !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-       >=sys-libs/db-4:*
-       dev-lang/perl
-       dev-libs/libltdl:0"
-DEPEND="${COMMON_DEPEND}
-       ecap? ( virtual/pkgconfig )
-       sys-apps/ed
-       test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-       samba? ( net-fs/samba )
-       mysql? ( dev-perl/DBD-mysql )
-       postgres? ( dev-perl/DBD-Pg )
-       selinux? ( sec-policy/selinux-squid )
-       sqlite? ( dev-perl/DBD-SQLite )
-       !<=sci-biology/meme-4.8.1-r1"
-
-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
-}
-
-pkg_setup() {
-       enewgroup squid
-       enewuser squid -1 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-3.5.7-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/README  || 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:' \
-               helpers/external_acl/unix_group/ext_unix_group_acl.8 \
-               helpers/external_acl/session/ext_session_acl.8 \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-               scripts/check_cache.pl || die
-       sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || 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
-
-       epatch_user
-
-       eautoreconf
-}
-
-src_configure() {
-       local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam"
-       use samba && basic_modules+=",SMB"
-       use ldap && basic_modules+=",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"
-       use samba && ext_helpers+=",wbinfo_group"
-       use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-       use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
-       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 CC AR
-
-       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 \
-               --disable-strict-error-checking \
-               --disable-arch-native \
-               $(use_with caps libcap) \
-               $(use_enable ipv6) \
-               $(use_enable snmp) \
-               $(use_with ssl openssl) \
-               $(use_with ssl nettle) \
-               $(use_with ssl gnutls) \
-               $(use_enable ssl-crtd) \
-               $(use_enable ecap) \
-               $(use_enable esi) \
-               $(use_enable htcp) \
-               $(use_enable wccp) \
-               $(use_enable wccpv2) \
-               ${transparent} \
-               ${myconf}
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-
-       # 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
-
-       # cleanup
-       rm -f "${D}"/usr/bin/Run*
-       rm -rf "${D}"/run/squid "${D}"/var/cache/squid
-
-       dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS 
doc/*.txt
-       newdoc helpers/negotiate_auth/kerberos/README README.kerberos
-       newdoc helpers/basic_auth/RADIUS/README README.RADIUS
-       newdoc helpers/external_acl/kerberos_ldap_group/README 
README.kerberos_ldap_group
-       newdoc tools/purge/README README.purge
-       newdoc tools/helper-mux.README README.helper-mux
-       dohtml RELEASENOTES.html
-
-       newpamd "${FILESDIR}/squid.pam" squid
-       newconfd "${FILESDIR}/squid.confd-r1" squid
-       newinitd "${FILESDIR}/squid.initd-r4" 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() {
-       if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] 
|| \
-               [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 5 
]]; then
-               elog "Please read the release notes at:"
-               elog "  
http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html";
-               echo
-       fi
-}

diff --git a/net-proxy/squid/squid-3.5.8.ebuild 
b/net-proxy/squid/squid-3.5.8.ebuild
deleted file mode 100644
index 1c2065f..0000000
--- a/net-proxy/squid/squid-3.5.8.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/";
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux 
logrotate test \
-       ecap esi ssl-crtd \
-       mysql postgres sqlite \
-       qos tproxy \
-       +htcp +wccp +wccpv2 \
-       pf-transparent ipf-transparent kqueue \
-       elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-       pam? ( virtual/pam )
-       ldap? ( net-nds/openldap )
-       kerberos? ( virtual/krb5 )
-       qos? ( net-libs/libnetfilter_conntrack )
-       ssl? ( dev-libs/openssl:* dev-libs/nettle >=net-libs/gnutls-3.1.5 )
-       sasl? ( dev-libs/cyrus-sasl )
-       ecap? ( net-libs/libecap:1 )
-       esi? ( dev-libs/expat dev-libs/libxml2 )
-       !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-       >=sys-libs/db-4:*
-       dev-lang/perl
-       dev-libs/libltdl:0"
-DEPEND="${COMMON_DEPEND}
-       ecap? ( virtual/pkgconfig )
-       sys-apps/ed
-       test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-       samba? ( net-fs/samba )
-       mysql? ( dev-perl/DBD-mysql )
-       postgres? ( dev-perl/DBD-Pg )
-       selinux? ( sec-policy/selinux-squid )
-       sqlite? ( dev-perl/DBD-SQLite )
-       !<=sci-biology/meme-4.8.1-r1"
-
-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
-}
-
-pkg_setup() {
-       enewgroup squid
-       enewuser squid -1 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-3.5.7-gentoo.patch"
-       epatch "${FILESDIR}/${PN}-kernel-headers-4.2.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/README  || 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:' \
-               helpers/external_acl/unix_group/ext_unix_group_acl.8 \
-               helpers/external_acl/session/ext_session_acl.8 \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-               scripts/check_cache.pl || die
-       sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || 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
-
-       epatch_user
-
-       eautoreconf
-}
-
-src_configure() {
-       local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam"
-       use samba && basic_modules+=",SMB"
-       use ldap && basic_modules+=",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"
-       use samba && ext_helpers+=",wbinfo_group"
-       use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-       use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
-       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 CC AR
-
-       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 \
-               --disable-strict-error-checking \
-               --disable-arch-native \
-               --with-ltdl-includedir=/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 ssl gnutls) \
-               $(use_enable ssl-crtd) \
-               $(use_enable ecap) \
-               $(use_enable esi) \
-               $(use_enable htcp) \
-               $(use_enable wccp) \
-               $(use_enable wccpv2) \
-               ${transparent} \
-               ${myconf}
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-
-       # 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
-
-       # cleanup
-       rm -f "${D}"/usr/bin/Run*
-       rm -rf "${D}"/run/squid "${D}"/var/cache/squid
-
-       dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS 
doc/*.txt
-       newdoc helpers/negotiate_auth/kerberos/README README.kerberos
-       newdoc helpers/basic_auth/RADIUS/README README.RADIUS
-       newdoc helpers/external_acl/kerberos_ldap_group/README 
README.kerberos_ldap_group
-       newdoc tools/purge/README README.purge
-       newdoc tools/helper-mux.README README.helper-mux
-       dohtml RELEASENOTES.html
-
-       newpamd "${FILESDIR}/squid.pam" squid
-       newconfd "${FILESDIR}/squid.confd-r1" squid
-       newinitd "${FILESDIR}/squid.initd-r4" 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() {
-       if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] 
|| \
-               [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 5 
]]; then
-               elog "Please read the release notes at:"
-               elog "  
http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html";
-               echo
-       fi
-}

diff --git a/net-proxy/squid/squid-3.5.9.ebuild 
b/net-proxy/squid/squid-3.5.9.ebuild
deleted file mode 100644
index 1c2065f..0000000
--- a/net-proxy/squid/squid-3.5.9.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/";
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux 
logrotate test \
-       ecap esi ssl-crtd \
-       mysql postgres sqlite \
-       qos tproxy \
-       +htcp +wccp +wccpv2 \
-       pf-transparent ipf-transparent kqueue \
-       elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
-       pam? ( virtual/pam )
-       ldap? ( net-nds/openldap )
-       kerberos? ( virtual/krb5 )
-       qos? ( net-libs/libnetfilter_conntrack )
-       ssl? ( dev-libs/openssl:* dev-libs/nettle >=net-libs/gnutls-3.1.5 )
-       sasl? ( dev-libs/cyrus-sasl )
-       ecap? ( net-libs/libecap:1 )
-       esi? ( dev-libs/expat dev-libs/libxml2 )
-       !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-       >=sys-libs/db-4:*
-       dev-lang/perl
-       dev-libs/libltdl:0"
-DEPEND="${COMMON_DEPEND}
-       ecap? ( virtual/pkgconfig )
-       sys-apps/ed
-       test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
-       samba? ( net-fs/samba )
-       mysql? ( dev-perl/DBD-mysql )
-       postgres? ( dev-perl/DBD-Pg )
-       selinux? ( sec-policy/selinux-squid )
-       sqlite? ( dev-perl/DBD-SQLite )
-       !<=sci-biology/meme-4.8.1-r1"
-
-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
-}
-
-pkg_setup() {
-       enewgroup squid
-       enewuser squid -1 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-3.5.7-gentoo.patch"
-       epatch "${FILESDIR}/${PN}-kernel-headers-4.2.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/README  || 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:' \
-               helpers/external_acl/unix_group/ext_unix_group_acl.8 \
-               helpers/external_acl/session/ext_session_acl.8 \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-               scripts/check_cache.pl || die
-       sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || die
-       sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
-               src/ssl/ssl_crtd.8 || 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
-
-       epatch_user
-
-       eautoreconf
-}
-
-src_configure() {
-       local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam"
-       use samba && basic_modules+=",SMB"
-       use ldap && basic_modules+=",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"
-       use samba && ext_helpers+=",wbinfo_group"
-       use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
-       use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
-       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 CC AR
-
-       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 \
-               --disable-strict-error-checking \
-               --disable-arch-native \
-               --with-ltdl-includedir=/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 ssl gnutls) \
-               $(use_enable ssl-crtd) \
-               $(use_enable ecap) \
-               $(use_enable esi) \
-               $(use_enable htcp) \
-               $(use_enable wccp) \
-               $(use_enable wccpv2) \
-               ${transparent} \
-               ${myconf}
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-
-       # 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
-
-       # cleanup
-       rm -f "${D}"/usr/bin/Run*
-       rm -rf "${D}"/run/squid "${D}"/var/cache/squid
-
-       dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS 
doc/*.txt
-       newdoc helpers/negotiate_auth/kerberos/README README.kerberos
-       newdoc helpers/basic_auth/RADIUS/README README.RADIUS
-       newdoc helpers/external_acl/kerberos_ldap_group/README 
README.kerberos_ldap_group
-       newdoc tools/purge/README README.purge
-       newdoc tools/helper-mux.README README.helper-mux
-       dohtml RELEASENOTES.html
-
-       newpamd "${FILESDIR}/squid.pam" squid
-       newconfd "${FILESDIR}/squid.confd-r1" squid
-       newinitd "${FILESDIR}/squid.initd-r4" 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() {
-       if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] 
|| \
-               [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 5 
]]; then
-               elog "Please read the release notes at:"
-               elog "  
http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html";
-               echo
-       fi
-}

[gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/, net-proxy/squid/files/

Reply via email to