commit: ddcaea5368de8417fd9b133b1f13cd9cab806976 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Nov 23 19:24:40 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Nov 23 19:26:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddcaea53
net-mail/relay-ctrl: Bump to EAPI 7 Closes: https://bugs.gentoo.org/697246 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild | 41 +++++++++++++++----------- 1 file changed, 23 insertions(+), 18 deletions(-) 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 f953a7df796..9a9a53077df 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" }
