gentoo resync : 20.03.2022

3 files changed, 2 insertions, 190 deletions

diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index eedd34c4e228..1a64c46b7c5b 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,8 +1,6 @@
 AUX amavisd-snmp-subagent.initd 890 BLAKE2B ccc1c91547775737676449765e90c12b70ff068ff8283e7bb8a55e7e568b30bb2b311f210ba34d932887476cda6114e204cb1535c76c5af739842ae283272363 SHA512 de18fbf19135625882e7c09753142f6cb9ef8ef74caa339201d0da338e0bace4e3626c8ad2bb1ad0f63f73b5d70e4cc156cc93a9484d6a90266a9b204d9a7d7e
 AUX amavisd.initd-r2 1594 BLAKE2B b778d21239440b6b01a0860f69b1363d57cc0e241a86501131cbafb563b77a58828c5801b86b5419c1e04eeaa85eeecd087f37394bfec2dc69a466c45c8155fa SHA512 67414b2d5977d74a1b613e8a3478a9e1f2a60ba29685c219db1cc48ead6fcf94e93a2d5897768b7720d5db352028c2eca89265bb1e2520b2f10ae011db200b65
 AUX amavisd.service-r1 433 BLAKE2B 8e61e95cfdadb37afec0040f87eb67745ea6aae766ca07b5eebfefc90e40ceba267028c8bf51e5208f198001a05edaef326d0a8ff23159a4d705f191c48c3753 SHA512 9696d50ab845d067e1289af8525c0ee3a8d55b4617af6f4d146d4844c9667b63886955145bea33a2980ed153210da69fa3747451c337075ff4ca500abafc0c7a
-DIST amavis-v2.12.1.tar.bz2 874339 BLAKE2B 23197298c448bae7bfaed62fda5065f507556737250caddde0d3bdec5fe219ab8834d4cbb1e06f443f2fc00b643d12d96447f58f37198b3ae7b96985f29ef2bf SHA512 8a2cef6ff6e2fa7f5d2e00a433a3f3ec7a15c47e21deadf6a25f50e0e29ad20d8641f474cd5d0dfcd3715458b07f08272f6df35efb2137b7c6a74a460cb91013
 DIST amavis-v2.12.2.tar.bz2 874946 BLAKE2B 0b52cb23e11d0b7b346e53b979b580b76f51ce22516a8e2ef6c6d579f1693a9d175ebd92e9cba74e4bed68b012250808e2f827182dddf5addbbb40f2602294f7 SHA512 8a6ab4441a9ef2ee757c839f656bc16f00dd9213f6cc0bb976d7f2b76793adf023d33a42099f07b0dae13281171db9ba0405028882a86e2230126e8d6a29a4ff
-EBUILD amavisd-new-2.12.1.ebuild 4913 BLAKE2B 41a71ebdc6b3da7cb98c9de7b6b7ea43b2df8c19f0cbc2e512cd85d793786c5e62624e141bd304e13a10c1fb9fc10643518f2c25e57371ebd0329a443c2b2627 SHA512 451478648cd555f4d00e03335493e28a85c99db67b28a94a22fd2c1add7156389c24cc6fabf3946e3239210e8014cbcb846acd45cff605213183378c34067bee
-EBUILD amavisd-new-2.12.2.ebuild 4918 BLAKE2B ddded3a78fef972abdfbe0ac2e81a2a763698d0dbd05a28c8a0d8d806a2a274753a94b16b3d78ac1da57fc690773c183632fe5271e57a2eba3067a8331126768 SHA512 f1863cc33d97ef91f35629a11f8973532050d93d9833d042b6fc2d8994f57fee5ef9f97c5e8d6eb06abb5309eae78cbbf8d92c2b7f0b4f8096612ff6b03744af
+EBUILD amavisd-new-2.12.2.ebuild 4913 BLAKE2B e4d85cd5fec69dc1cae4310ea5e1e0285adb2c3263a0b90ee12e01c3474dd25fc142c7ffe2f19209b4853229014594814f34e934e7ba9b15f53e218da2ac80fd SHA512 18c1983887a69ba4012afe213f2c8f8cf7fba6d9842dd35774c2572d5786beb683a60b986e6c30f42e0c494967aa43ba964d9b5814ce62b2b553d76b2ac91be2
 MISC metadata.xml 899 BLAKE2B 9b7c10ad571817f071c99963ed9930d87115f81813190d5c8b8e5e29dca556032ba312940e13077132d26c33212f28c90581c8a6d760b7aeea7f67c368c410d4 SHA512 f841f4ad9b70db155d9dea40d20de994b2d89769b63347a547adf45a2ba0c2cdf9ff8c8ed39b557beb001f2cc6fcb30c1cfc51c38aef601bd602f07e607f2a23
diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
deleted file mode 100644
index 30aa24ba326f..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="https://gitlab.com/amavis/amavis"
-SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin"
-
-MY_RSPAMD_DEPEND="dev-perl/HTTP-Message
-	dev-perl/JSON
-	dev-perl/LWP-UserAgent-Determined"
-DEPEND="acct-user/amavis"
-RDEPEND="${DEPEND}
-	app-arch/arc
-	app-arch/bzip2
-	app-arch/cabextract
-	app-arch/cpio
-	app-arch/gzip
-	app-arch/lha
-	app-arch/lrzip
-	app-arch/lzop
-	app-arch/ncompress
-	app-arch/p7zip
-	app-arch/pax
-	app-arch/arj
-	app-arch/unrar
-	app-arch/xz-utils
-	app-arch/zoo
-	dev-lang/perl:*
-	dev-perl/Archive-Zip
-	dev-perl/BerkeleyDB
-	dev-perl/Convert-BinHex
-	dev-perl/File-LibMagic
-	dev-perl/IO-Socket-SSL
-	dev-perl/IO-stringy
-	>=dev-perl/Mail-DKIM-0.31
-	>=dev-perl/MailTools-1.58
-	>=dev-perl/MIME-tools-5.415
-	dev-perl/Net-LibIDN
-	>=dev-perl/Net-Server-0.91
-	dev-perl/Net-SSLeay
-	dev-perl/Unix-Syslog
-	net-mail/ripole
-	net-mail/tnef
-	>=sys-apps/coreutils-5.0-r3
-	>=sys-libs/db-4.4.20
-	virtual/mta
-	virtual/perl-Compress-Raw-Zlib
-	virtual/perl-Digest-MD5
-	virtual/perl-File-Temp
-	virtual/perl-IO-Compress
-	virtual/perl-IO-Socket-IP
-	virtual/perl-MIME-Base64
-	virtual/perl-Time-HiRes
-	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 )
-	rspamd? ( ${MY_RSPAMD_DEPEND} )
-	rspamd-https? ( ${MY_RSPAMD_DEPEND}
-		dev-perl/LWP-Protocol-https
-		dev-perl/Net-SSLeay )
-	snmp? ( net-analyzer/net-snmp[perl] )
-	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )"
-
-AMAVIS_ROOT="/var/lib/amavishome"
-S="${WORKDIR}/amavis-v${PV}"
-
-src_prepare() {
-	if use courier ; then
-		eapply -p0 amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		eapply -p0 amavisd-new-qmqpqq.patch
-	fi
-
-	# We need to fix the daemon_user and daemon_group in amavis-mc even
-	# though we're going to run it in the foreground, because it calls
-	# "drop_priv" unconditionally and will crash if its user/group
-	# doesn't exist.
-	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 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{,-agent,-nanny,-release,-signer,-status}
-	dobin p0f-analyzer.pl amavisd-submit
-
-	if use snmp ; then
-		dosbin amavisd-snmp-subagent
-		newinitd "${FILESDIR}/amavisd-snmp-subagent.initd" \
-				 amavisd-snmp-subagent
-		dodoc AMAVIS-MIB.txt
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		newins LDAP.schema "${PN}.schema"
-	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
-}
-
-pkg_postinst() {
-	local d="/var/amavis"
-	if [ -d ${d} ]; then
-		elog "Existing data found. Please make sure to manually copy it to amavis' new"
-		elog "home directory by executing the following command as root from a shell:"
-		elog
-		elog "  cp -a ${d}/* ${d}/.??* ${AMAVIS_ROOT}/ && rm -r ${d}"
-		elog
-	fi
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
index f1305667633c..797e34be3276 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message