removed missing tools doc bug 296031

(Portage version: 2.1.7.10/git/Linux x86_64)
 (Unsigned Manifest commit)

3 files changed, 193 insertions, 1 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index 46e1895cf..f34fc5a7c 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*spamassassin-3.2.5-r3 (07 Dec 2009)
+
+  07 Dec 2009; David Abbott <dabbott@gentoo.org>
+  +spamassassin-3.2.5-r3.ebuild:
+  removed missing tools doc bug 296031
+
   03 Dec 2009; David Abbott <dabbott@gentoo.org>
   spamassassin-3.2.5-r2.ebuild:
   enabled install without doc use
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index d94763541..925b328a7 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -9,5 +9,6 @@ AUX spamassassin-3.2.5-DESTDIR.patch 8856 RMD160 c7aa95f1ddc21e7668266fe3eb00342
 DIST Mail-SpamAssassin-3.2.5.tar.bz2 1011883 RMD160 444baab6d966d4366834b82cde34c81e3e521144 SHA1 32b701ffc68f7975eded107c456b902bc710d8b2 SHA256 baaab5e4da7d3b0e04c0db579bdb44bbd6be916d29540682346eccead23f6c8a
 EBUILD spamassassin-3.2.5-r1.ebuild 4805 RMD160 1019b60d9beae929c7c647c9a21fb56be020a2f5 SHA1 3b50a6300358e038a0bbf2e643ddde5e51b13625 SHA256 a57b83a3c8a71f0b5d059fe45d53e460850b7904c7f60871ef7f5647c57fe1a6
 EBUILD spamassassin-3.2.5-r2.ebuild 5391 RMD160 b4dae8e0ec6193d11ba87eba86e1fc2d3da50de7 SHA1 0c609b1349fe5e9b51ef367b20cd293c32d10f13 SHA256 724b9b95e4d888c0cd22f38df0fb40a1ce3e91cd27e47da4e070982b91a935b2
-MISC ChangeLog 419 RMD160 9bbe1fe8cac3681d38e0db5fe7243427cc5948c6 SHA1 7b6c93ae3a04f5b329531f7d95057e3066833e4c SHA256 c7827f89b7349cb21d99277b0bbf0eeb98fa3292dac462d885e526c97767217b
+EBUILD spamassassin-3.2.5-r3.ebuild 5264 RMD160 a08dae2553150db805da3355a4b7a956ead59443 SHA1 2a16197778391440336e89eef710ddc3be2cbddf SHA256 ca427b0f1a2a0fdc77f3a6eb2a8ba220931dce7a2d909461179bf972441786df
+MISC ChangeLog 579 RMD160 3f48c749bc150366073333199eb09d1c263e3e74 SHA1 1e8218124eed5eddf2cc44a8c1197a1ee6bc7bb2 SHA256 aa1e5cba19461de0008cb698d3b99b872eacc43286bea26939a99e071eb94bec
 MISC metadata.xml 397 RMD160 57fce2ddbc573f348530f856bc0735ba1aae08b9 SHA1 ffab343d82e13c81c74ecb9d0724634a4df755d8 SHA256 6b960f56b7be9f2ecb4b7023b54e20fc6d5583d8ff9ea0b1a4a987c6d86b0a0a
diff --git a/mail-filter/spamassassin/spamassassin-3.2.5-r3.ebuild b/mail-filter/spamassassin/spamassassin-3.2.5-r3.ebuild
new file mode 100644
index 000000000..dd2150920
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.2.5-r3.ebuild
@@ -0,0 +1,185 @@
+# 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."
+}