gentoo resync : 22.04.2018

11 files changed, 4 insertions, 489 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 97c4120b02c6..fd643847e10f 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/anomy-sanitizer/Manifest b/mail-filter/anomy-sanitizer/Manifest
deleted file mode 100644
index ac115bac0e28..000000000000
--- a/mail-filter/anomy-sanitizer/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX anomy.conf 6714 BLAKE2B a907a1335af2fdc277f42b11d08a96751bbdf97751b5c7003a9e7c3c69f2f2b4065e371483292a071a4fe7850e471fb9fa0c843c452a78ac191b92c19a47b3e6 SHA512 3724971ea6463f9de263ecd8a4e6eab82e4ebde3601a43702a7535d85075edb48b47d44371ad7b52bfb8b06f0aca5e09679cb91dacdc637ccb6c11993d7a3e2f
-AUX sample2_mailfilter.sh 1898 BLAKE2B b2dbd59d10365ec19f2d70f1181136d60e308f72d3abd6cfe1d3551839364cbee97b1bacd992f8d35f5b2b3e24184614c0467c2c0958489ba86e2422d5d5d830 SHA512 c5d26bf2c5bbac8d8bae068e59f0e70094e366f0bd6c44ce0efd95744093e31ba6071efe6c53ad56a930be1a72a047e8c5eb518ca9eda6feb5bd3c750d5cb3a7
-AUX sample_mailfiler.sh 1725 BLAKE2B 3ef97a8a0ad82f588ad789cb08a65ed73a4358c117f8e24308ea5577b417087718618b582d75880bec427ba176b15e40ba5019efedc2edf1c6e839ec4a12bafa SHA512 0bda33d21bbceefaa019ba8699153dbc10b2e120fc5ee9068412cc914137acc05df3b469628b1753887287e9bb04ce7529eeb448c3b220d7b4ca5495a2b27398
-DIST anomy-sanitizer-1.76.tar.gz 172722 BLAKE2B d4467c64c7ee377c28d13ec0140b87bdf68c2cae7cc68d28997f8f15c0b0ede019d21e7751743195977b028a4d4ce41892e17357c241cad33a0ce2b4c93ebc6c SHA512 4ba805f733f291af71f6ec514274f27bedd132c8613ea5a96eb6bffce9ee6fed15eaf73562f69c77327174bb91e101ce36f2e24917af61efa1b88a8acb721b41
-DIST sample_e-mail-architecture.png.tar 20480 BLAKE2B 3ba03680ff15f2d83460ccd1018384ee7e224a90ada1bc405641a317ee53f857821bac4df9752057a334a27d13172b28b98a85ad099790b942b10add7fec8019 SHA512 8f2ea6fd8bda828479ad659ac5c87175eb822c7c239713103a650feac0c46ac55476b59bdf2c99ca94b23bebaa2247fc55517b31a73c96e85d9664d759b0f1e2
-DIST sample_e-mail-architektur.flw 7001 BLAKE2B 3120c6f38e188651927da6b2fb2d6ba8e9a893f96661eb98ed8e5b91cfa1edd9acd07f01f6664ed90d9bbcc662d32ba6cac711dd074eae042da36439e6b6c067 SHA512 7c45e3787f80a94f8dda26e9d7d980aa96ec0163fa8b6f998be9e7ea188fedceb9c7db29c7d65099da9003c36de68335a016a33ce827ca10330a7115a87d5c59
-EBUILD anomy-sanitizer-1.76-r1.ebuild 3052 BLAKE2B 458c80b59b6e688300dfb96900b4e04ef02d071102bcf670f6e52443a37b1bb10508183bb22dd1c61e2e324a6485b3d8c46e827dc891d99f70921f245de7f9aa SHA512 c62a1308566343e89010c76d4bd7753bbdbb9a5ef45099a5aefde7215b4f68f5c40c20c6d51ae267d79217f29a97d6b5b25a2f634bd717c29d3a39b7dbe6f15b
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-filter/anomy-sanitizer/anomy-sanitizer-1.76-r1.ebuild b/mail-filter/anomy-sanitizer/anomy-sanitizer-1.76-r1.ebuild
deleted file mode 100644
index a33654195069..000000000000
--- a/mail-filter/anomy-sanitizer/anomy-sanitizer-1.76-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils user
-
-DESCRIPTION="Perl based e-mail filtering tool"
-HOMEPAGE="http://mailtools.anomy.net/"
-SRC_URI="
-	https://dev.gentoo.org/~jlec/distfiles/sample_e-mail-architecture.png.tar
-	http://mailtools.anomy.net/dist/${PN}-${PV}.tar.gz
-	https://dev.gentoo.org/~pacho/maintainer-needed/sample_e-mail-architektur.flw"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-		>=virtual/perl-MIME-Base64-2.12-r2
-		>=dev-perl/Mail-Audit-2.1-r1
-		dev-perl/Convert-TNEF
-		dev-perl/MIME-tools
-		dev-perl/libwww-perl
-		virtual/mta"
-
-S="${WORKDIR}/anomy"
-DEST="/usr/share/${PN}"
-SANI_WORKDIR="/var/spool/sanitizer"
-SANI_CONFDIR="/etc/mail/${PN}"
-
-src_install() {
-	dodoc *.sanitizer CREDITS UNICODE.TXT
-	dohtml sanitizer.html
-	rm -rf "${S}/contrib/.tmp"
-	rm -f *.sanitizer CREDITS UNICODE.TXT sanitizer.html
-	mv "${S}/contrib" "${D}/usr/share/doc/${PF}/"
-
-	insinto /usr/share/doc/${PF}/examples
-	doins "${FILESDIR}"/*.sh "${WORKDIR}"/*.png "${DISTDIR}"/*.flw
-
-	keepdir ${SANI_CONFDIR}
-	insinto ${SANI_CONFDIR}
-	doins "${FILESDIR}"/*.conf
-
-	keepdir ${SANI_WORKDIR}
-	dodir ${DEST}
-	insinto ${DEST}
-
-# generate lists for doins
-	_list="anomy anomy/bin anomy/bin/Anomy anomy/bin/Anomy/Sanitizer anomy/testcases anomy/testcases/results.def"
-
-	for i in $_list; do
-		_di=`echo $i | sed -e "s/^anomy//g; s/^\///g"` &>/dev/null
-		insinto ${DEST}/$_di
-
-		_sublist=`find "${WORKDIR}"/$i/* -maxdepth 0 -type f`
-		for l in $_sublist; do
-			echo &>/dev/null
-			doins $l
-		done
-	done
-
-	dosym ${SANI_CONFDIR}/anomy.conf ${DEST}/anomy.conf
-}
-
-pkg_preinst() {
-	enewgroup sanitizer
-	enewuser sanitizer -1 -1 ${SANI_WORKDIR} sanitizer
-}
-
-pkg_postinst() {
-		chown -R sanitizer:sanitizer "${ROOT}"/${SANI_WORKDIR}
-		chmod -R a-rwx,g+X,u+rwX "${ROOT}"/${SANI_WORKDIR}
-		chown -R sanitizer:sanitizer "${ROOT}"/${DEST}
-		chmod -R a-rwx,g+rX,u+rX "${ROOT}"/${DEST}
-		chown sanitizer:sanitizer "${ROOT}"/${SANI_CONFDIR}/anomy.conf
-		chmod 0640 "${ROOT}"/${SANI_CONFDIR}/anomy.conf
-		chmod u+x "${ROOT}"/${DEST}/bin/*.pl
-		chmod u+x "${ROOT}"/${DEST}/testcases/*.sh
-		chmod u+w "${ROOT}"/${DEST}/*
-		chmod u+w "${ROOT}"/${DEST}/bin
-		chmod u+w "${ROOT}"/${DEST}/bin/Anomy
-		chmod u+w "${ROOT}"/${DEST}/bin/Anomy/Sanitizer
-		chmod u+w "${ROOT}"/${DEST}/testcases
-		chmod u+w "${ROOT}"/${DEST}/testcases/results.def
-
-		elog ""
-		elog "There is a howto for the integration of sanitizer"
-		elog "into your (postfix) mail system at"
-		elog "http://advosys.ca/papers/postfix-filtering.html"
-		elog "Please find example scripts to be used to integrate sanitizer"
-		elog "into your (postfix) mail system at"
-		elog "/usr/share/doc/${PF}/examples"
-		elog "There is also a png and kivio document about a possible"
-		elog "e-mail architecture"
-		elog ""
-
-}
-
-pkg_postrm() {
-	elog "After unmerging this ebuild, you will have to remove"
-	elog "created user and group manually. To do so, run:"
-	elog "userdel -r sanitizer; groupdel sanitizer"
-}
diff --git a/mail-filter/anomy-sanitizer/files/anomy.conf b/mail-filter/anomy-sanitizer/files/anomy.conf
deleted file mode 100644
index f7c45cd973d2..000000000000
--- a/mail-filter/anomy-sanitizer/files/anomy.conf
+++ /dev/null
@@ -1,207 +0,0 @@
-# Example configuration file for Anomy Sanitizer 
-#
-# Thiemo Kellner, thiemo@thiam.ch, 2003-05-29
-# Based on http://advosys.ca/papers/postfix-filtering.html,
-# Advosys Consulting Inc., Ottawa
-#
-# Works with Anomy Sanitizer revision 1.60
-
-
- # Warn user about unscanned parts, etc.
- feat_verbose = 1
- 
- # Inline logs: 0 = Off, 1 =  Maybe, 2 = Force
- feat_log_inline = 1
- 
- # Print log to standard error: 0 = Off, 1 = On
- feat_log_stderr = 1
- 
- # Don't use XML format for logs.
- feat_log_xml = 0
- 
- # Omit trace info from logs.
- feat_log_trace = 0
- 
- # Don't add any scratch space to part headers.
- feat_log_after = 0
- 
- # Enable filename-based policy decisions.
- feat_files = 1
- 
- # Force all parts (except text/plain and
- # text/html parts) to have file names: 0 = Off, 1 = On
- feat_force_name = 1
- 
- # Replace all boundary strings with our own
- # NOTE:  Always breaks PGP/MIME messages!
- feat_boundaries = 0
- 
- # Protect against buffer overflows and null values.
- feat_lengths = 1
- 
- # Defang incoming shell scripts.
- feat_scripts = 1
- 
- # Defang active HTML content.
- feat_html = 1
- 
- # Web-bugs are allowed.
- feat_webbugs = 0
- 
- # Don't scan PGP signed message parts: 0 = Don't scan (???)
- feat_trust_pgp = 0
- msg_pgp_warning = WARNING: Unsanitized content follows.\n
- 
- # Sanitize inline uuencoded files.
- feat_uuencoded = 1
- 
- # Sanitize forwarded messages
- feat_forwards = 1
- 
- # Set to 0 if going productive (This isn't a test-case configuration.)
- feat_testing = 1
- 
- # Fix invalid MIME, if possible.
- feat_fixmime = 1
- 
- # Don't be excessively paranoid about MIME headers etc.
- feat_paranoid = 0 
- 
- # Advertisement to insert in each mail header:
- header_info = X-Sanitizer: Anomy Sanitizer mail filter
- header_url = 0
- header_rev = 0
-
- 
- #
- # Scoring
- #
- 
- # Any message requring this many modifications
- # will cause the sanitizer to return a non-zero
- # exit code after processing the entire message.
- # To disable set to 0.
- score_bad = 100
- #score_panic = 0
- 
- msg_file_drop  = \n*****\n
- msg_file_drop += NOTE: An attachment named %FILENAME was deleted from 
- msg_file_drop += this message because it contained a (windows) executable 
- msg_file_drop += or other potentially dangerous file type. 
- msg_file_drop += If you really need this attachment, have it re-sent 
- msg_file_drop += encapsulated, e.g. in a zip or tgz archive or contact your 
- msg_file_drop += mail system administrator.
-
- #
- # You may need to increase the following if you have a very
- # complex configuration split between multiple files.
- #
- # Thiemo Kellner, thiemo@thiam.ch, 2003-05-31
- # max_conf_recursions does not work with 1.60
- #max_conf_recursions = 5    # The default is 5.
- #
- # Create temporary or saved files using this template.
- # An attachment named "dude.txt" might be saved as 
- #
- #  /var/quarantine/att-dude-txt.A9Y
- #
- # Note:  The directory must exist and be writable by
- # the user running the sanitizer.
- # (supposedly: $F -> file name, $$$ -> three arbitrary characters)
- file_name_tpl = /var/spool/sanitizer/att-$F.$$$
- 
- # We have three policies, in addition to the default which is
- # to defang file names.
- #
- file_list_rules = 3
- file_default_policy = defang
- file_default_filename = unnamed.file
-   
- # Delete obviously executable attachments.  This list is
- # incomplete!  This is a perl regular expression, see "man 
- # perlre" for info.  The (?i) prefix makes the regexp case 
- # insensitive.
- #
- file_list_1 = (?i)(winmail.dat)|
- file_list_1 += (\.(exe|com|vb[se]|dll|ocx|cmd|bat|pif|lnk|hlp|ms[ip]|reg|sct
- file_list_1 += |inf|asd|cab|sh[sb]|scr|cpl|chm|ws[fhc]|hta|vcd|vcf|eml|nws))$
- file_list_1_policy = drop
- file_list_1_scanner = 0
- 
- # Scan WinWord and Excel attachments with built-in macro scanner.
- # We consider anything exceeding the score of 25 to be dangerous,
- # and save it in the quarantine.
- #
- file_list_2 = (?i)\.(doc|dot|xls|xlw)$
- file_list_2_policy = accept:accept:save:save
- file_list_2_scanner = 0:1:2:builtin/macro 25# Do not log to STDERR:
- 
- # Allow file types considered "safe" (DO NOT JUST TRUST THIS LIST!)
- file_list_3 = (?i)\.(
- #  Plain ASCII formats:
- file_list_3 += txt|rtf|csv|dxf|htm|[sp]?html?|xml|xslt?|dtd|css|sgml
- #  PostScript (like) formats:
- file_list_3 += |pdf|e?ps
- #  Word processor and document formats:
- file_list_3 += |doc|dot|kwd|stw
- #  Spreadsheets:
- file_list_3 += |xls|xlw|xlt|wk[1-4]|stc|ksp|gnumeric
- #  Presentation applications:
- file_list_3 += |ppt|pps|pot|kpr|chrt
- #  Type setting formats:
- file_list_3 += |dvi|texi?|tfm|txi|texinfo
- #  Flow charting:
- file_list_3 += |flw
- #  Bitmap graphic files (maybe some are actually vector graphic formats):
- file_list_3 += |jpe?g|gif|png|tiff?|bmp|psd|pcx|xcf|pat|pix|pnm|sgi|snp|ras|tga
- file_list_3 += |xwd|xpm|dib|rle|cal|cas|pat|bmf|cel|cex|cgm|ico|img|jfi|jif|raw
- file_list_3 += |crw|sun
- #  Vector graphics and diagramming:
- file_list_3 += |vsd|drw|cdr|swf|pct|pict|kpm|kon
- #  Multimedia:
- file_list_3 += |mp[23]|avi|mpe?g|mov|ram?|midi?|ogg|aiff?|au|snd|wav
- #  Archives:
- file_list_3 += |zip|g?z|rar|tgz|t?bz2|tar|sit|sea|arc
- #  Package formats:
- file_list_3 += |rpm|deb
- #  Others:
- file_list_3 += |kfo
- #  Source code:
- file_list_3 += |[ch](pp|\+\+)?|s|inc|asm|patch|java|php\d?|jsp|bas|ebuild)
- file_list_3_policy = accept
- file_list_3_scanner = 0
- 
- # Any file type not listed above gets renamed to prevent
- # the mail client from auto-executing it.
- 
- #
- # More sample file lists
- #
- # Scan mp3 files for Evil Viruses, using the imaginary mp3virscan
- # utility.  Always define FOUR potential policies, which depend on the
- # exit code returned by the scanner.  Which code means what is 
- # defined in the scanner line, which must contain THREE entries.
- # The fourth policy is used for "anything else".
- #
- #   "accept" if the file is clean (exit status 0 or 1)
- #   "mangle" if the file was dirty, but is now clean (2 or 4)
- #   "drop"   if the file is still dirty (66)
- #   "save"   if the mp3virscan utility returns some other exit code
- #            or an error occurs.
- #
- #file_list_4 = (?i)\.(mp3|mp2|mpg)$
- #file_list_4_policy = accept:mangle:drop:save
- #file_list_4_scanner = 0,1:2,4:66:/path/to/mp3virscan -opt -f %FILENAME
- 
- # Archives and scriptable stuff - virus scan these.
- # NOTE:  There must be THREE groups of exit codes and FOUR policies,
- #      - the first three match the code groups, the fourth is default.
- #
- #file_list_5_scanner = 0:5:3,4:/usr/local/bin/avp.sh %FILENAME
- #file_list_5_policy  = accept:accept:save:save
- #file_list_5         = (?i)\.(xls|d(at|oc)|p(pt|l)|rtf|[sp]?html?
- #file_list_5        += |class|upd|wp\d?|m?db
- #file_list_5        += |z(ip|oo)|ar[cj]|lha|[tr]ar|rpm|deb|slp|tgz
- #file_list_5        += )(\.g?z|\.bz\d?)*$
- 
-
diff --git a/mail-filter/anomy-sanitizer/files/sample2_mailfilter.sh b/mail-filter/anomy-sanitizer/files/sample2_mailfilter.sh
deleted file mode 100644
index 3448d0ac0ea2..000000000000
--- a/mail-filter/anomy-sanitizer/files/sample2_mailfilter.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-#
-# spamassassin
-#
-# Simple filter to plug SpamAssassin only
-# into the Postfix MTA, using the spamc / spamd
-# daemon version of SpamAssassin.
-#
-# (Should result in higher performance on busy servers)
-#
-# NOTE: spamd must be running before using this script!
-#
-# For use with:
-#    Postfix 20010228 or later
-#    SpamAssassin 2.42 or later
-#
-############
-#          #
-# UNTESTED #
-#          #
-############
-
-
-# VARIABLES
-# ---------
-
-# File locations
-# (CHANGE AS REQUIRED TO MATCH YOUR SET-UP)
-INSPECT_DIR="/var/spool/sanitizer"
-#INSPECT_DIR="/var/spool/filter"
-SENDMAIL="/usr/lib/sendmail -i"
-ANOMY="/usr/share/anomy-sanitizer"
-ANOMY_BIN="${ANOMY}/bin/sanitizer.pl"
-ANOMY_CONF="/usr/share/anomy-sanitizer/anomy.conf"
-#ANOMY_LOG="/dev/null"
-ANOMY_LOG="/tmp/sanitizer.log"
-SPAMASSASSIN="/usr/bin/spamassassin"
-#SPAMASSASSIN_LOG="/dev/null"
-SPAMASSASSIN_LOG="/tmp/spamassassin.log"
-CAT="/bin/cat"
-
-# Messages
-UNABLE_TO_CD_INSPECTDIR="Impossible to change to ${INSPECT_DIR}"
-MSG_CONTENT_REJECTED="Message content rejected"
-
-# Exit codes from <sysexits.h>
-EX_TEMPFAIL=75
-EX_UNAVAILABLE=69
-
-# Users that execute different filters
-SPAMC_USER="sanitizer"
-
-export ANOMY
-
-
-# MAIN
-# ----
-
-cd ${INSPECT_DIR} || { echo ${UNABLE_TO_CD_INSPECTDIR} ; exit ${EX_TEMPFAIL}; }
-
-# Clean up when done or when aborting.
-trap "rm -f out.$$" 0 1 2 3 15
-
-# sanitizer only
-#${CAT} \
-#	| ${ANOMY_BIN} ${ANOMY_CONF} 2>>${ANOMY_LOG} > out.$$ || \
-#	{ echo ${MSG_CONTENT_REJECTED}; exit ${EX_UNAVAILABLE}; }
-
-# sanitizer and SpamAssassin
-${CAT} \
-	| ${SPAMC} -f -u ${SPAMC_USER} 2>${SPAMASSASSIN_LOG} \
-	| ${ANOMY_BIN} ${ANOMY_CONF} 2>>${ANOMY_LOG} > out.$$ || \
-	{ echo ${MSG_CONTENT_REJECTED}; exit ${EX_UNAVAILABLE}; }
-
-# SpamAssassin only
-#${CAT} \
-#	| ${SPAMC} -f -u ${SPAMC_USER} 2>${SPAMASSASSIN_LOG} > out.$$ || \
-#	{ echo ${MSG_CONTENT_REJECTED}; exit ${EX_UNAVAILABLE}; }
-
-$SENDMAIL "$@" < out.$$
-
-exit 0
-
diff --git a/mail-filter/anomy-sanitizer/files/sample_mailfiler.sh b/mail-filter/anomy-sanitizer/files/sample_mailfiler.sh
deleted file mode 100644
index a258f4890ded..000000000000
--- a/mail-filter/anomy-sanitizer/files/sample_mailfiler.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-#
-# spamc.sh
-#
-# Simple filter to plug SpamAssassin only
-# into the Postfix MTA, using the spamc / spamd
-# daemon version of SpamAssassin.
-#
-# (Should result in higher performance on busy servers)
-#
-# NOTE: spamd must be running before using this script!
-#
-# For use with:
-#    Postfix 20010228 or later
-#    SpamAssassin 2.42 or later
-#
-
-
-# VARIABLES
-# ---------
-
-# File locations
-# (CHANGE AS REQUIRED TO MATCH YOUR SET-UP)
-INSPECT_DIR="/var/spool/sanitizer"
-#INSPECT_DIR="/var/spool/filter"
-SENDMAIL="/usr/lib/sendmail -i"
-ANOMY="/usr/share/anomy-sanitizer"
-ANOMY_BIN="${ANOMY}/bin/sanitizer.pl"
-ANOMY_CONF="/usr/share/anomy-sanitizer/anomy.conf"
-#ANOMY_LOG="/dev/null"
-ANOMY_LOG="/tmp/sanitizer.log"
-SPAMC="/usr/bin/spamc"
-#SPAMC_LOG="/dev/null"
-SPAMC_LOG="/tmp/spamc.log"
-CAT="/bin/cat"
-
-# Messages
-UNABLE_TO_CD_INSPECTDIR="Impossible to change to ${INSPECT_DIR}"
-MSG_CONTENT_REJECTED="Message content rejected"
-
-# Exit codes from <sysexits.h>
-EX_TEMPFAIL=75
-EX_UNAVAILABLE=69
-
-# Users that execute different filters
-SPAMC_USER="sanitizer"
-
-export ANOMY
-
-
-# MAIN
-# ----
-
-cd ${INSPECT_DIR} || { echo ${UNABLE_TO_CD_INSPECTDIR} ; exit ${EX_TEMPFAIL}; }
-
-# sanitizer only
-#${CAT} \
-#	| ${ANOMY_BIN} ${ANOMY_CONF} 2>>${ANOMY_LOG} \
-#	| ${SENDMAIL} "$@" || \
-#	{ echo ${MSG_CONTENT_REJECTED}; exit ${EX_UNAVAILABLE}; }
-
-# sanitizer and SpamAssassin
-${CAT} \
-	| ${SPAMC} -f -u ${SPAMC_USER} 2>${SPAMC_LOG} \
-	| ${ANOMY_BIN} ${ANOMY_CONF} 2>>${ANOMY_LOG} \
-	| ${SENDMAIL} "$@" || \
-	{ echo ${MSG_CONTENT_REJECTED}; exit ${EX_UNAVAILABLE}; }
-
-# SpamAssassin only
-#${CAT} \
-#	| ${SPAMC} -f -u ${SPAMC_USER} 2>${SPAMC_LOG} \
-#	| ${SENDMAIL} "$@" || \
-#	{ echo ${MSG_CONTENT_REJECTED}; exit ${EX_UNAVAILABLE}; }
-
-exit 0
-
diff --git a/mail-filter/anomy-sanitizer/metadata.xml b/mail-filter/anomy-sanitizer/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/mail-filter/anomy-sanitizer/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index 9a163fdc0e5f..d1317b296400 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -9,5 +9,5 @@ DIST dcc-1.3.154.tar.Z 1711292 BLAKE2B 3e53488e718b13a1c36c1531f552ee811f42b274f
 DIST dcc-1.3.158.tar.Z 1714175 BLAKE2B 19e11e9e78268e76bf97f16ad6f03f0bb114ec9fbc9b1f8bb6ca7ce72fa419b1e50a6d35ee32ed5352b13da96002d313c00a07395317d33082eb69c9ae60008e SHA512 24fba5ea713e8df1468644508c323d64b3868685716b7cc02263933476940a807cfc4593432a9195371308c83d4ea93653e89634681d95dcb32f5d65c7274599
 EBUILD dcc-1.3.140-r1.ebuild 4450 BLAKE2B a7e8d531230170fa40cc7782929e53d01b1d29aabe750ab9d6b920416d5f09047e65eae84cb9d7417e8a51f16acb4609acaaf52b551c0aa027f5eb652f608747 SHA512 6a7dbf51021db45042ffabf96f4082af7cf16541607b5d6780f4bd66c4bd9b860316a84ca69a885a6de2aa05e48f12e2f47080a88c85c0471bb1ca7a8875f804
 EBUILD dcc-1.3.154.ebuild 4358 BLAKE2B 0e3b69bf36dc2a6f8f58eac9638c76648b825a2d9deee643e1a4ae174b34ce150a885fc115284aad0dc817743355f07bb450a75e62b5942172fc6d812c943c37 SHA512 d22050cdf0e5ab84a524c62e3752faa5a2bd986a57ee3ac643f56bf8ff5c7501b396d9a81f3788652e4f0c3229ae9c5bb7a45646bc903fac7b636670a0748508
-EBUILD dcc-1.3.158.ebuild 4356 BLAKE2B b4be2bc4942f2afc4a7b6fd4c6cbb7405e734a025809ff180660c0f05884808059ecb75b0206f7c0cf340b70a7b6144a574d6e93b023bf6bee0c98cf5d4c9146 SHA512 f3e723a777344ae59fca557fd77107fa84a7524c482e19fec22a0ec853bd48cf44f72a16e95dca3261ef401a5a68f817ec17f109fcb8369bc57b9d9ddc0c3078
+EBUILD dcc-1.3.158.ebuild 4355 BLAKE2B db260571a46aed8ade1ffcc14ccf3ab77eb729eef6bdac34c92005087e26052793ad53ff355279ef7c7841b4d9d4dfe7124a155a4845828d5abcd64845b487ca SHA512 e74657b3ac0746564ac784de51f21306ec6765408a0ae4c04a09e5c027efad0d80e03430c991f87f03ca91a6fa8e5dbdedb51b32f82dd1e8325e832d62f672e7
 MISC metadata.xml 417 BLAKE2B b1228d8060b3a3ce26e0a301089873d253bdee3e4e5fa785db1aef00528dbf3b786d3f2acd0d810b707fca436384cf26e67b5cfad63c912d3e6ae5cc374562e8 SHA512 8a17fc0c9502d8e21389a520cba60b482593a89064fb913a87b1c4fc73d20f0652948f848c803f22923a0873ed213025db2663effa584c800a9fe6b3a29f9339
diff --git a/mail-filter/dcc/dcc-1.3.158.ebuild b/mail-filter/dcc/dcc-1.3.158.ebuild
index 76a036e0b3a0..80d5dcb71c67 100644
--- a/mail-filter/dcc/dcc-1.3.158.ebuild
+++ b/mail-filter/dcc/dcc-1.3.158.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${P}.tar.Z"
 
 LICENSE="DCC GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ppc64 sparc x86 ~x86-fbsd" # ~amd64-fbsd
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" # ~amd64-fbsd
 IUSE="cgi ipv6 rrdtool milter"
 
 RDEPEND="dev-lang/perl
diff --git a/mail-filter/policyd-weight/Manifest b/mail-filter/policyd-weight/Manifest
index 04f43d244cde..e186cba64204 100644
--- a/mail-filter/policyd-weight/Manifest
+++ b/mail-filter/policyd-weight/Manifest
@@ -4,5 +4,5 @@ AUX policyd-weight.tmpfile 37 BLAKE2B 3401fc7d784c9d61f216fa46856a6d6e462866eaf8
 DIST policyd-weight-0.1.15.2-patches-1.0.tar.xz 6920 BLAKE2B 92bcf7b11dc5e07d5c8f10b9c103ac52b1d8e3449beb6e049311c2360ecb59d8751e35e20453c8dc402b286cf028f44cbdcc8bc45cf202a2af883d8954ae5e51 SHA512 a2d4ecd2ee76180cb6ebb0790a04e4fb101e9e6a73a253b83473ebb8952bc88cc903a8ea51b84743419dd8bc974a8ffc9378a187f8b8b65620268c382aaaa94e
 DIST policyd-weight-0.1.15.2.tar.gz 75347 BLAKE2B 3eba7a8909557b6f8ddc1ec0930e8b0c5d4a2ec213116977c8b340f52643491fc4ae81b7c9d319484e7584fe7c3c6c6aea92d7eecba7637d0f6378e00c64c28f SHA512 37702762c171b208d37651b2051b521e4f44708b7bb7e0d3001fd2ba123b227c847bad8dd479d7a56f9aeab02fdfd957d34b2c4d7f3a9fd727614cd4031f8b78
 EBUILD policyd-weight-0.1.15.2-r1.ebuild 959 BLAKE2B d54caebec49e82ea11afbf6c0d4251767585cfd7972d24d96932dc7e8970cb1115a13b489af191a2257aa36247cbb232b5880b4d77a271be9c6290f4334ba5f9 SHA512 e1be911e7576b014574ea66399dfe056ca037751e70de1b37575ea74f7cfca1e27ab7c61faa227d9158ef7d9f9b9926c1ab3824528b3f30dbf5e3a85f52abe47
-EBUILD policyd-weight-0.1.15.2-r2.ebuild 1180 BLAKE2B 72ff79fb49c51e972193bf216e5a09235a2bde9cbe8fcb231409c8405e56f9fec42be6fe64be2bda160e45cd7d7613f049e6d882680fb1895e2854b1c2b0c4ff SHA512 ef7811a5e919a1acb773843bf9f5a08e4eac8e9bc0eac8d449371143eeef403779f3433176adbdb68e0bbbc23fa9565e3add031961fc80763ef8187cdfb8248b
+EBUILD policyd-weight-0.1.15.2-r2.ebuild 1179 BLAKE2B eaff146b5a1d2f9d1aa1293f4e10b988863bd401527d3ab616aa4ee583f07b71da9d20ed1916624ccb97195f2acf4ad32ffcfe3da01f2345864d2183a9df48ab SHA512 35413c30a6651a7bb4ab8a91a83ba747ceeb0b1d40079dc6ee1587e6fc3adce7b956aa52b99863a96b8bbb0bee0dcc240e528808cd7af267ac58c9f09af9b053
 MISC metadata.xml 826 BLAKE2B 13a97351b95d9a5cff9e470e8d34e25499de444b2f13df706b4a80536a102abe5f3f1baa76f76fab68200328037cbe7a94374f7aabfbced2a12423e1e8d57fa3 SHA512 f7227950b202c28fe81a77e83ad679265526557775e30696594a434e4bfde1ffba3d59f7f0b5ee49a0dc373c92ed8b3c7591d679cec123fecc9e533329d7a735
diff --git a/mail-filter/policyd-weight/policyd-weight-0.1.15.2-r2.ebuild b/mail-filter/policyd-weight/policyd-weight-0.1.15.2-r2.ebuild
index 16319cb7224e..298da40f0b8a 100644
--- a/mail-filter/policyd-weight/policyd-weight-0.1.15.2-r2.ebuild
+++ b/mail-filter/policyd-weight/policyd-weight-0.1.15.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.policyd-weight.org/releases/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~x86"
+KEYWORDS="~alpha amd64 x86"
 IUSE=""
 
 DEPEND=""