spamassassin cleanup - old files removed

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

10 files changed, 12 insertions, 491 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index 5c6e58fdf..37b1dc19c 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Apr 2010; David Abbott <dabbott@gentoo.org> -files/3.0.0-spamd.init,
+  -files/3.2.5-spamd.init, -files/spamassassin-3.2.5-DESTDIR.patch,
+  -files/3.2.2-upstream-5574-fix.patch, -files/3.1.8-archive-iterator.patch,
+  -files/3.2.2-upstream-5574-testcase.patch, -files/secrets.cf,
+  metadata.xml:
+  Cleanup - old files removed
+
   07 Apr 2010; David Abbott <dabbott@gentoo.org> -spamassassin-3.3.1.ebuild:
   removed spamassassin 3.3.1 - 3.3.1-r1 in main tree
 
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 7bf754647..fc4592c88 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -2,20 +2,13 @@
 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.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 902 RMD160 232ba6607c607d8ba270454598bf228a9f8c66b2 SHA1 8b0401d344e1e89fc939d837ed95920d9ed26737 SHA256 87849cf9853cd298459c50fa7d8cbb64ff2c857b4248eae8aa9056f3e08fc196
 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
-MISC ChangeLog 1450 RMD160 55ec33035eb45b095cdd4f91f908f60b4e478d7e SHA1 bf8427dc344cc578b738bc3979d5a142ed423a3e SHA256 d2e5e542ee95fd215ee2dcb6b8b4824f32a7ee8ea4f56f9f9004b8065e971bdd
-MISC metadata.xml 397 RMD160 57fce2ddbc573f348530f856bc0735ba1aae08b9 SHA1 ffab343d82e13c81c74ecb9d0724634a4df755d8 SHA256 6b960f56b7be9f2ecb4b7023b54e20fc6d5583d8ff9ea0b1a4a987c6d86b0a0a
+MISC ChangeLog 1780 RMD160 cbc82b179b585a9d8500ec7a577a840999461223 SHA1 2def0c49b47ecb96cec119238fe9599946c93e8b SHA256 49b2dd4632977ad3ac84623b4851f05a1b737c2d23262aa7c66ad66fdf59b829
+MISC metadata.xml 339 RMD160 d26879faaf735d1ca3001a1c61ab472b14789420 SHA1 8b21003a4404ada77b2a9bf2a3fa1733e46fe352 SHA256 140cb2839ea50486116c578fe574b9090de04c483c2c7bce792dfa7e21138aa5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAku9CKwACgkQcZ+z4vAcSszbQQCffRJLYIT3tPjojWjdpbGnx9qr
-XCsAn1OCvRNQMq8St5BMjIzfDrj36BSq
-=BfB1
+iEYEARECAAYFAku9ClwACgkQcZ+z4vAcSsxwWgCfcb9jxaf/D99M87VMuAg/fprT
+W6oAoIULbNZw8rNeq8iWiiLwpYqK3Zqn
+=mLBj
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/spamassassin/files/3.0.0-spamd.init b/mail-filter/spamassassin/files/3.0.0-spamd.init
deleted file mode 100644
index a5e465faf..000000000
--- a/mail-filter/spamassassin/files/3.0.0-spamd.init
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/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 $
-
-# NB: Config is in /etc/conf.d/spamd
-
-# Provide a default location if they haven't in /etc/conf.d/spamd
-PIDFILE=${PIDFILE:-/var/run/spamd.pid}
-
-opts="reload"
-
-depend() {
-	need net
-	before mta
-	use logger
-}
-
-start() {
-	ebegin "Starting spamd"
-	start-stop-daemon --start --quiet \
-		--name spamd \
-		--nicelevel ${SPAMD_NICELEVEL:-0} \
-		--exec /usr/sbin/spamd -- -d -r ${PIDFILE} \
-			${SPAMD_OPTS}
-	eend $? "Failed to start spamd"
-}
-
-stop() {
-	ebegin "Stopping spamd"
-	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-	eend $? "Failed to stop spamd"
-}
-
-reload() {
-	ebegin "Reloading configuration"
-	kill -HUP $(< ${PIDFILE})
-	eend $?
-}
diff --git a/mail-filter/spamassassin/files/3.1.8-archive-iterator.patch b/mail-filter/spamassassin/files/3.1.8-archive-iterator.patch
deleted file mode 100644
index b4007f099..000000000
--- a/mail-filter/spamassassin/files/3.1.8-archive-iterator.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: sa-learn.raw
-===================================================================
---- sa-learn.raw	(revision 507745)
-+++ sa-learn.raw	(working copy)
-@@ -402,7 +402,10 @@
- 
-     # make sure the target list is in the normal AI format
-     if ($targets[$elem] !~ /^[^:]*:[a-z]+:/) {
--      $targets[$elem] = target($targets[$elem]);
-+      my $item = splice @targets, $elem, 1;
-+      $elem--; # go back to this element again
-+      target($item); # add back to the list
-+      next;
-     }
-   }
- 
diff --git a/mail-filter/spamassassin/files/3.2.2-upstream-5574-fix.patch b/mail-filter/spamassassin/files/3.2.2-upstream-5574-fix.patch
deleted file mode 100644
index 413353943..000000000
--- a/mail-filter/spamassassin/files/3.2.2-upstream-5574-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: spamd/spamd.raw
-===================================================================
---- spamd/spamd.raw	(revision 559081)
-+++ spamd/spamd.raw	(working copy)
-@@ -1024,10 +1024,11 @@
-       # use the POSIX functions to hide the platform specific workarounds 
-       POSIX::setgid($ugid);  # set effective and real gid
-       POSIX::setuid($uuid);  # set effective and real UID
-+      $< = $uuid; $> = $uuid;   # bug 5574
- 
-       # keep the sanity check to catch problems like bug 3900 just in case
-       if ( $> != $uuid and $> != ( $uuid - 2**32 ) ) {
--        die "spamd: setuid to uid $uuid failed\n";
-+        die "spamd: setuid to uid $uuid failed (> = $>, < = $<)\n";
-       }
-     }
- 
-Index: lib/Mail/SpamAssassin/Util.pm
-===================================================================
---- lib/Mail/SpamAssassin/Util.pm	(revision 559081)
-+++ lib/Mail/SpamAssassin/Util.pm	(working copy)
-@@ -1336,6 +1336,7 @@
-     # bug 3586: kludges needed to work around platform dependent behavior assigning to $<
-     #  The POSIX functions deal with that so just use it here
-     POSIX::setuid($touid);
-+    $< = $touid; $> = $touid;       # bug 5574
- 
-     # Check that we have now accomplished the setuid: catch bug 3586 if it comes back
-     if ($< != $touid) {
diff --git a/mail-filter/spamassassin/files/3.2.2-upstream-5574-testcase.patch b/mail-filter/spamassassin/files/3.2.2-upstream-5574-testcase.patch
deleted file mode 100644
index 67379769f..000000000
--- a/mail-filter/spamassassin/files/3.2.2-upstream-5574-testcase.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: MANIFEST
-===================================================================
---- MANIFEST	(revision 559081)
-+++ MANIFEST	(working copy)
-@@ -504,3 +504,4 @@
- t/root_spamd_x_u.t
- t/spamc_x_E_R.t
- t/spamc_x_e.t
-+t/root_spamd_u.t
-Index: t/root_spamd_u.t
-===================================================================
---- t/root_spamd_u.t	(revision 0)
-+++ t/root_spamd_u.t	(revision 0)
-@@ -0,0 +1,42 @@
-+#!/usr/bin/perl
-+
-+# run with:   sudo prove -v t/root_spamd*
-+
-+use lib '.'; use lib 't';
-+use SATest; sa_t_init("root_spamd_u");
-+use Test;
-+
-+use constant TEST_ENABLED => conf_bool('run_root_tests');
-+use constant IS_ROOT => eval { ($> == 0); };
-+use constant RUN_TESTS => (TEST_ENABLED && IS_ROOT);
-+
-+BEGIN { plan tests => (RUN_TESTS ? 14 : 0) };
-+exit unless RUN_TESTS;
-+
-+# ---------------------------------------------------------------------------
-+
-+%patterns = (
-+
-+q{ Return-Path: sb55sb55@yahoo.com}, 'firstline',
-+q{ Subject: There yours for FREE!}, 'subj',
-+q{ X-Spam-Status: Yes, score=}, 'status',
-+q{ X-Spam-Flag: YES}, 'flag',
-+q{ X-Spam-Level: **********}, 'stars',
-+q{ TEST_ENDSNUMS}, 'endsinnums',
-+q{ TEST_NOREALNAME}, 'noreal',
-+q{ This must be the very last line}, 'lastline',
-+
-+);
-+
-+# run spamc as unpriv uid
-+$spamc = "sudo -u nobody $spamc";
-+
-+ok(start_spamd("-L -u nobody"));
-+
-+$SIG{ALRM} = sub { die "timed out"; };
-+alarm 10;
-+ok(spamcrun("< data/spam/001", \&patterns_run_cb));
-+alarm 0;
-+ok_all_patterns();
-+
-+ok(stop_spamd());
-
-Property changes on: t/root_spamd_u.t
-___________________________________________________________________
-Name: svn:executable
-   + *
-
diff --git a/mail-filter/spamassassin/files/3.2.5-spamd.init b/mail-filter/spamassassin/files/3.2.5-spamd.init
deleted file mode 100644
index 77c0a1923..000000000
--- a/mail-filter/spamassassin/files/3.2.5-spamd.init
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# NB: Config is in /etc/conf.d/spamd
-
-# Provide a default location if they haven't in /etc/conf.d/spamd
-PIDFILE=${PIDFILE:-/var/run/spamd.pid}
-
-opts="reload"
-
-depend() {
-	need net
-	before mta
-	use logger
-@USEPOSTGRES@  use postgresql
-@USEMYSQL@ use mysql
-}
-
-start() {
-	ebegin "Starting spamd"
-	start-stop-daemon --start --quiet \
-		--name spamd \
-		--nicelevel ${SPAMD_NICELEVEL:-0} \
-		--pidfile ${PIDFILE} \
-		--exec /usr/sbin/spamd -- -d -r ${PIDFILE} \
-			${SPAMD_OPTS}
-	if ! [ -f "${PIDFILE}" ]; then
-		sleep 1
-	fi
-	eend $? "Failed to start spamd"
-}
-
-stop() {
-	ebegin "Stopping spamd"
-	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-	eend $? "Failed to stop spamd"
-}
-
-reload() {
-	ebegin "Reloading configuration"
-	kill -HUP $(< ${PIDFILE})
-	eend $?
-}
diff --git a/mail-filter/spamassassin/files/secrets.cf b/mail-filter/spamassassin/files/secrets.cf
deleted file mode 100644
index efa31a6fb..000000000
--- a/mail-filter/spamassassin/files/secrets.cf
+++ /dev/null
@@ -1,14 +0,0 @@
-# The below sample from bug 91430 is an example of using mysql
-# for spam filter storage
-
-#(Tell Spamassissin to use MySQL for bayes data
-#bayes_store_module              Mail::SpamAssassin::BayesStore::SQL
-#bayes_sql_dsn                   DBI:mysql:sa_bayes:localhost:3306
-#bayes_sql_username              db_name
-#bayes_sql_password              another_very_secret_password
-
-#(Tell Spamassissin to use MySQL for AWL data
-#auto_whitelist_factory          Mail::SpamAssassin::SQLBasedAddrList
-#user_awl_dsn                    DBI:mysql:sa_bayes:localhost:3306
-#user_awl_sql_username           db_name
-#user_awl_sql_password           another_very_secret_password
diff --git a/mail-filter/spamassassin/files/spamassassin-3.2.5-DESTDIR.patch b/mail-filter/spamassassin/files/spamassassin-3.2.5-DESTDIR.patch
deleted file mode 100644
index a9765fc55..000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.2.5-DESTDIR.patch
+++ /dev/null
@@ -1,273 +0,0 @@
---- Mail-SpamAssassin-3.2.5/Makefile.PL.old	2009-10-21 23:25:18.000000000 +0200
-+++ Mail-SpamAssassin-3.2.5/Makefile.PL	2009-10-21 23:31:28.000000000 +0200
-@@ -12,12 +12,12 @@
- 
- # avoid stupid 'Argument "6.30_01" isn't numeric in numeric ge (>=)' warnings;
- # strip off the beta subversion noise that causes the trouble.
- $mm_version =~ s/_\S+$//;      # "6.30_01" => "6.30"
- 
--if ($mm_version+0 < 5.45) {
--  die "SpamAssassin Makefile.PL requires at least ExtUtils::MakeMaker v5.45";
-+if ($mm_version < 6.17) {
-+  die "SpamAssassin Makefile.PL requires at least ExtUtils::MakeMaker v6.17";
- }
- 
- use constant RUNNING_ON_WINDOWS => ($^O =~ /^(mswin|dos|os2)/oi);
- use constant HAS_DBI => eval { require DBI; };
- 
-@@ -82,11 +82,10 @@
- );
- 
- 
- sub parse_arg {
-   my($val, $name) = (@_);
--
-   if ($val =~ /^($name)=["']?(.*?)["']?$/) {
-     return $2;
-   } else {
-     return undef;
-   }
-@@ -107,53 +106,27 @@
-   return 'yes' if bool($val, $def);
-   return 'no';
- }
- 
- 
--
- my %opt = (
--  'build_spamc'        => undef,
-+  'build_spamc'     => undef,
-   'enable_ssl'      => undef,
-   'contact_address' => undef,
-   'destdir'         => undef,
- );
- ARGV: foreach (@ARGV) {
-   foreach my $key (keys %opt) {
--    my $val;
--
--    $val = parse_arg($_, uc($key));
-+    my $val = parse_arg($_, uc($key));
-     if (defined $val) {
-       $opt{$key} = $val;
-       next ARGV;
-     }
-   }
- }
- 
- 
--# Gather some information about what EU::MM offers and/or needs
--my(
--  $mm_knows_destdir,
--  $mm_has_destdir,
--  $mm_has_good_destdir,
--  $mm_needs_destdir,
--);
--
--# MakeMaker prior to 6.11 doesn't support DESTDIR which is needed for
--# packaging with builddir!=destdir. See bug 2388.
--$mm_knows_destdir    = $ExtUtils::MakeMaker::Recognized_Att_Keys{DESTDIR};
--$mm_has_good_destdir = $mm_version >= 6.11;
--# Add DESTDIR hack only if it's requested (and necessary)
--$mm_needs_destdir    = $opt{'destdir'} && !$mm_has_good_destdir;
--$mm_has_destdir      = $mm_knows_destdir || $mm_needs_destdir;
--push(@ATT_KEYS, 'DESTDIR') if $mm_needs_destdir;
--
--# Now make EU::MM understand our extended vars
--foreach my $key (@ATT_KEYS) {
--  $ExtUtils::MakeMaker::Recognized_Att_Keys{$key} = 1;
--}
--
--
- # Gather the rules files in the range 00-69; we do this in perl because
- # it's more portable.  Also, plugin .pm files.
- my @datafiles = map { s,^rules/,,; $_ }
-                 grep { -f $_ } (<rules/*.cf>, <rules/*.pm>);
- my $datafiles = join(' ', (grep 
-@@ -270,75 +243,27 @@
- 
-     # We have only this Makefile.PL and this option keeps MakeMaker from
-     # asking all questions twice after a 'make dist*'.
-     'NORECURS' => 1,
- 
--    # bug 5074: perl 5.6.1 (with ExtUtils::MakeMaker 5.45) attempts to
--    # recurse anyway unless this is explicitly specified
--    'DIR' => [ ],
--
-     # Don't add META.yml to the MANIFEST for god's sake!
-     'NO_META' => 1,
- );
- 
- # rules/72_active.cf is built from "rulesrc", but *must* exist before
- # WriteMakefile() is called due to shortcomings in MakeMaker.
- my @FILES_THAT_MUST_EXIST = qw(
-         rules/72_active.cf
-     );
- 
--# That META.yml stuff was introduced with Perl 6.06_03, see
--# <http://archive.develooper.com/makemaker@perl.org/msg00922.html>
--# <http://archive.develooper.com/makemaker@perl.org/msg00984.html>
--delete $makefile{'NO_META'} if $mm_version < 6.06_03;
--
- # make sure certain optional modules are up-to-date if they are installed
- # also see PREREQ_PM above
- my %CURRENT_PM = (
-     'Net::DNS' => (RUNNING_ON_WINDOWS ? 0.46 : 0.34),
-     'Razor2::Client::Agent' => 2.40,
- );
- 
--if ($mm_needs_destdir) {
--  my $error = <<DESTDIR_HACK;
--
--    ***********************************************************************
--    ExtUtils::MakeMaker ${mm_version} doesn't include support for DESTDIR,
--    so if you want to be on the safe side, you might want to upgrade your
--    ExtUtils::MakeMaker to version 6.11 or later. It is available via CPAN.
--
--    You can use either the CPAN shell or go to
--      <http://search.cpan.org/search?module=ExtUtils::MakeMaker>
--    to get an up-to-date version.
--
--    This should only be necessary if you are creating binary packages.
--    ***********************************************************************
--
--DESTDIR_HACK
--  $error =~ s/^ {4}//gm;
--  warn $error;
--}
--elsif ($opt{'destdir'} and !$mm_has_good_destdir) {
--  my $error = <<DESTDIR_BUG;
--
--    ***********************************************************************
--    ExtUtils::MakeMaker ${mm_version} contains bugs that may cause problems
--    in the \"make\" process.  It is recommended that you upgrade
--    ExtUtils::MakeMaker to version 6.11 or later. It is available via CPAN.
--
--    You can use either the CPAN shell or go to
--      <http://search.cpan.org/search?module=ExtUtils::MakeMaker>
--    to get an up-to-date version.
--
--    This should only be necessary if you are creating binary packages.
--    ***********************************************************************
--
--DESTDIR_BUG
--  $error =~ s/^ {4}//gm;
--  warn $error;
--}
--
- 
- # All the $(*MAN1*) stuff is empty/zero if Perl was Configured with -Dman1dir=none;
- # however, support site/vendor man1 dirs (bug 5338)
- unless($Config{installman1dir}
-     || $Config{installsiteman1dir}
-@@ -405,22 +330,19 @@
- 
- # Now finish the meta hash and dump the Makefile
- $makefile{EXE_FILES} = [ values %{$makefile{EXE_FILES}} ];
- $makefile{AUTHOR} =~ s/(<.+) at (.+>)/$1\@$2/;
- WriteMakefile(%makefile);
--print "Makefile written by ExtUtils::MakeMaker ${mm_version}\n";
-+print "Makefile written by ExtUtils::MakeMaker $mm_version\n";
- 
- #######################################################################
- 
- package MY;
- 
--
- use vars qw(
-   $MY_GLOBALS_ARE_SANE
--
-   $RUNNING_ON_WINDOWS
--
-   @REPOSITORIES
- 
-   $MACRO_RE
-   $EQ_RE
-   $EQ
-@@ -906,19 +828,10 @@
-   init_MY_globals($self);
- 
-   foreach (@code) {
-     # Add our install targets as a dependency to all top-level install targets
-     s/^(install(?:_[a-z]+)?\s*::?\s*.*)$/$1 conf__install data__install/;
--
--    # Now do the DESTDIR hack, if necessary.
--    next if !$mm_needs_destdir;
--    # Write the correct path to perllocal.pod
--    next if /installed into/;
--
--    # Replace all other $(INSTALL*) vars (except $(INSTALLDIRS) of course)
--    # with their $(DESTINSTALL*) counterparts
--    s/\Q$(\E(INSTALL(?!DIRS)${MACRO_RE})\Q)\E/\$(DEST$1)/g;
-   }
- 
-   clean_MY_globals($self);
-   return join("\n", @code);
- }
-@@ -956,32 +869,10 @@
-           set_macro($rprefix, macro_ref('PREFIX'));
-           $line .= "\n" . macro_def($rprefix);
-         }
-       }
-     }
--
--    if (line_has_macro_def($line, 'MM_VERSION')) {
--      # These macros are just for debugging purposes.
--      $line = join("\n", $line,
--         macro_def(MM_HAS_DESTDIR      => ::yesno($mm_has_destdir)),
--         macro_def(MM_HAS_GOOD_DESTDIR => ::yesno($mm_has_good_destdir)),
--         macro_def(MM_KNOWS_DESTDIR    => ::yesno($mm_knows_destdir)),
--         macro_def(MM_NEEDS_DESTDIR    => ::yesno($mm_needs_destdir)),
--       );
--    }
--
--    # Add DESTDIR support if necessary
--    if ($mm_needs_destdir) {
--      if (line_has_macro_def($line, 'INSTALLDIRS')) {
--        $line .= "\n" . macro_def('DESTDIR');
--      }
--      elsif (line_has_macro_def($line, qr/INSTALL${MACRO_RE}/)) {
--        my $macro = get_macro_name_from_line($line);
--        $line .= "\n" . macro_def('DEST' . $macro,
--                          macro_ref('DESTDIR') . macro_ref($macro));
--      }
--    }
-   }
-   push(@code, qq{});
- 
-   # Add some additional target dirs
-   {
-@@ -1015,13 +906,11 @@
-       foreach my $r (@REPOSITORIES) {
-         my $macro = 'INSTALL' . repository($r) . $m;
-         # The INSTALL* macros.
-         push(@code, macro_def($macro));
-         # The DESTINSTALL* macros.
--        push(@code, macro_def('DEST' . $macro,
--                      macro_ref('DESTDIR') . macro_ref($macro)))
--          if $mm_has_destdir;
-+        push(@code, macro_def('DEST' . $macro, macro_ref('DESTDIR') . macro_ref($macro)));
-       }
-     }
-   }
- 
-   # Set the PERL_* stuff
-@@ -1068,17 +957,12 @@
-     # SCRIPT macro is the same for all repositories.
-     foreach my $macro (qw(SCRIPT DATA CONF LIB)) {
-       push(@code, macro_def('I_' . $macro . 'DIR',
-                     macro_ref('INSTALL' . repository($repository, $macro eq 'SCRIPT') . $macro)));
- 
--      if ($mm_has_destdir) {
--        push(@code, macro_def('B_' . $macro . 'DIR',
--                      macro_ref('DESTINSTALL' . repository($repository, $macro eq 'SCRIPT') . $macro)));
--      } else {
--        push(@code, macro_def('B_' . $macro . 'DIR',
--                      macro_ref('I_' . $macro . 'DIR')));
--      }
-+      push(@code, macro_def('B_' . $macro . 'DIR',
-+                    macro_ref('DESTINSTALL' . repository($repository, $macro eq 'SCRIPT') . $macro)));
-     }
-   }
- 
-   clean_MY_globals($self);
-   return join("\n", @code);
diff --git a/mail-filter/spamassassin/metadata.xml b/mail-filter/spamassassin/metadata.xml
index 916faf121..735796c62 100644
--- a/mail-filter/spamassassin/metadata.xml
+++ b/mail-filter/spamassassin/metadata.xml
@@ -8,7 +8,6 @@
 </maintainer>
 <use>
 	<flag name='qmail'>Build qmail functionality and docs</flag>
-	<flag name='tools'>Enables tools for spamassassin</flag>
 </use>
 </pkgmetadata>