Stable spamassassin 3.1.3 on mips, remove old mips-only 3.1.0 ebuild

(Portage version: 2.1.1-r1)
 (Unsigned Manifest commit)

3 files changed, 8 insertions, 239 deletions

diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 6e4a2fecd010..76944bbb1a5e 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -22,23 +22,18 @@ AUX spamd.init 617 RMD160 4624c79222ba863dc68e88a13f3de6bb0d579f89 SHA1 dc90ac2f
 MD5 9ab5a9bd40752148b4cb0982dd1a5581 files/spamd.init 617
 RMD160 4624c79222ba863dc68e88a13f3de6bb0d579f89 files/spamd.init 617
 SHA256 8b5abf70f7aac3ddcf7b258ce693f01dd4691048bb4f40a19c25a92e985321a8 files/spamd.init 617
-DIST Mail-SpamAssassin-3.1.0.tar.bz2 1012946 RMD160 976d18f76bf804472b24f70a695551c7f1b71d43 SHA1 0185f076f619dd9e64e94b453017f9b08d4b0f04 SHA256 5470943fd57d42feef998ed0eeb59a5eb4bbddd9ad956b4f864fcf47b6a911c4
 DIST Mail-SpamAssassin-3.1.3.tar.bz2 975274 RMD160 a17b5245e577bd1517db40d6d1de50699b0f72b5 SHA1 e1f4489ec8805985e0ca79765bde586bf0286725 SHA256 2170ead06852832166585f8b100150864844f8f2790615dc0c5e9c3778572dd4
 DIST Mail-SpamAssassin-3.1.4.tar.bz2 979302 RMD160 c5c0543827431a1ec0f157c8f09d23fa4f2ac64b SHA1 c764e94a4666c9bcb30b0540183b71e8edef6bb9 SHA256 646a8bc8b7ad70ea9abe003c7b0cad78955bf59558b9900f4249a9b0808ab395
 DIST Mail-SpamAssassin-3.1.5.tar.bz2 992013 RMD160 1afb28b30d5c10b1b34bf6cfb6216b5570dbd36c SHA1 9c9bcf4098c2b3418d5ea9ba69d1dcdfa255a819 SHA256 3265de94a2ca758a584a726630724f2bf1cfdfa8a0088149ad26ab2cf2daa1ed
 DIST Mail-SpamAssassin-3.1.6.tar.bz2 998136 RMD160 e852f311695b5f0a932f6b0fbf2f2fe40c2ed555 SHA1 16575633e60177733069c1681d6bf9528c076274 SHA256 66f13606d66d079def2c48173e3afaaac606af018536ec6786a694774cbd8890
-EBUILD spamassassin-3.1.0.ebuild 6500 RMD160 855e73b34f75dd247892daeeaedccea6fd5ab140 SHA1 934db3c658b6a365378cdf5af8ff6673e5861333 SHA256 1c5150c0be7fa48f1185bc7c63c6ae05fe930154e4d77ff793178ac36908c5f2
-MD5 925e038959618d5d0a78eed2cc27d4e2 spamassassin-3.1.0.ebuild 6500
-RMD160 855e73b34f75dd247892daeeaedccea6fd5ab140 spamassassin-3.1.0.ebuild 6500
-SHA256 1c5150c0be7fa48f1185bc7c63c6ae05fe930154e4d77ff793178ac36908c5f2 spamassassin-3.1.0.ebuild 6500
 EBUILD spamassassin-3.1.3-r1.ebuild 8057 RMD160 303a6cbc6e8e48dbc3909431dce849683ecefd06 SHA1 5635fb60f2b59286f0615c057a7e5262237eeecc SHA256 063a0f24b41cf3dfd2053afe642d0c98699386c24d8916f896784eddbdb9d1a2
 MD5 27386d4542358191f0bd972e89555956 spamassassin-3.1.3-r1.ebuild 8057
 RMD160 303a6cbc6e8e48dbc3909431dce849683ecefd06 spamassassin-3.1.3-r1.ebuild 8057
 SHA256 063a0f24b41cf3dfd2053afe642d0c98699386c24d8916f896784eddbdb9d1a2 spamassassin-3.1.3-r1.ebuild 8057
-EBUILD spamassassin-3.1.3.ebuild 7834 RMD160 b456eceae31a9a43862c95065c19ba8afa88873c SHA1 cefd8ffc28b694b693acc7de524fb27fcbc79979 SHA256 eec4f5b69a2f1be0a9a600ef3a65044674502ee8bfef2bc1be3326575bf5d8e2
-MD5 e0b79272c10b1986d6327163c916ebd7 spamassassin-3.1.3.ebuild 7834
-RMD160 b456eceae31a9a43862c95065c19ba8afa88873c spamassassin-3.1.3.ebuild 7834
-SHA256 eec4f5b69a2f1be0a9a600ef3a65044674502ee8bfef2bc1be3326575bf5d8e2 spamassassin-3.1.3.ebuild 7834
+EBUILD spamassassin-3.1.3.ebuild 7832 RMD160 102c5d01a6782487854552e6432bdab13f8acc5b SHA1 ab0a6fb424b5978bde1f36684c7ac087c065c5ae SHA256 f44cf259ece5216f3c67ac0ea92cc85daa4b5c3ce1392abc5f9a965b53e16c0b
+MD5 974aebcec7db66378215d616b57252eb spamassassin-3.1.3.ebuild 7832
+RMD160 102c5d01a6782487854552e6432bdab13f8acc5b spamassassin-3.1.3.ebuild 7832
+SHA256 f44cf259ece5216f3c67ac0ea92cc85daa4b5c3ce1392abc5f9a965b53e16c0b spamassassin-3.1.3.ebuild 7832
 EBUILD spamassassin-3.1.4.ebuild 7838 RMD160 a02cdd7bf2f78bd49a0b8027f823c18350e5ac75 SHA1 76cc19316f6c1dbd0c763236eabc5a1de8b87ca4 SHA256 1b926cee4a4a89e782493a0dbd6655d3f940035b2fd2623b304777f3e4195573
 MD5 12c62d899d666b8c713a01fbb981538a spamassassin-3.1.4.ebuild 7838
 RMD160 a02cdd7bf2f78bd49a0b8027f823c18350e5ac75 spamassassin-3.1.4.ebuild 7838
@@ -51,17 +46,14 @@ EBUILD spamassassin-3.1.6.ebuild 7859 RMD160 b0145946bd69047f03deb3c3191719cc8c1
 MD5 b16cde07be6347313a30d92cece897c4 spamassassin-3.1.6.ebuild 7859
 RMD160 b0145946bd69047f03deb3c3191719cc8c170a63 spamassassin-3.1.6.ebuild 7859
 SHA256 55dcc4ddae33eaabac747abcbdb87fdf45321a59a53c1d410a7a57e17996b254 spamassassin-3.1.6.ebuild 7859
-MISC ChangeLog 27083 RMD160 8548818627b51729dacf027cc4b8ef6938d619f5 SHA1 e6e83b8ba75f637d81b0b60ce66251f049d62b27 SHA256 60c2f4eace448908e9f7289af2d7e9d02c48582c582d95af8b43639d1656cdf3
-MD5 eb115af316398a687f5eaf823466e218 ChangeLog 27083
-RMD160 8548818627b51729dacf027cc4b8ef6938d619f5 ChangeLog 27083
-SHA256 60c2f4eace448908e9f7289af2d7e9d02c48582c582d95af8b43639d1656cdf3 ChangeLog 27083
+MISC ChangeLog 27382 RMD160 8eaba1eabb3d0fe97a721654823b699bce6a8120 SHA1 1aa43f6f29afdd16b6a6b27fb06c18ff51a39183 SHA256 2e51ed7b3f109e048bde49f1593b1f478b4af28c43a7573f4d62a406fd26b7f7
+MD5 aec7a0a6378f5c39ead8251f79fcdf23 ChangeLog 27382
+RMD160 8eaba1eabb3d0fe97a721654823b699bce6a8120 ChangeLog 27382
+SHA256 2e51ed7b3f109e048bde49f1593b1f478b4af28c43a7573f4d62a406fd26b7f7 ChangeLog 27382
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
 SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca metadata.xml 305
-MD5 adfd3091f64ba62fc9f715b6022cc2b9 files/digest-spamassassin-3.1.0 277
-RMD160 2771e3b35b854a26b9a9a3476fb7bc1f7b1378eb files/digest-spamassassin-3.1.0 277
-SHA256 9f18bff4b76ba225ef01a49a7d0c1686cf0c5f037ee6f8296d820af5c9cd60d3 files/digest-spamassassin-3.1.0 277
 MD5 53c722ea7ceaa67ec7f0738d9ea8eb3f files/digest-spamassassin-3.1.3 274
 RMD160 c9b7531ea7eb117ee77733b7a27fb9b692a806cd files/digest-spamassassin-3.1.3 274
 SHA256 f4af93fd5e39b91800c4e6ff5709d6e215b38b6a3497c5564d1249cac437aea8 files/digest-spamassassin-3.1.3 274
diff --git a/mail-filter/spamassassin/files/digest-spamassassin-3.1.0 b/mail-filter/spamassassin/files/digest-spamassassin-3.1.0
deleted file mode 100644
index 6b0220b00c9f..000000000000
--- a/mail-filter/spamassassin/files/digest-spamassassin-3.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d28bd7e83d01b234144e336bbfde0caa Mail-SpamAssassin-3.1.0.tar.bz2 1012946
-RMD160 976d18f76bf804472b24f70a695551c7f1b71d43 Mail-SpamAssassin-3.1.0.tar.bz2 1012946
-SHA256 5470943fd57d42feef998ed0eeb59a5eb4bbddd9ad956b4f864fcf47b6a911c4 Mail-SpamAssassin-3.1.0.tar.bz2 1012946
diff --git a/mail-filter/spamassassin/spamassassin-3.1.0.ebuild b/mail-filter/spamassassin/spamassassin-3.1.0.ebuild
deleted file mode 100644
index e300d6fbfbf0..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.1.0.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# 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.0.ebuild,v 1.15 2006/07/16 09:20:22 ian Exp $
-
-inherit perl-module
-
-MY_P=Mail-SpamAssassin-${PV//_/-}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="SpamAssassin is an extensible email filter which is used to identify spam."
-HOMEPAGE="http://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="mips"
-IUSE="berkdb qmail ssl doc mysql tools"
-
-# To consider (not all may be in tree at this time - mcummings):
-# dev-perl/Net-SMTP
-# dev-perl/IP-Country-Fast
-# dev-perl/Net-Ident
-# perl-core/Time-HiRes
-
-# New use flags once we get all of the archs up to speed.
-#	postgres? (
-#		dev-perl/DBI
-#		dev-perl/DBD-Pg
-#	)
-#	sqlite? (
-#		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
-#	)
-DEPEND=">=dev-lang/perl-5.8.2-r1
-	>=virtual/perl-PodParser-1.22
-	virtual/perl-MIME-Base64
-	virtual/perl-Storable
-	>=dev-perl/HTML-Parser-3.31
-	>=dev-perl/Net-DNS-0.34
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	>=dev-perl/Archive-Tar-1.26
-	dev-perl/IO-Zlib
-	ssl? (
-		dev-perl/IO-Socket-SSL
-		dev-libs/openssl
-	)
-	berkdb? (
-		virtual/perl-DB_File
-	)
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-"
-
-src_compile() {
-	# - 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=""
-
-	# Add Gentoo tag to make it easier for the upstream devs to spot
-	# possible modifications or patches.
-	version_tag="g${PV:6}${PR}"
-	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
-
-	# Remove the MANIFEST files as they aren't docu files
-	rm -f MANIFEST*
-
-	use doc && make text_html_doc
-}
-
-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
-
-	use qmail && dobin spamc/qmail-spamc
-
-	dosym /etc/mail/spamassassin /etc/spamassassin
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' ${D}/etc/mail/spamassassin/init.pre
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}"/3.0.0-spamd.init spamd
-	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
-
-	if use doc; then
-		dodoc NOTICE TRADEMARK CREDITS INSTALL UPGRADE BUGS USAGE \
-		sql/README.bayes sql/README.awl README.ldap procmailrc.example \
-		sample-nonspam.txt sample-spam.txt rules/STATISTICS-set0.txt \
-		STATISTICS-set1.txt STATISTICS-set2.txt STATISTICS-set3.txt \
-		spamd/PROTOCOL
-
-		# Rename some docu files so they don't clash with others
-		newdoc spamd/README README.spamd
-		newdoc sql/README README.sql
-		newdoc ldap/README README.ldap
-		use qmail && newdoc spamc/README.qmail README.qmail
-
-		dohtml doc/*.html
-		docinto sql
-		dodoc sql/*.sql
-	fi
-
-	# Install provided tools. See bug 108168
-	if use tools; then
-		docinto tools
-		dodoc tools/*
-	fi
-
-	cp ${FILESDIR}/secrets.cf ${D}/etc/mail/spamassassin/secrets.cf
-	fperms 0400 /etc/mail/spamassassin/secrets.cf
-	echo "">>${D}/etc/mail/spamassassin/local.cf
-	echo "# Sensitive data, such as database connection info, should">>${D}/etc/mail/spamassassin/local.cf
-	echo "# be stored in /etc/mail/spamassassin/secrets.cf with">>${D}/etc/mail/spamassassin/local.cf
-	echo "# appropriate permissions">>${D}/etc/mail/spamassassin/local.cf
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-
-	if ! has_version "perl-core/DB_File"; then
-		einfo "The Bayes backend requires the Berkeley DB to store its data. You"
-		einfo "need to emerge perl-core/DB_File or USE=berkdb to make it available."
-	fi
-
-	if has_version "mail-filter/razor"; then
-		if ! has_version ">=mail-filter/razor-2.61"; then
-				ewarn "You have $(best_version mail-filter/razor) installed but SpamAssassin"
-				if has_version "<mail-filter/razor-2.40"; then
-					ewarn "requires at least version 2.40, version 2.61 or later is recommended."
-				else
-					ewarn "recommends at least version 2.61."
-				fi
-		fi
-	fi
-
-	if use doc; then
-		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
-	fi
-	ewarn
-	ewarn "spamd is not designed to listen to an untrusted network"
-	ewarn "and is vulnerable to DoS attacks (and eternal doom) if"
-	ewarn "configured to do so"
-	ewarn
-	ewarn "If you plan on using the -u flag to spamd, please read the notes"
-	ewarn "in /etc/conf.d/spamd regarding the location of the pid file."
-
-	einfo
-	einfo "If you build ${PN} with optional dependancy support,"
-	einfo "you can enable them in /etc/mail/spamassassin/init.pre"
-}