Bug 126959, use-flag abuse curtailed. thanks Halcy0n

(Portage version: 2.1_pre6-r1)

3 files changed, 30 insertions, 35 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index 01b5f5196aeb..8e1008163a84 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/spamassassin
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.95 2006/03/19 22:22:17 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.96 2006/03/20 14:57:11 mcummings Exp $
+
+  20 Mar 2006; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-3.1.1.ebuild:
+  Bug 126959, use-flag abuse curtailed. thanks Halcy0n
 
   19 Mar 2006; Michael Cummings <mcummings@gentoo.org>
   spamassassin-3.1.1.ebuild:
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index f3d8b2dfa6ee..38f6eee3d4e1 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4b71aa9064867284f827a989f25eade2 ChangeLog 24084
 RMD160 9c97d0df67f1903e7cae20aceef6babe85a1cb87 ChangeLog 24084
 SHA256 ca306a23663b88c2eb1fb161fb3275a1c8bc7e46c7793b474816e857edbc36ee ChangeLog 24084
@@ -49,13 +46,6 @@ SHA256 a4ee5488f45cc1fd47d5a21d7874e71c5e8fdb784a3d4bda372757267030b4ec spamassa
 MD5 91b5e033bc40ed39ff378042862c2d58 spamassassin-3.1.0.ebuild 6548
 RMD160 801803b399ce703eaa5b3a34c91c4f6558e85b6d spamassassin-3.1.0.ebuild 6548
 SHA256 347b9f65d79dcebf5b1703c833d5de47f737746bfc22fa8e2aad477678bc6af3 spamassassin-3.1.0.ebuild 6548
-MD5 90bd4ca9554255509efb187d5adbf759 spamassassin-3.1.1.ebuild 7518
-RMD160 14410908fc6b95dbcd45ef57fcea69013f380afb spamassassin-3.1.1.ebuild 7518
-SHA256 a32b2ce6d1b4cee6dea0be257a7127fb0cb5506e7272e042ce4d3fa2b3bd899a spamassassin-3.1.1.ebuild 7518
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFEHdmStG5z4I8BtQoRAh3oAKCRvOTeIsQP5Y2f0CQSUWcuqO+HlACfbo0r
-uo0Si1c/QfomPATebRimfws=
-=Orog
------END PGP SIGNATURE-----
+MD5 2d6fcec44bd24147f0da7d055c9f8ed0 spamassassin-3.1.1.ebuild 7870
+RMD160 22c4bd346c04e7e5cf1fdb4e5e1889e498390726 spamassassin-3.1.1.ebuild 7870
+SHA256 87e90b6516d67e2efe5229e8be8e6a716448c57b7a079ae25d267b454a05176d spamassassin-3.1.1.ebuild 7870
diff --git a/mail-filter/spamassassin/spamassassin-3.1.1.ebuild b/mail-filter/spamassassin/spamassassin-3.1.1.ebuild
index 02ee29f1af30..f77da9057c29 100644
--- a/mail-filter/spamassassin/spamassassin-3.1.1.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.1.1.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/mail-filter/spamassassin/spamassassin-3.1.1.ebuild,v 1.4 2006/03/19 22:22:17 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.1.ebuild,v 1.5 2006/03/20 14:57:11 mcummings Exp $
 
 inherit perl-module
 
@@ -12,9 +12,8 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~mips"
-KEYWORDS="~ppc64 ~sparc ~x86"
-IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite spf tools dcc pyzor razor extramodules ipv6"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite tools ipv6"
 
 DEPEND=">=dev-lang/perl-5.8.2-r1
 	virtual/perl-MIME-Base64
@@ -48,24 +47,7 @@ DEPEND=">=dev-lang/perl-5.8.2-r1
 		dev-perl/DBI
 		dev-perl/DBD-SQLite
 	)
-	spf? (
-		dev-perl/Mail-SPF-Query
-	)
 
-	pyzor? (
-		dev-python/pyzor
-	)
-	razor? (
-		mail-filter/razor
-	)
-	dcc? (
-		mail-filter/dcc
-	)
-	extramodules? (
-		dev-perl/IP-Country
-		dev-perl/Net-Ident
-		dev-perl/Mail-DomainKeys
-	)
 	ipv6? (
 		dev-perl/IO-Socket-INET6
 	)"
@@ -213,6 +195,7 @@ pkg_postinst() {
 		einfo "  /usr/share/doc/${PF}/UPGRADE.gz"
 		einfo
 	fi
+
 	ewarn
 	ewarn "spamd is not designed to listen to an untrusted network"
 	ewarn "and is vulnerable to DoS attacks (and eternal doom) if"
@@ -242,4 +225,22 @@ pkg_postinst() {
 		ewarn "Notably, the LANG setting must not include \"utf8\".   However, some folks"
 		ewarn "have reported that this makes no difference. ;)"
 	fi
+	einfo
+	if ! has_version 'dev-perl/Mail-SPF-QUery'; then
+		einfo "For spf support, please emerge dev-perl/Mail-SPF-Query"
+	fi
+	if ! has_version 'mail-filter/dcc'; then
+		einfo "For dcc support, please emerge mail-filter/dcc"
+	fi
+	if ! has_version 'dev-python/pyzor'; then
+		einfo "For pyzor support, please emerge dev-python/pyzor"
+	fi
+	if ! has_version 'mail-filter/razor'; then
+		einfo "For razor support, please emerge mail-filter/razor"
+	fi
+	einfo
+	einfo "For addtional functionality, you may wish to emerge:"
+	einfo "dev-perl/IP-Country       dev-perl/Net-Ident "
+	einfo "dev-perl/Mail-DomainKeys"
+
 }