gentoo resync : 12.01.2019

3 files changed, 2 insertions, 194 deletions

diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 463ad132a0b9..8db1cf030f3c 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -11,6 +11,5 @@ AUX amavisd.service-r1 433 BLAKE2B 8e61e95cfdadb37afec0040f87eb67745ea6aae766ca0
 DIST amavis-amavisd-new-2.11.1.tar.gz 1093467 BLAKE2B 1e43ddea86ff269b02cbbcd125d913c51b66728b1063cde6ca3f3f24f1bd36f9f3c7f51a8baf509d2aca0d41a07a00bb9abe08dd70724391c552634715d01a75 SHA512 6ef291868908bd13d6ce913f5c8c3898b35eba490877e8eded3951a32be7549145df5db1409f124a3631ec88dd7eeb9457ce2b063ae3e3bccd76cc2a9b8741ae
 DIST amavisd-new-2.11.0.tar.xz 780548 BLAKE2B 59cea5219a737275411c08c7d137ff2109ebbfee8f5f567d80e0cd73cfbb22887dd186383bfd02ad9880e099e0c06b829de43b9e12dbc3151813533166e51654 SHA512 a33292c976abf54db9475392069658c926e7a6f11a4970bbe353b34b3343388bc83b40eda4729f8efa735a3a6e23fd1ed83487f6f7ccf1e9f0903220e6d26957
 EBUILD amavisd-new-2.11.0-r3.ebuild 4605 BLAKE2B 5e08b390567ea546fa4bb7ab8371dabcef91cb0c39d2ff87cfab4580f2f878c3a066f4d607fb57f214c9b4e837c079ecce80157662df805768f2f1e3db33e469 SHA512 0e349d6bf27c0492688b3715270dcc4e49d2ce2b2050a08d7f8b8854981752efa32361c661982e3eec083efb571a0fa831cba6d040f9799d1facee4b59fa893a
-EBUILD amavisd-new-2.11.1-r1.ebuild 4949 BLAKE2B f0dc3dd57190d24752fe09be30b3c9299e7fdb591347548adea000b2ab2f8a5bc7b6ec66f76eb6046da4bd1857e2f7e6e017899fb466d9ea784dec2481a44308 SHA512 57cb159e9e4da2b6e2393039c85bbd534b275744cb435b0879bee2a3fcf41a86531e154be591281c4e51c066de52a1a75259fcc988de1582e7d1db0156f0db56
-EBUILD amavisd-new-2.11.1-r2.ebuild 5220 BLAKE2B b0488be1475b10b25582a3b020a8a8517c5e9062eb7ddcfd4790e3b36f29e8c0b8893f9183436ba0021d1507a11e73347bc537179bf9d281d5eb1c2938f894ae SHA512 12dbe4d2b83a4c12c98170224ba69f4c3d16d65db6c761beb5400f3c6709da8e0b71c24e1b9dd859dcb0728d92b727276f16e1de0d676db3a4418e6f59d985c0
+EBUILD amavisd-new-2.11.1-r3.ebuild 5203 BLAKE2B a36ab3dd37f5d1a49a8ac2acb0e43568d837bf238d2d4380c925f32d8ce7b69e73bcb59b4ee8ee234aa8ae29a2768c6af6bb1eea8905ffddd1a3cd1ad01daa64 SHA512 271ed5e8d12f8c71fc12738f5c69419d2b166de3afd53d7f9f34d02356cc3cd7d07c665ad2226d45d327952d9bba069e09b8a4d55ca9879157b968e09f96480a
 MISC metadata.xml 845 BLAKE2B 5ea031bb47ac8f1ca3cb703ed6e6bcd94fa63ea275874c616e3c24c5802f0f2f4b2443b379b62e708eb6ea075a0950116722319cc08023b20d7152cbabce512e SHA512 4409524d4819357253b63c143f0aa4b760ffe0b4ed22d30d28632f86ee2731c7e84a95131016a21ab43a63c32ea35cfbe741010a07f45e8d21fe05f020387228
diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r1.ebuild
deleted file mode 100644
index d436def3bdbe..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.11.1-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd user
-
-DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="https://gitlab.com/amavis/amavis"
-SRC_URI="${HOMEPAGE}/-/archive/${P}/amavis-${P}.tar.gz"
-PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.10.0"
-
-RDEPEND="${DEPEND}
-	>=sys-apps/coreutils-5.0-r3
-	app-arch/cpio
-	app-arch/gzip
-	app-arch/bzip2
-	app-arch/arc
-	app-arch/cabextract
-	app-arch/freeze
-	app-arch/lha
-	app-arch/lrzip
-	app-arch/lzop
-	app-arch/ncompress
-	app-arch/p7zip
-	app-arch/pax
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/xz-utils
-	app-arch/zoo
-	net-mail/ripole
-	>=dev-perl/Archive-Zip-1.14
-	>=virtual/perl-IO-Compress-1.35
-	>=virtual/perl-Compress-Raw-Zlib-2.017
-	net-mail/tnef
-	virtual/perl-MIME-Base64
-	>=dev-perl/MIME-tools-5.415
-	>=dev-perl/MailTools-1.58
-	>=dev-perl/Net-Server-0.91
-	virtual/perl-Digest-MD5
-	dev-perl/IO-stringy
-	virtual/perl-IO-Socket-IP
-	>=virtual/perl-Time-HiRes-1.49
-	dev-perl/Unix-Syslog
-	dev-perl/Net-LibIDN
-	dev-perl/File-LibMagic
-	>=sys-libs/db-4.4.20
-	dev-perl/BerkeleyDB
-	dev-perl/Convert-BinHex
-	>=dev-perl/Mail-DKIM-0.31
-	virtual/perl-File-Temp
-	dev-perl/Net-SSLeay
-	dev-perl/IO-Socket-SSL
-	virtual/mta
-	clamav? ( app-antivirus/clamav )
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	razor? ( mail-filter/razor )
-	snmp? ( net-analyzer/net-snmp[perl] )
-	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
-	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/amavis-${P}"
-
-pkg_setup() {
-	# Create the user beforehand so that we can install the config file
-	# (and some directories) with group "amavis" in src_install().
-	enewgroup amavis
-	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
-}
-
-src_prepare() {
-	# amavisd-new version 2.11.0 breaks DKIM signing of outbound mail,
-	# see https://bugs.gentoo.org/603582
-	eapply "${FILESDIR}/amavisd-2.11.0-dkim.patch"
-
-	if use courier ; then
-		eapply -p0 amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		eapply -p0 amavisd-new-qmqpqq.patch
-	fi
-
-	sed -i  \
-		-e '/daemon/s/vscan/amavis/' \
-		-e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
-		"${S}/amavisd.conf" "${S}/amavis-mc"  || die "missing conf file"
-
-	if ! use dkim ; then
-		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
-			|| die "missing conf file - dkim"
-	fi
-
-	if use zmq ; then
-		sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf" \
-			|| die "missing conf file - zmq"
-	fi
-
-	if ! use spamassassin ; then
-		sed -i -e \
-			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
-			"${S}/amavisd.conf" || die "missing conf file - sa"
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \
-		amavisd-signer amavisd-status
-	dobin p0f-analyzer.pl amavisd-submit
-
-	if use snmp ; then
-		dosbin amavisd-snmp-subagent
-		use zmq && dosbin amavisd-snmp-subagent-zmq
-		dodoc AMAVIS-MIB.txt
-		newinitd "${FILESDIR}"/amavisd-snmp.initd amavisd-snmp
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
-	fi
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		newins LDAP.schema ${PN}.schema || die
-	fi
-
-	# The config file should be root:amavis so that the amavis user can
-	# read (only) it after dropping privileges. And of course he should
-	# own everything in his home directory.
-	insinto /etc
-	insopts -m0640 -g amavis
-	doins amavisd.conf
-
-	# Implementation detail? Keepdir calls dodir under the hood.
-	diropts -o amavis -g amavis
-	keepdir "${AMAVIS_ROOT}"/{,db,quarantine,tmp,var}
-
-	# BEWARE:
-	#
-	# Anything below this line is using the mangled insopts/diropts from
-	# above!
-	#
-
-	newinitd "${FILESDIR}/amavisd.initd-r2" amavisd
-
-	systemd_newunit "${FILESDIR}/amavisd.service-r1" amavisd.service
-
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
-		amavisd.conf-default amavisd-custom.conf
-
-	docinto README_FILES
-	dodoc README_FILES/README*
-	dodoc -r README_FILES/*.{html,css}
-	docinto README_FILES/images
-	dodoc README_FILES/images/*.png
-	docinto README_FILES/images/callouts
-	dodoc README_FILES/images/callouts/*.png
-
-	docinto test-messages
-	dodoc test-messages/README
-	dodoc test-messages/sample.tar.gz.compl
-}
-
-pkg_preinst() {
-	# TODO: the following is done as root, but should probably be done
-	# as the amavis user.
-	if use razor ; then
-		if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then
-			elog "Setting up initial razor config files..."
-
-			razor-admin -create -home="${D}/${AMAVIS_ROOT}/.razor"
-			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
-				"${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf" || die
-		fi
-	fi
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
index 1767bdefc4a6..fb89008a1ca2 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.1-r2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,6 @@ RDEPEND="${DEPEND}
 	app-arch/bzip2
 	app-arch/arc
 	app-arch/cabextract
-	app-arch/freeze
 	app-arch/lha
 	app-arch/lrzip
 	app-arch/lzop