[mail-filter/spamassassin] version bump to 3.3.2-r5

6 files changed, 129 insertions, 672 deletions

diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 354355b..d275848 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -5,13 +5,11 @@ AUX secrets.cf 664 SHA256 9f134c7b857b21689f612fc6d131f719e5a65e2ba341b282e7aa57
 AUX spamassassin-3.3.2-binary_token.patch 465 SHA256 170ffed8831f7e45d7e50fda774dccd2482f4652c733e419c664d04b3208f37f SHA512 0e101c9792bc1cc6123fa1546e2d412b23bd9811541f18454182871995ad4436916e038be2352774c313e61c6decf99c7b378b3e107dfd05fbeedb75a65ce6ad WHIRLPOOL 88739e51bba39242dfba9adc437a06922f1c9f43e7bc5988c3e6cccc3da937949b634567824587c5c366ff0a4f30b68631f14faf0425f05cd068380d87c83dbc
 AUX spamassassin-3.3.2-innodb.patch 4749 SHA256 d40a72692f9b7161f2a332189e68cfd5486b69a4d2e9fdea9d23d6ae7bd7fd10 SHA512 8d72542f1853eee35a9fb8a3127bd8a3a3aeb2ee0b30e1f15a7c45f7a1d81054c50c57a9b8109c9348dbdbe1a084a0932bc9efa8a5516da92142bd8371ed2ecd WHIRLPOOL 7f58df175bb6cef1d970577960e29077ae2172d74bda30dd7c47283df4e7dfbbe8f44045259531659f2eddc748b3f05853aca5c62f90949c6a22d3287a90495c
 AUX spamassassin-3.3.2-mysql_count_rows.patch 3319 SHA256 a97f6b9b67e721a95885b978c2def9a1065577855ab4377f80fb142fdf6cbba1 SHA512 47a5cb63e87fa2f76267578d1e9bf4b308fe16467bad9fa69894762c78dda9b6441872e4d6226a1d0e2dce205db9a92eb689377de3ec9f2df9da4d725ab7402d WHIRLPOOL 2f59f05fd813d556ad99829f35c48753ae120bc217f74c940599976d57400c41bc1b29e0734e0935e9856aaf6fcb5feadb9d499963d58467bfb37fa3117ee2b8
+AUX spamassassin-3.3.2-perl518.patch 5811 SHA256 4204eb41eba3a3818c3037f51003a4e8b4ced24c8d295c5ae5adcc930fe681ce SHA512 a1bb1b5c2f32717b77f3077253becf61dd6e511abce83a713f87470af2d4fffd7f9edd149322185c2690addf2464c0e166cc9472af55586cf2117335934517cb WHIRLPOOL 3ed197cfd1542b5df838bc72d27184ee692c7a19fef2fc515f05b233cd0bf4797f1ff511b0efb2c125de51f113e0eff485c8fe2fd606d6128219abd42baff43a
 AUX spamassassin.service 290 SHA256 c9c9e7aa13a47e05063a9e3b686d5e00fee34dba2983e42c91e48ae4207ba635 SHA512 409a468457f653c3705586262dd46e75bfdb7442a5a0828797c5f37a760740ecb1c19822f7f8d241176e2287b235a670d82e9470a1080c15c89d822aa1cda0e2 WHIRLPOOL 4658469f87868e421336e7a49698ca90a0710205bdd7b26a8af71427483beae7a28e13804cb940da678377f7bd3af4f2ab1c2106116fc1492f8086e69206e8b1
 AUX spamassassin.service-r1 323 SHA256 960eb0115ac4e70981f9a4350767e001cdabb244f5cd6d169d713fa05f662f3b SHA512 3c9356d1a24f73c3a3374398058c8e7cb9875ee98a1b6bb96d5a6d9ec2de4de527717f12d809b40d4d768958e098f6e5e04803018f9b7e46a0322cd9319c0923 WHIRLPOOL a2c4faf6788132cec2b4781aedd55c859f45ec6555e40ba078c9890d857971ba3b8b8114c48cc9bbbffa0dd4ac3cc24d0e52e8f6af78325ad259718e867f3c00
 AUX spamassassin.service.conf 333 SHA256 b6f942eb15f2476dbd161db92b8dacec43f2a0664b45405f3e4396f23ab8b18d SHA512 d818e0ca5bfa9dadb94f99351a307f41c05bc46b89f55a03b9ba2fba0bd06fada06adf1a3eff949f3a04151f3680b279d78fba08c8f28873d17e4a4aa55edca4 WHIRLPOOL 9b5e5674223f99df7afb48482f12f4fa307677290833dd6d3285cdcb94bea1a632c76e8a99e7e38b556a61c20375389d5a370105d2d8c2d4f1de445340ab429d
 DIST Mail-SpamAssassin-3.3.2.tar.bz2 1006577 SHA256 c7239b4b4ef04ba5e2d5aedb9156850146ed3fa47c88f0a0757f08e22f93a205 SHA512 3baabfacd2f3ac1debc2bbcdc0b2109ad51f6b176b9a6d037e14999c430150f0922469f777e7d35311ab819eb20905b55c00aa58f1c3c8d5f881d173dd441cbd WHIRLPOOL 5751d7285ffd29c041056f15ff6c85f66ecf6b9e806558623716ad8826124e1f92096f0e8b00016158b4a965927bde7e9e5ed48984ee956906175431e8a45ee5
-EBUILD spamassassin-3.3.2-r1.ebuild 7029 SHA256 a4286ee85c1ff9360fd683aac14bc7ca986d57a63a087d5344620e286c25958b SHA512 1e2d4726ed5971955f73617aabade57e7ff78ec5d83466d831d6e04c01a0cbaaf54dc791354030b405c96d685175dda1029036765383300f7a0766e0e56f6db5 WHIRLPOOL c5c78bddada13343c25089915a147d8afb3a6a640577dc4f34ce3fbfa070c0192a3708c0c714438ff5e5bac4fd02786f8913d85c9b93050ca86890d117f42ef9
-EBUILD spamassassin-3.3.2-r2.ebuild 7084 SHA256 e9bae256cf3282cbd547afe8074c38ec8b655849824b93fcdb4b5bdb9ba9fdaf SHA512 8b8e88dedcf785dc8ff08c61ccfca921e44daead36fb7acd05c42b9258aa5c1b59d18266d25770c6cee40ee5a6532f41d683bb74e10c321b41563dcfce5bed84 WHIRLPOOL 3f65bf101d588f6b457634fb9fd09823bc46ac164804b870f553a24aa494e75a634785ff33a13c738a301546fc155fe5beeb147a84cf68ca0d9ef69e9e9b923f
-EBUILD spamassassin-3.3.2-r3.ebuild 7093 SHA256 511058e349a1e82670efb9cbdca9f49e207837d3108c9c8090019e4b75887bdd SHA512 6213c55c07912cdbd529e4d41e2722bc610b815002c3043d1d6563f114229251d92a14024d0822401b52261a7fea247e5b844f9961739f4269f96ba73bad83cb WHIRLPOOL ed04d058d569647cd41093ccd3c634d8a489e35093ce1ab8b545a625a6ff349308c5047693204ef3d2d44e3a5485f8d0cfb928f5a7398c6b05cf1f22c40e0b50
-EBUILD spamassassin-3.3.2-r4.ebuild 7168 SHA256 9c94ffa1cb3a634fa94f8b181cec32a457aa1d3a18d705cb888ffd45413a5945 SHA512 2fc9685a4702100d96e2e7f58d5400401dad2145aef531ace836005f5f3fb5ca40e4d0302cc7e0d77ca108ed3798844c530de408b3e3588eebce918a151a3414 WHIRLPOOL ee0e7b702be450fdd5e114065e0a0418dd384567664cfc856c9acdc06a1a8a8fc52912f35091a394fcc7339b6f85eae603af4bd95e4446610091fe243958f6a5
+EBUILD spamassassin-3.3.2-r5.ebuild 7270 SHA256 3986768e8493091021483ebf486189eb339a39ea046c26c9c28632c9344618d8 SHA512 4ee9f085e17811234dd545bbdc2478863f257be1944ff0a911fc84f9f3c0f3b07d8b5e441946691c91a8807123eaa568927c28358d13b26f4475f58f23141bc5 WHIRLPOOL e1eceac6582fac80749b66911fe0e25518ff44d428aa2a1fc3f0f216cf6fb04e12f82dc24fd099ea107a7ad3d7d05e5ce60b0cfb2a0f2bf0ab584adf0d622159
 MISC ChangeLog 45049 SHA256 17ebe2875f0967d79048c049ada8b805eef3a094b28bc23e6233eb46404d50d0 SHA512 41b1741c9f7e46e7630829ba85f93bf05611bdd9d30f542cb82daadf14dbde800b03debfb882f76ed7924b6cfaabf30fce70a822a14d4589cb56dc5e70591bfb WHIRLPOOL 9a382d94f90141f831006aad6e895134b3ef1c2f64a80c9ac23e080adcd4735e947af8dd6362c10291df4b7f65a7943a1e72acbf7781123739a4e334abdfe2c2
 MISC metadata.xml 233 SHA256 2c234ebf47c0de34ea504b0342e8eca756fb7d77a6ac82cadb15fe5ba11e8beb SHA512 26f4aee998e006f276bd381132a5449fe3d8de3fe17610aab068873b1e0273d9f37b7171777e205b8ec3eabb53fcbce1eb4d45db7710fae41674b3fabca2eefa WHIRLPOOL 7992869e2f4237d58b3ea97c8b9fe61e90ec523d3fe81cbe14601841908ccf251d064aa53930ad73b61d5dfb7546995ea41491bfbad1542e18f9c5f9994f9153
diff --git a/mail-filter/spamassassin/files/spamassassin-3.3.2-perl518.patch b/mail-filter/spamassassin/files/spamassassin-3.3.2-perl518.patch
new file mode 100644
index 0000000..6588eb1
--- /dev/null
+++ b/mail-filter/spamassassin/files/spamassassin-3.3.2-perl518.patch
@@ -0,0 +1,119 @@
+diff -ruN Mail-SpamAssassin-3.3.2.orig/lib/Mail/SpamAssassin/AsyncLoop.pm Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/AsyncLoop.pm
+--- Mail-SpamAssassin-3.3.2.orig/lib/Mail/SpamAssassin/AsyncLoop.pm	2011-06-07 01:59:17.000000000 +0200
++++ Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/AsyncLoop.pm	2014-09-10 22:16:38.795106231 +0200
+@@ -360,7 +360,14 @@
+     }
+     $now = time;  # capture new timestamp, after possible sleep in 'select'
+ 
+-    while (my($key,$ent) = each %$pending) {
++    # A callback routine may generate another DNS query, which may insert
++    # an entry into the %$pending hash thus invalidating the each() context.
++    # So, make sure that callbacks are not called while the each() context
++    # is open, or avoid using each().  [Bug 6937]
++    #
++  # while (my($key,$ent) = each %$pending) {
++    foreach my $key (keys %$pending) {
++      my $ent = $pending->{$key};
+       my $id = $ent->{id};
+       if (defined $ent->{poll_callback}) {  # call a "poll_callback" if exists
+         # be nice, provide fresh info to a callback routine
+@@ -448,7 +455,8 @@
+   my $pending = $self->{pending_lookups};
+   my $foundcnt = 0;
+   my $now = time;
+-  while (my($key,$ent) = each %$pending) {
++  foreach my $key (keys %$pending) {
++    my $ent = $pending->{$key};
+     dbg("async: aborting after %.3f s, %s: %s",
+         $now - $ent->{start_time},
+         (defined $ent->{timeout_initial} &&
+diff -ruN Mail-SpamAssassin-3.3.2.orig/lib/Mail/SpamAssassin/Conf/Parser.pm Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/Conf/Parser.pm
+--- Mail-SpamAssassin-3.3.2.orig/lib/Mail/SpamAssassin/Conf/Parser.pm	2011-06-07 01:59:17.000000000 +0200
++++ Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/Conf/Parser.pm	2014-09-10 22:16:38.796106231 +0200
+@@ -1248,7 +1248,7 @@
+   my $safere = $re;
+   my $mods = '';
+   local ($1,$2);
+-  if ($re =~ s/^m{//) {
++  if ($re =~ s/^m\{//) {
+     $re =~ s/}([a-z]*)$//; $mods = $1;
+   }
+   elsif ($re =~ s/^m\(//) {
+diff -ruN Mail-SpamAssassin-3.3.2.orig/lib/Mail/SpamAssassin/DnsResolver.pm Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/DnsResolver.pm
+--- Mail-SpamAssassin-3.3.2.orig/lib/Mail/SpamAssassin/DnsResolver.pm	2011-06-07 01:59:17.000000000 +0200
++++ Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/DnsResolver.pm	2014-09-10 22:16:38.797106231 +0200
+@@ -440,10 +440,16 @@
+     { my $timer;  # collects timestamp when variable goes out of scope
+       if (!defined($timeout) || $timeout > 0)
+         { $timer = $self->{main}->time_method("poll_dns_idle") }
++      $! = 0;
+       ($nfound, $timeleft) = select($rout=$rin, undef, undef, $timeout);
+     }
+     if (!defined $nfound || $nfound < 0) {
+-      warn "dns: select failed: $!";
++      if ($!) { warn "dns: select failed: $!\n" }
++      else    { info("dns: select interrupted") }
++      return;
++    } elsif (!$nfound) {
++      if (!defined $timeout) { warn("dns: select returned empty-handed\n") }
++      elsif ($timeout > 0) { dbg("dns: select timed out %.3f s", $timeout) }
+       return;
+     }
+ 
+diff -ruN Mail-SpamAssassin-3.3.2.orig/lib/Mail/SpamAssassin/Message.pm Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/Message.pm
+--- Mail-SpamAssassin-3.3.2.orig/lib/Mail/SpamAssassin/Message.pm	2011-06-07 01:59:17.000000000 +0200
++++ Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/Message.pm	2014-09-10 22:16:38.797106231 +0200
+@@ -566,7 +566,7 @@
+   while (my $part = shift @toclean) {
+     # bug 5557: windows requires tmp file be closed before it can be rm'd
+     if (ref $part->{'raw'} eq 'GLOB') {
+-      close($part->{'raw'})  or die "error closing input file: $!";
++      close($part->{'raw'})  or warn "error closing input file: $!";
+     }
+ 
+     # bug 5858: avoid memory leak with deep MIME structure
+diff -ruN Mail-SpamAssassin-3.3.2.orig/lib/Mail/SpamAssassin/PerMsgStatus.pm Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/PerMsgStatus.pm
+--- Mail-SpamAssassin-3.3.2.orig/lib/Mail/SpamAssassin/PerMsgStatus.pm	2011-06-07 01:59:17.000000000 +0200
++++ Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/PerMsgStatus.pm	2014-09-10 22:16:38.799106231 +0200
+@@ -420,8 +420,8 @@
+       }
+     }
+ 
+-    # ignore tests with 0 score in this scoreset
+-    next if ($scores->{$test} == 0);
++    # ignore tests with 0 score (or undefined) in this scoreset
++    next if !$scores->{$test};
+ 
+     # Go ahead and add points to the proper locations
+     if (!$self->{conf}->maybe_header_only ($test)) {
+@@ -1252,13 +1252,12 @@
+               my $arg = (shift || ",");
+               my $line = '';
+               foreach my $test (sort @{$self->{test_names_hit}}) {
+-                if (!$line) {
+-                  $line .= $test . "=" . $self->{conf}->{scores}->{$test};
+-                } else {
+-                  $line .= $arg . $test . "=" . $self->{conf}->{scores}->{$test};
+-                }
++                my $score = $self->{conf}->{scores}->{$test};
++                $score = '0'  if !defined $score;
++                $line .= $arg  if $line ne '';
++                $line .= $test . "=" . $score;
+               }
+-              $line ? $line : 'none';
++              $line ne '' ? $line : 'none';
+             },
+ 
+             PREVIEW => sub { $self->get_content_preview() },
+diff -ruN Mail-SpamAssassin-3.3.2.orig/lib/Mail/SpamAssassin/Util.pm Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/Util.pm
+--- Mail-SpamAssassin-3.3.2.orig/lib/Mail/SpamAssassin/Util.pm	2011-06-07 01:59:17.000000000 +0200
++++ Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/Util.pm	2014-09-10 22:16:38.801106231 +0200
+@@ -1582,7 +1582,7 @@
+     warn "cannot remove delimiters from null regexp";
+     return undef;   # invalid
+   }
+-  elsif ($re =~ s/^m{//) {              # m{foo/bar}
++  elsif ($re =~ s/^m\{//) {             # m{foo/bar}
+     $delim = '}';
+   }
+   elsif ($re =~ s/^m\(//) {             # m(foo/bar)
diff --git a/mail-filter/spamassassin/spamassassin-3.3.2-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.3.2-r1.ebuild
deleted file mode 100644
index e817b9a..0000000
--- a/mail-filter/spamassassin/spamassassin-3.3.2-r1.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.3.2-r1.ebuild,v 1.13 2013/09/29 07:11:47 zlogene Exp $
-
-EAPI=4
-
-inherit perl-module toolchain-funcs 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="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-# 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_prepare() {
-	epatch "${FILESDIR}/85_disable_SSLv2.txt"
-	# http://old.nabble.com/Migrating-bayes-to-mysql-fails-with-parsing-errors-td31889789i20.html
-
-	# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6624
-	epatch "${FILESDIR}/${P}-mysql_count_rows.patch"
-
-	#https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6625
-	epatch "${FILESDIR}/${P}-binary_token.patch"
-
-	# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6626
-	epatch "${FILESDIR}/${P}-innodb.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=${EPREFIX}/etc DATADIR=${EPREFIX}/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=${EPREFIX}/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
-	# Configure spamc
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
-}
-
-src_compile() {
-	export PERL_MM_USE_DEFAULT=1
-
-	# Now compile all the stuff selected.
-	perl-module_src_compile
-
-	if use qmail; then
-		emake spamc/qmail-spamc
-	fi
-
-}
-
-src_install () {
-	perl-module_src_install
-
-	# Create the stub dir used by sa-update and friends
-	dodir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
-
-	if use qmail; then
-		dobin spamc/qmail-spamc
-	fi
-
-	ln -s mail/spamassassin "${ED}"/etc/spamassassin || die
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' "${ED}"/etc/mail/spamassassin/init.pre || die
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}"/3.3.1-spamd.init spamd
-	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
-
-	if use postgres; then
-		sed -i -e 's:@USEPOSTGRES@::' "${ED}/etc/init.d/spamd"
-
-		dodoc sql/*_pg.sql
-	else
-		sed -i -e '/@USEPOSTGRES@/d' "${ED}/etc/init.d/spamd"
-	fi
-
-	if use mysql; then
-		sed -i -e 's:@USEMYSQL@::' "${ED}/etc/init.d/spamd"
-
-		dodoc sql/*_mysql.sql
-	else
-		sed -i -e '/@USEMYSQL@/d' "${ED}/etc/init.d/spamd"
-	fi
-
-	dodoc NOTICE TRADEMARK CREDITS INSTALL.VMS UPGRADE USAGE \
-		sql/README.bayes sql/README.awl procmailrc.example sample-nonspam.txt \
-		sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
-		spamd-apache2/README.apache
-
-	# 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
-
-	if use qmail; then
-		dodoc spamc/README.qmail
-	fi
-
-	cp "${FILESDIR}"/secrets.cf "${ED}"/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"
-}
-
-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"
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.3.2-r2.ebuild b/mail-filter/spamassassin/spamassassin-3.3.2-r2.ebuild
deleted file mode 100644
index ec15556..0000000
--- a/mail-filter/spamassassin/spamassassin-3.3.2-r2.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.3.2-r2.ebuild,v 1.9 2013/12/21 18:00:47 zlogene Exp $
-
-EAPI=4
-
-inherit perl-module toolchain-funcs eutils systemd
-
-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 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-# 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_prepare() {
-	epatch "${FILESDIR}/85_disable_SSLv2.txt"
-
-	# http://old.nabble.com/Migrating-bayes-to-mysql-fails-with-parsing-errors-td31889789i20.html
-
-	# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6624
-	epatch "${FILESDIR}/${P}-mysql_count_rows.patch"
-
-	#https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6625
-	epatch "${FILESDIR}/${P}-binary_token.patch"
-
-	# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6626
-	epatch "${FILESDIR}/${P}-innodb.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=${EPREFIX}/etc DATADIR=${EPREFIX}/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=${EPREFIX}/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
-	# Configure spamc
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
-}
-
-src_compile() {
-	export PERL_MM_USE_DEFAULT=1
-
-	# Now compile all the stuff selected.
-	perl-module_src_compile
-
-	if use qmail; then
-		emake spamc/qmail-spamc
-	fi
-
-}
-
-src_install () {
-	perl-module_src_install
-
-	# Create the stub dir used by sa-update and friends
-	keepdir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
-
-	if use qmail; then
-		dobin spamc/qmail-spamc
-	fi
-
-	ln -s mail/spamassassin "${ED}"/etc/spamassassin || die
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' "${ED}"/etc/mail/spamassassin/init.pre || die
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}"/3.3.1-spamd.init spamd
-	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	if use postgres; then
-		sed -i -e 's:@USEPOSTGRES@::' "${ED}/etc/init.d/spamd"
-
-		dodoc sql/*_pg.sql
-	else
-		sed -i -e '/@USEPOSTGRES@/d' "${ED}/etc/init.d/spamd"
-	fi
-
-	if use mysql; then
-		sed -i -e 's:@USEMYSQL@::' "${ED}/etc/init.d/spamd"
-
-		dodoc sql/*_mysql.sql
-	else
-		sed -i -e '/@USEMYSQL@/d' "${ED}/etc/init.d/spamd"
-	fi
-
-	dodoc NOTICE TRADEMARK CREDITS INSTALL.VMS UPGRADE USAGE \
-		sql/README.bayes sql/README.awl procmailrc.example sample-nonspam.txt \
-		sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
-		spamd-apache2/README.apache
-
-	# 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
-
-	if use qmail; then
-		dodoc spamc/README.qmail
-	fi
-
-	cp "${FILESDIR}"/secrets.cf "${ED}"/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"
-}
-
-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"
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.3.2-r3.ebuild b/mail-filter/spamassassin/spamassassin-3.3.2-r3.ebuild
deleted file mode 100644
index e30d6dc..0000000
--- a/mail-filter/spamassassin/spamassassin-3.3.2-r3.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.3.2-r3.ebuild,v 1.1 2013/10/17 11:44:13 zlogene Exp $
-
-EAPI=4
-
-inherit perl-module toolchain-funcs eutils systemd
-
-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 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-# 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_prepare() {
-	epatch "${FILESDIR}/85_disable_SSLv2.txt"
-
-	# http://old.nabble.com/Migrating-bayes-to-mysql-fails-with-parsing-errors-td31889789i20.html
-
-	# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6624
-	epatch "${FILESDIR}/${P}-mysql_count_rows.patch"
-
-	#https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6625
-	epatch "${FILESDIR}/${P}-binary_token.patch"
-
-	# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6626
-	epatch "${FILESDIR}/${P}-innodb.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=${EPREFIX}/etc DATADIR=${EPREFIX}/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=${EPREFIX}/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
-	# Configure spamc
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
-}
-
-src_compile() {
-	export PERL_MM_USE_DEFAULT=1
-
-	# Now compile all the stuff selected.
-	perl-module_src_compile
-
-	if use qmail; then
-		emake spamc/qmail-spamc
-	fi
-
-}
-
-src_install () {
-	perl-module_src_install
-
-	# Create the stub dir used by sa-update and friends
-	keepdir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
-
-	if use qmail; then
-		dobin spamc/qmail-spamc
-	fi
-
-	ln -s mail/spamassassin "${ED}"/etc/spamassassin || die
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' "${ED}"/etc/mail/spamassassin/init.pre || die
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}"/3.3.1-spamd.init spamd
-	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	if use postgres; then
-		sed -i -e 's:@USEPOSTGRES@::' "${ED}/etc/init.d/spamd"
-
-		dodoc sql/*_pg.sql
-	else
-		sed -i -e '/@USEPOSTGRES@/d' "${ED}/etc/init.d/spamd"
-	fi
-
-	if use mysql; then
-		sed -i -e 's:@USEMYSQL@::' "${ED}/etc/init.d/spamd"
-
-		dodoc sql/*_mysql.sql
-	else
-		sed -i -e '/@USEMYSQL@/d' "${ED}/etc/init.d/spamd"
-	fi
-
-	dodoc NOTICE TRADEMARK CREDITS INSTALL.VMS UPGRADE USAGE \
-		sql/README.bayes sql/README.awl procmailrc.example sample-nonspam.txt \
-		sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
-		spamd-apache2/README.apache
-
-	# 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
-
-	if use qmail; then
-		dodoc spamc/README.qmail
-	fi
-
-	cp "${FILESDIR}"/secrets.cf "${ED}"/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"
-}
-
-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"
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.3.2-r4.ebuild b/mail-filter/spamassassin/spamassassin-3.3.2-r5.ebuild
index 0dec65e..d0c6493 100644
--- a/mail-filter/spamassassin/spamassassin-3.3.2-r4.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.3.2-r5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.3.2-r4.ebuild,v 1.1 2013/12/28 13:56:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.3.2-r5.ebuild,v 1.10 2014/09/24 19:39:16 maekke Exp $
 
-EAPI=4
+EAPI=5
 
 inherit perl-module toolchain-funcs eutils systemd
 
@@ -14,13 +14,13 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 # 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-Pod-Parser-1.32
 	virtual/perl-Storable
 	virtual/perl-Time-HiRes
 	>=dev-perl/HTML-Parser-3.43
@@ -74,6 +74,9 @@ src_prepare() {
 
 	# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6626
 	epatch "${FILESDIR}/${P}-innodb.patch"
+
+	# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6937#c2
+	epatch "${FILESDIR}/${P}-perl518.patch"
 }
 
 src_configure() {