gentoo resync : 17.02.2021

3 files changed, 32 insertions, 29 deletions

diff --git a/mail-filter/policyd/Manifest b/mail-filter/policyd/Manifest
index 4fd146456214..19dee0d91329 100644
--- a/mail-filter/policyd/Manifest
+++ b/mail-filter/policyd/Manifest
@@ -4,5 +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-r3.ebuild 2030 BLAKE2B 30bf9e509d433fa619d5f603bb3a5cafbcc916ff6e133be6af8b8f20b780c8f9d9337f27065592a23b9b92d164ee8c7d64860be19b29d67183beb5259e9bc81f SHA512 346e21f8ca413c058e2a22a6a3efd17869379145c640a54fc4f5b00d64e9379aea8e765484884f528b6c834321b1ae13d792fffb3266a1b3c385f2822222c82f
-MISC metadata.xml 249 BLAKE2B cea7fd2e21aaa481df4b19103927fcdd71b9e296720387e01aed419f8f27ef74ed751add3132fd2f811f55265315453ca1b6de218a4b4b78c06b6ec3bcb6d312 SHA512 d9f2d22053f3ff8e8dd64e0a1695fa371612f1f57d62bf1a914ce28443cc910dfb5b4f53b61742668da15ae3f8b9dfd3004c7fe980a71922d0fcf7bc8952ca9b
+EBUILD policyd-1.82-r4.ebuild 1957 BLAKE2B 5f4df5f8e82f079228084059e1fdb5dd53b1aa744d87bb9037bbb25fb4b7c8cefa636b64e05c89c42a785e324f342cf8942b9ff8b0e65929d1f36b18512ec12b SHA512 ba1c08a244219fb7c5e9a9cc369c4c5c010b8daca45a3cb649068c5aea9344fb1c321423c34be8b66e3ffdfac58afa406c1acf2d8f8d4183b2d3bc88e0304a80
+MISC metadata.xml 244 BLAKE2B 878a0d6a1b7aeca0b9cbc7903c25fb9494ba6e3e9ba68f6eb6f19b7f48b2bf8a34c17b3784fcd981f44569b10bebd83ae3f7875cd94900599b66f6dcf7e0d131 SHA512 0c207065dfdfebb4d126b9ac830a78c9a91b91ba29cc0d48f3668d17bf503a2b0b337cbe415a37560a571091d215660b4ba9ba6b495a0740a580f16c22d7fff3
diff --git a/mail-filter/policyd/metadata.xml b/mail-filter/policyd/metadata.xml
index e38074e80020..99c804e9dc66 100644
--- a/mail-filter/policyd/metadata.xml
+++ b/mail-filter/policyd/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">policyd</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">policyd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/policyd/policyd-1.82-r3.ebuild b/mail-filter/policyd/policyd-1.82-r4.ebuild
index 1fc4a90aaeda..ff0daf33992c 100644
--- a/mail-filter/policyd/policyd-1.82-r3.ebuild
+++ b/mail-filter/policyd/policyd-1.82-r4.ebuild
@@ -1,41 +1,44 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-inherit toolchain-funcs
+inherit flag-o-matic 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="libressl"
-DEPEND="dev-db/mysql-connector-c:0=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )"
+
+DEPEND="
+	dev-db/mysql-connector-c:0=
+	dev-libs/openssl:0="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-post182.patch"
-	"${FILESDIR}/${PN}-makefile.patch"
+	"${FILESDIR}"/${PN}-post182.patch
+	"${FILESDIR}"/${PN}-makefile.patch
 )
 
 src_prepare() {
 	default
 	sed -i -e 's/@${CC}/${CC}/' -e 's/@$(CC)/$(CC)/' Makefile
 
-	ebegin "Applying config patches"
+	# 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
+		-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
+}
+
+src_configure() {
+	append-cflags -fcommon
+	default
 }
 
 src_compile() {
@@ -44,8 +47,8 @@ src_compile() {
 
 src_install() {
 	insopts -o root -g nobody -m 0750
-	mv cleanup policyd_cleanup
-	mv stats policyd_stats
+	mv cleanup policyd_cleanup || die
+	mv stats policyd_stats || die
 
 	dosbin policyd policyd_cleanup policyd_stats
 
@@ -55,12 +58,12 @@ src_install() {
 
 	insopts -o root -g nobody -m 0700
 	exeinto /etc/cron.hourly
-	newexe "${FILESDIR}/${PN}-cleanup.cron" ${PN}-cleanup.cron
+	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}
+	newinitd "${FILESDIR}"/${PN}.rc policyd
+	newconfd "${FILESDIR}"/${PN}.confd policyd
 }
 
 pkg_postinst() {