Addresses bug 65102.

5 files changed, 217 insertions, 6 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index 01deecaa18e8..0009db64d443 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/spamassassin
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.13 2004/09/22 14:18:09 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.14 2004/09/24 16:22:47 mcummings Exp $
+
+*spamassassin-3.0.0-r1 (24 Sep 2004)
+
+  24 Sep 2004; Michael Cummings <mcummings@gentoo.org>
+  +spamassassin-3.0.0-r1.ebuild, spamassassin-3.0.0.ebuild:
+  Mistake on my part with importing the DATADIR that was used in the pre-release
+  ebuild. Corrected in both 3 and 3-r1 just to be safe. Addresses bug 65102.
 
   22 Sep 2004; Michael Cummings <mcummings@gentoo.org>
   spamassassin-3.0.0.ebuild:
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 73edf152ae4f..4733573b8c3f 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -3,7 +3,8 @@ MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 07be834b0dbedbb5f91170c18dd22c1f spamassassin-2.63-r1.ebuild 2401
 MD5 977dc4b389deafd70daf9fd67c796b06 spamassassin-2.63.ebuild 2293
 MD5 2657d9c6ecc65a8b2fe87046b5d05ebf spamassassin-2.64.ebuild 2508
-MD5 6507a2d58651d40d1742c14e5b813e0c spamassassin-3.0.0.ebuild 5919
+MD5 b4a6ebda42b5858ce84d199b64bb00f9 spamassassin-3.0.0.ebuild 5799
+MD5 b4a6ebda42b5858ce84d199b64bb00f9 spamassassin-3.0.0-r1.ebuild 5799
 MD5 4b17c303c2a11eab455003b92cd1851a files/3.0.0-spamd.conf 596
 MD5 2bc962fe7cbd5fc24b6ca7703a498e83 files/digest-spamassassin-2.63 75
 MD5 2bc962fe7cbd5fc24b6ca7703a498e83 files/digest-spamassassin-2.63-r1 75
@@ -12,3 +13,4 @@ MD5 1ed9c6ddcb224ed5d2ad37aab7c0cce9 files/spamd.conf 265
 MD5 90925e8f6521add45f8a727ed982e61a files/spamd.init 645
 MD5 7d4ce834279c9e36320d114a7118c127 files/digest-spamassassin-3.0.0 76
 MD5 c59cb3e2d51ddebc58ae4fb3b2b167a1 files/3.0.0-spamd.init 676
+MD5 7d4ce834279c9e36320d114a7118c127 files/digest-spamassassin-3.0.0-r1 76
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.0.0-r1 b/mail-filter/spamassassin/files/digest-spamassassin-3.0.0-r1
new file mode 100644
index 000000000000..d7a506365f0d
--- /dev/null
+++ b/mail-filter/spamassassin/files/digest-spamassassin-3.0.0-r1
@@ -0,0 +1 @@
+MD5 b77c7b29ddc4283d597610bf540670d9 Mail-SpamAssassin-3.0.0.tar.bz2 897349
diff --git a/mail-filter/spamassassin/spamassassin-3.0.0-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..f842336f51aa
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.0.0-r1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.0.0-r1.ebuild,v 1.1 2004/09/24 16:22:47 mcummings Exp $
+
+inherit perl-module
+
+DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam."
+HOMEPAGE="http://spamassassin.apache.org/"
+LICENSE="Apache-2.0"
+
+MY_P=Mail-SpamAssassin-${PV//_/-}
+S=${WORKDIR}/${MY_P}
+
+SRC_URI="http://www.apache.org/dist/spamassassin/${MY_P}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64"
+IUSE="berkdb ssl doc"
+
+DEPEND=">=dev-lang/perl-5.8.2-r1
+	>=dev-perl/PodParser-1.22
+	>=dev-perl/HTML-Parser-3.31
+	>=dev-perl/Net-DNS-0.34
+	dev-perl/Digest-SHA1
+	ssl? (
+		dev-perl/IO-Socket-SSL
+		dev-libs/openssl
+	)
+	berkdb? (
+		dev-perl/DB_File
+	)"
+
+
+# - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
+#   (just to be sure, nobody knows how it could happen in the first place).
+myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin"
+
+# If ssl is enabled, spamc can be built with ssl support
+if use ssl; then
+	myconf="${myconf} ENABLE_SSL=yes"
+else
+	myconf="${myconf} ENABLE_SSL=no"
+fi
+
+# Set the path to the Perl executable explictly.  This will be used to
+# create the initial sharpbang line in the scripts and might cause
+# a versioned app name end in there, see
+# <http://bugs.gentoo.org/show_bug.cgi?id=62276>
+myconf="${myconf} PERL_BIN=/usr/bin/perl"
+
+# 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="NOTICE
+	TRADEMARK
+	LICENSE
+	CREDITS
+	INSTALL
+	UPGRADE
+	BUGS
+	USAGE
+	README.spamd
+	README.sql
+	README.ldap
+	procmailrc.example
+	sample-nonspam.txt
+	sample-spam.txt
+	STATISTICS.set0
+	STATISTICS.set1
+	STATISTICS.set2
+	STATISTICS.set3"
+
+# Commented out until qmail is a valid keyword - mcummings
+#use qmail && mydoc="${mydoc} README.qmail"
+
+
+src_move_doc() {
+	echo "Renaming $1 to $2"
+	mv $1 $2 || die failed to move documentation
+}
+
+src_append_doc() {
+	echo "Appending $1 to $2"
+	cat $1 >> $2 || die failed to append documentation
+}
+
+src_compile() {
+	# Add Gentoo tag to make it easier for the upstream devs to spot
+	# possible modifications or patches.
+	version_tag="g${PV/*_/}${PR/r0/}"
+	version_str="${PV//_/-}-${version_tag}"
+
+	# Create the Gentoo config file before Makefile.PL is called so it
+	# is copied later on.
+	echo "version_tag ${version_tag}" > rules/11_gentoo.cf
+
+	# Setting the following env var ensures that no questions are asked.
+	export PERL_MM_USE_DEFAULT=1
+	perl-module_src_prep
+	# Run the autoconf stuff now, just to make the build sequence look more
+	# familiar to the user :)  Plus feeding the VERSION_STRING skips some
+	# calls to Perl.
+	make spamc/Makefile VERSION_STRING="${version_str}"
+
+	# Now compile all the stuff selected.
+	perl-module_src_compile
+	if use qmail; then
+		make spamc/qmail-spamc || die building qmail-spamc failed
+	fi
+
+	# Rename some docu files so they don't clash with others
+	src_move_doc   spamd/README              README.spamd
+	src_move_doc   spamc/README.qmail        README.qmail
+	src_move_doc   sql/README                README.sql
+	src_append_doc sql/README.bayes          README.sql
+	src_append_doc sql/README.awl            README.sql
+	src_move_doc   ldap/README               README.ldap
+	src_move_doc   rules/STATISTICS.txt      STATISTICS.set0
+	src_move_doc   rules/STATISTICS-set1.txt STATISTICS.set1
+	src_move_doc   rules/STATISTICS-set2.txt STATISTICS.set2
+	src_move_doc   rules/STATISTICS-set3.txt STATISTICS.set3
+	# Remove the MANIFEST files as they aren't docu files
+	rm -f MANIFEST*
+
+	if use doc; then
+		make text_html_doc
+	fi
+
+	# FIXME: Remove the following block in the final ebuild.
+	if [ "${PV//[^_]/}" == _ ]; then
+		hasq maketest $FEATURES || perl-module_src_test
+	fi
+}
+
+src_install () {
+	perl-module_src_install
+
+	# Move spamd to sbin where it belongs.
+	dodir /usr/sbin
+	mv ${D}/usr/bin/spamd ${D}/usr/sbin/spamd  || die
+
+	if use qmail; then
+		into /usr
+		dobin spamc/qmail-spamc
+	fi
+
+	# Add the init and config scripts.
+	dodir /etc/init.d /etc/conf.d
+	insinto /etc/init.d
+	newins ${FILESDIR}/3.0.0-spamd.init spamd
+	fperms 755 /etc/init.d/spamd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/3.0.0-spamd.conf spamd
+
+	if use doc; then
+		dodoc spamd/PROTOCOL
+		for f in doc/*.html; do
+			dodoc $f
+		done
+	fi
+}
+
+pkg_postinst() {
+	perl-module_pkg_postinst
+
+	if ! has_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 or USE=berkdb to make it available."
+	fi
+
+	if has_version "mail-filter/razor"; then
+		if ! has_version "<=net-mail/razor-2.40"; then
+			ewarn "You have $(best_version mail-filter/razor) installed but SpamAssassin"
+			ewarn "requires at least version 2.40, version 2.61 or later is recommended."
+		elif ! has_version ">=net-mail/razor-2.61"; then
+			ewarn "You have $(best_version mail-filter/razor) installed but SpamAssassin"
+			ewarn "recommends at least version 2.61."
+		fi
+	fi
+
+	einfo
+	einfo "Please read the file"
+	einfo "  /usr/share/doc/${PF}/INSTALL.gz"
+	einfo "to find out which optional modules you need to install to enable"
+	einfo "additional features which depend on them."
+	einfo
+	einfo "If upgraded from 2.x, please read the file"
+	einfo "  /usr/share/doc/${PF}/UPGRADE.gz"
+	einfo
+}
+
diff --git a/mail-filter/spamassassin/spamassassin-3.0.0.ebuild b/mail-filter/spamassassin/spamassassin-3.0.0.ebuild
index 45be4e60d802..cf711323ebbe 100644
--- a/mail-filter/spamassassin/spamassassin-3.0.0.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.0.0.ebuild,v 1.2 2004/09/22 14:18:09 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.0.0.ebuild,v 1.3 2004/09/24 16:22:47 mcummings Exp $
 
 inherit perl-module
 
@@ -33,9 +33,7 @@ DEPEND=">=dev-lang/perl-5.8.2-r1
 
 # - Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
 #   (just to be sure, nobody knows how it could happen in the first place).
-# - Set DATADIR to a subdirectory so other ebuilds which offer rules can store
-#   their stuff below the dir, too.
-myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin/core"
+myconf="SYSCONFDIR=/etc DATADIR=/usr/share/spamassassin"
 
 # If ssl is enabled, spamc can be built with ssl support
 if use ssl; then