Remove old test version. Mark stable on x86 and die in pkg_setup if zero-penalty-hit USE flag is enabled.

Package-Manager: portage-2.1.1

3 files changed, 11 insertions, 218 deletions

diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 1d346fd481cc..c6dd08bf1ca3 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -32,8 +32,6 @@ DIST squid-2.5.STABLE13-patches-20060325.tar.gz 23020 RMD160 504261a17070faea4ca
 DIST squid-2.5.STABLE13.tar.gz 1399833 RMD160 5b66a9ef004f3fcb1225cd0378431f7ee4d005b6 SHA1 af1e1c3d33cf87cacadb7916f41b972a7d6df55a SHA256 e8a5330a5f0e79394612ef57d2bf48658551787062055ffba94eb0bc67355b1a
 DIST squid-2.5.STABLE14-patches-20060619.tar.gz 23811 RMD160 a2779367052e0ac2a8ab085c78ad29de41b6f166 SHA1 fccc2097838c9ff3727a5eac1d92e9d8998ea4a9 SHA256 0688f218779317304195aa2f728f6599635d34528882b23eb8461ca4cfa55319
 DIST squid-2.5.STABLE14.tar.gz 1399962 RMD160 abe464ab115b3f9541d3890fd413044f526ab5f0 SHA1 e8cd21bc84e4cab219a00142eb597f6dcefe301b SHA256 3ddb16abfe51f5fcbab66d2ca6a6e25341ed470eb7eb1415111401b9e20ba5f2
-DIST squid-2.6.STABLE1-patches-20060711.tar.gz 24063 RMD160 9cc2daf35f22fcf0dc2bf4109b39ac8032b78985 SHA1 570c4afc683a128021f9b1bb7bd96a1cd11bbd99 SHA256 edea461781c676b8c6a2ad5e181436594c64325ac8f76d9d870e77d4596801b6
-DIST squid-2.6.STABLE1.tar.gz 1579299 RMD160 6b1740a6db8117b12ba8b859d56a28669d29d10a SHA1 6ebfb890d2224a8686224cd8b82619229389029e SHA256 e52a4c8b35a0644f0b1285874e4b0c0905e6415140d134c30ed2a4717392692e
 DIST squid-2.6.STABLE3-patches-20060819.tar.gz 4832 RMD160 0bab6b6b9d0df4da9e30a1c2e7e0d9fdd63c8057 SHA1 404362d88d2e949827ed14f8941387859d9203dd SHA256 b096aada8aa92502a05ef96b572f00f6f5127907ba5cfe39d5441a396781cde3
 DIST squid-2.6.STABLE3.tar.gz 1599876 RMD160 7b13a91f0809b94c1dacc11a9fe9366fd4362395 SHA1 59e52b0be9697108b3a581270cf0695119ffa7df SHA256 293c9b8ea4c5fa19e8df92d86e9554081b66454bd97b0acdf0bbb289845614a6
 EBUILD squid-2.5.12-r1.ebuild 6753 RMD160 acb1bc57d6d972e61bfbd424aca7b3a1a0ac2d91 SHA1 6341414a00f644e58786363965ae3363e2747e3c SHA256 03577f1a7be0549a49d1e6e490f5bc4c254a10bf6d9c9e80394477ca76bf0249
@@ -52,18 +50,14 @@ EBUILD squid-2.5.14.ebuild 6521 RMD160 1ef0fcfe2ee9a72dea17fafb567873c2e4fcf623
 MD5 39b1712669ac35f0230a0684fae3055e squid-2.5.14.ebuild 6521
 RMD160 1ef0fcfe2ee9a72dea17fafb567873c2e4fcf623 squid-2.5.14.ebuild 6521
 SHA256 ba1d740eb05b3d5c6571a32343da2e7858260235766ad5393703522b636eaad1 squid-2.5.14.ebuild 6521
-EBUILD squid-2.6.1-r1.ebuild 6270 RMD160 1e403180c77ca8641ffc12b4cf2368edd6622455 SHA1 603b53f52a9cf2d77836320e82b4969a2e0682b6 SHA256 70e9c51fffaafdab423b61267efbb5536e52b3c3f5693ff1e3b229dd6272449a
-MD5 b71f911fdbfbe1b8f1e4761544ec738a squid-2.6.1-r1.ebuild 6270
-RMD160 1e403180c77ca8641ffc12b4cf2368edd6622455 squid-2.6.1-r1.ebuild 6270
-SHA256 70e9c51fffaafdab423b61267efbb5536e52b3c3f5693ff1e3b229dd6272449a squid-2.6.1-r1.ebuild 6270
-EBUILD squid-2.6.3.ebuild 6334 RMD160 780713533edc0b532f40ba1f7c1e633450c0d25b SHA1 19403e8de2d94c24558e8d328396e277418b1e1c SHA256 93ccea9bf0c42175b5717cb16528f9b7ac20cd4d868f59117ce9353e59fd48aa
-MD5 ffee808397d3f365676dac10aa7af9a1 squid-2.6.3.ebuild 6334
-RMD160 780713533edc0b532f40ba1f7c1e633450c0d25b squid-2.6.3.ebuild 6334
-SHA256 93ccea9bf0c42175b5717cb16528f9b7ac20cd4d868f59117ce9353e59fd48aa squid-2.6.3.ebuild 6334
-MISC ChangeLog 28336 RMD160 941a138e19c8b93eaf7a72c5feed8725e191c100 SHA1 233596a1872874e557ad217e72373c167792e4e8 SHA256 6d94ec679424bd6813d86fd0e19dc2be246f5438b4ef99e88a06ea8b6f1f0356
-MD5 8db802338fd90400e27591eb74eb78d8 ChangeLog 28336
-RMD160 941a138e19c8b93eaf7a72c5feed8725e191c100 ChangeLog 28336
-SHA256 6d94ec679424bd6813d86fd0e19dc2be246f5438b4ef99e88a06ea8b6f1f0356 ChangeLog 28336
+EBUILD squid-2.6.3.ebuild 6545 RMD160 fbc8989652a427dc45d80e497605d49539b7e2d2 SHA1 b981be4e51ae4510e18f56259f0b9d46cfae79c3 SHA256 008113e26c6dd869ecad0cf2f485458eabcb01fee9f7fcdc125a85397025b151
+MD5 df566e9b012af3d3e150726636d7a434 squid-2.6.3.ebuild 6545
+RMD160 fbc8989652a427dc45d80e497605d49539b7e2d2 squid-2.6.3.ebuild 6545
+SHA256 008113e26c6dd869ecad0cf2f485458eabcb01fee9f7fcdc125a85397025b151 squid-2.6.3.ebuild 6545
+MISC ChangeLog 28540 RMD160 45bd4aa5880d9d0b7b6a4d69ff88eeab51b6a37f SHA1 cb12e2cbe17a80ffa77f542b4b1af0291b1c13af SHA256 0780cc3cf6f21cd017f5b2b138a64d9f8ed2fcefd3dc1a6d9fe1b9a005521045
+MD5 1146d2fbae4aeac38511bae23c03bc41 ChangeLog 28540
+RMD160 45bd4aa5880d9d0b7b6a4d69ff88eeab51b6a37f ChangeLog 28540
+SHA256 0780cc3cf6f21cd017f5b2b138a64d9f8ed2fcefd3dc1a6d9fe1b9a005521045 ChangeLog 28540
 MISC metadata.xml 229 RMD160 3017fab68c82b875738f1df5bb414f46480f142f SHA1 975a764b9c2b956a744795d61a702bd3545bbfb9 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87
 MD5 24a10e76803f4cc98cdc979586096c6f metadata.xml 229
 RMD160 3017fab68c82b875738f1df5bb414f46480f142f metadata.xml 229
@@ -80,16 +74,13 @@ SHA256 34af136654198a96d6fdad147b0b0a49c6216f14baa08625373fca5b96ed5e95 files/di
 MD5 94e9eea9d8b6b6cad4263131af7c7887 files/digest-squid-2.5.14 563
 RMD160 5b862305d93ac58ec4907ee9dc7a98671d5e1077 files/digest-squid-2.5.14 563
 SHA256 1727923e9880a2d267ed0cc7cbc782c1617aa8b5a9161ad7c6dc255870f1c916 files/digest-squid-2.5.14 563
-MD5 b6ed1b56b618678cf691d12f0d461f1a files/digest-squid-2.6.1-r1 557
-RMD160 744937035c3208d15abdc4cfe082432b547daf9f files/digest-squid-2.6.1-r1 557
-SHA256 8401caf0f6014b6f7ba8e4d83e22927b249992a9f62c174e0b6e6473f2dede55 files/digest-squid-2.6.1-r1 557
 MD5 20c37d29b4c77c6ce131a4cfd43522ef files/digest-squid-2.6.3 554
 RMD160 faca783db3cf13434396304df1626fbb0d2c62a3 files/digest-squid-2.6.3 554
 SHA256 13bfe27e077faccb18011cb199666e201afa371eae2d11a9b0cd4b6a38dfb01c files/digest-squid-2.6.3 554
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFEQMT3sf9c6kjmR8RArSMAKC+jZk/llDg0xhbilPO/tlDcr7c2QCeJd1n
-09187V4AFlLuxXFcLaTtWOI=
-=JQLi
+iD8DBQFFEiR/3sf9c6kjmR8RAmTYAJ9ppvgGhSWzxmv6mrBGOewthBUxGwCgpvOF
+9Ld+0vFZ5KE3P6VObBJ8H2Y=
+=UGSL
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/digest-squid-2.6.1-r1 b/net-proxy/squid/files/digest-squid-2.6.1-r1
deleted file mode 100644
index dcac16bc522a..000000000000
--- a/net-proxy/squid/files/digest-squid-2.6.1-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 478b6871baf83f98f57eaa0e51b4416f squid-2.6.STABLE1-patches-20060711.tar.gz 24063
-RMD160 9cc2daf35f22fcf0dc2bf4109b39ac8032b78985 squid-2.6.STABLE1-patches-20060711.tar.gz 24063
-SHA256 edea461781c676b8c6a2ad5e181436594c64325ac8f76d9d870e77d4596801b6 squid-2.6.STABLE1-patches-20060711.tar.gz 24063
-MD5 f1e7f7693c3d2ed329c31a7a855c83cb squid-2.6.STABLE1.tar.gz 1579299
-RMD160 6b1740a6db8117b12ba8b859d56a28669d29d10a squid-2.6.STABLE1.tar.gz 1579299
-SHA256 e52a4c8b35a0644f0b1285874e4b0c0905e6415140d134c30ed2a4717392692e squid-2.6.STABLE1.tar.gz 1579299
diff --git a/net-proxy/squid/squid-2.6.1-r1.ebuild b/net-proxy/squid/squid-2.6.1-r1.ebuild
deleted file mode 100644
index 2824599834f9..000000000000
--- a/net-proxy/squid/squid-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.1-r1.ebuild,v 1.3 2006/07/19 11:06:07 mrness Exp $
-
-inherit eutils pam toolchain-funcs flag-o-matic autotools
-
-#lame archive versioning scheme..
-S_PV="${PV%.*}"
-S_PL="${PV##*.}"
-S_PL="${S_PL/_rc/-RC}"
-S_PP="${PN}-${S_PV}.STABLE${S_PL}"
-PATCH_VERSION="20060711"
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v2/${S_PV}/${S_PP}.tar.gz
-	mirror://gentoo/${S_PP}-patches-${PATCH_VERSION}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="pam ldap sasl nis ssl snmp selinux logrotate \
-	pf-transparent ipf-transparent \
-	elibc_uclibc kernel_linux \
-	underscores customlog zero-penalty-hit follow-xff" #Dead flags; should be removed when <squid-2.6.1 versions are removed
-
-RDEPEND="pam? ( virtual/pam )
-	ldap? ( >=net-nds/openldap-2.1.26 )
-	ssl? ( >=dev-libs/openssl-0.9.7j )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.21 )
-	selinux? ( sec-policy/selinux-squid )
-	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
-	>=sys-libs/db-4"
-DEPEND="${RDEPEND} dev-lang/perl"
-
-S="${WORKDIR}/${S_PP}"
-
-pkg_setup() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-
-	use zero-penalty-hit && ewarn "zero-penalty-hit patch has been removed because the homepage has vanished."
-	use underscores && ewarn "underscores USE flag has no effect (the option is available through allow_underscore configuration directive)."
-	use customlog && ewarn "customlog USE flag has no effect (the correspondent patch has been included in the main version)."
-	use follow-xff && ewarn "follow-xff USE flag has no effect (the correspondent patch has been included in the main version)."
-}
-
-src_unpack() {
-	unpack ${A} || die "unpack failed"
-	cd "${S}" || die "dir ${S} not found"
-
-	# Do bulk patching from squids bug fix list as well as our patches
-	EPATCH_SUFFIX="patch"
-	epatch "${WORKDIR}/patch"
-
-	sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in
-
-	#disable lazy bindings on (some at least) suided basic auth programs
-	sed -i -e '$aAM_LDFLAGS = '$(bindnow-flags) \
-		helpers/basic_auth/*/Makefile.am
-
-	eautoreconf
-}
-
-src_compile() {
-	local basic_modules="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM"
-	use ldap && basic_modules="LDAP,${basic_modules}"
-	use pam && basic_modules="PAM,${basic_modules}"
-	use sasl && basic_modules="SASL,${basic_modules}"
-	use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
-
-	local ext_helpers="ip_user,session,unix_group,wbinfo_group"
-	use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
-	local myconf=""
-
-	# Support for uclibc #61175
-	if use elibc_uclibc; then
-		myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null"
-		myconf="${myconf} --disable-async-io"
-	else
-		myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null"
-		myconf="${myconf} --enable-async-io"
-	fi
-
-	if use kernel_linux; then
-		myconf="${myconf} --enable-linux-netfilter --enable-epoll"
-	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		myconf="${myconf} --enable-kqueue"
-		if use pf-transparent; then
-			myconf="${myconf} --enable-pf-transparent"
-		elif use ipf-transparent; then
-			myconf="${myconf} --enable-ipf-transparent"
-		fi
-	fi
-
-	export CC=$(tc-getCC)
-
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--exec-prefix=/usr \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/squid \
-		--libexecdir=/usr/lib/squid \
-		--datadir=/usr/share/squid \
-		--enable-auth="basic,digest,ntlm" \
-		--enable-removal-policies="lru,heap" \
-		--enable-digest-auth-helpers="password" \
-		--enable-basic-auth-helpers="${basic_modules}" \
-		--enable-external-acl-helpers="${ext_helpers}" \
-		--enable-ntlm-auth-helpers="SMB,fakeauth" \
-		--enable-ident-lookups \
-		--enable-useragent-log \
-		--enable-cache-digests \
-		--enable-delay-pools \
-		--enable-referer-log \
-		--enable-truncate \
-		--enable-arp-acl \
-		--with-pthreads \
-		--with-large-files \
-		--enable-htcp \
-		--enable-carp \
-		--enable-follow-x-forwarded-for \
-		$(use_enable snmp) \
-		$(use_enable ssl) \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	sed -i -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \
-		include/autoconf.h
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	#need suid root for looking into /etc/shadow
-	fowners root:squid /usr/lib/squid/ncsa_auth
-	fowners root:squid /usr/lib/squid/pam_auth
-	fperms 4750 /usr/lib/squid/ncsa_auth
-	fperms 4750 /usr/lib/squid/pam_auth
-
-	#some clean ups
-	rm -f "${D}"/usr/bin/Run*
-
-	#simply switch this symlink to choose the desired language..
-	dosym /usr/share/squid/errors/English /etc/squid/errors
-
-	dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \
-		helpers/ntlm_auth/no_check/README.no_check_ntlm_auth
-	newdoc helpers/basic_auth/SMB/README README.auth_smb
-	dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html
-	newdoc helpers/basic_auth/LDAP/README README.auth_ldap
-	doman helpers/basic_auth/LDAP/*.8
-	dodoc helpers/basic_auth/SASL/squid_sasl_auth*
-
-	newpamd "${FILESDIR}/squid.pam" squid
-	newconfd "${FILESDIR}/squid.confd" squid
-	if use logrotate; then
-		newinitd "${FILESDIR}/squid.initd-logrotate" squid
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/squid.logrotate" squid
-	else
-		newinitd "${FILESDIR}/squid.initd" squid
-		exeinto /etc/cron.weekly
-		newexe "${FILESDIR}/squid.cron" squid.cron
-	fi
-
-	rm -rf "${D}"/var
-	diropts -m0755 -o squid -g squid
-	keepdir /var/cache/squid /var/log/squid
-}
-
-pkg_preinst() {
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-pkg_postinst() {
-	echo
-	ewarn "Squid authentication helpers have been installed suid root."
-	ewarn "This allows shadow based authentication (see bug #52977 for more)."
-	echo
-	ewarn "Be careful what type of cache_dir you select!"
-	ewarn "   'diskd' is optimized for high levels of traffic, but it might seem slow"
-	ewarn "when there isn't sufficient traffic to keep squid reasonably busy."
-	ewarn "   If your traffic level is low to moderate, use 'aufs' or 'ufs'."
-	echo
-}