gentoo resync : 13.10.2019

3 files changed, 2 insertions, 79 deletions

diff --git a/mail-filter/policyd/Manifest b/mail-filter/policyd/Manifest
index 70f35bd8aa4c..4fd146456214 100644
--- a/mail-filter/policyd/Manifest
+++ b/mail-filter/policyd/Manifest
@@ -4,6 +4,5 @@ AUX policyd-post182.patch 1567 BLAKE2B 7019004993501396bada4754b40dbbf09e507220d
 AUX policyd.confd 61 BLAKE2B d39d4e5894dbc1164d29bf7e3fccc19c4247fd6a0f09c09f07e6f57ed531fc8aa5c22ea05ce63767e011754d1fc4aeed03b1d0cb1ef07705bf734c4e1f3b5f53 SHA512 6fbac91a71bd556e864b70534a57fcc60bf4a838ff780ee878b257313e12205ae95402c591cc62604dad8d1ee349ecea74c1646429c39587dc0ba13a697ca68f
 AUX policyd.rc 443 BLAKE2B 1135a6ab78cda5cb03cbed9d18773ab91237db217feaa0867dc0a9793f44f72d97033f77c78f94eb58b11a7f42071f59705088bf0b8e21cb8c8020a1bf6cf05b SHA512 32f2dec8b9067bcf219ee4edec2b36d010cadc34a018e6597339b238b21db7782975d12098d1232854b70e19bbdbe355bc8c4f23a5675ecc6171eeca81bfa69c
 DIST policyd-1.82.tar.gz 68372 BLAKE2B 39603b025235d3a68401e8cf9b357d224515f5308f1b86bf84d1231157ac2d5c2ca4dc00cc9deefdd03cdb4ffc214a8ebe5582e299f05b79a471e93238e36cff SHA512 08de114736620d5f1c11f7183135ecf4589c2d6258dee486b5f4f5a9156e4feabd7eaf19fa09428e79d5d5c72ac4757c83af86f43a7547030b1a59cb368e82a8
-EBUILD policyd-1.82-r1.ebuild 1974 BLAKE2B 9467c9cb11441d4e528717b1c01abb878b18f02e0321c3195c4ae359ca413ed16d4abb28c54834494661ee92124f7ccb9da8439048c2ee0f75e48b7bbf3b44e9 SHA512 17c253ac9d1f3c0b8e2eccb320e1fc3df627014828fbc4c95f3438b67a27075fb703eb42c806644dd6e9741450b897aaca11e1799255a257269513fd228caf2b
-EBUILD policyd-1.82-r3.ebuild 2032 BLAKE2B f2e98fb86aa068c899f1900224806cfc71d8858c195f6c15ee8276a9b571b029f0de075fc469e0f513936281e08d6907197616371a5ca78114be60f6ee762f5f SHA512 705f158545acf90e1d2dcffddcb3b5f9f7c6f562c7f98116771f558f2486139a9189d34f94417ea39a5636295d12b8b54ca7b189658980ea38f61ad1684871d7
+EBUILD policyd-1.82-r3.ebuild 2030 BLAKE2B 30bf9e509d433fa619d5f603bb3a5cafbcc916ff6e133be6af8b8f20b780c8f9d9337f27065592a23b9b92d164ee8c7d64860be19b29d67183beb5259e9bc81f SHA512 346e21f8ca413c058e2a22a6a3efd17869379145c640a54fc4f5b00d64e9379aea8e765484884f528b6c834321b1ae13d792fffb3266a1b3c385f2822222c82f
 MISC metadata.xml 249 BLAKE2B cea7fd2e21aaa481df4b19103927fcdd71b9e296720387e01aed419f8f27ef74ed751add3132fd2f811f55265315453ca1b6de218a4b4b78c06b6ec3bcb6d312 SHA512 d9f2d22053f3ff8e8dd64e0a1695fa371612f1f57d62bf1a914ce28443cc910dfb5b4f53b61742668da15ae3f8b9dfd3004c7fe980a71922d0fcf7bc8952ca9b
diff --git a/mail-filter/policyd/policyd-1.82-r1.ebuild b/mail-filter/policyd/policyd-1.82-r1.ebuild
deleted file mode 100644
index ab88aeb093eb..000000000000
--- a/mail-filter/policyd/policyd-1.82-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Policy daemon for postfix and other MTAs"
-HOMEPAGE="http://policyd.sf.net/"
-
-# This is not available through SF mirrors
-SRC_URI="http://policyd.sourceforge.net/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE=""
-DEPEND="virtual/mysql
-		dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-post182.patch"
-	epatch "${FILESDIR}/${PN}-makefile.patch"
-	sed -i -e "s/gcc/$(tc-getCC)/" Makefile
-
-	ebegin "Applying config patches"
-	sed -i -e s:UID=0:UID=65534:g \
-	    -e s:GID=0:GID=65534:g \
-	    -e s:DAEMON=0:DAEMON=1:g \
-	    -e s:DEBUG=3:DEBUG=0:g \
-	    -e s:DATABASE_KEEPALIVE=0:DATABASE_KEEPALIVE=1:g \
-	    policyd.conf || die "sed failed"
-	eend
-}
-
-src_compile() {
-	emake build || die "emake build failed"
-}
-
-src_install() {
-	insopts -o root -g nobody -m 0750
-	mv cleanup policyd_cleanup
-	mv stats policyd_stats
-
-	dosbin policyd policyd_cleanup policyd_stats
-
-	insopts -o root -g nobody -m 0640
-	insinto /etc
-	doins policyd.conf
-
-	insopts -o root -g nobody -m 0700
-	exeinto /etc/cron.hourly
-	newexe "${FILESDIR}/${PN}-cleanup.cron" ${PN}-cleanup.cron
-
-	dodoc ChangeLog DATABASE.mysql README doc/support.txt
-
-	newinitd "${FILESDIR}/${PN}.rc" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-}
-
-pkg_postinst() {
-	elog "You will need to create the database using the script DATABASE.mysql"
-	elog "in /usr/share/doc/${PF}/"
-	elog "Read the mysql section of the README.txt for details."
-	elog
-	elog "To use policyd with postfix, update your /etc/postfix/main.cf file by adding"
-	elog "  check_policy_service inet:127.0.0.1:10031"
-	elog "to your smtpd_recipient_restrictions line, or similar."
-	elog
-	elog "Also remember to start the daemon at boot:"
-	elog "  rc-update add policyd default"
-	elog
-	elog "Read the documentation for more info."
-}
diff --git a/mail-filter/policyd/policyd-1.82-r3.ebuild b/mail-filter/policyd/policyd-1.82-r3.ebuild
index 0d1be22af1b6..1fc4a90aaeda 100644
--- a/mail-filter/policyd/policyd-1.82-r3.ebuild
+++ b/mail-filter/policyd/policyd-1.82-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://policyd.sf.net/"
 SRC_URI="http://policyd.sourceforge.net/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE="libressl"
 DEPEND="dev-db/mysql-connector-c:0=
 	!libressl? ( dev-libs/openssl:0= )