Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/perl-overlay

4 files changed, 16 insertions, 10 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index aeea73655..46e1895cf 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Dec 2009; David Abbott <dabbott@gentoo.org>
+  spamassassin-3.2.5-r2.ebuild:
+  enabled install without doc use
+
 *spamassassin-3.2.5-r2 (26 Nov 2009)
 
   26 Nov 2009; David Abbott <dabbott@gentoo.org> +files/3.2.5-spamd.init,
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 08a8cbce0..d94763541 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -3,11 +3,11 @@ AUX 3.0.0-spamd.init 891 RMD160 d8f80c02238e22704cd588f0fee5d198f787df38 SHA1 2e
 AUX 3.1.8-archive-iterator.patch 501 RMD160 6eb7ef7c73d8f207d04e5cffe59e8d924d13c06e SHA1 0b3fbbeb778daffa72094a68d91a48073438ef0a SHA256 244fa7e6af21998f7ba1d7632c618b50924401effb84db79070b9c7c24e41215
 AUX 3.2.2-upstream-5574-fix.patch 1271 RMD160 4b8a47313b220701f2fb74d4c2c8f552f90a9c82 SHA1 6a1a42770f30eeef76d29fa38e5f19817b68b827 SHA256 ac262a3950e0d6c00619488d14be34859e774ff3b7b3bd6cf97ce556c36f660d
 AUX 3.2.2-upstream-5574-testcase.patch 1611 RMD160 e94baa4f60c825777744ffcd58fdcda2951721f6 SHA1 1a4e7947bb46d2e475d9db33e682136295075c91 SHA256 9d5439c465418c89c10bd10b0802c80f73332fc47d5ce7df3e506696f6cb559e
-AUX 3.2.5-spamd.init 942 RMD160 19b53ebb16601e1e90737e7fb95bebdf12cc2465 SHA1 2d8cce16153a69d6140721e550fc2fcaecfea33c SHA256 69e8b2b1faf91799ef9130dffe6b8974a23d2dc3e3b3889b18452855183e4394
+AUX 3.2.5-spamd.init 831 RMD160 021e779537163cbffbe9aeafdb6a773465beaa96 SHA1 d1638ce1531f92f2ee8415f9a31e4e4a13b8e327 SHA256 82b72ec3eca7afe7a0d940ce6a13e8941fafdb050496dec380c275b6992312fd
 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
 EBUILD spamassassin-3.2.5-r1.ebuild 4805 RMD160 1019b60d9beae929c7c647c9a21fb56be020a2f5 SHA1 3b50a6300358e038a0bbf2e643ddde5e51b13625 SHA256 a57b83a3c8a71f0b5d059fe45d53e460850b7904c7f60871ef7f5647c57fe1a6
-EBUILD spamassassin-3.2.5-r2.ebuild 5363 RMD160 c00fe1158598070c1d929c62374c9cbbca5f56bb SHA1 a5735dc7944ee3a72be5e107dd1301c1a881e82b SHA256 4c92984b85b00123729deda7f36888ff6f430eb8820d8cc57fc5a58f50911ea1
-MISC ChangeLog 303 RMD160 dd2be7d582f5079397930e9b8b8c84d4a6eaf53b SHA1 f85bf0a6885499253b2fea7838867911c4a2bf6f SHA256 10b1ea2d0f5a724fbe711252de6358717df9a4ea35e31ad99c76c7cacbc4a77b
+EBUILD spamassassin-3.2.5-r2.ebuild 5391 RMD160 b4dae8e0ec6193d11ba87eba86e1fc2d3da50de7 SHA1 0c609b1349fe5e9b51ef367b20cd293c32d10f13 SHA256 724b9b95e4d888c0cd22f38df0fb40a1ce3e91cd27e47da4e070982b91a935b2
+MISC ChangeLog 419 RMD160 9bbe1fe8cac3681d38e0db5fe7243427cc5948c6 SHA1 7b6c93ae3a04f5b329531f7d95057e3066833e4c SHA256 c7827f89b7349cb21d99277b0bbf0eeb98fa3292dac462d885e526c97767217b
 MISC metadata.xml 397 RMD160 57fce2ddbc573f348530f856bc0735ba1aae08b9 SHA1 ffab343d82e13c81c74ecb9d0724634a4df755d8 SHA256 6b960f56b7be9f2ecb4b7023b54e20fc6d5583d8ff9ea0b1a4a987c6d86b0a0a
diff --git a/mail-filter/spamassassin/files/3.2.5-spamd.init b/mail-filter/spamassassin/files/3.2.5-spamd.init
index ed3e17d59..982afd198 100644
--- a/mail-filter/spamassassin/files/3.2.5-spamd.init
+++ b/mail-filter/spamassassin/files/3.2.5-spamd.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/files/3.0.0-spamd.init,v 1.8 2008/05/14 21:25:56 sbriesen Exp $
+# $Header: $
 
 # NB: Config is in /etc/conf.d/spamd
 
diff --git a/mail-filter/spamassassin/spamassassin-3.2.5-r2.ebuild b/mail-filter/spamassassin/spamassassin-3.2.5-r2.ebuild
index 9649ef78f..6094d196f 100644
--- a/mail-filter/spamassassin/spamassassin-3.2.5-r2.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.2.5-r2.ebuild
@@ -94,7 +94,7 @@ 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
+	make spamc/Makefile VERSION_STRING="${version_str}" || die 
 
 	# Now compile all the stuff selected.
 	perl-module_src_compile
@@ -134,11 +134,11 @@ src_install () {
 	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 \
@@ -149,9 +149,11 @@ src_install () {
 	newdoc sql/README README.sql || die
 	newdoc ldap/README README.ldap || die
 
-	dohtml doc/*.html || die
-	docinto sql
-	dodoc sql/*.sql || 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