gentoo resync : 23.09.2020

4 files changed, 35 insertions, 56 deletions

diff --git a/net-mail/serialmail/Manifest b/net-mail/serialmail/Manifest
index 14e91c50721d..31c2ede75a29 100644
--- a/net-mail/serialmail/Manifest
+++ b/net-mail/serialmail/Manifest
@@ -1,6 +1,6 @@
 AUX serialmail-0.75-implicit.patch 965 BLAKE2B 1e0d173dba771330c8eb9993b3a4428161f8f3969975ad9026fd4cddf80681b2d0d95eec71205f0546355d30c2fe2eeea9714c93f6363a3cc071154bd23c7a37 SHA512 2c3bb49ed651aaea32f29e25db29c2a7d538e583c8d2b2200cb68790c397edebda5f8d36cf997059694f8209472e5d3949d934be9877cf0da524ff816a2ef268
+AUX serialmail-0.75-respect-AR-RANLIB.patch 560 BLAKE2B 0198b3d97c956dc28645176afe849ad7fa0d91d35412677d48432616bb7017c77cd540a4a27b91b2e34e5afde42e3bcee4958313dec31b15c9717ef3b54fb21a SHA512 f1de8fade3884acf8e1a7fc38192a831c66e89579a4e98fba871124288a2f307a46891a70f877261c125303cf3bb6858f2a6eaf47ee004233211b36b3860f55c
 DIST serialmail-0.75-patch.tar.bz2 7702 BLAKE2B a1593c15dc086d78ee6b605197d616da8a50d67e9a7fe79fe1f4aa5b9664b16bd3eb9dcea79902fbe4fbe7020d74870d72c2dcdd3c1dad18506b54f0f0ea5357 SHA512 da1eb9a9a834fe5a9db4233d1a7e09657f5a2903f3356ebd6922f03c7f4833d96b4b9ecfb3412733dcdd3b384e503b25fd2564d0f93c639a7a9409872dc52c25
 DIST serialmail-0.75.tar.gz 55079 BLAKE2B 9ab05731069819be14d3b7cd56b2ab4bd2e87fec7867f4243d8180fd42eeb7b95b255c48ea8dfe06918b8cba772b228c7594ddef6c56d3bcb80d0ea19da4935e SHA512 f0c7f14330b44f12f8e5f3590416d707bb2daaca84db8fcd236ae05855269005a726d946269c0cbb25f51238fba350420e0e3a1d57f0ab227c447fafcae497dc
-EBUILD serialmail-0.75-r4.ebuild 1266 BLAKE2B 81a70cead5573b817728c7483dd7e27b84367cf6c4041d26b90f37f8b955dfe0cf1300b1f1cde9fe69a57f0bc5fb36087739b19428f91a0d755535374bff9b98 SHA512 479c3380acdcabd58e1c5a06e9404f876e087acfaebf9cb3a52d1f3245f7806bf7337ab1b1aac7c20496916cfec5475a263810fe7e349a7fa3e09977ab166ab7
-EBUILD serialmail-0.75-r5.ebuild 1210 BLAKE2B c1bb75f96a99ce070a7dc9e088d0cb5a2fde12fe0807c3f0db7351c9e5d51be64aaf6fade8c4e3a8e807a29c0b89feaad9db590052772c3b52e95c4716f5ce94 SHA512 1fecd6cc02cb974f6330c928f3b87741e879262492569fcda9c3f65c809e77a316db134b267c57c0d7242fe0e9fb95e562d78936adeb7ab25922d3860af816d3
+EBUILD serialmail-0.75-r5.ebuild 1311 BLAKE2B 7cd31971e68f804e83acab6d33f7d32332cfec703f458e5db671ad50a9976b68dc630d50d7a150b4a9ae88dced0bb59695fabfe2288eee170f061ca27f7f946f SHA512 1359bf48278f48d549d876089e83d78c83bb3e36adcd21fbcd158e3b404196000f036a3692610bad75edbd366f20c16946cb2aa2f223f698417c337c67a35743
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/serialmail/files/serialmail-0.75-respect-AR-RANLIB.patch b/net-mail/serialmail/files/serialmail-0.75-respect-AR-RANLIB.patch
new file mode 100644
index 000000000000..c04f0d78a28c
--- /dev/null
+++ b/net-mail/serialmail/files/serialmail-0.75-respect-AR-RANLIB.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile b/Makefile
+index 4edccea..7530107 100644
+--- a/Makefile
++++ b/Makefile
+@@ -369,7 +369,7 @@ warn-auto.sh systype
+ 	( cat warn-auto.sh; \
+ 	echo 'main="$$1"; shift'; \
+ 	echo 'rm -f "$$main"'; \
+-	echo 'ar cr "$$main" $${1+"$$@"}'; \
++	echo '"$(AR)" cr "$$main" $${1+"$$@"}'; \
+ 	case "`cat systype`" in \
+ 	sunos-5.*) ;; \
+ 	unix_sv*) ;; \
+@@ -378,7 +378,7 @@ warn-auto.sh systype
+ 	dgux-*) ;; \
+ 	hp-ux-*) ;; \
+ 	sco*) ;; \
+-	*) echo 'ranlib "$$main"' ;; \
++	*) echo '"$(RANLIB)" "$$main"' ;; \
+ 	esac \
+ 	) > makelib
+ 	chmod 755 makelib
diff --git a/net-mail/serialmail/serialmail-0.75-r4.ebuild b/net-mail/serialmail/serialmail-0.75-r4.ebuild
deleted file mode 100644
index 78801715a18e..000000000000
--- a/net-mail/serialmail/serialmail-0.75-r4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A serialmail is a collection of tools for passing mail across serial links"
-HOMEPAGE="http://cr.yp.to/serialmail.html"
-SRC_URI="http://cr.yp.to/software/${P}.tar.gz
-	mirror://gentoo/${P}-patch.tar.bz2"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="static"
-RESTRICT="mirror bindist"
-
-DEPEND="sys-apps/groff
-	>=sys-apps/ucspi-tcp-0.88"
-
-RDEPEND="sys-apps/groff
-	>=sys-apps/ucspi-tcp-0.88
-	virtual/daemontools"
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-gentoo.patch
-	epatch "${WORKDIR}"/${P}-smtpauth.patch
-	epatch "${WORKDIR}"/${P}-smtpauth_comp.patch
-	sed -i "s|@CFLAGS@|${CFLAGS}|" conf-cc
-	use static && LDFLAGS="${LDFLAGS} -static"
-	sed -i "s|@LDFLAGS@|${LDFLAGS}|" conf-ld
-	epatch "${FILESDIR}"/${P}-implicit.patch
-}
-
-src_compile() {
-	grep -v man hier.c | grep -v doc > hier.c.tmp ; mv hier.c.tmp hier.c
-	emake it man
-}
-
-src_install() {
-	dobin serialsmtp serialqmtp maildirsmtp maildirserial maildirqmtp
-
-	dodoc AUTOTURN CHANGES FROMISP SYSDEPS THANKS TOISP \
-		BLURB FILES INSTALL README TARGETS TODO VERSION
-
-	doman maildirqmtp.1 maildirserial.1 maildirsmtp.1 \
-		serialqmtp.1 serialsmtp.1
-}
diff --git a/net-mail/serialmail/serialmail-0.75-r5.ebuild b/net-mail/serialmail/serialmail-0.75-r5.ebuild
index dff981e6190b..e7b04e421d3b 100644
--- a/net-mail/serialmail/serialmail-0.75-r5.ebuild
+++ b/net-mail/serialmail/serialmail-0.75-r5.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="A serialmail is a collection of tools for passing mail across serial links"
 HOMEPAGE="http://cr.yp.to/serialmail.html"
 SRC_URI="http://cr.yp.to/software/${P}.tar.gz
@@ -10,9 +12,9 @@ SRC_URI="http://cr.yp.to/software/${P}.tar.gz
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="static"
-RESTRICT="mirror bindist"
+RESTRICT="mirror bindist test"
 
 BDEPEND="sys-apps/groff"
 DEPEND=">=sys-apps/ucspi-tcp-0.88"
@@ -26,18 +28,22 @@ PATCHES=(
 	"${WORKDIR}"/${P}-smtpauth.patch
 	"${WORKDIR}"/${P}-smtpauth_comp.patch
 	"${FILESDIR}"/${P}-implicit.patch
+	"${FILESDIR}"/${PN}-0.75-respect-AR-RANLIB.patch
 )
 
 src_prepare() {
 	default
 
-	sed -i "s|@CFLAGS@|${CFLAGS}|" conf-cc || die
-	use static && LDFLAGS="${LDFLAGS} -static"
-	sed -i "s|@LDFLAGS@|${LDFLAGS}|" conf-ld || die
+	use static && LDFLAGS+="${LDFLAGS} -static"
+
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
 }
 
 src_compile() {
 	sed -i -e '/(man|doc)/d' hier.c || die
+
+	tc-export AR RANLIB
 	emake it man
 }