gentoo resync : 31.05.2021

8 files changed, 24 insertions, 8 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 227bbe94af9a..aad198ef49ce 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 64a1bc1cfd79..cb5aff0f9091 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -62,7 +62,7 @@ AUX bash-5.0-syslog-history-extern.patch 376 BLAKE2B d883d3c3adbf8f4d19ecc3c2790
 AUX bash-5.0_p11-disable_priv_mode.patch 2651 BLAKE2B 9abd8497cdafa8f4b5fa2db887c0c67304077609da8894a43b5debe6d2223f2f5cb009879ad1a17a589e492273d5bfe139676451a68cd461bd82926d5f029e85 SHA512 112e71b85a7edec4898c940ba278ed2c1f443af7d658b10dec12ced8473fb2111fe772b2ceea93ec319038cee25ca275bc39216364150f52cdefe2155cdb78d7
 AUX bash-5.1-parallel_make.patch 472 BLAKE2B fa6432b4a92f868eae1162f39de2860c94970c90a7209b445099bf1771d06b3545ebec13e7b18754b016f0d822bfc01983e994d25ca00bab3ab4494e27d7b3a3 SHA512 9137f58f568142fb1d8cb554adbc382fbdf317b5090f609672d2c4a1dde4a4a5c0d1ca3df6b28c8c196b660956e9bc34bbf1b76f8133d1099b65f4648f6051b9
 AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d
-AUX bashrc 3566 BLAKE2B c8013229792e6ece99d08615543d34935b8ef1604cfc48ad651ea64ae60cb39b6d945c46fa046d4fdd453a70eb46d065113defb11aa167f1a18f5b4246363828 SHA512 d7cda4637aa57f6a5500a421b7a0767a7ef9f526cbeb601f9cbe71164628189ca80258402d97074909b1437b65b708f1be3b867d66243022f628f7a0473ac98a
+AUX bashrc 3570 BLAKE2B 78fdff186afb07f9080b19e77ff197113df67b03407525d014a41b51ba6b42d98310f5093ecdc46c1d5354a77c578e94b9a4cd6d965156ad5f31c2955f4e41a2 SHA512 a3271c3c70b450fe67114720f0d2e4abf4eaf1925e5b3de1ee437968f4a29d722bc74b8e9461cd555487c578afe6f289d66898c75a7cc994d205fa5b29045604
 AUX dot-bash_logout 127 BLAKE2B 8290778aea3426f4c56e5a9e7328faa76f99001fc7ce3eeb3ec26624edcd918d7e946da9a63ffcd0cf0f739b528ccb9e764d448276fe4344b69ef2036fdd9921 SHA512 e0248b5087656a4dd3a4790ed8e6101866b922ccab36b510b3bf408dc0c583e70f323fbad0392e4ea6ca5dcbe73568733e0c0aa9c8ce6b00ff5f72bf3e9fd8fd
 AUX dot-bash_profile 204 BLAKE2B cdb5ece2bea3b47651e2c9ca8d48ef3b0c4b7e2d660632d79edf3cdcea8f5f5a061019739b977538b25f2ace9dcb46e25b30e2d566ea71f6c1ac05388e59c957 SHA512 97ad83696b7eb8b084a53530d1a3e7648722ae4199c91737ceb02b8238e7637b0770731f5140ffb552142311f79b140a041d7e1e5366ba60399b0019f164fce9
 AUX dot-bashrc 551 BLAKE2B e245955936f0e036073e7fe153bd01181ae7206a73b45b0411e8d1a6eb0b7131dce260755eed00d2639848eebaefacf7c13087d4315b17f85fbafa6eba4c9fd8 SHA512 518b62aa2fa30e7d1692847929a6ce8dae4eac93e8b16d223d1ae86f4d5b076bcbe1852c9034f321c013e17502db9f771979957c67f8e8a71ca4eea7bfe9cc1b
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
index 2f3dc7755455..bce7204e3c01 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@@ -94,8 +94,8 @@ if ${use_color} ; then
 	#BSD#@export CLICOLOR=1
 	#GNU#@alias ls='ls --color=auto'
 	alias grep='grep --colour=auto'
-	alias egrep='egrep --colour=auto'
-	alias fgrep='fgrep --colour=auto'
+	alias egrep='grep -E --colour=auto'
+	alias fgrep='grep -F --colour=auto'
 else
 	# show root@ when we don't have colors
 	PS1+='\u@\h \w \$ '
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index 089604bebc69..2d6e362b8838 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,4 +1,4 @@
 DIST mksh-R59c.tgz 442736 BLAKE2B 4e1b6e6fc69b27d01e262a5622191515fa71d29e81a3f10fb60458542506874b49f60f9af1e28c1cd266c63c91e3287579ab6bda00c39b7388445b19c969fa22 SHA512 f56b6956f9e1dd88ddce2294301a5eb698050d9d4f49286fdcd8f9df8554eabbcc71d37e2bf3eb7234e3968a17231cc6de8aa7efbf17768834a90b14e8cdf340
-EBUILD mksh-59c.ebuild 1670 BLAKE2B 280eb2f02ed77dd96e2c174c7d11a4609ec72c069da95ec5a2174fa96029f3648866da75099853f820ba64f70b7b48cc112d9b2fd42ca6be0f0d8e856cd0f6ca SHA512 c175cc225ce9d3aa8cddecb40a4620241e7ecc902fabd53f0689ab29aa492936237cbfcc9c8a8d3ee5d510b464c33970ebfa644b9fc561a85597f06837d37c52
-EBUILD mksh-9999.ebuild 1677 BLAKE2B f982dd420a14f10299e9109dbdcc592941e7b1a928a911756df854e30bf62161b34bfa63814295606334192beb4d4659bfb28301d44091561de78bc42669604e SHA512 11045c9d7a2284c090afdd37f17f53d7bcb98898c8a680a458273eca5111302e7227f44fdfda9e196e1d6c984b5d94f20479e75a0caf5f60efb4cea3c6ec16bd
+EBUILD mksh-59c.ebuild 1936 BLAKE2B 5e560af29bf3469323380b50588dc616b32d37412b3942f8514b39ef9140d45de5d5e87c2b9a1cac16eed988c8560799371aa9fe0c302d7b81b0202286605aed SHA512 9a16b72f00d49ef21d140bcfb85ed8359037054478108195b1789e6756c135ae59525d610d9113852ba544469802fa1eed1006c2f9c92ae0cf222e559b1de509
+EBUILD mksh-9999.ebuild 1943 BLAKE2B 80ff96ebe054fa660d741e967a6f2640ac4b9e10d06d766a6405a9b505784cb6a9ea45a5497ac5a0c510645ca956d4d7f2eb29bc4f65e2e74aa0241716e50db4 SHA512 d954f28c8a152a533e63204806c4bbe392bc031831a6d8adfe05e0d86ea555e392464ca6c00667ee0c70dd2a03fcada0c0cb7e4f6425c8dab5de143005af6e21
 MISC metadata.xml 595 BLAKE2B be131f5babf31d1c99d0e744fdaea55fe9e3eddaf23464de024bf103b3064b53786c30cd07d95ad284df2bcbf62cec4c2df6c8a9b0de0026c2745b4bce30c04c SHA512 e60a0606ef2ecbddc1c4a0f4180714ae75b24ca9cfc011b017502938e74cb0d8bb6a69759e8ce727b06c9d863bccb2ca6ddfb19bb7551b3c74c6912e7847d862
diff --git a/app-shells/mksh/mksh-59c.ebuild b/app-shells/mksh/mksh-59c.ebuild
index e66f17ebd1bd..d688b372e06d 100644
--- a/app-shells/mksh/mksh-59c.ebuild
+++ b/app-shells/mksh/mksh-59c.ebuild
@@ -20,7 +20,12 @@ DESCRIPTION="MirBSD Korn Shell"
 # Host is TLSv1.0-only, keep to http for compatibility with modern browsers
 HOMEPAGE="http://mirbsd.de/mksh"
 
-LICENSE="BSD"
+# See http://www.mirbsd.org/TaC-mksh.txt or ${S}/www/files/TaC-mksh.txt
+# MirOS for most of it
+# BSD for when strlcpy(3) is absent, such as with glibc
+# unicode for some included Unicode data
+# ISC if the printf builtin is used, not currently the case
+LICENSE="MirOS BSD unicode"
 SLOT="0"
 IUSE="lksh static test"
 RESTRICT="!test? ( test )"
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild
index c94ae683a150..9154bea1a42e 100644
--- a/app-shells/mksh/mksh-9999.ebuild
+++ b/app-shells/mksh/mksh-9999.ebuild
@@ -20,7 +20,12 @@ DESCRIPTION="MirBSD Korn Shell"
 # Host is TLSv1.0-only, keep to http for compatibility with modern browsers
 HOMEPAGE="http://mirbsd.de/mksh"
 
-LICENSE="BSD"
+# See http://www.mirbsd.org/TaC-mksh.txt or ${S}/www/files/TaC-mksh.txt
+# MirOS for most of it
+# BSD for when strlcpy(3) is absent, such as with glibc
+# unicode for some included Unicode data
+# ISC if the printf builtin is used, not currently the case
+LICENSE="MirOS BSD unicode"
 SLOT="0"
 IUSE="lksh static test"
 RESTRICT="!test? ( test )"
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index cf1d96ba2d15..0854ed382ef8 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -8,5 +8,5 @@ DIST tcsh-6.22.02.tar.gz 1006405 BLAKE2B f18b2c48958b4d38a0f55b0df8563564b2a3b34
 DIST tcsh-6.22.04.tar.gz 1012977 BLAKE2B 5702e17e25603a244e4481294cbe2dc2272d4f3ac8362be9e1dd65f3857e0e54520a245d321dda5ef747345776c22068dcb130705daddf71cb650b154ed96ba4 SHA512 3956df52124d496dc0e67e4e3e801787f31690f96a60399953e401648d5b4cfb06baa9833c32cb771177b3e89b7a27e5765534db073206568fe773598a55e873
 DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
 EBUILD tcsh-6.22.02.ebuild 2848 BLAKE2B 69a2feb7be32236da46fbec033e30ecf3645d3ebe4f82ae4a0fb3d3686e0ccad57746d086a8cffa36c697e45c2b1638793b38b1d687e02c26d0b3e4abf9e02f2 SHA512 8dbe5a06213546dd27b940a472bf158e7424ae55e570e83d903d6b9e5b7575b070f48dc701401f619ba194b1c4d9199fb43d130ca420b2fa544635ceae60c0fc
-EBUILD tcsh-6.22.04.ebuild 2738 BLAKE2B cc73939910534d0e2357f0db38f50eb26dca3d0534e437d862a427a5c96ce3816b996fa0ccaeeb17f3a50a5e1cd00c8edf454673c401e9682b161c73ed122fa7 SHA512 f5090773d21d1cb544ff5b2bd7b24d601ce0847b8539d5e474bc92e81cf45c52d537546cd0443efe30137b58252256c626297f76a55366ea073b92019fdd8113
+EBUILD tcsh-6.22.04.ebuild 2867 BLAKE2B ee4d4ba7d2721dda920837128a6f9f7c31db11fef7effd2d847e0597e0f529ea5c73b39e15b5d03793ee8b74715f448e4799666123c49ff279b113e2b156b336 SHA512 c63dad4c7146437540bfa4dca8711aefb64c61a4f730d0044dfa00d34cc21ff8805c4e855c577fec41419fef94988dbecb92cfc9842bd60e5bb260861da11115
 MISC metadata.xml 645 BLAKE2B 6a9d41c4ca043c899c0bfd8c5140958799c4eaf988f301551e8b8302995c81b0968981a2fda9247189965fc28887841eb30e1f3433262a58c843c0f890f857e5 SHA512 0f36e708c427083603b31df4bd4d808147333ff2711addff30936178e72b10f1020534046cb15ef1fecafee656c37d357ad3b5922320980ee15fddda11912f22
diff --git a/app-shells/tcsh/tcsh-6.22.04.ebuild b/app-shells/tcsh/tcsh-6.22.04.ebuild
index 3ce4f1d44b2e..41835e196feb 100644
--- a/app-shells/tcsh/tcsh-6.22.04.ebuild
+++ b/app-shells/tcsh/tcsh-6.22.04.ebuild
@@ -77,6 +77,12 @@ src_configure() {
 	append-cppflags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'"
 	append-cppflags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'"
 
+	# musl's utmp is non-functional
+	if use elibc_musl ; then
+		export ac_cv_header_utmp_h=no
+		export ac_cv_header_utmpx_h=no
+	fi
+
 	econf \
 		--prefix="${EPREFIX:-}" \
 		--datarootdir='${prefix}/usr/share' \