add 2.61, clean house

12 files changed, 96 insertions, 230 deletions

diff --git a/dev-perl/Mail-SpamAssassin/ChangeLog b/dev-perl/Mail-SpamAssassin/ChangeLog
index fb07979a80f2..7735ba37d73c 100644
--- a/dev-perl/Mail-SpamAssassin/ChangeLog
+++ b/dev-perl/Mail-SpamAssassin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-perl/Mail-SpamAssassin
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin/ChangeLog,v 1.35 2003/10/28 20:22:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin/ChangeLog,v 1.36 2003/12/18 19:45:00 rac Exp $
+
+*Mail-SpamAssassin-2.61 (18 Dec 2003)
+
+  18 Dec 2003; <rac@gentoo.org> Mail-SpamAssassin-2.55-r1.ebuild,
+  Mail-SpamAssassin-2.55-r2.ebuild, Mail-SpamAssassin-2.55.ebuild,
+  Mail-SpamAssassin-2.60.ebuild, Mail-SpamAssassin-2.61.ebuild:
+  Add 2.61, clean house. Address bug 35423
 
 *Mail-SpamAssassin-2.60-r2 (28 Oct 2003)
 
diff --git a/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.55-r1.ebuild b/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.55-r1.ebuild
deleted file mode 100644
index 8e3d1549f298..000000000000
--- a/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.55-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.55-r1.ebuild,v 1.5 2003/06/21 21:36:36 drobbins Exp $
-
-inherit perl-module
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Perl Mail::SpamAssassin - A program to filter spam"
-SRC_URI="http://www.spamassassin.org/released/${P}.tar.gz"
-HOMEPAGE="http://www.spamassassin.org"
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2 | Artistic"
-KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha"
-
-DEPEND="dev-perl/Net-DNS
-	dev-perl/HTML-Parser
-	dev-perl/PodParser
-	dev-perl/Time-Local"
-
-myconf="INST_PREFIX=/usr SITEPREFIX=\$(PREFIX) INST_SYSCONFDIR=/etc SYSCONFDIR=${D}/etc RUN_RAZOR1_TESTS=n RUN_RAZOR2_TESTS=n"
-mymake="PREFIX=/usr SYSCONFDIR=/etc"
-mydoc="License Changes procmailrc.example sample-nonspam.txt sample-spam.txt"
-
-
-
-src_compile() {
-
-	perl-module_src_compile
-	dodir /etc/mail/spamassassin
-
-}
-
-src_install () {
-
-	perl-module_src_install
-
-	dodir /etc/init.d /etc/conf.d
-	cp ${FILESDIR}/spamd.init ${D}/etc/init.d/spamd
-	chmod +x ${D}/etc/init.d/spamd
-	cp ${FILESDIR}/spamd.conf ${D}/etc/conf.d/spamd
-
-
-
-}
diff --git a/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.55-r2.ebuild b/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.55-r2.ebuild
deleted file mode 100644
index 307a4c037c7f..000000000000
--- a/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.55-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.55-r2.ebuild,v 1.1 2003/09/25 06:13:13 rac Exp $
-
-inherit perl-module
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Perl Mail::SpamAssassin - A program to filter spam"
-SRC_URI="http://www.spamassassin.org/released/${P}.tar.gz"
-HOMEPAGE="http://www.spamassassin.org"
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2 | Artistic"
-KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha"
-
-DEPEND="dev-perl/Net-DNS
-	dev-perl/HTML-Parser
-	dev-perl/PodParser
-	dev-perl/Time-Local"
-
-myconf="INST_PREFIX=/usr SITEPREFIX=\$(PREFIX) INST_SYSCONFDIR=/etc SYSCONFDIR=${D}/etc PKG_DEF_RULES_DIR=${D}/usr/share/spamassassin RUN_RAZOR1_TESTS=n RUN_RAZOR2_TESTS=n"
-mymake="PREFIX=/usr SYSCONFDIR=/etc"
-mydoc="License Changes procmailrc.example sample-nonspam.txt sample-spam.txt"
-
-
-
-src_compile() {
-
-	perl-module_src_compile
-	dodir /etc/mail/spamassassin
-
-}
-
-src_install () {
-
-	perl-module_src_install
-
-	dodir /etc/init.d /etc/conf.d
-	cp ${FILESDIR}/spamd.init ${D}/etc/init.d/spamd
-	chmod +x ${D}/etc/init.d/spamd
-	cp ${FILESDIR}/spamd.conf ${D}/etc/conf.d/spamd
-
-
-
-}
diff --git a/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.55.ebuild b/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.55.ebuild
deleted file mode 100644
index 83b3251822d1..000000000000
--- a/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.55.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.55.ebuild,v 1.2 2003/06/21 21:36:36 drobbins Exp $
-
-inherit perl-module
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Perl Mail::SpamAssassin - A program to filter spam"
-SRC_URI="http://www.spamassassin.org/released/${P}.tar.gz"
-HOMEPAGE="http://www.spamassassin.org"
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2 | Artistic"
-KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha"
-
-DEPEND="dev-perl/Net-DNS
-	dev-perl/HTML-Parser
-	dev-perl/Time-HiRes"
-
-mydoc="License Changes procmailrc.example sample-nonspam.txt sample-spam.txt"
-myinst="${myinst} LOCAL_RULES_DIR=${D}/etc/mail/spamassassin"
-myconf="${myconf} SYSCONFDIR=${D}/etc INST_PREFIX=/usr RUN_RAZOR1_TESTS=n RUN_RAZOR2_TESTS=n"
-
-src_compile() {
-
-	perl-module_src_prep
-	dodir /etc/mail/spamassassin
-
-}
-
-src_install () {
-
-	perl-module_src_install
-
-	dodir /etc/init.d /etc/conf.d
-	cp ${FILESDIR}/spamd.init ${D}/etc/init.d/spamd
-	chmod +x ${D}/etc/init.d/spamd
-	cp ${FILESDIR}/spamd.conf ${D}/etc/conf.d/spamd
-
-	sed -e "s:${D}::" ${D}/usr/bin/spamassassin > spamassassin.tmp
-	mv spamassassin.tmp ${D}/usr/bin/spamassassin
-	chmod 555 ${D}/usr/bin/spamassassin
-
-	sed -e "s:${D}::" ${D}/usr/bin/spamd > spamd.tmp
-	mv spamd.tmp ${D}/usr/bin/spamd
-	chmod 555 ${D}/usr/bin/spamd
-
-}
diff --git a/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.60.ebuild b/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.60.ebuild
deleted file mode 100644
index 209712d5d637..000000000000
--- a/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.60.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.60.ebuild,v 1.4 2003/09/12 06:14:20 rajiv Exp $
-
-inherit perl-module
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Perl Mail::SpamAssassin - A program to filter spam"
-SRC_URI="http://www.spamassassin.org/released/${P}.tar.gz"
-HOMEPAGE="http://www.spamassassin.org"
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2 | Artistic"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha"
-
-DEPEND="dev-perl/Net-DNS
-	dev-perl/HTML-Parser
-	dev-perl/PodParser
-	dev-perl/Time-Local
-	berkdb? ( dev-perl/DB_File ) "
-
-RAZORVERINS=`best_version net-mail/razor`
-
-myconf="INST_PREFIX=/usr SITEPREFIX=\$(PREFIX) INST_SYSCONFDIR=/etc SYSCONFDIR=${D}/etc CONTACT_ADDRESS=root@localhost"
-
-# If ssl is enabled, spamc can be built with ssl support
-if [ "`use ssl`" ];
-then
-	myconf="${myconf} ENABLE_SSL=yes"
-fi
-
-if [ ! -z "${RAZORVERINS}" ];
-then
-	myconf="${myconf} RUN_RAZOR2_TESTS=n"
-fi
-
-mymake="PREFIX=/usr SYSCONFDIR=/etc"
-mydoc="License Changes procmailrc.example sample-nonspam.txt sample-spam.txt"
-
-
-
-src_compile() {
-
-	perl-module_src_compile
-	dodir /etc/mail/spamassassin
-
-}
-
-src_install () {
-
-	perl-module_src_install
-
-	dodir /etc/init.d /etc/conf.d
-	cp ${FILESDIR}/spamd.init ${D}/etc/init.d/spamd
-	chmod +x ${D}/etc/init.d/spamd
-	cp ${FILESDIR}/spamd.conf ${D}/etc/conf.d/spamd
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-
-	ewarn "Message from the author of SpamAssassin:"
-	einfo ""
-	einfo "Perl 5.8 now uses Unicode internally by default, "
-	einfo "which causes trouble for SpamAssassin (and almost"
-	einfo "all other reasonably complex pieces of perl code!)."
-	einfo ""
-	einfo "Setting the LANG environment variable before any "
-	einfo "invocation of SpamAssassin sometimes seems to help"
-	einfo "fix it, like so:"
-	einfo ""
-	ewarn "  export LANG=en_US"
-	einfo ""
-	einfo "Notably, the LANG setting must not include utf8. "
-	einfo "However, some folks have reported that this makes"
-	einfo "no difference. ;)"
-}
diff --git a/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.61.ebuild b/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.61.ebuild
new file mode 100644
index 000000000000..822008c4760d
--- /dev/null
+++ b/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.61.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.61.ebuild,v 1.1 2003/12/18 19:45:00 rac Exp $
+
+inherit perl-module
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Perl Mail::SpamAssassin - A program to filter spam"
+SRC_URI="http://spamassassin.org/released/${P}.tar.bz2"
+HOMEPAGE="http://spamassassin.org"
+IUSE="berkdb ssl"
+SLOT="0"
+LICENSE="GPL-2 | Artistic"
+KEYWORDS="~x86 amd64 ~ppc ~sparc ~alpha"
+
+newdepend ">=dev-perl/ExtUtils-MakeMaker-6.11-r1
+	dev-perl/Time-Local
+	dev-perl/Getopt-Long
+	>=dev-perl/File-Spec-0.8
+	>=dev-perl/PodParser-1.22
+	>=dev-perl/HTML-Parser-3.24
+	dev-perl/Net-DNS
+	dev-perl/Digest-SHA1
+	ssl?    ( dev-perl/IO-Socket-SSL )
+	berkdb? ( dev-perl/DB_File )"
+
+myconf="CONTACT_ADDRESS=root@localhost RUN_RAZOR_TESTS=0"
+
+# If ssl is enabled, spamc can be built with ssl support
+if use ssl; then
+	myconf="${myconf} ENABLE_SSL=yes"
+fi
+
+# if you are going to enable taint mode, make sure that the bug where
+# spamd doesn't start when the PATH contains . is addressed, and make
+# sure you deal with versions of razor <2.36-r1 not being taint-safe.
+# <http://bugzilla.spamassassin.org/show_bug.cgi?id=2511> and
+# <http://spamassassin.org/released/Razor2.patch>.
+
+myconf="${myconf} PERL_TAINT=no"
+
+# No settings needed for 'make all'.
+mymake=""
+
+# Neither for 'make install'.
+myinst=""
+
+# Some more files to be installed (README* and Changes are already
+# included per default)
+mydoc="License
+	COPYRIGHT
+	TRADEMARK
+	CONTRIB_CERT
+	BUGS
+	USAGE
+	procmailrc.example
+	sample-nonspam.txt
+	sample-spam.txt "
+
+src_compile() {
+	perl-module_src_compile
+	perl-module_src_test
+}
+
+src_install () {
+	perl-module_src_install
+
+	# Add the init and config scripts.
+	dodir /etc/init.d /etc/conf.d
+	insinto /etc/init.d
+	newins ${FILESDIR}/spamd.init spamd
+	fperms 755 /etc/init.d/spamd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/spamd.conf spamd
+}
+
+pkg_postinst() {
+	perl-module_pkg_postinst
+
+	if [ -z "`best_version dev-perl/DB_File`" ]; then
+		einfo "The Bayes backend requires the Berkeley DB to store its data. You"
+		einfo "need to emerge dev-perl/DB_File to make it available."
+	fi
+
+}
diff --git a/dev-perl/Mail-SpamAssassin/Manifest b/dev-perl/Mail-SpamAssassin/Manifest
index ba9a6c0425c6..7ffb3fe18864 100644
--- a/dev-perl/Mail-SpamAssassin/Manifest
+++ b/dev-perl/Mail-SpamAssassin/Manifest
@@ -1,20 +1,12 @@
-MD5 15dc0d94ec82f40421ab547b644250fc Mail-SpamAssassin-2.55-r1.ebuild 1161
 MD5 84521b7fec60032d0004b8c45ecf34fc Mail-SpamAssassin-2.60-r2.ebuild 2203
-MD5 f40894c454e37dbd1de4b9d7c392d795 Mail-SpamAssassin-2.60.ebuild 2056
 MD5 6472e25049da5b2b77df3fe6b3b36eaa Mail-SpamAssassin-2.60-r1.ebuild 2200
 MD5 1668982e7bdc070ccaf5e771b03ed3cc Mail-SpamAssassin-2.44.ebuild 1343
-MD5 77e8f5eb7402ea3af60476734a0a7738 Mail-SpamAssassin-2.55-r2.ebuild 1202
-MD5 173979729e799b1396e69c8fb4ebe706 Mail-SpamAssassin-2.55.ebuild 1386
-MD5 84521b7fec60032d0004b8c45ecf34fc Mail-SpamAssassin-2.61.ebuild 2203
-MD5 a04e714e52ba96cb483a93223c33ed21 ChangeLog 6236
+MD5 ebf0da1dd06dfe7693ec8658c89d0753 Mail-SpamAssassin-2.61.ebuild 2219
+MD5 3472018a832e3d3b48bb559f256ceaa6 ChangeLog 6512
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 c698f2d5a26c38caf3c9e5593004a484 files/digest-Mail-SpamAssassin-2.55-r1 74
-MD5 c698f2d5a26c38caf3c9e5593004a484 files/digest-Mail-SpamAssassin-2.55-r2 74
 MD5 eb124c50f7f7ab2f7e12b8b5bb325e60 files/digest-Mail-SpamAssassin-2.60-r1 75
 MD5 eb124c50f7f7ab2f7e12b8b5bb325e60 files/digest-Mail-SpamAssassin-2.60-r2 75
 MD5 1ed9c6ddcb224ed5d2ad37aab7c0cce9 files/spamd.conf 265
 MD5 4bc47f7ee058bf11457cca8723fcac91 files/spamd.init 576
 MD5 1e2dfc5372ad24097799c70e896fe8c4 files/digest-Mail-SpamAssassin-2.44 74
-MD5 c698f2d5a26c38caf3c9e5593004a484 files/digest-Mail-SpamAssassin-2.55 74
-MD5 aa8db426d67f90c5c540c2c9429b7d78 files/digest-Mail-SpamAssassin-2.60 74
 MD5 3d503ea1b4d7a317f59dccfa3c5c7382 files/digest-Mail-SpamAssassin-2.61 75
diff --git a/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.55 b/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.55
deleted file mode 100644
index c8f78a1535ba..000000000000
--- a/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.55
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f4d7898301851c83ad157c0a59b98833 Mail-SpamAssassin-2.55.tar.gz 700610
diff --git a/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.55-r1 b/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.55-r1
deleted file mode 100644
index c8f78a1535ba..000000000000
--- a/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.55-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f4d7898301851c83ad157c0a59b98833 Mail-SpamAssassin-2.55.tar.gz 700610
diff --git a/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.55-r2 b/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.55-r2
deleted file mode 100644
index c8f78a1535ba..000000000000
--- a/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.55-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f4d7898301851c83ad157c0a59b98833 Mail-SpamAssassin-2.55.tar.gz 700610
diff --git a/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.60 b/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.60
deleted file mode 100644
index 74e4c25c58e0..000000000000
--- a/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.60
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5d23aa5ddb1c5381281cd88bf734341f Mail-SpamAssassin-2.60.tar.gz 945512
diff --git a/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.61 b/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.61
new file mode 100644
index 000000000000..6ea67ed83ee6
--- /dev/null
+++ b/dev-perl/Mail-SpamAssassin/files/digest-Mail-SpamAssassin-2.61
@@ -0,0 +1 @@
+MD5 25a87ca67c1550360e1378c816301b53 Mail-SpamAssassin-2.61.tar.bz2 737599