some random QA fixup

- revbump libtom* since i seem to have forgot that for multilib, no changes (besides the revert to unstable for libtomcrypt)
- sync amavisd-new with tree
- fix spamassassin url
- remove RESTRICT=installsources since it seems that it has no effect
- fix whitespace errors in swift

mail-filter/amavisd-new/amavisd-new-2.8.2_rc1.ebuild

@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit eutils user
+inherit eutils systemd user
 
 MY_P="${P/_/-}"
 DESCRIPTION="High-performance interface between the MTA and content checkers."
@@ -115,6 +115,10 @@ src_install() {
 
 	newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
 
+	systemd_dounit "${FILESDIR}/amavisd.service"
+	use clamd || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
+	use spamassasin || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
+
 	keepdir "${AMAVIS_ROOT}"
 	keepdir "${AMAVIS_ROOT}/db"
 	keepdir "${AMAVIS_ROOT}/quarantine"

mail-filter/amavisd-new/files/amavisd.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Amavisd Daemon
+Wants=postfix.service
+Wants=spamassassin.service
+Wants=clamd.service
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/amavisd -c /etc/amavisd.conf foreground
+ExecReload=/usr/sbin/amavisd -c /etc/amavisd.conf reload
+
+[Install]
+WantedBy=multi-user.target

mail-filter/spamassassin/spamassassin-3.4.0.ebuild

@@ -10,8 +10,7 @@ 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"
-SRC_URI="http://people.apache.org/~kmcgrail/devel/${MY_P}.tar.bz2"
+SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"