commit: 6255d60c9e868c1b233d09f8f6800548aa8608ae Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Nov 23 19:15:30 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Nov 23 19:26:26 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6255d60c
net-mail/qmailanalog: Bump to EAPI 7 Bug: https://bugs.gentoo.org/697246 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> net-mail/qmailanalog/files/0.70-errno.patch | 4 +-- net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild | 39 +++++++++++++------------ 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/net-mail/qmailanalog/files/0.70-errno.patch b/net-mail/qmailanalog/files/0.70-errno.patch index 4aca1b2b4e5..f0cd380019f 100644 --- a/net-mail/qmailanalog/files/0.70-errno.patch +++ b/net-mail/qmailanalog/files/0.70-errno.patch @@ -1,5 +1,5 @@ ---- error.h.orig 2003-03-05 15:42:51.000000000 -0500 -+++ error.h 2003-03-05 15:43:00.000000000 -0500 +--- a/error.h 2003-03-05 15:42:51.000000000 -0500 ++++ b/error.h 2003-03-05 15:43:00.000000000 -0500 @@ -1,7 +1,7 @@ #ifndef ERROR_H #define ERROR_H diff --git a/net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild b/net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild index efdab855bc1..5e085af316f 100644 --- a/net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild +++ b/net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=0 +EAPI=7 -inherit eutils fixheadtails toolchain-funcs +inherit fixheadtails toolchain-funcs DESCRIPTION="collection of tools to help you analyze qmail's activity record" SRC_URI="http://cr.yp.to/software/${P}.tar.gz"; @@ -16,20 +16,22 @@ IUSE="" DEPEND="sys-apps/groff" -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PV}-errno.patch +src_prepare() { + eapply_user + eapply "${FILESDIR}"/${PV}-errno.patch ht_fix_file auto_home.c.do default.do Makefile } -src_compile() { - echo "/var/qmail" > conf-home - echo "$(tc-getCC) ${CFLAGS}" > conf-cc - echo "$(tc-getCC) ${LDFLAGS}" > conf-ld +src_configure() { + echo "/var/qmail" > conf-home || die + echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die + echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die +} - emake || die - $(tc-getCC) ${CFLAGS} "${FILESDIR}"/tai64nfrac.c -o tai64nfrac || die +src_compile() { + default + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \ + "${FILESDIR}"/tai64nfrac.c -o tai64nfrac || die } src_test() { :; } @@ -38,11 +40,10 @@ src_install() { doman matchup.1 xqp.1 xsender.1 xrecipient.1 columnt.1 dodoc MATCHUP ACCOUNTING BLURB - insopts -o root -g qmail -m 755 - insinto /var/qmail/bin - into /var/qmail - dobin columnt ddist deferrals failures matchup recipients rhosts - dobin rxdelay senders successes suids xqp xrecipient xsender - dobin zddist zdeferrals zfailures zoverall zrecipients zrhosts - dobin zrxdelay zsenders zsendmail zsuccesses zsuids tai64nfrac + exeopts -o root -g qmail -m 755 + exeinto /var/qmail/bin + doexe columnt ddist deferrals failures matchup recipients rhosts + doexe rxdelay senders successes suids xqp xrecipient xsender + doexe zddist zdeferrals zfailures zoverall zrecipients zrhosts + doexe zrxdelay zsenders zsendmail zsuccesses zsuids tai64nfrac }
