From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 15 Dec 2019 18:09:03 +0000
Subject: gentoo resync : 15.12.2019

---
 net-mail/qtools/Manifest           |  2 +-
 net-mail/qtools/qtools-0.56.ebuild | 32 ++++++++++++++------------------
 2 files changed, 15 insertions(+), 19 deletions(-)

(limited to 'net-mail/qtools')

diff --git a/net-mail/qtools/Manifest b/net-mail/qtools/Manifest
index f9e057909d7e..1fc24b0d20c7 100644
--- a/net-mail/qtools/Manifest
+++ b/net-mail/qtools/Manifest
@@ -1,5 +1,5 @@
 AUX qtools-0.56-errno.patch 291 BLAKE2B c204bc9a9c210b849f9a4978a7f19e94ecb9e46991a710dd58d9375b332e062f527b6ac274f9c2bc6d1037395e0f17afd920927400c4f72997e491c90b434770 SHA512 ca8fc0fc14724a1dfc9931e24071f0b72ba8bdc3c13c3dc84a597b73e92541043526a288ceb2e260dfb8ab8ce4f970b6505b323458817e499188cc4c6680ba22
 AUX qtools-0.56-head.patch 2117 BLAKE2B 2d0468547e2d67b65be1a8448c9b89f2e2a4ee307a79c47957f465d20671b947ef322af65ac94185cd39a9d98450d517d715c25f182eaab184286cda3d9685bc SHA512 0701bfa739cb163f4463b5ffb1a0242027400fd38e27e2533915f2698712177421f38d9d5b7a02caf1c23ade31bf02ce9236f18e522b688b6adc71af15b32a87
 DIST qtools-0.56.tar.gz 37748 BLAKE2B f4bb79259d2ceb99f21ec87dcc8dac6dca740a9bb1fb723f0393384996e51cdd0a56b92c066161dbcd75adf6d1e008041b5bfdf4abe7534279f504ed2c318111 SHA512 2016ca4f77fc370f6caac56f447325461018dff1f8a61fad305744578f0c26f0495c26d6cba6a8a9d5c86c6ef86635edd69705e9af88f70477a3f6ed121e6085
-EBUILD qtools-0.56.ebuild 1152 BLAKE2B 715cd8c69088fa24f6422702b1f4ec5469c421aa69145cc3ae1361a043956d99e9ebef9b7b7498c3e592c7bdb786d00ec01aedb61076104ed65f52e35aa4d639 SHA512 93675737debc6a1a2d97578f759d5c79a72bc10c1ada2a1e8fcf89c0fbb4406e0928c225bee75d95427424fa9b89ece8ea24b10e23c79addcb8f5f6a1e22b506
+EBUILD qtools-0.56.ebuild 1076 BLAKE2B 976f40d338bee88313856a7d4948099df3825c8f0c8c5bb1087eaf5b5cd7b0cf0bfb667903239e806d8b2a2ea5651114abf20d59b5329840a7f0082a27ba310a SHA512 c383d5433c61f78151b2d4aac0947d037dc8900bf523aae6db479b6229db761f3d09648a02049d54d6141064721537223d65fa5df5cb4bf02cfe85ad376b7893
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/qtools/qtools-0.56.ebuild b/net-mail/qtools/qtools-0.56.ebuild
index 7251ba3d40ef..b5c83062f98b 100644
--- a/net-mail/qtools/qtools-0.56.ebuild
+++ b/net-mail/qtools/qtools-0.56.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
+inherit toolchain-funcs
 
 DESCRIPTION="Utilities for use with qmail, typically as part of .qmail command processing"
 HOMEPAGE="http://www.superscript.com/qtools/intro.html"
@@ -15,28 +15,24 @@ KEYWORDS="alpha ~amd64 ~hppa ~mips ppc ~sparc x86"
 IUSE="static"
 RESTRICT="mirror bindist"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-errno.patch
-	epatch "${FILESDIR}"/${P}-head.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-errno.patch
+	"${FILESDIR}"/${P}-head.patch
+)
 
-src_compile() {
+src_configure() {
 	use static && LDFLAGS="${LDFLAGS} -static"
 	export CC="$(tc-getCC)"
-	echo "${CC} ${CFLAGS}" > conf-cc
-	echo "${CC} ${LDFLAGS}" > conf-ld
-	echo "/usr" > conf-home
-	emake || die "emake failed"
+	echo "${CC} ${CFLAGS}" > conf-cc || die
+	echo "${CC} ${LDFLAGS}" > conf-ld || die
+	echo "/usr" > conf-home || die
 }
 
 src_install() {
-	into /usr
 	dobin 822addr 822body 822bodyfilter 822fields 822headerfilter \
-		  822headerok 822headers checkaddr checkdomain \
-		  condtomaildir filterto ifaddr iftoccfrom replier \
-		  replier-config tomaildir
+		822headerok 822headers checkaddr checkdomain \
+		condtomaildir filterto ifaddr iftoccfrom replier \
+		replier-config tomaildir
 
 	dodoc BAPVERSION CHANGES FILES README SYSDEPS TARGETS TODO VERSION
 }
-- 
cgit v1.2.3