gentoo auto-resync : 07:12:2023 - 11:08:00

9 files changed, 0 insertions, 2137 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 8712021632ff..2e69f7c17593 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 02af9ae8fc3a..d7322fa1521e 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,23 +1,11 @@
 AUX squid-4.17-use-system-libltdl.patch 497 BLAKE2B 38dbd734d7a56c2d5acb508ac5ab348c81247ce20f2bb9b7a278c9b480c15b2d29f106647d58aa2abb290b864bb103f2d11deeb7a50f7574e3f619b9392353a7 SHA512 754c41b03e5627ead2b824fc9ed6e91463b51308833e4c7ad6f4e35b0cfb5e58af1a8db9a6a5f3157933f408f7d5127214efbf91db4f74a7176f2dcb8ae87ad9
-AUX squid-5.3-gentoo.patch 2765 BLAKE2B 0260544df7ed59b99e6fb030b277330ad6d9ffc3130b550a8b3aee7386ba635b9848cdf655bf264fe83614c00772921eaaa5e66ed3ccefddc23a8b8f1fedfc62 SHA512 d68c1fd82a2a65cfc7bf257b7305827cfead3e37361952171cb6f5e933c607ba82025434b1430e4210ff937d58200019d66b4869a4c0d0291d19192e76105770
 AUX squid-6.2-gentoo.patch 2494 BLAKE2B 8115a9ad312c6dd639ab92b8673532e61341acf9459d0c28329fbc5b97e3649ecba521607ea2f4a6daa760f022f39593af924992383c68964f3435b145baa6c8 SHA512 8034be4b3f7503ba1ef3fa029c46a7fbfb654f865e8d85851cb6bcdadc66c293b7578363921f194066f8dcdc6dcf46671a4618e75234e0c63326cbeccb98ac80
 AUX squid-6.4-gcc14-algorithm.patch 233 BLAKE2B f6be1bf9907397a3510987a235f963276da4b4f36ac4e558a1a12811c8d83c5fb327b0348f5ed92139bcbf3c973177a3f810c7b059386ceab6081047a49e5871 SHA512 42d78b26847af56a788412496ef19ccffa1c8953d8d2369900c5b1c26cb245dadeb0c3d3859f9bbcb2d72b64bf8b284ed812de7aec291e4cf6a7b2482da4c7ee
 AUX squid.confd-r2 707 BLAKE2B 9fce12f6c6d395448b1e70c95ef75418d1844e7409738df60bee7c1adab786ca7e504070eacdd2b6e30a35df8a7322cccdfb950e60bcde352d35d090d55c6be9 SHA512 37435f808b1dab1ca3ceecafd6cd9007c44e10d257f135ba6baf1a51b1e3408f2a76b71d85a08ce6dcb7f86b9841b7bfcd870b0d312a2365699290e28f72314a
 AUX squid.cron 143 BLAKE2B 17b1bccea20771a481a5b4745c9832a4b762132a500eaeb091349a59b870c14b680d8ea97e03bb7a0b2d67e1ca1d4ee1db31dc43b9dbf02be8953d15f214b033 SHA512 cec563c20799ffea8b4fb418d5015d6dc437bd38c35e7150ed01bc298dab5214132e10f4e7b8176da1966e16a7f53f423c36e8419642cb16716f5c346c30d749
-AUX squid.initd-r5 4339 BLAKE2B 3529ddaab2e708215e6674514ce8e20e9d28d26e45860e19b59c7c3566550b298c71a20a9b62c2c89fd621f4ca67698d03af43586ac75cf16eee3b342c6a5a2c SHA512 e761500fb208954c92e0e83a6314688b29f1379855bf78195a72b12984c8fc7fdd09f5823729e90515bb7a382903fdcb42b79488d7f73474f8244311137b3e18
 AUX squid.initd-r6 4513 BLAKE2B 46406790dcc86048cdf4d98e648d266733ebf671ccf4f5b7c23d2fd25d97b161d00e05ff0d749af810cc9d1ad1300efef5a43caf62ac534e026b75c099dfc1b4 SHA512 4205350ace938f7eda0b62c4aedc8af3f5a14b011fad76a8e6ad6138358f835592453ac168e58ff3dcb3fb0bbcffd9b97acf4ce2060e34a47c2b92946f86164e
 AUX squid.logrotate 103 BLAKE2B f6d190d1914b76b08d90a2c3b3b07ff9cd332cdb2e595f4849537d1f1d32d8be1386fcdfffb40d073bcdd715a62c1c44727f1e10b75cfaff69c0d042c2a7e904 SHA512 d75a667c3ffa32fdd938ef40df8813a467d9f10b2363107bf915cb0c99834fbe8d0eb502a18a816875b67b0db1b27806ed3caf620c38516040cb644b225f5a55
 AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdbb8d4c6a0248ec9fa1a0f5f1d6136643c9abc4c5f67e8ef75305414b374763e2055272950d5 SHA512 5501e3d9319aea99f0deed98748366d4dfbeccdde96d842474fe144a4584394d8f5563372cd7b2437a389378c49b61b646403cca1be4362c888750d027b2f594
-DIST squid-5.7.tar.xz 2566560 BLAKE2B 4a403ca4f94034356922ea1a4feffd5f5289e2aadbe1585bd04e83ee89712227ce04c53f7e05c10f7c8ac6be67a265a32b47032e7b56e929a172772fa41d5299 SHA512 624a39041a6ceda6c470dc0937616f1aa67200f3db02b4d74095d8d706ed31d6df5e0417dcacde45f6be40b617bee018849793d52c96a626aab32a2b182972aa
-DIST squid-5.8.tar.xz 2447560 BLAKE2B c9d1ae9464e68beabdf7ae1641a70d6c614bc4d4f4bae3fc5946c2bf61510634992cbd5abe63f071104edb2fa487a6c5c7fb8fbf8f06ac723a6522ec9ade8b68 SHA512 81a9a7d1dfcb58476369e08e99feb76411dd3242a3374feb175408fa0dc8161545a9a903603219c6fa2bcfb615461901e093428e97ac74cf4c596a7065d3247d
-DIST squid-5.9.tar.xz 2569204 BLAKE2B 898a34357f8019291379ea37c66fa312e1a6437e8f643987dd4e54d7d52728248e16129b00195c5f6e0378c0f32c9f9ade3f98ca0ec4bb952f9f443357face82 SHA512 7dc366ef6b2a397ca6adec993c05876949de5f5e72a8a4409c9c9c52c42a8a4b37f58e85a171eebd36a166951f6c764176cfebec30019b299abe34a5adc4e5ac
-DIST squid-6.2.tar.xz 2546172 BLAKE2B e934371e40093b1570c88c76f9427089087d2fa0b16629e7ca3afabd17f7bc5592b2b65354da54ebc43350ab6732081dd39a39e5db712f70a48246c22b8ae45d SHA512 a2f3ad666b88708ddc52958e610222778e4f64c2ac097b821867ae4022ca35dcbe225f2c5bba42a69fa56f89feebf63764d1a936444e4debce7e55e87b7366db
-DIST squid-6.4.tar.xz 2553476 BLAKE2B 0f55fb8b4bcc291b9d978c8a150d86986ca32cf7c866907ac03ff3995ad6fbce333b0ebe977827e01e51a08d7104e41300a402bb811be0692a61fa81fd160304 SHA512 7bbf759841448874090a145699ee01f67696c19da147e433b1ecc80a856095cbfae611ef910bc4f2c44218101d89f2ee13796f5b7ada2e21e95638d4dae077ab
 DIST squid-6.5.tar.xz 2554492 BLAKE2B 91ed91f9b0f56f440a7f15a63bbc3e19537b60bc8b31b5bf7e16884367d0da060c5490e1721dbd7c5fce7f4a4e958fb3554d6bdc5b55f568598f907722b651de SHA512 d3a40f5f390f0042a8e981ca28755a90dd520230a06b4246ba7bec0c98025ce1cdc7426797a666f769addd60238e28e1f04d2c701ea2ef2d7329dbe87b830d70
-EBUILD squid-5.7-r1.ebuild 9416 BLAKE2B 06d2d220c5d79bb6cd08e90ff3cdd131e60cbe43e7ee7d80efc7433b105d5f70b8c58d7693e7d34609fc65150668763d5a82f2193a49890aa3a726a2120d4c7a SHA512 92d96fb49886f2ef0df9ecd8b8c988b5ae8534849f42ba6ab7bba472537e5b2b7af4b9ceb1d77f596427c09642e411ccd560592a8a70222ad9a33bbd1b154224
-EBUILD squid-5.8.ebuild 9528 BLAKE2B dd6c51b261cc4ac0b1d4a0b76139a0b05babfb2c0fda6dfd29020a195114423e6aaebe3a2444626cbe297b8030fd0044bfbadc47ccf71ea9cee03897bcd19665 SHA512 281c3d5e18ccc6ebfd2650b29a3f07e9d7f6ae400270670fbbc4b285827dc97c1ca2a596bc2ee1c7e8d3ad8459e344b5732267dfc2dc5155b9c66aa972279d25
-EBUILD squid-5.9.ebuild 9528 BLAKE2B dd6c51b261cc4ac0b1d4a0b76139a0b05babfb2c0fda6dfd29020a195114423e6aaebe3a2444626cbe297b8030fd0044bfbadc47ccf71ea9cee03897bcd19665 SHA512 281c3d5e18ccc6ebfd2650b29a3f07e9d7f6ae400270670fbbc4b285827dc97c1ca2a596bc2ee1c7e8d3ad8459e344b5732267dfc2dc5155b9c66aa972279d25
-EBUILD squid-6.2.ebuild 9538 BLAKE2B 2854372933a238a436881fe3ceb886a299cfa712b12622e04ca1ac8b8a22f083af0c8e6336d9e7796f905d095c279a7dad0d0faa094da70bb6d686dcb9035992 SHA512 8ca804b9cb18fe662a792bdbef4fd24e6b61fc93555e16d6665db9680fc24b4c5608870fa2ef694422ccc38c8779513358ed167754225c8dc0954ec9a0c2b82a
-EBUILD squid-6.4.ebuild 9627 BLAKE2B 6a723a5247f18a5e8438d79cb0d8a6ce1e7f0d57aaa5604b75bf56e775fb55b7a47790dbc8a5e3ae0518a470608fa1ebd3e93249fd94933262b20f92a869043b SHA512 4894e562dfed3819657436b586ca9dae800adb477397dee1fd801a90fc372148fccaa6e9a4afdbd8bca3c06d3093292b28898191a5accd2a2de8171b3b9780a4
 EBUILD squid-6.5.ebuild 9624 BLAKE2B beb0c9d36b2b2a3c85837f030eb754424aefe43953578eaa5f5c60d21b0ba15ec4450162b58e0b872ccafbc21ac5d0f1589ef938aa50b79b045b4a65315c828f SHA512 8eaa5c69a8c264a76d2c8d5a6759981440d7769874d49fcc4ddaa7dca7be5312463c3add59be348c36f7b3dcec3ea5945755b42d7a65291f639b25bdc4f58a46
 MISC metadata.xml 1351 BLAKE2B 8a6ea8bc939b5900572bd323fb3be78e0dfa9b4d7436f2d5e27fa59905f57af5cd9b7fe9a2903f8f57859a88176aab17c1a5d507a69765aab0f5320ceec69c96 SHA512 db7a47668d220a16f10d25319ffc4cd33270209d7d00f488d45680150f094d70776c4bf3c7b203b6ec8c69be18e5ac3a78d3d4367ec90a9ffb91ffd29f66890f
diff --git a/net-proxy/squid/files/squid-5.3-gentoo.patch b/net-proxy/squid/files/squid-5.3-gentoo.patch
deleted file mode 100644
index 54c036e14e50..000000000000
--- a/net-proxy/squid/files/squid-5.3-gentoo.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 7bd608b..0a0a908 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,9 +33,9 @@ PRESET_CXXFLAGS="$CXXFLAGS"
- 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/src/cf.data.pre b/src/cf.data.pre
-index 9275219..1e3aca2 100644
---- a/src/cf.data.pre
-+++ b/src/cf.data.pre
-@@ -1633,6 +1633,7 @@ acl Safe_ports port 280		# http-mgmt
- 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
- NOCOMMENT_END
- DOC_END
- 
-@@ -7200,11 +7201,11 @@ COMMENT_END
- 
- 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
-diff --git a/src/debug.cc b/src/debug.cc
-index 59ad1e9..265a9fe 100644
---- a/src/debug.cc
-+++ b/src/debug.cc
-@@ -496,7 +496,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 4b3988e..5622141 100644
---- a/src/main.cc
-+++ b/src/main.cc
-@@ -1921,7 +1921,7 @@ watch_child(const CommandLine &masterCommand)
- 
-     enter_suid();
- 
--    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
- 
-     if (!opt_foreground)
-         GoIntoBackground();
-@@ -2013,7 +2013,7 @@ watch_child(const CommandLine &masterCommand)
- 
-             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);
-                 (void)execvp(masterCommand.arg0(), kidCommand.argv());
-                 int xerrno = errno;
-                 syslog(LOG_ALERT, "execvp failed: %s", xstrerr(xerrno));
-@@ -2025,7 +2025,7 @@ watch_child(const CommandLine &masterCommand)
-         }
- 
-         /* parent */
--        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
- 
-         // If Squid received a signal while checking for dying kids (below) or
-         // starting new kids (above), then do a fast check for a new dying kid
diff --git a/net-proxy/squid/files/squid.initd-r5 b/net-proxy/squid/files/squid.initd-r5
deleted file mode 100644
index 0572fbcefefb..000000000000
--- a/net-proxy/squid/files/squid.initd-r5
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-SQUID_SVCNAME=$( echo "${RC_SVCNAME}" | tr -cd '[a-zA-Z0-9]' )
-
-extra_started_commands="reload rotate"
-
-depend() {
-	use dns net
-}
-
-checkconfig() {
-	local CONFFILES="/etc/squid/${RC_SVCNAME}.conf /etc/squid/${RC_SVCNAME}.include /etc/squid/${RC_SVCNAME}.include.*"
-	if [ ! -f /etc/squid/${RC_SVCNAME}.conf ]; then
-		eerror "You need to create /etc/squid/${RC_SVCNAME}.conf first."
-		eerror "The main configuration file and all included file names should have the following format:"
-		eerror "${CONFFILES}"
-		eerror "An example can be found in /etc/squid/squid.conf.default"
-		return 1
-	fi
-
-	local PIDFILE=$(cat ${CONFFILES} 2>/dev/null 3>/dev/null | awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }')
-	[ -z ${PIDFILE} ] && PIDFILE=/run/squid.pid
-	if [ /run/${RC_SVCNAME}.pid != ${PIDFILE} ]; then
-		eerror "/etc/squid/${RC_SVCNAME}.conf must set pid_filename to"
-		eerror "   /run/${RC_SVCNAME}.pid"
-		eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than"
-		eerror "         in any other instance of squid."
-		eerror "Make sure the main configuration file and all included file names have the following format:"
-		eerror "${CONFFILES}"
-		return 1
-	fi
-
-	# Maximum file descriptors squid can open is determined by:
-	# a basic default of N=1024
-	#  ... altered by ./configure --with-filedescriptors=N
-	#  ... overridden on production by squid.conf max_filedescriptors (if,
-	#  and only if, setrlimit() RLIMIT_NOFILE is able to be built+used).
-	# Since we do not configure hard coded # of filedescriptors anymore,
-	# there is no need for ulimit calls in the init script.
-	# Use max_filedescriptors in squid.conf instead.
-
-	local CACHE_SWAP=$(cat ${CONFFILES} 2>/dev/null 3>/dev/null | awk '/^[ \t]*cache_dir[ \t]+/ { if ( $2 == "rock" ) printf "%s/rock ", $3; else if ( $2 == "coss" ) printf "%s/stripe ", $3; else printf "%s/00 ", $3; }')
-	[ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00"
-	
-	local x
-	for x in $CACHE_SWAP ; do
-		if [ ! -e $x ] ; then
-			ebegin "Initializing cache directory ${x%/*}"
-			local ORIG_UMASK=$(umask)
-			umask 027
-
-			if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then
-				eend 1
-				return 1
-			fi
-
-			local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME} 2>&1)"
-			if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then
-				umask $ORIG_UMASK
-				eend 1
-				echo "$INIT_CACHE_RESPONSE"
-				return 1
-			fi
-
-			umask $ORIG_UMASK
-			eend 0
-			break
-		fi
-	done
-	
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-	checkpath -d -q -m 0750 -o squid:squid /run/${RC_SVCNAME}
-
-	# see https://wiki.squid-cache.org/MultipleInstances
-	ebegin "Starting ${RC_SVCNAME} (service name ${SQUID_SVCNAME}) with KRB5_KTNAME=\"${SQUID_KEYTAB}\" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}"
-	KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}
-	eend $? && sleep 1
-}
-
-stop() {
-	ebegin "Stopping ${RC_SVCNAME} with /usr/sbin/squid -k shutdown -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}"
-	if /usr/sbin/squid -k shutdown -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME} ; then
-		# Now we have to wait until squid has _really_ stopped.
-		sleep 1
-		if [ -f /run/${RC_SVCNAME}.pid ] ; then
-			einfon "Waiting for squid to shutdown ."
-			cnt=0
-			while [ -f /run/${RC_SVCNAME}.pid ] ; do
-				cnt=$(expr $cnt + 1)
-				if [ $cnt -gt 60 ] ; then
-					# Waited 120 seconds now. Fail.
-					echo
-					eend 1 "Failed."
-					break
-				fi
-				sleep 2
-				printf "."
-			done
-			echo
-		fi
-	else
-		eerror "Squid shutdown failed, probably service is already down."
-	fi
-	eend 0
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading ${RC_SVCNAME} with /usr/sbin/squid -k reconfigure -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}"
-	/usr/sbin/squid -k reconfigure -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}
-	eend $?
-}
-
-rotate() {
-	service_started ${RC_SVCNAME} || return 1
-	ebegin "Rotating ${RC_SVCNAME} logs with /usr/sbin/squid -k rotate -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}"
-	/usr/sbin/squid -k rotate -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}
-	eend $?
-}
diff --git a/net-proxy/squid/squid-5.7-r1.ebuild b/net-proxy/squid/squid-5.7-r1.ebuild
deleted file mode 100644
index adf1e1062c64..000000000000
--- a/net-proxy/squid/squid-5.7-r1.ebuild
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-
-MY_PV_MAJOR=$(ver_cut 1)
-# Upstream patch ID for the most recent bug-fixed update to the formal release.
-#r=-20181117-r0022167
-r=
-if [[ -z ${r} ]]; then
-	SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz"
-else
-	SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}${r}.tar.bz2"
-	S="${S}${r}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc x86"
-IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap"
-IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp +wccp +wccpv2"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="tproxy? ( caps ) qos? ( caps )"
-
-DEPEND="
-	acct-group/squid
-	acct-user/squid
-	dev-libs/libltdl
-	sys-libs/tdb
-	virtual/libcrypt:=
-	caps? ( >=sys-libs/libcap-2.16 )
-	ecap? ( net-libs/libecap:1 )
-	esi? (
-		dev-libs/expat
-		dev-libs/libxml2
-	)
-	ldap? ( net-nds/openldap:= )
-	gnutls? ( >=net-libs/gnutls-3.1.5:= )
-	logrotate? ( app-admin/logrotate )
-	nis? (
-		net-libs/libtirpc:=
-		net-libs/libnsl:=
-	)
-	kerberos? ( virtual/krb5 )
-	pam? ( sys-libs/pam )
-	qos? ( net-libs/libnetfilter_conntrack )
-	ssl? (
-		dev-libs/nettle:=
-		!gnutls? (
-			dev-libs/openssl:=
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="
-	${DEPEND}
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	perl? ( dev-lang/perl )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-squid )
-	sqlite? ( dev-perl/DBD-SQLite )
-"
-BDEPEND="
-	dev-lang/perl
-	ecap? ( virtual/pkgconfig )
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3-gentoo.patch
-	"${FILESDIR}"/${PN}-4.17-use-system-libltdl.patch
-)
-
-pkg_pretend() {
-	if use tproxy; then
-		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Fixup various paths
-	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
-		INSTALL QUICKSTART \
-		scripts/fileno-to-pathname.pl \
-		scripts/check_cache.pl \
-		tools/cachemgr.cgi.8 \
-		tools/purge/conffile.hh \
-		tools/purge/purge.1 || die
-	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
-		INSTALL QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
-		QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
-		QUICKSTART \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
-		src/acl/external/unix_group/ext_unix_group_acl.8 \
-		src/acl/external/session/ext_session_acl.8 || die
-	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-		scripts/check_cache.pl || die
-	# /var/run/squid to /run/squid
-	sed -i -e 's:$(localstatedir)::' \
-		src/ipc/Makefile.am || die
-	sed -i 's:/var/run/:/run/:g' tools/systemd/squid.service || die
-
-	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
-		libltdl/configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--datadir=/usr/share/squid
-		--libexecdir=/usr/libexec/squid
-		--localstatedir=/var
-		--sysconfdir=/etc/squid
-		--with-default-user=squid
-		--with-logdir=/var/log/squid
-		--with-pidfile=/run/squid.pid
-
-		--enable-build-info="Gentoo ${PF} (r: ${r:-NONE})"
-		--enable-log-daemon-helpers
-		--enable-url-rewrite-helpers
-		--enable-cache-digests
-		--enable-delay-pools
-		--enable-disk-io
-		--enable-eui
-		--enable-icmp
-		--enable-ipv6
-		--enable-follow-x-forwarded-for
-		--enable-removal-policies="lru,heap"
-		--disable-strict-error-checking
-		--disable-arch-native
-
-		--with-large-files
-		--with-build-environment=default
-
-		--with-tdb
-
-		--without-included-ltdl
-		--with-ltdl-include="${ESYSROOT}"/usr/include
-		--with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir)
-
-		$(use_with caps libcap)
-		$(use_enable snmp)
-		$(use_with ssl openssl)
-		$(use_with ssl nettle)
-		$(use_with gnutls)
-		$(use_enable ssl-crtd)
-		$(use_with systemd)
-		$(use_with test cppunit)
-		$(use_enable ecap)
-		$(use_enable esi)
-		$(use_enable esi expat)
-		$(use_enable esi libxml2)
-		$(use_enable htcp)
-		$(use_enable wccp)
-		$(use_enable wccpv2)
-	)
-
-	# Basic modules
-	local basic_modules=(
-		NCSA
-		POP3
-		getpwnam
-
-		$(usev samba 'SMB')
-		$(usev ldap 'SMB_LM LDAP')
-		$(usev pam 'PAM')
-		$(usev sasl 'SASL')
-		$(usev nis 'NIS')
-		$(usev radius 'RADIUS')
-	)
-
-	use nis && append-cppflags "-I${ESYSROOT}/usr/include/tirpc"
-
-	if use mysql || use postgres || use sqlite; then
-		basic_modules+=( DB )
-	fi
-
-	# Digests
-	local digest_modules=(
-		file
-
-		$(usev ldap 'LDAP eDirectory')
-	)
-
-	# Kerberos
-	local negotiate_modules=( none )
-
-	myeconfargs+=( --without-mit-krb5 --without-heimdal-krb5 )
-
-	if use kerberos; then
-		# We intentionally overwrite negotiate_modules here to lose
-		# the 'none'.
-		negotiate_modules=( kerberos wrapper )
-
-		if has_version app-crypt/heimdal; then
-			myeconfargs+=(
-				--without-mit-krb5
-				--with-heimdal-krb5
-			)
-		else
-			myeconfargs+=(
-				--with-mit-krb5
-				--without-heimdal-krb5
-			)
-		fi
-	fi
-
-	# NTLM modules
-	local ntlm_modules=( none )
-
-	if use samba ; then
-		# We intentionally overwrite ntlm_modules here to lose
-		# the 'none'.
-		ntlm_modules=( SMB_LM )
-	fi
-
-	# External helpers
-	local ext_helpers=(
-		file_userip
-		session
-		unix_group
-		delayer
-		time_quota
-
-		$(usev samba 'wbinfo_group')
-		$(usev ldap 'LDAP_group eDirectory_userip')
-	)
-
-	use ldap && use kerberos && ext_helpers+=( kerberos_ldap_group )
-	if use mysql || use postgres || use sqlite; then
-		ext_helpers+=( SQL_session )
-	fi
-
-	# Storage modules
-	local storeio_modules=(
-		aufs
-		diskd
-		rock
-		ufs
-	)
-
-	#
-	local transparent
-	if use kernel_linux; then
-		myeconfargs+=(
-			--enable-linux-netfilter
-			$(usev qos '--enable-zph-qos --with-netfilter-conntrack')
-		)
-	fi
-
-	tc-export_build_env BUILD_CXX
-	export BUILDCXX="${BUILD_CXX}"
-	export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
-	tc-export CC AR
-
-	# Should be able to drop this workaround with newer versions.
-	# https://bugs.squid-cache.org/show_bug.cgi?id=4224
-	tc-is-cross-compiler && export squid_cv_gnu_atomics=no
-
-	# Bug #719662
-	append-atomic-flags
-
-	print_options_without_comma() {
-		# IFS as ',' will cut off any trailing commas
-		(
-			IFS=','
-			options=( $(printf "%s," "${@}") )
-			echo "${options[*]}"
-		)
-	}
-
-	myeconfargs+=(
-		--enable-storeio=$(print_options_without_comma "${storeio_modules[@]}")
-		--enable-auth-basic=$(print_options_without_comma "${basic_modules[@]}")
-		--enable-auth-digest=$(print_options_without_comma "${digest_modules[@]}")
-		--enable-auth-ntlm=$(print_options_without_comma "${ntlm_modules[@]}")
-		--enable-auth-negotiate=$(print_options_without_comma "${negotiate_modules[@]}")
-		--enable-external-acl-helpers=$(print_options_without_comma "${ext_helpers[@]}")
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	systemd_dounit tools/systemd/squid.service
-
-	# Need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
-	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
-
-	if use pam; then
-		fowners root:squid /usr/libexec/squid/basic_pam_auth
-		fperms 4750 /usr/libexec/squid/basic_pam_auth
-	fi
-
-	# Pinger needs suid as well
-	fowners root:squid /usr/libexec/squid/pinger
-	fperms 4750 /usr/libexec/squid/pinger
-
-	# These scripts depend on perl
-	if ! use perl; then
-		local perl_scripts=(
-			basic_pop3_auth ext_delayer_acl helper-mux
-			log_db_daemon security_fake_certverify
-			storeid_file_rewrite url_lfs_rewrite
-		)
-
-		local script
-		for script in "${perl_scripts[@]}"; do
-			rm "${ED}"/usr/libexec/squid/${script} || die
-		done
-	fi
-
-	# Cleanup
-	rm -r "${D}"/run "${D}"/var/cache || die
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
-	newdoc src/auth/negotiate/kerberos/README README.kerberos
-	newdoc src/auth/basic/RADIUS/README README.RADIUS
-	newdoc src/acl/external/kerberos_ldap_group/README README.kerberos_ldap_group
-	dodoc RELEASENOTES.html
-
-	if use pam; then
-		newpamd "${FILESDIR}"/squid.pam squid
-	fi
-
-	newconfd "${FILESDIR}"/squid.confd-r2 squid
-	newinitd "${FILESDIR}"/squid.initd-r5 squid
-
-	if use logrotate ; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/squid.logrotate squid
-	else
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}"/squid.cron squid.cron
-	fi
-
-	diropts -m0750 -o squid -g squid
-	keepdir /var/log/squid /etc/ssl/squid /var/lib/squid
-
-	# Hack for bug #834503 (see also bug #664940)
-	# Please keep this for a few years until it's no longer plausible
-	# someone is upgrading from < squid 5.7.
-	mv "${ED}"/usr/share/squid/errors{,.new} || die
-}
-
-pkg_preinst() {
-	# Remove file in EROOT that the directory collides with.
-	rm -rf "${EROOT}"/usr/share/squid/errors || die
-
-	# Following the collision protection check, reverse
-	# src_install's rename in ED.
-	mv "${ED}"/usr/share/squid/errors{.new,} || die
-}
-
-pkg_postinst() {
-	elog "A good starting point to debug Squid issues is to use 'squidclient mgr:' commands such as 'squidclient mgr:info'."
-
-	if [[ ${#r} -gt 0 ]]; then
-		elog "You are using a release with the official ${r} patch! Make sure you mention that, or send the output of 'squidclient mgr:info' when asking for support."
-	fi
-}
diff --git a/net-proxy/squid/squid-5.8.ebuild b/net-proxy/squid/squid-5.8.ebuild
deleted file mode 100644
index f7f2f01d3c06..000000000000
--- a/net-proxy/squid/squid-5.8.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-
-MY_PV_MAJOR=$(ver_cut 1)
-# Upstream patch ID for the most recent bug-fixed update to the formal release.
-#r=-20181117-r0022167
-r=
-if [[ -z ${r} ]]; then
-	SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz"
-else
-	SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}${r}.tar.bz2"
-	S="${S}${r}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap"
-IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp valgrind +wccp +wccpv2"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="tproxy? ( caps ) qos? ( caps ) ssl-crtd? ( ssl )"
-
-DEPEND="
-	acct-group/squid
-	acct-user/squid
-	dev-libs/libltdl
-	sys-libs/tdb
-	virtual/libcrypt:=
-	caps? ( >=sys-libs/libcap-2.16 )
-	ecap? ( net-libs/libecap:1 )
-	esi? (
-		dev-libs/expat
-		dev-libs/libxml2
-	)
-	ldap? ( net-nds/openldap:= )
-	gnutls? ( >=net-libs/gnutls-3.1.5:= )
-	logrotate? ( app-admin/logrotate )
-	nis? (
-		net-libs/libtirpc:=
-		net-libs/libnsl:=
-	)
-	kerberos? ( virtual/krb5 )
-	pam? ( sys-libs/pam )
-	qos? ( net-libs/libnetfilter_conntrack )
-	ssl? (
-		dev-libs/nettle:=
-		!gnutls? (
-			dev-libs/openssl:=
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="
-	${DEPEND}
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	perl? ( dev-lang/perl )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-squid )
-	sqlite? ( dev-perl/DBD-SQLite )
-"
-DEPEND+=" valgrind? ( dev-util/valgrind )"
-BDEPEND="
-	dev-lang/perl
-	ecap? ( virtual/pkgconfig )
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3-gentoo.patch
-	"${FILESDIR}"/${PN}-4.17-use-system-libltdl.patch
-)
-
-pkg_pretend() {
-	if use tproxy; then
-		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Fixup various paths
-	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
-		INSTALL QUICKSTART \
-		scripts/fileno-to-pathname.pl \
-		scripts/check_cache.pl \
-		tools/cachemgr.cgi.8 \
-		tools/purge/conffile.hh \
-		tools/purge/purge.1 || die
-	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
-		INSTALL QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
-		QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
-		QUICKSTART \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
-		src/acl/external/unix_group/ext_unix_group_acl.8 \
-		src/acl/external/session/ext_session_acl.8 || die
-	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-		scripts/check_cache.pl || die
-	# /var/run/squid to /run/squid
-	sed -i -e 's:$(localstatedir)::' \
-		src/ipc/Makefile.am || die
-	sed -i 's:/var/run/:/run/:g' tools/systemd/squid.service || die
-
-	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
-		libltdl/configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--datadir=/usr/share/squid
-		--libexecdir=/usr/libexec/squid
-		--localstatedir=/var
-		--sysconfdir=/etc/squid
-		--with-default-user=squid
-		--with-logdir=/var/log/squid
-		--with-pidfile=/run/squid.pid
-
-		--enable-build-info="Gentoo ${PF} (r: ${r:-NONE})"
-		--enable-log-daemon-helpers
-		--enable-url-rewrite-helpers
-		--enable-cache-digests
-		--enable-delay-pools
-		--enable-disk-io
-		--enable-eui
-		--enable-icmp
-		--enable-ipv6
-		--enable-follow-x-forwarded-for
-		--enable-removal-policies="lru,heap"
-		--disable-strict-error-checking
-		--disable-arch-native
-
-		--with-large-files
-		--with-build-environment=default
-
-		--with-tdb
-
-		--without-included-ltdl
-		--with-ltdl-include="${ESYSROOT}"/usr/include
-		--with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir)
-
-		$(use_with caps libcap)
-		$(use_enable snmp)
-		$(use_with ssl openssl)
-		$(use_with ssl nettle)
-		$(use_with gnutls)
-		$(use_enable ssl-crtd)
-		$(use_with systemd)
-		$(use_with test cppunit)
-		$(use_enable ecap)
-		$(use_enable esi)
-		$(use_enable esi expat)
-		$(use_enable esi libxml2)
-		$(use_enable htcp)
-		$(use_with valgrind valgrind-debug)
-		$(use_enable wccp)
-		$(use_enable wccpv2)
-	)
-
-	# Basic modules
-	local basic_modules=(
-		NCSA
-		POP3
-		getpwnam
-
-		$(usev samba 'SMB')
-		$(usev ldap 'SMB_LM LDAP')
-		$(usev pam 'PAM')
-		$(usev sasl 'SASL')
-		$(usev nis 'NIS')
-		$(usev radius 'RADIUS')
-	)
-
-	use nis && append-cppflags "-I${ESYSROOT}/usr/include/tirpc"
-
-	if use mysql || use postgres || use sqlite; then
-		basic_modules+=( DB )
-	fi
-
-	# Digests
-	local digest_modules=(
-		file
-
-		$(usev ldap 'LDAP eDirectory')
-	)
-
-	# Kerberos
-	local negotiate_modules=( none )
-
-	myeconfargs+=( --without-mit-krb5 --without-heimdal-krb5 )
-
-	if use kerberos; then
-		# We intentionally overwrite negotiate_modules here to lose
-		# the 'none'.
-		negotiate_modules=( kerberos wrapper )
-
-		if has_version app-crypt/heimdal; then
-			myeconfargs+=(
-				--without-mit-krb5
-				--with-heimdal-krb5
-			)
-		else
-			myeconfargs+=(
-				--with-mit-krb5
-				--without-heimdal-krb5
-			)
-		fi
-	fi
-
-	# NTLM modules
-	local ntlm_modules=( none )
-
-	if use samba ; then
-		# We intentionally overwrite ntlm_modules here to lose
-		# the 'none'.
-		ntlm_modules=( SMB_LM )
-	fi
-
-	# External helpers
-	local ext_helpers=(
-		file_userip
-		session
-		unix_group
-		delayer
-		time_quota
-
-		$(usev samba 'wbinfo_group')
-		$(usev ldap 'LDAP_group eDirectory_userip')
-	)
-
-	use ldap && use kerberos && ext_helpers+=( kerberos_ldap_group )
-	if use mysql || use postgres || use sqlite; then
-		ext_helpers+=( SQL_session )
-	fi
-
-	# Storage modules
-	local storeio_modules=(
-		aufs
-		diskd
-		rock
-		ufs
-	)
-
-	#
-	local transparent
-	if use kernel_linux; then
-		myeconfargs+=(
-			--enable-linux-netfilter
-			$(usev qos '--enable-zph-qos --with-netfilter-conntrack')
-		)
-	fi
-
-	tc-export_build_env BUILD_CXX
-	export BUILDCXX="${BUILD_CXX}"
-	export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
-	tc-export CC AR
-
-	# Should be able to drop this workaround with newer versions.
-	# https://bugs.squid-cache.org/show_bug.cgi?id=4224
-	tc-is-cross-compiler && export squid_cv_gnu_atomics=no
-
-	# Bug #719662
-	append-atomic-flags
-
-	print_options_without_comma() {
-		# IFS as ',' will cut off any trailing commas
-		(
-			IFS=','
-			options=( $(printf "%s," "${@}") )
-			echo "${options[*]}"
-		)
-	}
-
-	myeconfargs+=(
-		--enable-storeio=$(print_options_without_comma "${storeio_modules[@]}")
-		--enable-auth-basic=$(print_options_without_comma "${basic_modules[@]}")
-		--enable-auth-digest=$(print_options_without_comma "${digest_modules[@]}")
-		--enable-auth-ntlm=$(print_options_without_comma "${ntlm_modules[@]}")
-		--enable-auth-negotiate=$(print_options_without_comma "${negotiate_modules[@]}")
-		--enable-external-acl-helpers=$(print_options_without_comma "${ext_helpers[@]}")
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	systemd_dounit tools/systemd/squid.service
-
-	# Need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
-	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
-
-	if use pam; then
-		fowners root:squid /usr/libexec/squid/basic_pam_auth
-		fperms 4750 /usr/libexec/squid/basic_pam_auth
-	fi
-
-	# Pinger needs suid as well
-	fowners root:squid /usr/libexec/squid/pinger
-	fperms 4750 /usr/libexec/squid/pinger
-
-	# These scripts depend on perl
-	if ! use perl; then
-		local perl_scripts=(
-			basic_pop3_auth ext_delayer_acl helper-mux
-			log_db_daemon security_fake_certverify
-			storeid_file_rewrite url_lfs_rewrite
-		)
-
-		local script
-		for script in "${perl_scripts[@]}"; do
-			rm "${ED}"/usr/libexec/squid/${script} || die
-		done
-	fi
-
-	# Cleanup
-	rm -r "${D}"/run "${D}"/var/cache || die
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
-	newdoc src/auth/negotiate/kerberos/README README.kerberos
-	newdoc src/auth/basic/RADIUS/README README.RADIUS
-	newdoc src/acl/external/kerberos_ldap_group/README README.kerberos_ldap_group
-	dodoc RELEASENOTES.html
-
-	if use pam; then
-		newpamd "${FILESDIR}"/squid.pam squid
-	fi
-
-	newconfd "${FILESDIR}"/squid.confd-r2 squid
-	newinitd "${FILESDIR}"/squid.initd-r6 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
-
-	# Hack for bug #834503 (see also bug #664940)
-	# Please keep this for a few years until it's no longer plausible
-	# someone is upgrading from < squid 5.7.
-	mv "${ED}"/usr/share/squid/errors{,.new} || die
-}
-
-pkg_preinst() {
-	# Remove file in EROOT that the directory collides with.
-	rm -rf "${EROOT}"/usr/share/squid/errors || die
-
-	# Following the collision protection check, reverse
-	# src_install's rename in ED.
-	mv "${ED}"/usr/share/squid/errors{.new,} || die
-}
-
-pkg_postinst() {
-	elog "A good starting point to debug Squid issues is to use 'squidclient mgr:' commands such as 'squidclient mgr:info'."
-
-	if [[ ${#r} -gt 0 ]]; then
-		elog "You are using a release with the official ${r} patch! Make sure you mention that, or send the output of 'squidclient mgr:info' when asking for support."
-	fi
-}
diff --git a/net-proxy/squid/squid-5.9.ebuild b/net-proxy/squid/squid-5.9.ebuild
deleted file mode 100644
index f7f2f01d3c06..000000000000
--- a/net-proxy/squid/squid-5.9.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-
-MY_PV_MAJOR=$(ver_cut 1)
-# Upstream patch ID for the most recent bug-fixed update to the formal release.
-#r=-20181117-r0022167
-r=
-if [[ -z ${r} ]]; then
-	SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz"
-else
-	SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}${r}.tar.bz2"
-	S="${S}${r}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap"
-IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp valgrind +wccp +wccpv2"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="tproxy? ( caps ) qos? ( caps ) ssl-crtd? ( ssl )"
-
-DEPEND="
-	acct-group/squid
-	acct-user/squid
-	dev-libs/libltdl
-	sys-libs/tdb
-	virtual/libcrypt:=
-	caps? ( >=sys-libs/libcap-2.16 )
-	ecap? ( net-libs/libecap:1 )
-	esi? (
-		dev-libs/expat
-		dev-libs/libxml2
-	)
-	ldap? ( net-nds/openldap:= )
-	gnutls? ( >=net-libs/gnutls-3.1.5:= )
-	logrotate? ( app-admin/logrotate )
-	nis? (
-		net-libs/libtirpc:=
-		net-libs/libnsl:=
-	)
-	kerberos? ( virtual/krb5 )
-	pam? ( sys-libs/pam )
-	qos? ( net-libs/libnetfilter_conntrack )
-	ssl? (
-		dev-libs/nettle:=
-		!gnutls? (
-			dev-libs/openssl:=
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="
-	${DEPEND}
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	perl? ( dev-lang/perl )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-squid )
-	sqlite? ( dev-perl/DBD-SQLite )
-"
-DEPEND+=" valgrind? ( dev-util/valgrind )"
-BDEPEND="
-	dev-lang/perl
-	ecap? ( virtual/pkgconfig )
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3-gentoo.patch
-	"${FILESDIR}"/${PN}-4.17-use-system-libltdl.patch
-)
-
-pkg_pretend() {
-	if use tproxy; then
-		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Fixup various paths
-	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
-		INSTALL QUICKSTART \
-		scripts/fileno-to-pathname.pl \
-		scripts/check_cache.pl \
-		tools/cachemgr.cgi.8 \
-		tools/purge/conffile.hh \
-		tools/purge/purge.1 || die
-	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
-		INSTALL QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
-		QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
-		QUICKSTART \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
-		src/acl/external/unix_group/ext_unix_group_acl.8 \
-		src/acl/external/session/ext_session_acl.8 || die
-	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-		scripts/check_cache.pl || die
-	# /var/run/squid to /run/squid
-	sed -i -e 's:$(localstatedir)::' \
-		src/ipc/Makefile.am || die
-	sed -i 's:/var/run/:/run/:g' tools/systemd/squid.service || die
-
-	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
-		libltdl/configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--datadir=/usr/share/squid
-		--libexecdir=/usr/libexec/squid
-		--localstatedir=/var
-		--sysconfdir=/etc/squid
-		--with-default-user=squid
-		--with-logdir=/var/log/squid
-		--with-pidfile=/run/squid.pid
-
-		--enable-build-info="Gentoo ${PF} (r: ${r:-NONE})"
-		--enable-log-daemon-helpers
-		--enable-url-rewrite-helpers
-		--enable-cache-digests
-		--enable-delay-pools
-		--enable-disk-io
-		--enable-eui
-		--enable-icmp
-		--enable-ipv6
-		--enable-follow-x-forwarded-for
-		--enable-removal-policies="lru,heap"
-		--disable-strict-error-checking
-		--disable-arch-native
-
-		--with-large-files
-		--with-build-environment=default
-
-		--with-tdb
-
-		--without-included-ltdl
-		--with-ltdl-include="${ESYSROOT}"/usr/include
-		--with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir)
-
-		$(use_with caps libcap)
-		$(use_enable snmp)
-		$(use_with ssl openssl)
-		$(use_with ssl nettle)
-		$(use_with gnutls)
-		$(use_enable ssl-crtd)
-		$(use_with systemd)
-		$(use_with test cppunit)
-		$(use_enable ecap)
-		$(use_enable esi)
-		$(use_enable esi expat)
-		$(use_enable esi libxml2)
-		$(use_enable htcp)
-		$(use_with valgrind valgrind-debug)
-		$(use_enable wccp)
-		$(use_enable wccpv2)
-	)
-
-	# Basic modules
-	local basic_modules=(
-		NCSA
-		POP3
-		getpwnam
-
-		$(usev samba 'SMB')
-		$(usev ldap 'SMB_LM LDAP')
-		$(usev pam 'PAM')
-		$(usev sasl 'SASL')
-		$(usev nis 'NIS')
-		$(usev radius 'RADIUS')
-	)
-
-	use nis && append-cppflags "-I${ESYSROOT}/usr/include/tirpc"
-
-	if use mysql || use postgres || use sqlite; then
-		basic_modules+=( DB )
-	fi
-
-	# Digests
-	local digest_modules=(
-		file
-
-		$(usev ldap 'LDAP eDirectory')
-	)
-
-	# Kerberos
-	local negotiate_modules=( none )
-
-	myeconfargs+=( --without-mit-krb5 --without-heimdal-krb5 )
-
-	if use kerberos; then
-		# We intentionally overwrite negotiate_modules here to lose
-		# the 'none'.
-		negotiate_modules=( kerberos wrapper )
-
-		if has_version app-crypt/heimdal; then
-			myeconfargs+=(
-				--without-mit-krb5
-				--with-heimdal-krb5
-			)
-		else
-			myeconfargs+=(
-				--with-mit-krb5
-				--without-heimdal-krb5
-			)
-		fi
-	fi
-
-	# NTLM modules
-	local ntlm_modules=( none )
-
-	if use samba ; then
-		# We intentionally overwrite ntlm_modules here to lose
-		# the 'none'.
-		ntlm_modules=( SMB_LM )
-	fi
-
-	# External helpers
-	local ext_helpers=(
-		file_userip
-		session
-		unix_group
-		delayer
-		time_quota
-
-		$(usev samba 'wbinfo_group')
-		$(usev ldap 'LDAP_group eDirectory_userip')
-	)
-
-	use ldap && use kerberos && ext_helpers+=( kerberos_ldap_group )
-	if use mysql || use postgres || use sqlite; then
-		ext_helpers+=( SQL_session )
-	fi
-
-	# Storage modules
-	local storeio_modules=(
-		aufs
-		diskd
-		rock
-		ufs
-	)
-
-	#
-	local transparent
-	if use kernel_linux; then
-		myeconfargs+=(
-			--enable-linux-netfilter
-			$(usev qos '--enable-zph-qos --with-netfilter-conntrack')
-		)
-	fi
-
-	tc-export_build_env BUILD_CXX
-	export BUILDCXX="${BUILD_CXX}"
-	export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
-	tc-export CC AR
-
-	# Should be able to drop this workaround with newer versions.
-	# https://bugs.squid-cache.org/show_bug.cgi?id=4224
-	tc-is-cross-compiler && export squid_cv_gnu_atomics=no
-
-	# Bug #719662
-	append-atomic-flags
-
-	print_options_without_comma() {
-		# IFS as ',' will cut off any trailing commas
-		(
-			IFS=','
-			options=( $(printf "%s," "${@}") )
-			echo "${options[*]}"
-		)
-	}
-
-	myeconfargs+=(
-		--enable-storeio=$(print_options_without_comma "${storeio_modules[@]}")
-		--enable-auth-basic=$(print_options_without_comma "${basic_modules[@]}")
-		--enable-auth-digest=$(print_options_without_comma "${digest_modules[@]}")
-		--enable-auth-ntlm=$(print_options_without_comma "${ntlm_modules[@]}")
-		--enable-auth-negotiate=$(print_options_without_comma "${negotiate_modules[@]}")
-		--enable-external-acl-helpers=$(print_options_without_comma "${ext_helpers[@]}")
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	systemd_dounit tools/systemd/squid.service
-
-	# Need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
-	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
-
-	if use pam; then
-		fowners root:squid /usr/libexec/squid/basic_pam_auth
-		fperms 4750 /usr/libexec/squid/basic_pam_auth
-	fi
-
-	# Pinger needs suid as well
-	fowners root:squid /usr/libexec/squid/pinger
-	fperms 4750 /usr/libexec/squid/pinger
-
-	# These scripts depend on perl
-	if ! use perl; then
-		local perl_scripts=(
-			basic_pop3_auth ext_delayer_acl helper-mux
-			log_db_daemon security_fake_certverify
-			storeid_file_rewrite url_lfs_rewrite
-		)
-
-		local script
-		for script in "${perl_scripts[@]}"; do
-			rm "${ED}"/usr/libexec/squid/${script} || die
-		done
-	fi
-
-	# Cleanup
-	rm -r "${D}"/run "${D}"/var/cache || die
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
-	newdoc src/auth/negotiate/kerberos/README README.kerberos
-	newdoc src/auth/basic/RADIUS/README README.RADIUS
-	newdoc src/acl/external/kerberos_ldap_group/README README.kerberos_ldap_group
-	dodoc RELEASENOTES.html
-
-	if use pam; then
-		newpamd "${FILESDIR}"/squid.pam squid
-	fi
-
-	newconfd "${FILESDIR}"/squid.confd-r2 squid
-	newinitd "${FILESDIR}"/squid.initd-r6 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
-
-	# Hack for bug #834503 (see also bug #664940)
-	# Please keep this for a few years until it's no longer plausible
-	# someone is upgrading from < squid 5.7.
-	mv "${ED}"/usr/share/squid/errors{,.new} || die
-}
-
-pkg_preinst() {
-	# Remove file in EROOT that the directory collides with.
-	rm -rf "${EROOT}"/usr/share/squid/errors || die
-
-	# Following the collision protection check, reverse
-	# src_install's rename in ED.
-	mv "${ED}"/usr/share/squid/errors{.new,} || die
-}
-
-pkg_postinst() {
-	elog "A good starting point to debug Squid issues is to use 'squidclient mgr:' commands such as 'squidclient mgr:info'."
-
-	if [[ ${#r} -gt 0 ]]; then
-		elog "You are using a release with the official ${r} patch! Make sure you mention that, or send the output of 'squidclient mgr:info' when asking for support."
-	fi
-}
diff --git a/net-proxy/squid/squid-6.2.ebuild b/net-proxy/squid/squid-6.2.ebuild
deleted file mode 100644
index 0c10c03e6c44..000000000000
--- a/net-proxy/squid/squid-6.2.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
-
-DESCRIPTION="Full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-
-MY_PV_MAJOR=$(ver_cut 1)
-# Upstream patch ID for the most recent bug-fixed update to the formal release.
-#r=-20181117-r0022167
-r=
-if [[ -z ${r} ]]; then
-	SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz"
-else
-	SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}${r}.tar.bz2"
-	S="${S}${r}"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap"
-IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp valgrind +wccp +wccpv2"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="tproxy? ( caps ) qos? ( caps ) ssl-crtd? ( ssl )"
-
-DEPEND="
-	acct-group/squid
-	acct-user/squid
-	dev-libs/libltdl
-	sys-libs/tdb
-	virtual/libcrypt:=
-	caps? ( >=sys-libs/libcap-2.16 )
-	ecap? ( net-libs/libecap:1 )
-	esi? (
-		dev-libs/expat
-		dev-libs/libxml2
-	)
-	ldap? ( net-nds/openldap:= )
-	gnutls? ( >=net-libs/gnutls-3.1.5:= )
-	logrotate? ( app-admin/logrotate )
-	nis? (
-		net-libs/libtirpc:=
-		net-libs/libnsl:=
-	)
-	kerberos? ( virtual/krb5 )
-	pam? ( sys-libs/pam )
-	qos? ( net-libs/libnetfilter_conntrack )
-	ssl? (
-		dev-libs/nettle:=
-		!gnutls? (
-			dev-libs/openssl:=
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="
-	${DEPEND}
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	perl? ( dev-lang/perl )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-squid )
-	sqlite? ( dev-perl/DBD-SQLite )
-"
-DEPEND+=" valgrind? ( dev-util/valgrind )"
-BDEPEND="
-	dev-lang/perl
-	ecap? ( virtual/pkgconfig )
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.2-gentoo.patch
-	"${FILESDIR}"/${PN}-4.17-use-system-libltdl.patch
-)
-
-pkg_pretend() {
-	if use tproxy; then
-		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Fixup various paths
-	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
-		INSTALL QUICKSTART \
-		scripts/fileno-to-pathname.pl \
-		scripts/check_cache.pl \
-		tools/cachemgr.cgi.8 \
-		tools/purge/conffile.hh \
-		tools/purge/purge.1 || die
-	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
-		INSTALL QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
-		QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
-		QUICKSTART \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
-		src/acl/external/unix_group/ext_unix_group_acl.8 \
-		src/acl/external/session/ext_session_acl.8 || die
-	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-		scripts/check_cache.pl || die
-	# /var/run/squid to /run/squid
-	sed -i -e 's:$(localstatedir)::' \
-		src/ipc/Makefile.am || die
-	sed -i 's:/var/run/:/run/:g' tools/systemd/squid.service || die
-
-	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
-		libltdl/configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--datadir=/usr/share/squid
-		--libexecdir=/usr/libexec/squid
-		--localstatedir=/var
-		--sysconfdir=/etc/squid
-		--with-default-user=squid
-		--with-logdir=/var/log/squid
-		--with-pidfile=/run/squid.pid
-
-		--enable-build-info="Gentoo ${PF} (r: ${r:-NONE})"
-		--enable-log-daemon-helpers
-		--enable-url-rewrite-helpers
-		--enable-cache-digests
-		--enable-delay-pools
-		--enable-disk-io
-		--enable-eui
-		--enable-icmp
-		--enable-ipv6
-		--enable-follow-x-forwarded-for
-		--enable-removal-policies="lru,heap"
-		--disable-strict-error-checking
-		--disable-arch-native
-
-		--with-large-files
-		--with-build-environment=default
-
-		--with-tdb
-
-		--without-included-ltdl
-		--with-ltdl-include="${ESYSROOT}"/usr/include
-		--with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir)
-
-		$(use_with caps cap)
-		$(use_enable snmp)
-		$(use_with ssl openssl)
-		$(use_with ssl nettle)
-		$(use_with gnutls)
-		$(use_with ldap)
-		$(use_enable ssl-crtd)
-		$(use_with systemd)
-		$(use_with test cppunit)
-		$(use_enable ecap)
-		$(use_enable esi)
-		$(use_enable esi expat)
-		$(use_enable esi xml2)
-		$(use_enable htcp)
-		$(use_with valgrind valgrind-debug)
-		$(use_enable wccp)
-		$(use_enable wccpv2)
-	)
-
-	# Basic modules
-	local basic_modules=(
-		NCSA
-		POP3
-		getpwnam
-
-		$(usev samba 'SMB')
-		$(usev ldap 'SMB_LM LDAP')
-		$(usev pam 'PAM')
-		$(usev sasl 'SASL')
-		$(usev nis 'NIS')
-		$(usev radius 'RADIUS')
-	)
-
-	use nis && append-cppflags "-I${ESYSROOT}/usr/include/tirpc"
-
-	if use mysql || use postgres || use sqlite; then
-		basic_modules+=( DB )
-	fi
-
-	# Digests
-	local digest_modules=(
-		file
-
-		$(usev ldap 'LDAP eDirectory')
-	)
-
-	# Kerberos
-	local negotiate_modules=( none )
-
-	myeconfargs+=( --without-mit-krb5 --without-heimdal-krb5 )
-
-	if use kerberos; then
-		# We intentionally overwrite negotiate_modules here to lose
-		# the 'none'.
-		negotiate_modules=( kerberos wrapper )
-
-		if has_version app-crypt/heimdal; then
-			myeconfargs+=(
-				--without-mit-krb5
-				--with-heimdal-krb5
-			)
-		else
-			myeconfargs+=(
-				--with-mit-krb5
-				--without-heimdal-krb5
-			)
-		fi
-	fi
-
-	# NTLM modules
-	local ntlm_modules=( none )
-
-	if use samba ; then
-		# We intentionally overwrite ntlm_modules here to lose
-		# the 'none'.
-		ntlm_modules=( SMB_LM )
-	fi
-
-	# External helpers
-	local ext_helpers=(
-		file_userip
-		session
-		unix_group
-		delayer
-		time_quota
-
-		$(usev samba 'wbinfo_group')
-		$(usev ldap 'LDAP_group eDirectory_userip')
-	)
-
-	use ldap && use kerberos && ext_helpers+=( kerberos_ldap_group )
-	if use mysql || use postgres || use sqlite; then
-		ext_helpers+=( SQL_session )
-	fi
-
-	# Storage modules
-	local storeio_modules=(
-		aufs
-		diskd
-		rock
-		ufs
-	)
-
-	#
-	local transparent
-	if use kernel_linux; then
-		myeconfargs+=(
-			--enable-linux-netfilter
-			$(usev qos '--enable-zph-qos --with-netfilter-conntrack')
-		)
-	fi
-
-	tc-export_build_env BUILD_CXX
-	export BUILDCXX="${BUILD_CXX}"
-	export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
-	tc-export CC AR
-
-	# Should be able to drop this workaround with newer versions.
-	# https://bugs.squid-cache.org/show_bug.cgi?id=4224
-	tc-is-cross-compiler && export squid_cv_gnu_atomics=no
-
-	# Bug #719662
-	append-atomic-flags
-
-	print_options_without_comma() {
-		# IFS as ',' will cut off any trailing commas
-		(
-			IFS=','
-			options=( $(printf "%s," "${@}") )
-			echo "${options[*]}"
-		)
-	}
-
-	myeconfargs+=(
-		--enable-storeio=$(print_options_without_comma "${storeio_modules[@]}")
-		--enable-auth-basic=$(print_options_without_comma "${basic_modules[@]}")
-		--enable-auth-digest=$(print_options_without_comma "${digest_modules[@]}")
-		--enable-auth-ntlm=$(print_options_without_comma "${ntlm_modules[@]}")
-		--enable-auth-negotiate=$(print_options_without_comma "${negotiate_modules[@]}")
-		--enable-external-acl-helpers=$(print_options_without_comma "${ext_helpers[@]}")
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	systemd_dounit tools/systemd/squid.service
-
-	# Need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
-	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
-
-	if use pam; then
-		fowners root:squid /usr/libexec/squid/basic_pam_auth
-		fperms 4750 /usr/libexec/squid/basic_pam_auth
-	fi
-
-	# Pinger needs suid as well
-	fowners root:squid /usr/libexec/squid/pinger
-	fperms 4750 /usr/libexec/squid/pinger
-
-	# These scripts depend on perl
-	if ! use perl; then
-		local perl_scripts=(
-			basic_pop3_auth ext_delayer_acl helper-mux
-			log_db_daemon security_fake_certverify
-			storeid_file_rewrite url_lfs_rewrite
-		)
-
-		local script
-		for script in "${perl_scripts[@]}"; do
-			rm "${ED}"/usr/libexec/squid/${script} || die
-		done
-	fi
-
-	# Cleanup
-	rm -r "${D}"/run "${D}"/var/cache || die
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
-	newdoc src/auth/negotiate/kerberos/README README.kerberos
-	newdoc src/auth/basic/RADIUS/README README.RADIUS
-	newdoc src/acl/external/kerberos_ldap_group/README README.kerberos_ldap_group
-	dodoc RELEASENOTES.html
-
-	if use pam; then
-		newpamd "${FILESDIR}"/squid.pam squid
-	fi
-
-	newconfd "${FILESDIR}"/squid.confd-r2 squid
-	newinitd "${FILESDIR}"/squid.initd-r6 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
-
-	# Hack for bug #834503 (see also bug #664940)
-	# Please keep this for a few years until it's no longer plausible
-	# someone is upgrading from < squid 5.7.
-	mv "${ED}"/usr/share/squid/errors{,.new} || die
-}
-
-pkg_preinst() {
-	# Remove file in EROOT that the directory collides with.
-	rm -rf "${EROOT}"/usr/share/squid/errors || die
-
-	# Following the collision protection check, reverse
-	# src_install's rename in ED.
-	mv "${ED}"/usr/share/squid/errors{.new,} || die
-}
-
-pkg_postinst() {
-	elog "A good starting point to debug Squid issues is to use 'squidclient mgr:' commands such as 'squidclient mgr:info'."
-
-	if [[ ${#r} -gt 0 ]]; then
-		elog "You are using a release with the official ${r} patch! Make sure you mention that, or send the output of 'squidclient mgr:info' when asking for support."
-	fi
-}
diff --git a/net-proxy/squid/squid-6.4.ebuild b/net-proxy/squid/squid-6.4.ebuild
deleted file mode 100644
index 0ecdce7be628..000000000000
--- a/net-proxy/squid/squid-6.4.ebuild
+++ /dev/null
@@ -1,386 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
-
-DESCRIPTION="Full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-
-MY_PV_MAJOR=$(ver_cut 1)
-# Upstream patch ID for the most recent bug-fixed update to the formal release.
-#r=-20181117-r0022167
-r=
-if [[ -z ${r} ]]; then
-	SRC_URI="http://static.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz"
-else
-	SRC_URI="http://static.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}${r}.tar.bz2"
-	S="${S}${r}"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap"
-IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp valgrind +wccp +wccpv2"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="tproxy? ( caps ) qos? ( caps ) ssl-crtd? ( ssl )"
-
-DEPEND="
-	acct-group/squid
-	acct-user/squid
-	dev-libs/libltdl
-	sys-libs/tdb
-	virtual/libcrypt:=
-	caps? ( >=sys-libs/libcap-2.16 )
-	ecap? ( net-libs/libecap:1 )
-	esi? (
-		dev-libs/expat
-		dev-libs/libxml2
-	)
-	ldap? ( net-nds/openldap:= )
-	gnutls? ( >=net-libs/gnutls-3.1.5:= )
-	logrotate? ( app-admin/logrotate )
-	nis? (
-		net-libs/libtirpc:=
-		net-libs/libnsl:=
-	)
-	kerberos? ( virtual/krb5 )
-	pam? ( sys-libs/pam )
-	qos? ( net-libs/libnetfilter_conntrack )
-	ssl? (
-		dev-libs/nettle:=
-		!gnutls? (
-			dev-libs/openssl:=
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="
-	${DEPEND}
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	perl? ( dev-lang/perl )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-squid )
-	sqlite? ( dev-perl/DBD-SQLite )
-"
-DEPEND+=" valgrind? ( dev-util/valgrind )"
-BDEPEND="
-	dev-lang/perl
-	ecap? ( virtual/pkgconfig )
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.2-gentoo.patch
-	"${FILESDIR}"/${PN}-4.17-use-system-libltdl.patch
-	"${FILESDIR}"/${PN}-6.4-gcc14-algorithm.patch
-)
-
-pkg_pretend() {
-	if use tproxy; then
-		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Fixup various paths
-	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
-		INSTALL QUICKSTART \
-		scripts/fileno-to-pathname.pl \
-		scripts/check_cache.pl \
-		tools/cachemgr.cgi.8 \
-		tools/purge/conffile.hh \
-		tools/purge/purge.1 || die
-	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
-		INSTALL QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
-		QUICKSTART || die
-	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
-		QUICKSTART \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
-		src/log/access_log.cc || die
-	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
-		src/acl/external/unix_group/ext_unix_group_acl.8 \
-		src/acl/external/session/ext_session_acl.8 || die
-	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
-		scripts/check_cache.pl || die
-	# /var/run/squid to /run/squid
-	sed -i -e 's:$(localstatedir)::' \
-		src/ipc/Makefile.am || die
-	sed -i 's:/var/run/:/run/:g' tools/systemd/squid.service || die
-
-	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
-		libltdl/configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--cache-file="${S}"/config.cache
-
-		--datadir=/usr/share/squid
-		--libexecdir=/usr/libexec/squid
-		--localstatedir=/var
-		--sysconfdir=/etc/squid
-		--with-default-user=squid
-		--with-logdir=/var/log/squid
-		--with-pidfile=/run/squid.pid
-
-		--enable-build-info="Gentoo ${PF} (r: ${r:-NONE})"
-		--enable-log-daemon-helpers
-		--enable-url-rewrite-helpers
-		--enable-cache-digests
-		--enable-delay-pools
-		--enable-disk-io
-		--enable-eui
-		--enable-icmp
-		--enable-ipv6
-		--enable-follow-x-forwarded-for
-		--enable-removal-policies="lru,heap"
-		--disable-strict-error-checking
-		--disable-arch-native
-
-		--with-large-files
-		--with-build-environment=default
-
-		--with-tdb
-
-		--without-included-ltdl
-		--with-ltdl-include="${ESYSROOT}"/usr/include
-		--with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir)
-
-		$(use_with caps cap)
-		$(use_enable snmp)
-		$(use_with ssl openssl)
-		$(use_with ssl nettle)
-		$(use_with gnutls)
-		$(use_with ldap)
-		$(use_enable ssl-crtd)
-		$(use_with systemd)
-		$(use_with test cppunit)
-		$(use_enable ecap)
-		$(use_enable esi)
-		$(use_enable esi expat)
-		$(use_enable esi xml2)
-		$(use_enable htcp)
-		$(use_with valgrind valgrind-debug)
-		$(use_enable wccp)
-		$(use_enable wccpv2)
-	)
-
-	# Basic modules
-	local basic_modules=(
-		NCSA
-		POP3
-		getpwnam
-
-		$(usev samba 'SMB')
-		$(usev ldap 'SMB_LM LDAP')
-		$(usev pam 'PAM')
-		$(usev sasl 'SASL')
-		$(usev nis 'NIS')
-		$(usev radius 'RADIUS')
-	)
-
-	use nis && append-cppflags "-I${ESYSROOT}/usr/include/tirpc"
-
-	if use mysql || use postgres || use sqlite; then
-		basic_modules+=( DB )
-	fi
-
-	# Digests
-	local digest_modules=(
-		file
-
-		$(usev ldap 'LDAP eDirectory')
-	)
-
-	# Kerberos
-	local negotiate_modules=( none )
-
-	myeconfargs+=( --without-mit-krb5 --without-heimdal-krb5 )
-
-	if use kerberos; then
-		# We intentionally overwrite negotiate_modules here to lose
-		# the 'none'.
-		negotiate_modules=( kerberos wrapper )
-
-		if has_version app-crypt/heimdal; then
-			myeconfargs+=(
-				--without-mit-krb5
-				--with-heimdal-krb5
-			)
-		else
-			myeconfargs+=(
-				--with-mit-krb5
-				--without-heimdal-krb5
-			)
-		fi
-	fi
-
-	# NTLM modules
-	local ntlm_modules=( none )
-
-	if use samba ; then
-		# We intentionally overwrite ntlm_modules here to lose
-		# the 'none'.
-		ntlm_modules=( SMB_LM )
-	fi
-
-	# External helpers
-	local ext_helpers=(
-		file_userip
-		session
-		unix_group
-		delayer
-		time_quota
-
-		$(usev samba 'wbinfo_group')
-		$(usev ldap 'LDAP_group eDirectory_userip')
-	)
-
-	use ldap && use kerberos && ext_helpers+=( kerberos_ldap_group )
-	if use mysql || use postgres || use sqlite; then
-		ext_helpers+=( SQL_session )
-	fi
-
-	# Storage modules
-	local storeio_modules=(
-		aufs
-		diskd
-		rock
-		ufs
-	)
-
-	#
-	local transparent
-	if use kernel_linux; then
-		myeconfargs+=(
-			--enable-linux-netfilter
-			$(usev qos '--enable-zph-qos --with-netfilter-conntrack')
-		)
-	fi
-
-	tc-export_build_env BUILD_CXX
-	export BUILDCXX="${BUILD_CXX}"
-	export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
-	tc-export CC AR
-
-	# Should be able to drop this workaround with newer versions.
-	# https://bugs.squid-cache.org/show_bug.cgi?id=4224
-	tc-is-cross-compiler && export squid_cv_gnu_atomics=no
-
-	# Bug #719662
-	append-atomic-flags
-
-	print_options_without_comma() {
-		# IFS as ',' will cut off any trailing commas
-		(
-			IFS=','
-			options=( $(printf "%s," "${@}") )
-			echo "${options[*]}"
-		)
-	}
-
-	myeconfargs+=(
-		--enable-storeio=$(print_options_without_comma "${storeio_modules[@]}")
-		--enable-auth-basic=$(print_options_without_comma "${basic_modules[@]}")
-		--enable-auth-digest=$(print_options_without_comma "${digest_modules[@]}")
-		--enable-auth-ntlm=$(print_options_without_comma "${ntlm_modules[@]}")
-		--enable-auth-negotiate=$(print_options_without_comma "${negotiate_modules[@]}")
-		--enable-external-acl-helpers=$(print_options_without_comma "${ext_helpers[@]}")
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	systemd_dounit tools/systemd/squid.service
-
-	# Need suid root for looking into /etc/shadow
-	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
-	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
-
-	if use pam; then
-		fowners root:squid /usr/libexec/squid/basic_pam_auth
-		fperms 4750 /usr/libexec/squid/basic_pam_auth
-	fi
-
-	# Pinger needs suid as well
-	fowners root:squid /usr/libexec/squid/pinger
-	fperms 4750 /usr/libexec/squid/pinger
-
-	# These scripts depend on perl
-	if ! use perl; then
-		local perl_scripts=(
-			basic_pop3_auth ext_delayer_acl helper-mux
-			log_db_daemon security_fake_certverify
-			storeid_file_rewrite url_lfs_rewrite
-		)
-
-		local script
-		for script in "${perl_scripts[@]}"; do
-			rm "${ED}"/usr/libexec/squid/${script} || die
-		done
-	fi
-
-	# Cleanup
-	rm -r "${D}"/run "${D}"/var/cache || die
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
-	newdoc src/auth/negotiate/kerberos/README README.kerberos
-	newdoc src/auth/basic/RADIUS/README README.RADIUS
-	newdoc src/acl/external/kerberos_ldap_group/README README.kerberos_ldap_group
-	dodoc RELEASENOTES.html
-
-	if use pam; then
-		newpamd "${FILESDIR}"/squid.pam squid
-	fi
-
-	newconfd "${FILESDIR}"/squid.confd-r2 squid
-	newinitd "${FILESDIR}"/squid.initd-r6 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
-
-	# Hack for bug #834503 (see also bug #664940)
-	# Please keep this for a few years until it's no longer plausible
-	# someone is upgrading from < squid 5.7.
-	mv "${ED}"/usr/share/squid/errors{,.new} || die
-}
-
-pkg_preinst() {
-	# Remove file in EROOT that the directory collides with.
-	rm -rf "${EROOT}"/usr/share/squid/errors || die
-
-	# Following the collision protection check, reverse
-	# src_install's rename in ED.
-	mv "${ED}"/usr/share/squid/errors{.new,} || die
-}
-
-pkg_postinst() {
-	elog "A good starting point to debug Squid issues is to use 'squidclient mgr:' commands such as 'squidclient mgr:info'."
-
-	if [[ ${#r} -gt 0 ]]; then
-		elog "You are using a release with the official ${r} patch! Make sure you mention that, or send the output of 'squidclient mgr:info' when asking for support."
-	fi
-}