gentoo resync : 15.12.2019

3 files changed, 24 insertions, 23 deletions

diff --git a/net-mail/qmailanalog/Manifest b/net-mail/qmailanalog/Manifest
index f1761f1e9a3d..1d26f4af6d41 100644
--- a/net-mail/qmailanalog/Manifest
+++ b/net-mail/qmailanalog/Manifest
@@ -1,5 +1,5 @@
-AUX 0.70-errno.patch 243 BLAKE2B f6fc2134f1e1781c7887c9dcb0f9ecc05d59558187b001353b1f5cdc8b5f73d507a8edab3f525b4c1407c02c0c0d11e09e96eaa5d041217da23f92aaef6c03e1 SHA512 1d4c1abde8eb0b4d6dd2254be29b685c922265ededa02a19010bc487e2e2013ef2df9a86a5dd797e0d7a30567cc18ae72324f2a67558633aae76262b2a9681a1
+AUX 0.70-errno.patch 242 BLAKE2B 1494fa86bb59202e9e0c85d9f81a249b767d90c8e4a2aa59dd78d7a5dbd488c599bd18bc15e3e36e4a50ea156c77614eaa4f507b968b6906699fe40f958cd295 SHA512 0576644a2820a42cac44be9ba564b5043245cdb192a50115bafc871e3306945a657440c7e74d6a83796a33b964269f60ab1b3345b65cdc5ff2342e4f2cbaf9ab
 AUX tai64nfrac.c 1461 BLAKE2B bf9c933a5916c578dfbf9fa3c9a02de188b40e376f545a9706fecaee14fc4270af90f1d1fa7f6b7035b23fb4cf0abf8cb701f17469c7bd95bd232a81ea1d5d93 SHA512 0febee72c3a0328f651134105e6c9c7db1f2822458fa873694cad9807847a9a1bfb7d91a3f7a7ecbb99564515d001e10f2829f70b9a8e768d26764c0ab408be4
 DIST qmailanalog-0.70.tar.gz 28416 BLAKE2B 771a9d9cad36f770c1b9032808a5252e8cada6ebed311272e5d2cf7a34449ec9e59c9c032a1c165103535a6eeca03331f56d8a484c171308c9fee49f8b4b2f12 SHA512 0a4991a9ac13b64494b15a6ad42df1bee273a7a3c5ead923450d5516d747989e80e3a0f88e29203dce24dc833cc3bb46d5935633f67bed547f27ac22ad866f3d
-EBUILD qmailanalog-0.70-r1.ebuild 1274 BLAKE2B 7841b141664a87dfe241afff877d9784d40b475e989120ce7d55a45df927f613d2183e933b3a684a793baf0a42db035ea798f6861884631f4775b54dc479f97c SHA512 d62555a3962ddde1f27a12f86e809f04ab2631094d31966eddeaff187b61ba8bcbe7430f8befbf1044a6bf34f4c412972144f87bc9b52089d36badbcd986789b
+EBUILD qmailanalog-0.70-r1.ebuild 1303 BLAKE2B d0dd17109e237dea41303329eb6400c5a50752cbbcf710718d57f9860aecbac5542f3461bd32cb72f6bea808adf92d984137d42619060d61c0f6c5ffc7e45a76 SHA512 2530613d2e8bba33d29f2b681718b089dc16127a7f2f9cf61659c0c3bf5eb0d66a578b73fa23635bf78166f56d35455ddba8716eac1ec70c455250d09aaca893
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/qmailanalog/files/0.70-errno.patch b/net-mail/qmailanalog/files/0.70-errno.patch
index 4aca1b2b4e58..f0cd380019f8 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 efdab855bc16..5e085af316f0 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
 }