removed 3.2.5 and 3.3.1 - 3.3.1 added to main tree

(Portage version: 2.1.8.3/git/Linux x86_64)
 (Signed Manifest commit)

4 files changed, 8 insertions, 389 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index a48e7d6b8..09febee8d 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Apr 2010; David Abbott <dabbott@gentoo.org>
+  -spamassassin-3.2.5-r3.ebuild, -spamassassin-3.3.1-r1.ebuild:
+  removed spamassassin 3.2.5 and 3.3.1 - 3.3.1 added to main tree
+
 *spamassassin-3.3.1-r1 (07 Apr 2010)
 
   07 Apr 2010; David Abbott <dabbott@gentoo.org> +files/3.3.1-spamd.init,
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 2266a10e7..4ef231305 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -10,17 +10,14 @@ AUX 3.2.5-spamd.init 902 RMD160 232ba6607c607d8ba270454598bf228a9f8c66b2 SHA1 8b
 AUX 3.3.1-spamd.init 932 RMD160 9a987db6e5280b9024e1591ad9f5abb8525bae37 SHA1 d9d52d7e6c3f1cd1b14eda60d8739bdfdbe7c6e9 SHA256 a73a201506e27e5c4654d0ed856fdfb6d22f4f3ae8ead780fbcd8a5b70907b39
 AUX secrets.cf 664 RMD160 afb1212a464bd7053c1301c1a1e670b73216528a SHA1 a742beddf850e55bc4454a7548dc43c36f8e9760 SHA256 9f134c7b857b21689f612fc6d131f719e5a65e2ba341b282e7aa57402c854139
 AUX spamassassin-3.2.5-DESTDIR.patch 8856 RMD160 c7aa95f1ddc21e7668266fe3eb00342ba5569c8c SHA1 045a446362b8b0491164a53cff18391c49fe6786 SHA256 f73e3d63b7fd79c364799cd1e3525369ac483019e55c079f33529b6ce81c9264
-DIST Mail-SpamAssassin-3.2.5.tar.bz2 1011883 RMD160 444baab6d966d4366834b82cde34c81e3e521144 SHA1 32b701ffc68f7975eded107c456b902bc710d8b2 SHA256 baaab5e4da7d3b0e04c0db579bdb44bbd6be916d29540682346eccead23f6c8a
 DIST Mail-SpamAssassin-3.3.1.tar.bz2 1015008 RMD160 b681fc60292cd30efd405585aad70f39c9633260 SHA1 f5748043eb286b1acb456093039a55db00c6f25e SHA256 4c348cd951fc2c5688e9713fcbc6ba453df51d32a1ab332a63800d20ff18bdb4
-EBUILD spamassassin-3.2.5-r3.ebuild 5261 RMD160 4b893e89e9a3d96756eb5131f38a0508a6c78d6f SHA1 f1656db33e903c2db0f907e61eeaf07362643422 SHA256 3b6028f29c946e9bbdf57631636b7ca4f09aed2ced2603acff4af553aae71fad
-EBUILD spamassassin-3.3.1-r1.ebuild 6162 RMD160 b50f9309c43c14cffb0932c12e1fb6fb2febc041 SHA1 adb446d537b26efe5fd2e27f68c732a8c7068081 SHA256 4bb6adb3f526a3314243b0bc659cbd410f6b842c774cb67db1033a433ccdabcc
 EBUILD spamassassin-3.3.1.ebuild 6162 RMD160 cbe76496669afab3247c360ec26f99cab557c875 SHA1 da87df43a35068859f63b5d8a407630944c4e915 SHA256 690d211c97e69a7b8efd91406b69e9763e5d0751634177a0e6a4fe5d357cfdbc
-MISC ChangeLog 1139 RMD160 15d12d241b4ea1eaf0a70cb6a6775dcea220562b SHA1 0cdb066d22937e7f6276c7619e0edd40616da68c SHA256 96336735ba1592e16120e043cd105054e314eaf3fef70dc0114b164d6bbd3a35
+MISC ChangeLog 1319 RMD160 448815a92ad5f61cd5eed466f4b80e025f225825 SHA1 fe08265810d53cca1e2a94088ca5a5c94ccc0128 SHA256 2a59dd4140941252d02a03a39f059255f76f7519c3406bc043a2a1769d215e9b
 MISC metadata.xml 397 RMD160 57fce2ddbc573f348530f856bc0735ba1aae08b9 SHA1 ffab343d82e13c81c74ecb9d0724634a4df755d8 SHA256 6b960f56b7be9f2ecb4b7023b54e20fc6d5583d8ff9ea0b1a4a987c6d86b0a0a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAku8CvAACgkQcZ+z4vAcSsxh+gCghJcOSOl1rqnL8JbyLHiYnmSL
-h3UAnRhmifnpve3hyoSljAWCvCceHQHO
-=P+0t
+iEYEARECAAYFAku9B7oACgkQcZ+z4vAcSswXTQCfdDkQjcysJrpLqRXF7LO1LRlf
+ItgAnA4JXdg0OWsGFFA0ZRMmHynttJyb
+=d/9D
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/spamassassin/spamassassin-3.2.5-r3.ebuild b/mail-filter/spamassassin/spamassassin-3.2.5-r3.ebuild
deleted file mode 100644
index 2a2f1c13f..000000000
--- a/mail-filter/spamassassin/spamassassin-3.2.5-r3.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit perl-module eutils
-
-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="http://archive.apache.org/dist/spamassassin/source/${MY_P}.tar.bz2"
-SRC_TEST="do"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite ipv6"
-
-DEPEND=">=dev-lang/perl-5.8.2-r1
-	virtual/perl-MIME-Base64
-	>=virtual/perl-PodParser-1.32
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
-	>=dev-perl/HTML-Parser-3.43
-	>=dev-perl/Net-DNS-0.53
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	>=virtual/perl-Archive-Tar-1.26
-	app-crypt/gnupg
-	>=virtual/perl-IO-Zlib-1.04
-	>=dev-util/re2c-0.12.0
-	ssl? (
-		dev-perl/IO-Socket-SSL
-		dev-libs/openssl
-	)
-	berkdb? (
-		virtual/perl-DB_File
-	)
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-	ipv6? (
-		dev-perl/IO-Socket-INET6
-	)"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-3.2.5-DESTDIR.patch" )
-
-src_configure() {
-	# - 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+=" ENABLE_SSL=yes"
-	else
-		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+=" PERL_BIN=/usr/bin/perl"
-
-	# 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.
-	perl-module_src_configure
-}
-
-src_compile() {
-	# 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}" || die
-
-	# Now compile all the stuff selected.
-	perl-module_src_compile
-
-	if use qmail; then
-		make spamc/qmail-spamc || die "building qmail-spamc failed"
-	fi
-
-	if use doc; then
-		make text_html_doc || die
-	fi
-}
-
-src_install () {
-	perl-module_src_install
-
-	# Create the stub dir used by sa-update and friends
-	dodir /var/lib/spamassassin || die
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd  || die
-
-	if use qmail; then
-		dobin spamc/qmail-spamc || die
-	fi
-
-	dosym /etc/mail/spamassassin /etc/spamassassin || die
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' "${D}"/etc/mail/spamassassin/init.pre || die
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}"/3.2.5-spamd.init spamd || die
-	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd || die
-
-	use postgres && \
-		sed -i -e 's:@USEPOSTGRES@::' "${D}/etc/init.d/spamd" || \
-		sed -i -e '/@USEPOSTGRES@/d' "${D}/etc/init.d/spamd"
-
-	use mysql && \
-		sed -i -e 's:@USEMYSQL@::' "${D}/etc/init.d/spamd" || \
-		sed -i -e '/@USEMYSQL@/d' "${D}/etc/init.d/spamd"
-
-	dodoc NOTICE TRADEMARK CREDITS INSTALL.VMS UPGRADE USAGE \
-		sql/README.bayes sql/README.awl procmailrc.example sample-nonspam.txt \
-		sample-spam.txt spamassassin.spec spamd/PROTOCOL spamd/README.vpopmail \
-		spamd-apache2/README.apache || die
-
-	# Rename some docu files so they don't clash with others
-	newdoc spamd/README README.spamd || die
-	newdoc sql/README README.sql || die
-	newdoc ldap/README README.ldap || die
-
-	if use doc; then
-		dohtml doc/*.html || die
-		docinto sql
-		dodoc sql/*.sql || die
-	fi
-
-	if use qmail; then
-		dodoc spamc/README.qmail || die
-	fi
-
-	cp "${FILESDIR}"/secrets.cf "${D}"/etc/mail/spamassassin/secrets.cf.example || die
-	fperms 0400 /etc/mail/spamassassin/secrets.cf.example
-
-	cat <<EOF > "${T}/local.cf.example"
-# Sensitive data, such as database connection info, should be stored in
-# /etc/mail/spamassassin/secrets.cf with appropriate permissions
-EOF
-
-	insinto /etc/mail/spamassassin/
-	doins "${T}/local.cf.example" || die
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-	elog "If you plan on using the -u flag to spamd, please read the notes"
-	elog "in /etc/conf.d/spamd regarding the location of the pid file."
-	elog "If you build ${PN} with optional dependancy support,"
-	elog "you can enable them in /etc/mail/spamassassin/init.pre"
-	elog "You need to configure your database to be able to use Bayes filter"
-	elog "with database backend, otherwise it will still use (and need) the"
-	elog "Berkeley DB support."
-	elog "Look at the sql/README.bayes file in the documentation directory"
-	elog "for how to configure it."
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.3.1-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.3.1-r1.ebuild
deleted file mode 100644
index 55726512e..000000000
--- a/mail-filter/spamassassin/spamassassin-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit perl-module eutils
-
-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="http://apache.osuosl.org/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86"
-# need keyword request for Mail-SPF ppc ppc64
-IUSE="berkdb qmail ssl doc ldap mysql postgres sqlite ipv6"
-
-DEPEND=">=dev-lang/perl-5.8.8-r8
-	virtual/perl-MIME-Base64
-	>=virtual/perl-PodParser-1.32
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
-	>=dev-perl/HTML-Parser-3.43
-	>=dev-perl/Mail-DKIM-0.37
-	>=dev-perl/Net-DNS-0.53
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	>=virtual/perl-Archive-Tar-1.26
-	app-crypt/gnupg
-	>=virtual/perl-IO-Zlib-1.04
-	>=dev-util/re2c-0.12.0
-	dev-perl/Mail-SPF
-	dev-perl/NetAddr-IP
-	ssl? (
-		dev-perl/IO-Socket-SSL
-		dev-libs/openssl
-	)
-	berkdb? (
-		virtual/perl-DB_File
-	)
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-	ipv6? (
-		dev-perl/IO-Socket-INET6
-	)"
-
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
-
-src_configure() {
-	# - 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+=" ENABLE_SSL=yes"
-	else
-		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+=" PERL_BIN=/usr/bin/perl"
-
-	# Add Gentoo tag to make it easy 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.
-	perl-module_src_configure
-}
-
-src_compile() {
-	mymake=""
-	myinst=""
-
-	export PERL_MM_USE_DEFAULT=1
-	emake spamc/Makefile  || die "emake failed"
-
-	# Now compile all the stuff selected.
-	perl-module_src_compile
-
-	if use qmail; then
-		emake spamc/qmail-spamc || die "building qmail-spamc emake failed"
-	fi
-
-}
-
-src_install () {
-	perl-module_src_install
-
-	# Create the stub dir used by sa-update and friends
-	dodir /var/lib/spamassassin || die
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${D}"/usr/bin/spamd "${D}"/usr/sbin/spamd  || die "move spamd failed"
-
-	if use qmail; then
-		dobin spamc/qmail-spamc || die
-	fi
-
-	dosym /etc/mail/spamassassin /etc/spamassassin || die
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' "${D}"/etc/mail/spamassassin/init.pre || die
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}"/3.3.1-spamd.init spamd || die
-	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd || die
-
-	use postgres && \
-		sed -i -e 's:@USEPOSTGRES@::' "${D}/etc/init.d/spamd" || \
-		sed -i -e '/@USEPOSTGRES@/d' "${D}/etc/init.d/spamd"
-
-	use mysql && \
-		sed -i -e 's:@USEMYSQL@::' "${D}/etc/init.d/spamd" || \
-		sed -i -e '/@USEMYSQL@/d' "${D}/etc/init.d/spamd"
-
-	dodoc NOTICE TRADEMARK CREDITS INSTALL.VMS UPGRADE USAGE \
-		sql/README.bayes sql/README.awl procmailrc.example sample-nonspam.txt \
-		sample-spam.txt spamassassin.spec spamd/PROTOCOL spamd/README.vpopmail \
-		spamd-apache2/README.apache || die
-
-	# Rename some docu files so they don't clash with others
-	newdoc spamd/README README.spamd || die
-	newdoc sql/README README.sql || die
-	newdoc ldap/README README.ldap || die
-
-	if use qmail; then
-		dodoc spamc/README.qmail || die
-	fi
-
-	cp "${FILESDIR}"/secrets.cf "${D}"/etc/mail/spamassassin/secrets.cf.example || die
-	fperms 0400 /etc/mail/spamassassin/secrets.cf.example
-
-	cat <<EOF > "${T}/local.cf.example"
-# Sensitive data, such as database connection info, should be stored in
-# /etc/mail/spamassassin/secrets.cf with appropriate permissions
-EOF
-
-	insinto /etc/mail/spamassassin/
-	doins "${T}/local.cf.example" || die
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-	elog "If you plan on using the -u flag to spamd, please read the notes"
-	elog "in /etc/conf.d/spamd regarding the location of the pid file.\n"
-	elog "If you build ${PN} with optional dependancy support,"
-	elog "you can enable them in /etc/mail/spamassassin/init.pre\n"
-	elog "You need to configure your database to be able to use Bayes filter"
-	elog "with database backend, otherwise it will still use (and need) the"
-	elog "Berkeley DB support."
-	elog "Look at the sql/README.bayes file in the documentation directory"
-	elog "for how to configure it.\n"
-	elog "If you plan to use Vipul's Razor, note that versions up to and"
-	elog "including version 2.82 include a bug that will slow down the entire"
-	elog "perl interpreter.  Version 2.83 or later fixes this."
-	elog "If you do not plan to use this plugin, be sure to comment out"
-	elog "its loadplugin line in /etc/mail/spamassassin/v310.pre.\n"
-	elog "The DKIM plugin is now enabled by default for new installs,"
-	elog "if the perl module Mail::DKIM is installed."
-	elog "However, installation of SpamAssassin will not overwrite existing"
-	elog ".pre configuration files, so to use DKIM when upgrading from a"
-	elog "previous release that did not use DKIM, a directive:\n"
-	elog "loadplugin Mail::SpamAssassin::Plugin::DKIM"
-	elog "will need to be uncommented in file 'v312.pre', or added"
-	elog "to some other .pre file, such as local.pre.\n"
-	ewarn "Rules are no longer included with SpamAssassin out of the box".
-	ewarn "You will need to immediately run sa-update, or download"
-	ewarn "the additional rules .tgz package and run sa-update --install"
-	ewarn "with it, to get a ruleset."
-}