gentoo resync : 23.09.2020

2 files changed, 21 insertions, 14 deletions

diff --git a/net-mail/mess822/Manifest b/net-mail/mess822/Manifest
index dbaee0c54784..93257f468575 100644
--- a/net-mail/mess822/Manifest
+++ b/net-mail/mess822/Manifest
@@ -1,4 +1,4 @@
 AUX mess822-0.58-implicit.patch 1373 BLAKE2B 39fde0a0ab48958774493aebebac5ca82beb74430cbf94e9634f1b0a74963d08f98a6196d10cf2d774241538b395cdc70c710d6dc6885d93a35c4073564eafdc SHA512 ee2819702b4dfc558eeea8e2885ea16c69c3fc9b48a4713d8eead6ba03a870c583406d6ff37269c11cda11f4a0f70caf45a2cf3569acba31d938ac75379a4b8d
 DIST mess822-0.58.tar.gz 64287 BLAKE2B d24c7c6c4d3cfcd21166ba9ac2ec72c0a0dbd05fb8329ac04668d9febe8632f63304342642f8c1a3543d4edd94ee5bcc7a2688ccc6f4afc12bfbd8d38eaccea5 SHA512 5fb30f06dfa08f60dc8760f9c5d692e59397ff848441bc94313a079bac8fb53b779133b48abae9b487dff6fbb277d5210a9690a138366bf4d34f052d661be65e
-EBUILD mess822-0.58-r2.ebuild 1236 BLAKE2B f54190b7049910238117ea52c7e8cca5daf22503584f37ced24920e61f0f4a0c08b6fd5ea366ec345688b85bfcd7119e5e77ad592f4dc24a17441f313ea5d104 SHA512 560ed33b23ac0d78824a4ab9dbe6c5a18856d0f8bb9b18329565c603bea252ec657808060ca6181a09622e97254f6423b04580907166df6a9139abe785a5b802
+EBUILD mess822-0.58-r2.ebuild 1412 BLAKE2B 1d456ac1d4759b4d263c532cc09bdade9fe5f162f761bc04e524990caea5b13ce38ef695eb10a353bee940850bda99b5e22504d602b62938a63bf3168447eb46 SHA512 fc035effa578da07710514b9dfcb0ab3fcb254ba07204b86529ceab63a36bd2f4c873281d0d84916a89552c1091ed99ee8f90c85b709e60a668db928ec321a6e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/mess822/mess822-0.58-r2.ebuild b/net-mail/mess822/mess822-0.58-r2.ebuild
index 95c6b44751e5..f4e4688dd5b7 100644
--- a/net-mail/mess822/mess822-0.58-r2.ebuild
+++ b/net-mail/mess822/mess822-0.58-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit multilib toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="Collection of utilities for parsing Internet mail messages"
 SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
@@ -18,15 +18,22 @@ RDEPEND=">=sys-apps/sed-4"
 DEPEND="${RDEPEND}"
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-implicit.patch
+)
+
 src_prepare() {
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	echo "/usr" > conf-home
+	default
+
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+	echo "/usr" > conf-home || die
 
 	# fix errno.h problem; bug #26165
-	sed -i 's/^extern int errno;/#include <errno.h>/' error.h
+	sed -i 's/^extern int errno;/#include <errno.h>/' error.h || die
 
-	epatch "${FILESDIR}"/${P}-implicit.patch
+	sed -i -e "s/ar/$(tc-getAR)/" make-makelib.sh || die
+	sed -i -e "s/ranlib/$(tc-getRANLIB)/" make-makelib.sh || die
 }
 
 src_install() {
@@ -35,16 +42,16 @@ src_install() {
 
 	# Now that the commands are compiled, update the conf-home file to point
 	# to the installation image directory.
-	echo "${D}/usr/" > conf-home
-	sed -i -e "s:\"/etc\":\"${D}/etc\":" hier.c || die "sed hier.c failed"
+	echo "${ED}/usr/" > conf-home || die
+	sed -i -e "s:\"/etc\":\"${ED}/etc\":" hier.c || die "sed hier.c failed"
 
 	emake setup
 
 	# Move the man pages into /usr/share/man
-	mv "${D}/usr/man" "${D}/usr/share/"
+	mv "${ED}/usr/man" "${ED}/usr/share/" || die
 
 	dodir /usr/$(get_libdir)
-	mv "${D}/usr/lib/${PN}.a" "${D}/usr/$(get_libdir)/${PN}.a"
-	rmdir "${D}/usr/lib"
+	mv "${ED}/usr/lib/${PN}.a" "${ED}/usr/$(get_libdir)/${PN}.a" || die
+	rmdir "${ED}/usr/lib" || die
 	dodoc BLURB CHANGES INSTALL README THANKS TODO VERSION
 }