summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2006-09-21 05:34:40 +0000
committerAlin Năstac <mrness@gentoo.org>2006-09-21 05:34:40 +0000
commitb19b6dd21b76282b3fee386e8030dba9dc8b9bf6 (patch)
treee97fb7cd325cc7d009ee166888e9c9de7215ec6d
parentmasked version bump (diff)
downloadhistorical-b19b6dd21b76282b3fee386e8030dba9dc8b9bf6.tar.gz
historical-b19b6dd21b76282b3fee386e8030dba9dc8b9bf6.tar.bz2
historical-b19b6dd21b76282b3fee386e8030dba9dc8b9bf6.zip
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
-rw-r--r--net-proxy/squid/ChangeLog7
-rw-r--r--net-proxy/squid/squid-2.6.3.ebuild14
2 files changed, 17 insertions, 4 deletions
diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 8f8b373c0cfb..d1cf14c7a7d2 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-proxy/squid
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.90 2006/09/20 08:59:55 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.91 2006/09/21 05:34:40 mrness Exp $
+
+ 21 Sep 2006; Alin Nastac <mrness@gentoo.org> -squid-2.6.1-r1.ebuild,
+ squid-2.6.3.ebuild:
+ Remove old test version. Mark stable on x86 and die in pkg_setup if
+ zero-penalty-hit USE flag is enabled.
20 Sep 2006; Alin Nastac <mrness@gentoo.org> files/squid.initd,
files/squid.initd-logrotate:
diff --git a/net-proxy/squid/squid-2.6.3.ebuild b/net-proxy/squid/squid-2.6.3.ebuild
index 4f6ed08aaab4..b89f345229b2 100644
--- a/net-proxy/squid/squid-2.6.3.ebuild
+++ b/net-proxy/squid/squid-2.6.3.ebuild
@@ -1,6 +1,6 @@
# 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.3.ebuild,v 1.1 2006/08/19 08:02:46 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.3.ebuild,v 1.2 2006/09/21 05:34:40 mrness Exp $
inherit eutils pam toolchain-funcs flag-o-matic autotools linux-info
@@ -18,7 +18,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v2/${S_PV}/${S_PP}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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 \
@@ -39,7 +39,15 @@ 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."
+ 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)."