gentoo resync : 14.05.2020

5 files changed, 2 insertions, 164 deletions

diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index 7cfd4db1bc02..2f2677ec6c81 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -2,10 +2,6 @@ AUX opendmarc-1.3.2-multiple-From.patch 1394 BLAKE2B 91b36a131ca9dca5e33f3a9610a
 AUX opendmarc.confd 85 BLAKE2B 52cccfd8d194febc24453ad92bebf4358f92125cc4512e664e279f09ee0c44bffc4fa2c4c6dbbdfaf653576bcce821597cccb58fafdfae51b81e5ac149e20113 SHA512 7e5faeebbccaaafe42e6edda3a812b9954f19d71b4593cb2ab895dfeb26a8073e4aaeb2f5c626b1c35877d08ea00077b0507fe833e2838b10d83d5e0acfe966c
 AUX opendmarc.initd 1509 BLAKE2B b1cde9546c95b51c8c395f10eddf85bcb2fd17fd8a537df523e04a71d241c0fad4a3d2e4c34c950d7b684be518368fe78538828b81627d647e3531177eabb85e SHA512 00c9901cf5b460e20d8010d4aedfd7c338c76d1053f9ddcd9d4aa2c183345e3b810d0bee1207ff9a7ad988577192c52470ca62c67130a981fa67e393d5c70129
 AUX opendmarc.service 800 BLAKE2B 866b1aaa0c8570494ac56aaa9962821204a7a24437cdb8bec0343c716cfc1d3748a368a32ec314dfce7e4264188cfb1dff51212d60340d4be8e33394a85486f6 SHA512 b140dc3ac99ee7c3dcee80743d6c4295dec4ce5090ab9f560ffe35f9d5e63c7f5af871edcc759be462b8110706028c047cd05ae910a74ecba0436620d6b291bb
-DIST opendmarc-1.1.3.tar.gz 586574 BLAKE2B a5574aa705db6e5b87a704f3073039d667c9052d1ec907ca9423532f62d52cbdaf7af1680a2179198616f27786940650492ad39c4fdb668c27c5979804471eea SHA512 30de56b6da1665e0ed68484702bfcfcbd0b65275053818c807c16dea26f0e014a0484dc9d5ed6d1405628ea22a61082f13cecf66714a414139f612c51a294086
 DIST opendmarc-1.3.2.tar.gz 593448 BLAKE2B 80f47a82e38c6cdc5791a695485262c50e9363b81537a52d7af204bd6a830df6eea9e9b6f710b72b7934c3ab7df800def7d4b3e54f53b8908a7f1b42bcea2b2d SHA512 6045fb7d2be8f0ffdeca07324857d92908a41c6792749017c2fcc1058f05f55317b1919c67c780827dd7094ec8fff2e1fa4aeb5bab7ff7461537957af2652748
-EBUILD opendmarc-1.1.3.ebuild 757 BLAKE2B 1dc78305bb746405185e6b3e2a435a976475bf881ad3e2702c1e99cb38ae9c3ddca5bd6e51ea506ab0a84f40629ac1b7de24c5d44739b2fb54d301a2ce3cfac6 SHA512 4bdd251638b2ff2dd90ed985da7ae04152b7f41028585149e31f463f82203b11e972845821084f355e7481a5fd9275278b057a24abd5002559571b196b4ba3a1
-EBUILD opendmarc-1.3.2-r1.ebuild 1411 BLAKE2B 09744240801d95ffab1ddea96509c1e1796aab9b5787ad264984a9e94e943e07b52af49ec05670acad01a14685b1f38a099b387b1249a91f5a97305f2cb3b86e SHA512 b5a927769b5635124d815311daa6ff8057b4e735895e10726687c835fb19cf663e43d6e8c085a5e13e07d35c07d2ab22ff65f464f4de2ee26c05404bdda8def5
-EBUILD opendmarc-1.3.2-r2.ebuild 1550 BLAKE2B b5ba54570b5d5fde5df574e13e2d82ffed5de6a2293a094ab7e8a2aff95843d49cd3266baf4cedb86ade0a35189aa37a159cb12bec9d7d37132921f5978af62d SHA512 0d187edb2a3fe745f4f9b9ebc5c13a4a26c38308a18ea0a7966297a6d2a4835f611a90e0baa4a0794f886edc6df429202bea25f2a6a87e4a0ec3ff5dcffe063f
-EBUILD opendmarc-1.3.2-r3.ebuild 1603 BLAKE2B 9183cfae9e768b485e5c469208660ec02c8d7fe8cecc8bd5916ab87d0579d9d4699a07a86ce9915eefea5e4ba549b71aeaf52f8be01c9b53e68d4f6f7c0ac1a3 SHA512 1c13bcdb86bacf192c0f1be61781757054bfdfa9db6a96b46de103eeebb28e35cee88051b580ebbe8be13708826c32e2169d3cf518b0e2c381b22990757d61e8
+EBUILD opendmarc-1.3.2-r3.ebuild 1610 BLAKE2B 78304b8b07399155f72cbbac51e47cecad9459e862425c5d0beb01a1ce5ec02791abaaaf87d674200c3dacb7069f1443959811a7ac6dd1a113f121b087f9dfeb SHA512 6a6e5125d8447a73c28478764f793af9a0052a4142e51773904275857f77384e8f4c4f07e04045b94e704d397ddd6d8d787fea9d1415c28d0110efb9052e6486
 MISC metadata.xml 512 BLAKE2B e837ed3fdef4432f4a6e208b57942ac6b74de558ad20fa978ce046d49147b4225720506c7191a07eeceeb85d6773d3f6d2ae5ca62c08fddb7126061bcfd46fdb SHA512 33b5347b487959b6412dd8a9e7babf0cedac3dd27eb6397dfc226de5d34b70c7e67e9b30dae231bdf743e4c18ffd2cfcd6df1af450e201cafa3c5105d5a889f0
diff --git a/mail-filter/opendmarc/opendmarc-1.1.3.ebuild b/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
deleted file mode 100644
index 63923f17a6d8..000000000000
--- a/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Open source DMARC implementation "
-HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
-SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-perl/DBI
-	|| ( mail-filter/libmilter mail-mta/sendmail )"
-RDEPEND="${DEPEND}
-	dev-perl/Switch"
-
-src_prepare() {
-	# fix building with newer glibc, already fixed in later releases, #640012
-	sed -i -e 's/T_RRSIG/disabled_T_RRSIG/' libopendmarc/opendmarc_dns.c || die
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild
deleted file mode 100644
index 35988944a840..000000000000
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd
-
-DESCRIPTION="Open source DMARC implementation "
-HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
-SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~x86"
-IUSE="spf +reports"
-
-DEPEND="reports? ( dev-perl/DBI )
-	|| ( mail-filter/libmilter mail-mta/sendmail )"
-RDEPEND="${DEPEND}
-	reports? (
-		dev-perl/DBD-mysql
-		dev-perl/HTTP-Message
-		dev-perl/Switch
-	)
-	spf? ( mail-filter/libspf2 )"
-
-pkg_setup() {
-	enewgroup milter
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	default
-	if use !reports ; then
-		sed -i -e '/^SUBDIRS =/s/reports//' Makefile.in || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_with spf) \
-		$(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
-		$(use_with spf spf2-lib "${EPREFIX}"/usr/lib)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/opendmarc.initd opendmarc
-	newconfd "${FILESDIR}"/opendmarc.confd opendmarc
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	dodir /etc/opendmarc
-
-	# create config file
-	sed \
-		-e 's:^# UserID .*$:UserID milter:' \
-		-e "s:^# PidFile .*:PidFile ${EPREFIX}/var/run/opendmarc/opendmarc.pid:" \
-		-e '/^# Socket /s:^# ::' \
-		"${S}"/opendmarc/opendmarc.conf.sample \
-		> "${ED}"/etc/opendmarc/opendmarc.conf \
-		|| die
-}
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
deleted file mode 100644
index 031cb5289f55..000000000000
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user multilib systemd
-
-DESCRIPTION="Open source DMARC implementation "
-HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
-SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="spf +reports static-libs"
-
-DEPEND="reports? ( dev-perl/DBI )
-	|| ( mail-filter/libmilter mail-mta/sendmail )"
-RDEPEND="${DEPEND}
-	reports? (
-		dev-perl/DBD-mysql
-		dev-perl/HTTP-Message
-		dev-perl/Switch
-	)
-	spf? ( mail-filter/libspf2 )"
-
-pkg_setup() {
-	enewgroup milter
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	default
-	if use !reports ; then
-		sed -i -e '/^SUBDIRS =/s/reports//' Makefile.in || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_with spf) \
-		$(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
-		$(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir)) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la
-
-	newinitd "${FILESDIR}"/opendmarc.initd opendmarc
-	newconfd "${FILESDIR}"/opendmarc.confd opendmarc
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	dodir /etc/opendmarc
-
-	# create config file
-	sed \
-		-e 's:^# UserID .*$:UserID milter:' \
-		-e "s:^# PidFile .*:PidFile ${EPREFIX}/var/run/opendmarc/opendmarc.pid:" \
-		-e '/^# Socket /s:^# ::' \
-		"${S}"/opendmarc/opendmarc.conf.sample \
-		> "${ED}"/etc/opendmarc/opendmarc.conf \
-		|| die
-}
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
index b3c31185020a..480100bb10f5 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="spf +reports static-libs"
 
 DEPEND="reports? ( dev-perl/DBI )