gentoo resync : 15.12.2019

2 files changed, 24 insertions, 19 deletions

diff --git a/net-mail/relay-ctrl/Manifest b/net-mail/relay-ctrl/Manifest
index c38081f9942e..f4d73dc4cee8 100644
--- a/net-mail/relay-ctrl/Manifest
+++ b/net-mail/relay-ctrl/Manifest
@@ -1,4 +1,4 @@
 AUX authenticated.c-relayfixup.diff 702 BLAKE2B c597a6dbf6fc7161caa769aafc3938bcc5ca14ac6ef3da176b04dbf62bb7832059816e603f9600394cbd7225d1c5d9ec30829f41a4b00da3d0e9d2ac6805c60e SHA512 2515f2b5a43e5bae900ef0f419d7f9fb95953e39ebaee524efd8952e0764d82507483b08279866426cd84c6c8524a57cd51b8cf439a6dfbfca3da3e5d3fb0089
 DIST relay-ctrl-3.1.1.tar.gz 35046 BLAKE2B 91e4ce0f1f6ce5933f64e0d60407004d409474180f42bf40632bdb3bce1f3f974abdb597d34ab7ee4113e041323bd55965ce57f271fe79cfb8c56972fe8612b4 SHA512 738a001f6a058809955f04664919f261ff1a0bfc280ec5e805b870baf448b27664e1b376dd078100a2847e38248eb16651e23812f00609a437893e7b1dc9102c
-EBUILD relay-ctrl-3.1.1-r2.ebuild 2045 BLAKE2B f74e8c277f235e1f9f9cab0aa164b4a44516d85287f073717915b5d2442feb202a18056ee3336e97a50470c2b02ffc1038bbd85052e86d7a26ac12effae973cc SHA512 53cf00e0c9b101c2b0032932f7caf82c26631a2220e1242a0ab3fa2d11ed66026e94d6990d9c65caae78f2ab89dfacb894b4923933641d979adc3e65cc95f71a
+EBUILD relay-ctrl-3.1.1-r2.ebuild 2094 BLAKE2B 30a58a02ba1c68387251dafd38eb942aaea325224ae97f6b50a70c8d4ebdab3f18720c634afcb9fb004ec2ed1453ae672a6fe300a7dd8d654435cbf30ad8be40 SHA512 cfc96e7dabc169c21d7bf64a00e51a8a8565d16f13e4a59cbadc5508243d9d514b4e8d5dffb232fd29392e5132cbed787e2d586eec460dd4359e7ab0da84bb92
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
index f953a7df796b..9a9a53077df7 100644
--- a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
+++ b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils toolchain-funcs fixheadtails
+inherit toolchain-funcs fixheadtails
 
 DESCRIPTION="SMTP Relaying Control designed for qmail & tcpserver"
 HOMEPAGE="http://untroubled.org/relay-ctrl/"
@@ -16,7 +16,7 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="sys-apps/ucspi-tcp
-	 virtual/daemontools"
+	virtual/daemontools"
 
 RELAYCTRL_BASE="/var/spool/relay-ctrl"
 # this is relative to RELAYCTRL_BASE
@@ -24,20 +24,19 @@ RELAYCTRL_STORAGE="allow"
 RELAYCTRL_CONFDIR="/etc/relay-ctrl"
 RELAYCTRL_BINDIR="/usr/bin"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	eapply_user
 	ht_fix_file "${S}"/Makefile
-	epatch "${FILESDIR}"/authenticated.c-relayfixup.diff
+	eapply "${FILESDIR}"/authenticated.c-relayfixup.diff
 }
 
-src_compile() {
-	myCC="$(tc-getCC)"
-	echo "${myCC} ${CFLAGS}" > conf-cc
-	echo "${myCC} ${LDFLAGS}" > conf-ld
-	emake || die
+src_configure() {
+	local myCC="$(tc-getCC)"
+	echo "${myCC} ${CFLAGS}" > conf-cc || die
+	echo "${myCC} ${LDFLAGS}" > conf-ld || die
 }
 
-src_install () {
+src_install() {
 	exeinto ${RELAYCTRL_BINDIR}
 	doexe relay-ctrl-age relay-ctrl-allow relay-ctrl-check relay-ctrl-send relay-ctrl-udp relay-ctrl-chdir
 
@@ -52,16 +51,22 @@ src_install () {
 	dodir ${RELAYCTRL_CONFDIR}
 
 	# tell it our storage dir
-	echo "${RELAYCTRL_BASE}/${RELAYCTRL_STORAGE}" > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR
+	echo "${RELAYCTRL_BASE}/${RELAYCTRL_STORAGE}" \
+		> ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR || die
 	# default to 30 minutes
-	echo "1800" > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY
+	echo "1800" > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY || die
 
 	dodir /etc/cron.hourly
-	echo "/usr/bin/envdir ${RELAYCTRL_CONFDIR} ${RELAYCTRL_BINDIR}/relay-ctrl-age" >${D}/etc/cron.hourly/relay-ctrl-age
+	echo "/usr/bin/envdir ${RELAYCTRL_CONFDIR} ${RELAYCTRL_BINDIR}/relay-ctrl-age" \
+		> "${D}"/etc/cron.hourly/relay-ctrl-age
 	fperms 755 /etc/cron.hourly/relay-ctrl-age
 }
 
 pkg_postinst() {
-	[ -d /usr/lib/courier-imap/authlib ] && ln -sf /usr/bin/relay-ctrl-allow /usr/lib/courier-imap/authlib/relay-ctrl-allow
-	elog "Please see the instructions in /usr/share/doc/${PF}/README for setup instructions with Courier-IMAP and Qmail"
+	if [[ -d /usr/lib/courier-imap/authlib ]]; then
+		ln -sf /usr/bin/relay-ctrl-allow \
+			/usr/lib/courier-imap/authlib/relay-ctrl-allow
+	fi
+	elog "Please see the instructions in /usr/share/doc/${PF}/README"
+	elog "for setup instructions with Courier-IMAP and Qmail"
 }