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
This commit is contained in:
Robert Förster 2014-03-19 04:59:10 +01:00
parent 73c2b098c3
commit 0fc737b673
9 changed files with 57 additions and 21 deletions

View File

@ -12,7 +12,7 @@ SRC_URI="http://www.libtom.org/files/ltm-${PV}.tar.bz2"
LICENSE="WTFPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc examples static-libs"
DEPEND="sys-devel/libtool"

View File

@ -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"

View File

@ -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

View File

@ -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"

View File

@ -11,7 +11,7 @@ HOMEPAGE="http://www.teamspeak.com/"
SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-amd64-${PV}.tar.gz )
x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-x86-${PV}.tar.gz )"
RESTRICT="installsources fetch mirror strip"
RESTRICT="fetch mirror strip"
LICENSE="teamspeak3 GPL-2"
SLOT="0"

View File

@ -1,14 +1,34 @@
# we inerhit eclasses from gentoo
masters = gentoo
# Use new hashes
# This went live Wednesday, July 4, 2012 at 10:00 UTC
# For more details, please see: http://archives.gentoo.org/gentoo-dev-announce/msg_00000.xml
# and/or GLEP 59.
manifest-hashes = SHA256 SHA512 WHIRLPOOL
# Do not update changelogs
# Bug #470670 - gentoo's council says to deprecate EAPIs 1 and 2.
# 2014-02-25 council meeting deprecated EAPIs 0 and 3.
eapis-deprecated = 0 1 2 3
# Bug #337853 - gentoo's council says to enable
# --echangelog by default for the "gentoo" repo
# we don't do it, use git log instead.
update-changelog = false
# Use thin manifests
thin-manifests = true
# Dont sign thin manifests. There is no current policy for git commit signing
sign-manifests = false
# Dont sign commits
sign-commits = false
# the default *is* actually pms, but better safe then sorry
# since we don't actually need stuff like package.* as
# directory
profile-formats = pms
# Make egencache generate newer (more reliable)
# md5-dict cache format (see bug #409445).
# NOTE: list md5-dict first so clients prefer it
# INFRA NOTE: Format 'pms' was removed on Aug 6 2012. (Announced prior as Aug 1
# 2012 was the removal date)
cache-formats = md5-dict