gentoo resync : 24.06.2021

7 files changed, 6 insertions, 22 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 1ab94d13e88f..95ccfefdd344 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index cb5aff0f9091..d5a376084a27 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -412,6 +412,6 @@ EBUILD bash-4.1_p17.ebuild 4157 BLAKE2B 3b13dc7bd1b9b7934a94b9de3d772c815619a43b
 EBUILD bash-4.2_p53.ebuild 4345 BLAKE2B 4a872160fef38f2eb94a625060a637c2e66e01b8f4ea287ccc56bb2eb11f8cbf22fe263172d777c9f0f823ab9d943a3f9aeef11f22fbc330d382b35d715d8141 SHA512 bda1694d2c6d40b9a81ccc785d0efd9df7aa2aaabc4189e9a6df4ad48de8b937fd2551f2b73d176f11206a3e6ad2f095af332bd833757a18f041f79dd0465895
 EBUILD bash-4.3_p48-r2.ebuild 5624 BLAKE2B 4d4056a9a6ee1b0602f106caf0798820953f4d2d0e7bcf6f54923e1edebedb6ea24ccb3dcbb42b3229967e08e162fa89253ae2a03fd7cbe0829ac315616a1681 SHA512 c74853e84737bcc4fbf745e0c49d77d156e69106b2b66fd67885b16cfdb3e59ab84648b03cdf35274402d89a725b79f0da83fe4ab16f9c17a7938da45853692d
 EBUILD bash-4.4_p23-r2.ebuild 5709 BLAKE2B 533de68a81792479a0da8e18a7700d5b29f78370ebaaf582069cfc21177c4cf94754afa5328ec2ee4dbd3807db37cb5e01f40d28d10ffd71e3c62c8f81a62d2d SHA512 d8fe7e91ccf16f972a91263d485d299b5cf79f7676f18f6027d9f808961a3647e6db6b978c7617658b185cc89ebd70de7c25dba318a27ed21bb1310881da0a8c
-EBUILD bash-5.0_p18.ebuild 7319 BLAKE2B f20e7209dca32a56d9b902e856b20cfdba4791c570c06645b7d7f9e15feed3647ae2051d99517ec4b9a0dbc1d81cd05f3a97677b463232e0ade85178601b3662 SHA512 278c0991ae73334c38b03c2881efb63332df74b72cdac7870c2971a878977ec5a52402429f311998fca9aea0d6033c904293266175560bc2081f60032e0e90d1
-EBUILD bash-5.1_p8.ebuild 7301 BLAKE2B 9e90df138be295655467fec50b1f0fd4691f01d631bc007691fd9b252ab1d667a3eabcc0118f333a6e38589f436a407b09f9ec58e8b0c614ea5a320e6de7aa80 SHA512 e9e74d77b59470efb1238b2f40e085766fd7fe78c6332adb62afb5c0c99ab161b25b77491ec7d03dc370a2be1d3ab996fa804651a5e8ec26ba04d4a291f72efd
+EBUILD bash-5.0_p18.ebuild 7009 BLAKE2B a89c8fe825839b3308a78ff398a6389c2e1586231eb99e7b25c61fdb4e12c2b4ba715ec6ef5e98e5423e7f5855de2472c6e69673a6886f22acd160f525b297e9 SHA512 8bee7a015cee324276d8a3d7814da8515540fd7d4a4d85ee63525628a2d21714a84f261694a2d45a11e494183e9ec467edf3173b6f9b22130ff959cea8131ee8
+EBUILD bash-5.1_p8.ebuild 6991 BLAKE2B 93d1328bfb8530b53cdc0ff81b85f475b4aa03377b71937e93a9b62c977dfb86e0f7b81fbe1c14e020d8fcc7a6e8521ea027b5992ac6c8efc9c010d0b6ce235d SHA512 bc67182c7bdb2b8a29f367b0f60fcc700b1b0b326457121c445badb2204e4472688010910ba316b99eeb8078bf5571bc7f318e61c10c54b126f75b3604c47ed3
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-5.0_p18.ebuild b/app-shells/bash/bash-5.0_p18.ebuild
index 3ea29fe66b10..ab801c88333f 100644
--- a/app-shells/bash/bash-5.0_p18.ebuild
+++ b/app-shells/bash/bash-5.0_p18.ebuild
@@ -255,15 +255,6 @@ pkg_preinst() {
 		mkdir -p "${EROOT}"/etc/bash
 		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
 	fi
-
-	if [[ -L ${EROOT}/bin/sh ]] ; then
-		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
-		# missing even temporarily causes a fatal error with paludis.
-		local target=$(readlink "${EROOT}"/bin/sh)
-		local tmp="${T}"/sh
-		ln -sf "${target}" "${tmp}"
-		mv -f "${tmp}" "${EROOT}"/bin/sh
-	fi
 }
 
 pkg_postinst() {
diff --git a/app-shells/bash/bash-5.1_p8.ebuild b/app-shells/bash/bash-5.1_p8.ebuild
index a8f2880bece7..88199a177aa1 100644
--- a/app-shells/bash/bash-5.1_p8.ebuild
+++ b/app-shells/bash/bash-5.1_p8.ebuild
@@ -255,15 +255,6 @@ pkg_preinst() {
 		mkdir -p "${EROOT}"/etc/bash
 		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
 	fi
-
-	if [[ -L ${EROOT}/bin/sh ]] ; then
-		# Rewrite the symlink to ensure that its mtime changes. Having /bin/sh
-		# missing even temporarily causes a fatal error with paludis.
-		local target=$(readlink "${EROOT}"/bin/sh)
-		local tmp="${T}"/sh
-		ln -sf "${target}" "${tmp}"
-		mv -f "${tmp}" "${EROOT}"/bin/sh
-	fi
 }
 
 pkg_postinst() {
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 0854ed382ef8..a5bd10f88f2f 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -7,6 +7,6 @@ AUX tcsh-6.21.04-no-nls.patch 406 BLAKE2B f4e9baa31c4f54c657d18bdb026bfee85f1bfb
 DIST tcsh-6.22.02.tar.gz 1006405 BLAKE2B f18b2c48958b4d38a0f55b0df8563564b2a3b34becf02eda8802d7f5e2194082bf96c46323d606c2e6bd2a26aaed303bae3132d03515274407c63b713583dde7 SHA512 32d271b568c63265ea4c98494f5e60b37c3a3fc2594e8763b8f6f0b09018ab9db7ef6f951120b37f7880ccf04ba3a2559e30dc08d24f4ba9dc36853238d55980
 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 2867 BLAKE2B ee4d4ba7d2721dda920837128a6f9f7c31db11fef7effd2d847e0597e0f529ea5c73b39e15b5d03793ee8b74715f448e4799666123c49ff279b113e2b156b336 SHA512 c63dad4c7146437540bfa4dca8711aefb64c61a4f730d0044dfa00d34cc21ff8805c4e855c577fec41419fef94988dbecb92cfc9842bd60e5bb260861da11115
+EBUILD tcsh-6.22.02-r1.ebuild 2868 BLAKE2B 9663690588a73517fd13c1aeaaabdb8e62246586ef21758471922642806f2c37ffd03b813d6429cb410b344f3632130fb174d0174498e85ffe8840aba225128a SHA512 89c409b0c1bb9a9fe4b13476bbd8549551b45778ec275c5b522fce9a8b2242152789921533062d16d4e59d20622834ea35dba59d65a75e1d5ef08a785ddbbc63
+EBUILD tcsh-6.22.04-r1.ebuild 2887 BLAKE2B 0a7f43d9fbc778cfe1b6c7df7a60e5e635a9836adebde71822a6bec180f2659d4c36b8c747ae9d4d191860ae72d03dccb99254ae761a8eb1a34faa92dcd7bb3b SHA512 7f53c57bc01114914defc7912c2555c122d0bb321f431e9c00014c5f9825281bbd0b947edb70d9a7b06e035ce9f04f761c03005ed470f60a22f8cdd3e0b2b82a
 MISC metadata.xml 645 BLAKE2B 6a9d41c4ca043c899c0bfd8c5140958799c4eaf988f301551e8b8302995c81b0968981a2fda9247189965fc28887841eb30e1f3433262a58c843c0f890f857e5 SHA512 0f36e708c427083603b31df4bd4d808147333ff2711addff30936178e72b10f1020534046cb15ef1fecafee656c37d357ad3b5922320980ee15fddda11912f22
diff --git a/app-shells/tcsh/tcsh-6.22.02.ebuild b/app-shells/tcsh/tcsh-6.22.02-r1.ebuild
index b5d2662737f5..962d72644d4b 100644
--- a/app-shells/tcsh/tcsh-6.22.02.ebuild
+++ b/app-shells/tcsh/tcsh-6.22.02-r1.ebuild
@@ -22,6 +22,7 @@ RESTRICT="test"
 # we need gettext because we run autoconf (AM_ICONV)
 RDEPEND="
 	>=sys-libs/ncurses-5.1:0=
+	virtual/libcrypt:=
 	virtual/libiconv"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
diff --git a/app-shells/tcsh/tcsh-6.22.04.ebuild b/app-shells/tcsh/tcsh-6.22.04-r1.ebuild
index 41835e196feb..da1bb0b9c52b 100644
--- a/app-shells/tcsh/tcsh-6.22.04.ebuild
+++ b/app-shells/tcsh/tcsh-6.22.04-r1.ebuild
@@ -22,6 +22,7 @@ RESTRICT="test"
 # we need gettext because we run autoconf (AM_ICONV)
 RDEPEND="
 	>=sys-libs/ncurses-5.1:0=
+	virtual/libcrypt:=
 	virtual/libiconv"
 DEPEND="${RDEPEND}
 	sys-devel/gettext