Remove the perl-5.12 warnings (#328939). Thanks to David Abbott

Package-Manager: portage-2.2_rc67_p525/cvs/Linux x86_64

4 files changed, 452 insertions, 2 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index c29f33928fca..c534f9219849 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/spamassassin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.181 2010/07/06 21:01:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.182 2010/08/15 15:18:23 tove Exp $
+
+*spamassassin-3.3.1-r3 (15 Aug 2010)
+
+  15 Aug 2010; Torsten Veller <tove@gentoo.org>
+  +spamassassin-3.3.1-r3.ebuild, +files/spamassassin-3.3.1-PERL-5-12.patch:
+  Remove the perl-5.12 warnings (#328939). Thanks to David Abbott
 
   06 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
   spamassassin-3.3.1-r2.ebuild:
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index bcef2ffe7bcf..5c91aa3aabdc 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -1,14 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.0.0-spamd.conf 1527 RMD160 8075268aecdf6f41f5cdacb683fe92567d860dae SHA1 01623333cecb1ef38b25a130d3b5afe016e70f1c SHA256 ea61041e8b6b1616ec096cc42245ab8442b962f72c318695f5acff1fd794ee34
 AUX 3.0.0-spamd.init 891 RMD160 d8f80c02238e22704cd588f0fee5d198f787df38 SHA1 2ed966512c79a016f8bf2242c76879434367942c SHA256 09bcdf5287b2464e754f78647c939b0de86c135433eaa3ca45d89ab2b68a79ac
 AUX 3.3.1-spamd.init 1030 RMD160 c5ae0c1fbcbc2b67722b990ac73533b85d002836 SHA1 73cc4c4619a5e9a3a264847e7a58abb57c06d0df SHA256 d05c8fcaf23f705180a13227e46aa925d13729e4bf768eb8531bbbf7c6d51106
 AUX FH_DATE_PAST_20XX.patch 416 RMD160 85ccd5fce6faa70ceb16bbdc98cf0c710dd15847 SHA1 c97166533adcfe5c75cd6df9ae07632ea98e7306 SHA256 682668c68d0765cddda23f731c2d83a4da0852c38557a1406e4e74b18f5100c3
 AUX secrets.cf 664 RMD160 afb1212a464bd7053c1301c1a1e670b73216528a SHA1 a742beddf850e55bc4454a7548dc43c36f8e9760 SHA256 9f134c7b857b21689f612fc6d131f719e5a65e2ba341b282e7aa57402c854139
 AUX spamassassin-3.2.5-DESTDIR.patch 8856 RMD160 c7aa95f1ddc21e7668266fe3eb00342ba5569c8c SHA1 045a446362b8b0491164a53cff18391c49fe6786 SHA256 f73e3d63b7fd79c364799cd1e3525369ac483019e55c079f33529b6ce81c9264
+AUX spamassassin-3.3.1-PERL-5-12.patch 8952 RMD160 f748f6568adeedd9db7b6302cd9f484cc9882599 SHA1 fd2b8f081d26c062a1e21f4ccf90b2b4079f89e1 SHA256 6054e7ac297e22c0f24ca524169140526e4d036dc0c11bedf4e64e30c6cbb593
 DIST Mail-SpamAssassin-3.2.1.tar.bz2 981918 RMD160 508e9aae2705d1caaeba78720ba78b6385a6e237 SHA1 3095b38d90d0362c4e47e117fb612778a2ac362b SHA256 bccd0ecf00c3bc6bbcbe4a5eaa486e0db7dc755076130a66c935ec50b3fa8b3c
 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.1-r2.ebuild 8050 RMD160 7f275770c6a20e6a68fdf04757be5db88a72b929 SHA1 918ec7a51eb35f79e1d9f73a50b7d3bedb1d7fd1 SHA256 1671f927661a80b047a1d4afddee2726a1f30d577950c3799531f36771f916e8
 EBUILD spamassassin-3.2.5-r2.ebuild 8064 RMD160 9992839960d432c71d227caa7a0af3c2b08d5d1d SHA1 f7fb49cd7dadb561a9ad3bc73764018ad8acbce1 SHA256 5ee9b1b781b819a4f3ddd5e22144204be168899e5799ba8e459f09a039c83a84
 EBUILD spamassassin-3.3.1-r2.ebuild 6663 RMD160 5bebdcf53a4ae008a924732cddf6aeed3f4915ff SHA1 5f2b41e2990259981524846772b45fdad59a3a36 SHA256 44494d3cd28b66302b8d7ec45f35a95131dacebc1e374023086e5d6dfd6d0c6c
-MISC ChangeLog 37632 RMD160 7bed3f24f3a2d3b3a80059fc3bcc2124aac607ea SHA1 94dbaca901471c20ef015d592d3d5d93b59fb73f SHA256 64f45f68b8b2f50187d022aad425f5ba59f9eff9edefe5703b0710f18f52ec8f
+EBUILD spamassassin-3.3.1-r3.ebuild 6706 RMD160 b05c403098783dbda892dac0d5ab4f92b944e18c SHA1 a15b79675bfdb44cac01bbbebaa1f4f585f12bc3 SHA256 fab65ccddc6c2451cd5c707a68a9941ce697adc1c060380358048ef2aaab161b
+MISC ChangeLog 37856 RMD160 86ac108a33da434237c3db5171acb86f02d8a360 SHA1 bd534614f78ee7e3602b3fa48d2e7bdcc57da22b SHA256 ee2f29d47fccf84302b03edb7e504277955ea8a0004589a1901c49e8d961cfe1
 MISC metadata.xml 397 RMD160 57fce2ddbc573f348530f856bc0735ba1aae08b9 SHA1 ffab343d82e13c81c74ecb9d0724634a4df755d8 SHA256 6b960f56b7be9f2ecb4b7023b54e20fc6d5583d8ff9ea0b1a4a987c6d86b0a0a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkxoBUwACgkQV3J2n04EauxN/gCfcmZupce340wizmRgEDgqTfm4
+hewAoLPNQf261oszdBiVcMZR56mhYBBK
+=xloQ
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/spamassassin/files/spamassassin-3.3.1-PERL-5-12.patch b/mail-filter/spamassassin/files/spamassassin-3.3.1-PERL-5-12.patch
new file mode 100644
index 000000000000..d7a6b14c2530
--- /dev/null
+++ b/mail-filter/spamassassin/files/spamassassin-3.3.1-PERL-5-12.patch
@@ -0,0 +1,230 @@
+--- a/Mail-SpamAssassin-3.3.1//lib/Mail/SpamAssassin/Dns.pm	2010-03-16 10:49:21.000000000 -0400
++++ b/Mail-SpamAssassin-3.3.1//lib/Mail/SpamAssassin/Dns.pm	2010-07-20 15:54:23.000000000 -0400
+@@ -754,7 +754,7 @@
+   dbg("dns: entering helper-app run mode");
+   $self->{old_slash} = $/;              # Razor pollutes this
+   %{$self->{old_env}} = ();
+-  if ( defined %ENV ) {
++  if ( %ENV ) {
+     # undefined values in %ENV can result due to autovivification elsewhere,
+     # this prevents later possible warnings when we restore %ENV
+     while (my ($key, $value) = each %ENV) {
+--- a/Mail-SpamAssassin-3.3.1//lib/Mail/SpamAssassin/HTML.pm	2010-03-16 10:49:21.000000000 -0400
++++ b/Mail-SpamAssassin-3.3.1//lib/Mail/SpamAssassin/HTML.pm	2010-07-20 15:52:50.000000000 -0400
+@@ -191,7 +191,7 @@
+   my $self = shift;
+   my %options = @_;
+ 
+-  return join('', @{ $self->{text} }) unless keys %options;
++  return join('', @{ $self->{text} }) unless %options;
+ 
+   my $mask;
+   while (my ($k, $v) = each %options) {
+--- a/Mail-SpamAssassin-3.3.1//lib/Mail/SpamAssassin/Plugin/BodyEval.pm	2010-03-16 10:49:21.000000000 -0400
++++ b/Mail-SpamAssassin-3.3.1//lib/Mail/SpamAssassin/Plugin/BodyEval.pm	2010-07-20 16:04:57.000000000 -0400
+@@ -119,7 +119,7 @@
+         }
+ 
+ 	# If there are no words, mark if there's at least 1 image ...
+-	if (keys %html == 0 && exists $pms->{html}{inside}{img}) {
++  if (!%html && exists $pms->{html}{inside}{img}) {
+ 	  # Use "\n" as the mark since it can't ever occur normally
+ 	  $html{"\n"}=1;
+ 	}
+--- a/Mail-SpamAssassin-3.3.1//lib/Mail/SpamAssassin/Plugin/Check.pm	2010-03-16 10:49:21.000000000 -0400
++++ b/Mail-SpamAssassin-3.3.1//lib/Mail/SpamAssassin/Plugin/Check.pm	2010-07-20 16:03:00.000000000 -0400
+@@ -307,64 +307,51 @@
+   my $package_name = __PACKAGE__;
+   my $methodname = $package_name."::_".$ruletype."_tests_".$clean_priority;
+ 
+-  if (defined &{$methodname} && !$doing_user_rules) {
+-run_compiled_method:
+-  # dbg("rules: run_generic_tests - calling %s", $methodname);
+-    my $t = Mail::SpamAssassin::Timeout->new({ deadline => $master_deadline });
+-    my $err = $t->run(sub {
+-      no strict "refs";
+-      $methodname->($pms, @{$opts{args}});
+-    });
+-    if ($t->timed_out() && $master_deadline && time > $master_deadline) {
+-      info("check: exceeded time limit in $methodname, skipping further tests");
+-      $pms->{deadline_exceeded} = 1;
+-    }
+-    return;
+-  }
++  if (!defined &{$methodname} || $doing_user_rules) {
+ 
+-  # use %nopts for named parameter-passing; it's more friendly to future-proof
+-  # subclassing, since new parameters can be added without breaking third-party
+-  # subclassed implementations of this plugin.
+-  my %nopts = (
+-    ruletype => $ruletype,
+-    doing_user_rules => $doing_user_rules,
+-    priority => $priority,
+-    clean_priority => $clean_priority
+-  );
+-
+-  # build up the eval string...
+-  $self->{evalstr_methodname} = $methodname;
+-  $self->{evalstr_chunk_current_methodname} = undef;
+-  $self->{evalstr_chunk_methodnames} = [];
+-  $self->{evalstr_chunk_prefix} = [];  # stack (array) of source code sections
+-  $self->{evalstr} = ''; $self->{evalstr_l} = 0;
+-  $self->{evalstr2} = '';
+-  $self->begin_evalstr_chunk($pms);
+-
+-  $self->push_evalstr_prefix($pms, '
+-      # start_rules_plugin_code '.$ruletype.' '.$priority.'
+-      my $scoresptr = $self->{conf}->{scores};
+-  ');
+-  if (defined $opts{pre_loop_body}) {
+-    $opts{pre_loop_body}->($self, $pms, $conf, %nopts);
+-  }
+-  $self->add_evalstr($pms,
+-                     $self->start_rules_plugin_code($ruletype, $priority) );
+-  while (my($rulename, $test) = each %{$opts{testhash}->{$priority}}) {
+-    $opts{loop_body}->($self, $pms, $conf, $rulename, $test, %nopts);
+-  }
+-  if (defined $opts{post_loop_body}) {
+-    $opts{post_loop_body}->($self, $pms, $conf, %nopts);
+-  }
++    # use %nopts for named parameter-passing; it's more friendly
++    # to future-proof subclassing, since new parameters can be added without
++    # breaking third-party subclassed implementations of this plugin.
++    my %nopts = (
++      ruletype => $ruletype,
++      doing_user_rules => $doing_user_rules,
++      priority => $priority,
++      clean_priority => $clean_priority
++    );
++
++    # build up the eval string...
++    $self->{evalstr_methodname} = $methodname;
++    $self->{evalstr_chunk_current_methodname} = undef;
++    $self->{evalstr_chunk_methodnames} = [];
++    $self->{evalstr_chunk_prefix} = []; # stack (array) of source code sections
++    $self->{evalstr} = ''; $self->{evalstr_l} = 0;
++    $self->{evalstr2} = '';
++    $self->begin_evalstr_chunk($pms);
++
++    $self->push_evalstr_prefix($pms, '
++        # start_rules_plugin_code '.$ruletype.' '.$priority.'
++        my $scoresptr = $self->{conf}->{scores};
++    ');
++    if (defined $opts{pre_loop_body}) {
++      $opts{pre_loop_body}->($self, $pms, $conf, %nopts);
++    }
++    $self->add_evalstr($pms,
++                       $self->start_rules_plugin_code($ruletype, $priority) );
++    while (my($rulename, $test) = each %{$opts{testhash}->{$priority}}) {
++      $opts{loop_body}->($self, $pms, $conf, $rulename, $test, %nopts);
++    }
++    if (defined $opts{post_loop_body}) {
++      $opts{post_loop_body}->($self, $pms, $conf, %nopts);
++    }
+ 
+-  $self->flush_evalstr($pms, 'run_generic_tests');
+-  $self->free_ruleset_source($pms, $ruletype, $priority);
++    $self->flush_evalstr($pms, 'run_generic_tests');
++    $self->free_ruleset_source($pms, $ruletype, $priority);
+ 
+-  # clear out a previous version of this method
+-  undef &{$methodname};
++    # clear out a previous version of this method
++    undef &{$methodname};
+ 
+-  # generate the loop that goes through each line...
+-  my $evalstr = <<"EOT";
++    # generate the loop that goes through each line...
++    my $evalstr = <<"EOT";
+   {
+     package $package_name;
+ 
+@@ -373,40 +360,51 @@
+     sub $methodname {
+ EOT
+ 
+-  for my $chunk_methodname (@{$self->{evalstr_chunk_methodnames}}) {
+-    $evalstr .= "      $chunk_methodname(\@_);\n";
+-  }
++    for my $chunk_methodname (@{$self->{evalstr_chunk_methodnames}}) {
++      $evalstr .= "      $chunk_methodname(\@_);\n";
++    }
+ 
+-  $evalstr .= <<"EOT";
++    $evalstr .= <<"EOT";
+     }
+ 
+     1;
+   }
+ EOT
+ 
+-  delete $self->{evalstr};   # free up some RAM before we eval()
+-  delete $self->{evalstr2};
+-  delete $self->{evalstr_methodname};
+-  delete $self->{evalstr_chunk_current_methodname};
+-  delete $self->{evalstr_chunk_methodnames};
+-  delete $self->{evalstr_chunk_prefix};
+-
+-  dbg("rules: run_generic_tests - compiling eval code: %s, priority %s",
+-      $ruletype, $priority);
+-# dbg("rules: eval code to compile: $evalstr");
+-  my $eval_result;
+-  { my $timer = $self->{main}->time_method('compile_gen');
+-    $eval_result = eval($evalstr);
+-  }
+-  if (!$eval_result) {
+-    my $eval_stat = $@ ne '' ? $@ : "errno=$!";  chomp $eval_stat;
+-    warn "rules: failed to compile $ruletype tests, skipping:\n".
+-         "\t($eval_stat)\n";
+-    $pms->{rule_errors}++;
+-  }
+-  else {
++    delete $self->{evalstr};   # free up some RAM before we eval()
++    delete $self->{evalstr2};
++    delete $self->{evalstr_methodname};
++    delete $self->{evalstr_chunk_current_methodname};
++    delete $self->{evalstr_chunk_methodnames};
++    delete $self->{evalstr_chunk_prefix};
++
++    dbg("rules: run_generic_tests - compiling eval code: %s, priority %s",
++        $ruletype, $priority);
++  # dbg("rules: eval code to compile: $evalstr");
++    my $eval_result;
++    { my $timer = $self->{main}->time_method('compile_gen');
++      $eval_result = eval($evalstr);
++    }
++    if (!$eval_result) {
++      my $eval_stat = $@ ne '' ? $@ : "errno=$!";  chomp $eval_stat;
++      warn "rules: failed to compile $ruletype tests, skipping:\n".
++           "\t($eval_stat)\n";
++      $pms->{rule_errors}++;
++      return;
++    }
+     dbg("rules: compiled $ruletype tests");
+-    goto run_compiled_method;
++  }
++
++#run_compiled_method:
++# dbg("rules: run_generic_tests - calling %s", $methodname);
++  my $t = Mail::SpamAssassin::Timeout->new({ deadline => $master_deadline });
++  my $err = $t->run(sub {
++    no strict "refs";
++    $methodname->($pms, @{$opts{args}});
++  });
++  if ($t->timed_out() && $master_deadline && time > $master_deadline) {
++    info("check: exceeded time limit in $methodname, skipping further tests");
++    $pms->{deadline_exceeded} = 1;
+   }
+ }
+ 
+--- a/Mail-SpamAssassin-3.3.1//lib/Mail/SpamAssassin/Plugin/MIMEEval.pm	2010-03-16 10:49:21.000000000 -0400
++++ b/Mail-SpamAssassin-3.3.1//lib/Mail/SpamAssassin/Plugin/MIMEEval.pm	2010-07-20 16:06:47.000000000 -0400
+@@ -498,7 +498,7 @@
+     # perhaps just limit to test, and image?
+     next if ($ctype eq 'application/ics');
+ 
+-    my $cte = lc $p->get_header('content-transfer-encoding') || '';
++    my $cte = lc($p->get_header('content-transfer-encoding') || '');
+     next if ($cte !~ /^base64$/);
+     foreach my $l ( @{$p->raw()} ) {
+       my $len = length $l;
diff --git a/mail-filter/spamassassin/spamassassin-3.3.1-r3.ebuild b/mail-filter/spamassassin/spamassassin-3.3.1-r3.ebuild
new file mode 100644
index 000000000000..f59d6e76ce89
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.3.1-r3.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.3.1-r3.ebuild,v 1.1 2010/08/15 15:18:23 tove Exp $
+
+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 ~ppc64 ~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
+	)"
+
+PATCHES=( "${FILESDIR}/${P}-PERL-5-12.patch" )
+
+RDEPEND="${DEPEND}"
+
+# - Disable tests as they will fail
+# - Please see http://www.cpantesters.org/distro/M/Mail-SpamAssassin.html#Mail-SpamAssassin-3.3.1
+# - for more info, upstream problem not specific to Gentoo
+SRC_TEST="skip"
+
+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() {
+	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.\n"
+	elog "If when you run sa-update and receive a GPG validation error."
+	elog "Then you need to import an updated sa-update key."
+	elog "sa-update --import /usr/share/spamassassin/sa-update-pubkey.txt\n"
+}