Resurrect zero-penalty-hit USE flag (#150301).

(Portage version: 2.1.1)
 (Signed Manifest commit)

3 files changed, 23 insertions, 232 deletions

diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 893e7c68f271..8c61ccf89363 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -33,8 +33,9 @@ DIST squid-2.5.STABLE13.tar.gz 1399833 RMD160 5b66a9ef004f3fcb1225cd0378431f7ee4
 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.STABLE3-patches-20060819.tar.gz 4832 RMD160 0bab6b6b9d0df4da9e30a1c2e7e0d9fdd63c8057 SHA1 404362d88d2e949827ed14f8941387859d9203dd SHA256 b096aada8aa92502a05ef96b572f00f6f5127907ba5cfe39d5441a396781cde3
+DIST squid-2.6.STABLE3-patches-20061007.tar.gz 7371 RMD160 f50c838e64501aeff6409840a998a6483791cf42 SHA1 de76db7f5d93b9783a879b7039788cbce58e2c44 SHA256 c156f49d3b6b5c4cb263b20308c3fa219780d01b29a4c5f8ef3bfaa611238830
 DIST squid-2.6.STABLE3.tar.gz 1599876 RMD160 7b13a91f0809b94c1dacc11a9fe9366fd4362395 SHA1 59e52b0be9697108b3a581270cf0695119ffa7df SHA256 293c9b8ea4c5fa19e8df92d86e9554081b66454bd97b0acdf0bbb289845614a6
-DIST squid-2.6.STABLE4-patches-20061005.tar.gz 4796 RMD160 940ab8d293a4e92e71c9a64881b9e6fce1c4cb05 SHA1 10813bf01e7c1b80c0e13a7895d817a62d598a94 SHA256 d653bb84b050fe6f2cb5231cbc90b46a90ba6cf97687be139af1b8879f08c6d3
+DIST squid-2.6.STABLE4-patches-20061007.tar.gz 7329 RMD160 a68e568e0f9c58fc3f8819de3a9bfad24873cd1d SHA1 b2ca6d49e43748c913f6bedc7da9d4de61c9b4f2 SHA256 de8bb7a9e1373dd8ddae680c409de92718845c7009aa9be68c9fca19ec4e51d0
 DIST squid-2.6.STABLE4.tar.gz 1627562 RMD160 98fbcb6c817b6f6cce9530b7dfdc1d81571eea89 SHA1 82dea18e047c8f1192dde55e51b4537863f44a2c SHA256 ab346a474c73a308a9589be49bae4139c8b158247cefe3ffd27d2301ba86c5d0
 EBUILD squid-2.5.12-r1.ebuild 6753 RMD160 acb1bc57d6d972e61bfbd424aca7b3a1a0ac2d91 SHA1 6341414a00f644e58786363965ae3363e2747e3c SHA256 03577f1a7be0549a49d1e6e490f5bc4c254a10bf6d9c9e80394477ca76bf0249
 MD5 d016ce3a38feda11279d8b2c1f6dba25 squid-2.5.12-r1.ebuild 6753
@@ -52,18 +53,18 @@ EBUILD squid-2.5.14.ebuild 6521 RMD160 40d78192f73c483de1fa06d4434ab61ed8f9a66e
 MD5 0f206eb095d70ec6025a587afb3692c2 squid-2.5.14.ebuild 6521
 RMD160 40d78192f73c483de1fa06d4434ab61ed8f9a66e squid-2.5.14.ebuild 6521
 SHA256 320a9f9fb23e294c1eb406789b95ed98bf34e860234682f0b09222b2f21e5da7 squid-2.5.14.ebuild 6521
-EBUILD squid-2.6.3.ebuild 6542 RMD160 7f3d29c5e2fff2b14c004088eceb05ee759505d2 SHA1 ff406e598977a04f7c4367dfa47c1b5fb3d79a77 SHA256 78a2a4a5c8533e3150343073d584fb967d93899daef95cc32837c6b03c30e75e
-MD5 27177c30aa851cb051aaf338e7d5ecb1 squid-2.6.3.ebuild 6542
-RMD160 7f3d29c5e2fff2b14c004088eceb05ee759505d2 squid-2.6.3.ebuild 6542
-SHA256 78a2a4a5c8533e3150343073d584fb967d93899daef95cc32837c6b03c30e75e squid-2.6.3.ebuild 6542
-EBUILD squid-2.6.4.ebuild 6666 RMD160 bfbc18fa92871ac67f269b2c4532b97d76188b63 SHA1 e810825891923bf7d805d84e5b7b34f6474d1bee SHA256 9df4f00570fb94ef1a7066e68692aec579b8b8ecbb11c4c6df31e723442e77f1
-MD5 ee68b4a9dbe931eec25c6c2cbbd75d66 squid-2.6.4.ebuild 6666
-RMD160 bfbc18fa92871ac67f269b2c4532b97d76188b63 squid-2.6.4.ebuild 6666
-SHA256 9df4f00570fb94ef1a7066e68692aec579b8b8ecbb11c4c6df31e723442e77f1 squid-2.6.4.ebuild 6666
-MISC ChangeLog 29124 RMD160 10cb90e3a366fe8bf357bfcb5260ce026a7cbb6d SHA1 68b7ae54381611bf3e014e180d17014cd6eff0fb SHA256 b8b03479123d9a22bcc9247a5d2c1e781762e3a8a3db111e683c3a4532aa4fbd
-MD5 a23ad3e61b22997b5d42c141e9a4e381 ChangeLog 29124
-RMD160 10cb90e3a366fe8bf357bfcb5260ce026a7cbb6d ChangeLog 29124
-SHA256 b8b03479123d9a22bcc9247a5d2c1e781762e3a8a3db111e683c3a4532aa4fbd ChangeLog 29124
+EBUILD squid-2.6.3.ebuild 6315 RMD160 732df4d73f0e4c065915866164906c92f264f6ea SHA1 4dcc5d12b9e796e7b934c638b5569536ed74ead0 SHA256 055275722f83580fc87141f430a58fc01f899747fba4e8a2be671797134de25b
+MD5 cb335bf8d7bf5b7d84a72230fae8b9a2 squid-2.6.3.ebuild 6315
+RMD160 732df4d73f0e4c065915866164906c92f264f6ea squid-2.6.3.ebuild 6315
+SHA256 055275722f83580fc87141f430a58fc01f899747fba4e8a2be671797134de25b squid-2.6.3.ebuild 6315
+EBUILD squid-2.6.4-r1.ebuild 6407 RMD160 0fc62a0c899be97ad71704bfc191cb578a428dbb SHA1 5f8d179d61fe8b6355e39ea057a0c2d5aa70421c SHA256 b35f2d1e5db63cf18ab6eb50fe64ae459a4b732298d2f4b350eb093be04ba4d1
+MD5 e559be786c9691a2bd9f4afedf7a4810 squid-2.6.4-r1.ebuild 6407
+RMD160 0fc62a0c899be97ad71704bfc191cb578a428dbb squid-2.6.4-r1.ebuild 6407
+SHA256 b35f2d1e5db63cf18ab6eb50fe64ae459a4b732298d2f4b350eb093be04ba4d1 squid-2.6.4-r1.ebuild 6407
+MISC ChangeLog 29319 RMD160 368c63d8b29c37170f468788597207d69928cbb6 SHA1 179a5bc9dc23b6955c5c3cdaba4e7e7c79028009 SHA256 52089e991af36ab6ed969625c6e6289a518682f0c8dd3477869216c0e8db3c97
+MD5 ca4aa8fa9637286ad68580cd38061b87 ChangeLog 29319
+RMD160 368c63d8b29c37170f468788597207d69928cbb6 ChangeLog 29319
+SHA256 52089e991af36ab6ed969625c6e6289a518682f0c8dd3477869216c0e8db3c97 ChangeLog 29319
 MISC metadata.xml 229 RMD160 3017fab68c82b875738f1df5bb414f46480f142f SHA1 975a764b9c2b956a744795d61a702bd3545bbfb9 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87
 MD5 24a10e76803f4cc98cdc979586096c6f metadata.xml 229
 RMD160 3017fab68c82b875738f1df5bb414f46480f142f metadata.xml 229
@@ -80,16 +81,16 @@ 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 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
-MD5 edea1d2f7209063f2a937122ef2584e3 files/digest-squid-2.6.4 554
-RMD160 ad37c4bfa4f72d9720417c6237ce7dcd6a28bcf3 files/digest-squid-2.6.4 554
-SHA256 1fba39e1cc9f8817abd2641fb029806a594d79bc8304a376a3dee3cde8c095df files/digest-squid-2.6.4 554
+MD5 1bf029faae01373cee9f51fd7492fb18 files/digest-squid-2.6.3 852
+RMD160 b534859ed81bdaef649a93f4c9763c1ecb9c21f8 files/digest-squid-2.6.3 852
+SHA256 6de8efdb0f77fcd3fda484e7eff2934837b702d0e442358f4b212243a3f0e4c7 files/digest-squid-2.6.3 852
+MD5 7df5b1b37d4eebbb99ab8154f1cebb3f files/digest-squid-2.6.4-r1 554
+RMD160 a21d45278b3e4cba2294ad0f9a5825fa6354fd7c files/digest-squid-2.6.4-r1 554
+SHA256 b9a5699ad5dd25232a1c37a1a6a736322366f46a254aa87e6c5ac7056034bfc0 files/digest-squid-2.6.4-r1 554
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJM6G3sf9c6kjmR8RAiN5AJ9RKbThjWDRJFM6h4wk9JShodazCACgh1l9
-L7r+v9PQZMtNmjcc/aV3GqY=
-=nZ2a
+iD8DBQFFJzbQ3sf9c6kjmR8RAiFHAJ9IzI+cZEX8o5iWLP8IoYh2po5EDgCeKu0U
+ZOs1WnBL3oJ+Y75jouF8Xi4=
+=CB1B
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/digest-squid-2.6.4 b/net-proxy/squid/files/digest-squid-2.6.4
deleted file mode 100644
index b33ac0fb1b4e..000000000000
--- a/net-proxy/squid/files/digest-squid-2.6.4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 71a6e0567a1ce43cb359d8207bacb918 squid-2.6.STABLE4-patches-20061005.tar.gz 4796
-RMD160 940ab8d293a4e92e71c9a64881b9e6fce1c4cb05 squid-2.6.STABLE4-patches-20061005.tar.gz 4796
-SHA256 d653bb84b050fe6f2cb5231cbc90b46a90ba6cf97687be139af1b8879f08c6d3 squid-2.6.STABLE4-patches-20061005.tar.gz 4796
-MD5 b29affd7dd5b57ca4fdcfdb177c4e402 squid-2.6.STABLE4.tar.gz 1627562
-RMD160 98fbcb6c817b6f6cce9530b7dfdc1d81571eea89 squid-2.6.STABLE4.tar.gz 1627562
-SHA256 ab346a474c73a308a9589be49bae4139c8b158247cefe3ffd27d2301ba86c5d0 squid-2.6.STABLE4.tar.gz 1627562
diff --git a/net-proxy/squid/squid-2.6.4.ebuild b/net-proxy/squid/squid-2.6.4.ebuild
deleted file mode 100644
index 5912369efc4d..000000000000
--- a/net-proxy/squid/squid-2.6.4.ebuild
+++ /dev/null
@@ -1,204 +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.4.ebuild,v 1.1 2006/10/05 09:20:40 mrness Exp $
-
-inherit eutils pam toolchain-funcs flag-o-matic autotools linux-info
-
-#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="20061005"
-
-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
-
-	if use zero-penalty-hit ; then
-		eerror "zero-penalty-hit patch has been removed because:"
-		eerror "    a) Is incompatible with this version of squid"
-		eerror "    b) The homepage has vanished"
-		eerror "Disable zero-penalty-hit USE flag and run"
-		eerror "    emerge --resume"
-		die "Invalid USE flag detected"
-	fi
-
-	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"
-		if kernel_is ge 2 6 ; then
-			myconf="${myconf} --enable-epoll"
-		fi
-	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-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
-	ewarn "Squid can be configured to run in transparent mode like this:"
-	ewarn "   ${HILITE}http_port internal-addr:3128 transparent${NORMAL}"
-}