gentoo resync : 25.09.2019

13 files changed, 15 insertions, 178 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 1cdb443c8057..abf08e3a1e39 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -24,16 +24,16 @@ DIST glibc-2.30-patches-1.tar.xz 19364 BLAKE2B 853ae651cf48a78796ac0a3c9c8409873
 DIST glibc-2.30-patches-2.tar.xz 19588 BLAKE2B 672343ef8a44486304f03091844635febef9d1bc8000ab3382d702dcc1111a107b5e758355beaef8db5012f7e324e4c2365e10fc642b01c9f9a3a315de2dc7f6 SHA512 494155147b56e094a4427aed79e278b4a350928ddaff84330d6a40fad079131a4574f20c591dc95e572391b68ef72c49790571ee5323a2a541ec0757bcaeb161
 DIST glibc-2.30.tar.xz 16576920 BLAKE2B bd5aae4c9854f40785b91f83c3b632de6d48d811027ddfe61651cb1bc617db8017d7914c23a770cdd3feed06fcc316da841eea916cdba54179e7eace4ea45484 SHA512 37483990cd653685873e96c45dd1651b32b441b6d7919a68ebe3bae31a0c3f7ce183fc9b110f0b268b353f80312f18370559a1e7aecea0e5aa755c8f2aef1d6b
 DIST glibc-9999-patches-14.tar.xz 17908 BLAKE2B a6e1f22a4358111ff757431c5d42fd020f6095584c3517aa854ea266129d1a177a7c09b310643f1cea32ffaf253806ac08f3aed864fb477097aaa2c4010450f4 SHA512 ef28b409b26472ec1d868167345aecfee70b1edf1863374dc2f25892f40c10f0826620a8b22fbbc9f737c8f611569b3412e8e2ea041da1ad1ef7f6398b82cddc
-EBUILD glibc-2.19-r2.ebuild 37974 BLAKE2B bff1f1a082705e06fdc44d91615a5e137b126e56006b2c2894b765738f710f9365eba0a7d3e7c21433419ffda53a0675d785fe389b1939b8a05c8a60cd05bc82 SHA512 edf5b1e688b438af20d46ef0b7c234abc8b1f3d0e6118146d7c5aa80fbc7bf40670c2ba59a9d16e115d5f0e32c8774ffb3d3c498d4a2a5853c868f9a2cbd5c39
-EBUILD glibc-2.24-r4.ebuild 4988 BLAKE2B 8e08345c96e176984b73a073efca21f771d41af1af75106ec88a22bd55d7f69f28d9c01989026a3e58f3df4fac2a59db68d5ac8a8bbb0f411c75da8792f3402a SHA512 dd1d996eaf35197f7b7b6c111957eb98ef776d0a76a949b95f9bb17075dca43b2a354f8d15be133b9f3ff6c40a5b1f4ec28bd8d41c5cfc51da006eda8b005a05
-EBUILD glibc-2.25-r11.ebuild 4975 BLAKE2B cef32f5d160644845e7cf45a9dd4c8cef1dcff8fca6b64c083c3e05d07533e445a6139939710b9284f7587bbf3977ca556caeb964e73ac21a382d942423d886a SHA512 f26645acc02f16209ec068641a800ef0a4ad2a422c9473e14a273fdece9b53074b837907d635a8585cf9dbb1acea14178166a4a3410aa4c70a745b89a764b6f1
-EBUILD glibc-2.26-r7.ebuild 25509 BLAKE2B 49166ae538135fe9663954a2f2ae6778b240ba32ab77e600091e56f44ef06df91f856c1389e78431420a33cb381743f4b44d5f02bbe6041a01134795fd2fad14 SHA512 82111610d0de42b52cdd6452d8a7f09464a2aaceea8fee1d8d6dcc6a9ee35396a093448361111e62b8acdec06d84795600dab65dbbe4e951663827106e81268f
-EBUILD glibc-2.27-r6.ebuild 41564 BLAKE2B 7a0d3bf89587630f59c8f4e271ec26db8695f1ccec95148d1d79c8bb14fb1382a37ada421c002ca0d66661b28ab1166acbfe884bcfeed8da413ff82d448ff141 SHA512 02d6d45d177bc43438a74918a8dcbd19507100b00ebd079102296ca197c05a957cdf9d58ffa11e1710d781016c4b6ab98c2aa492b2dd1483ad02de856fa2a54b
-EBUILD glibc-2.28-r6.ebuild 41334 BLAKE2B 4de861388f365a5b38aa09bac691d2a6e22f4ff54942eb1fa044d125b9214d5519f10549214cfa46d96e968a6ec80b6e022a9e7000db8d351e2a03cb02530aa8 SHA512 52174bb1cafbf8401851efa950398a31d84319bf3b403f6db9bbbc0e0044b18f1c08e64ae181d062a33139d139eaca5706dd0df1a3b9f555a73a35389dcc2a6a
-EBUILD glibc-2.29-r2.ebuild 42668 BLAKE2B 9fe4878b9f99c4c06185f8ff6cca5592e9650fbffa6ee5fdf8fe4f1f5a383a1c93998d7501d2441abd99eb59175dea3f8a156b3425f89f6b6d5a8240005ff615 SHA512 4fe050deca50f9ae95296b2da538d2d1cb47eddbc7e66cedc8090f6d8df9ff697dae42d615b9e71c5fbcadeaa0cc3011f5c1e28ebbe5ac352aac19e233a95f5f
-EBUILD glibc-2.29-r4.ebuild 42974 BLAKE2B d156327652eae83c2ec8f1d30dde09d4b0a57c8ce1957277d6b5df6d72b3abfaf18fc092bda0256ae4b4bdd838a685ee3be647fa7978a72f06795d6a01ac543e SHA512 1eba277054fabaa88e236c26a2b38c8aa52d391b73d1e31686e659b228f2521a1914546220f67e7ea9b3bf54102b82cd6b6b2e3b85b7517e0ad497add4cdfcbd
-EBUILD glibc-2.29-r5.ebuild 42971 BLAKE2B 4073abe9e595e85a7832bcbfeca702ddd505d66fd250a038551156ff94b9729ae6e2a471cec8f4738ffafae62089cfbbf8ae1bf63792c7711fcd095b941a31fc SHA512 6b9b1b2a4319d70b9d1001300e4c874b9eda053ee3edcde79a7be38e8aebb3a29859df006a446a0975af46c6c066e42ec991eebed9215df7be7a04f788c4855f
-EBUILD glibc-2.30-r1.ebuild 43261 BLAKE2B 33fa4f4accb38b7e60376db35932c33c0f3c11f671ae506e657600f64a0acf859155eb4f5b3b4507119aef941e289359f4d043397ea1ec8e1e300965d77cfc56 SHA512 c2e38e311820edcd508928c53f7a7b66e2aa88b547c29d1c4499ed48f80e27ee8a85f193cd950886240d681826b06726ddc6b6cd88a52e3a371b2969d36f159f
-EBUILD glibc-2.30.ebuild 43264 BLAKE2B a7a2c31914e2cce3ba035d3e5d58747e6568a195ebec44d758a93e1c2e76043c28662322cccf6ccf3f34e61690c55a6c6e32e67576b947594447cf545b6bf56d SHA512 070ee6fa0b537d345bcd03c69b299092285da386f456d609c5b3a11271d5202179b17d446436c5a7a2640fe1e03380745db448b6cf55f72e33cc70749fe7685d
-EBUILD glibc-9999.ebuild 42745 BLAKE2B d6193d86b916247f16a8f83a9ffd1d94203f480ae02eba99f5a6e755fecd1363ef8203ebc5b4bd3f8628e0f78d9a493fbb75b25ebe41f9a50a87a48a1a215e23 SHA512 e46ee7850be4a95d2563a054bb19296f73db2e7f23906e2e7d64310d5e6c9041d982deb1770a534ff902ac2e72ca36f85093dba046a715163f593aae0d7de090
+EBUILD glibc-2.19-r2.ebuild 37249 BLAKE2B 477834110e0ff22d012c892243ef5405ac700c54924e4f03fbed65701c31c3cd445c332d20fb4dee3728893d1a94ce2ef26bb164f7b8ae027651b9f1687d08d6 SHA512 1afce121f756cda0fce819a5227533daa74180dbdd9029aa1c6c0fb4210543b9e5d1e13cc7e6571f38221a4f4740a7e82f03a420e670368c35070cd2431e202d
+EBUILD glibc-2.24-r4.ebuild 4945 BLAKE2B abeea3d030413af56ead335673e72fe6231de26f9d770b58928300bc8f8632c1eb1a7d65ed1b8e7c0ccc32f1283cd2e72a30253900fcce1c8cb34c9afe8aca83 SHA512 6d4e53d4ffb0789a4f92fd171058997ad2ec52b9c6cd5e8086cf79ab44dddeb0e14158a1c2e2cdc9a462e9b6a77fabde696b174c757ecd143d28b7cd606abd3a
+EBUILD glibc-2.25-r11.ebuild 4932 BLAKE2B bdc57cade5e96352ecb62e032f0ad048ae1f95383e66745b76f291f58b153f7ae5c37ad96a94b628c9b115db11d1bf9cb093da1eb5d47f7a70bff59dd296a805 SHA512 486937b13919c3c64539a2da3ebb32f8bd8a1b2b7286562d3525a111f23cd34df90ffb0fe10b793c30dc51af767ee580b9dcebbf390fdf2544c1fe2f20240414
+EBUILD glibc-2.26-r7.ebuild 25458 BLAKE2B 5e00db722b4bc65203203e7463e897f6212b62f10a7c5c084a9db99c1daf23b5f4a6041a15f5e347869878f87889974bdee200ebeaca6b83e21f905571050c7d SHA512 42cc1e283e62753760bab06ac35be1686b939bd49976e43b484963416886f867b2fda3360eea6d16065217a3ef8e3fc3fb7b4073767b13c25e8e23575d01baaa
+EBUILD glibc-2.27-r6.ebuild 40826 BLAKE2B 3eddb89bf0490e6c209e4d989975c17c64abdb323495e388a19727d6e79270a9b819909a85b34b86a9678f3020a1cf02f894e367bdf6779f77892e259230ddf9 SHA512 78c14022ce6aa26e4c9e52e83150cb57902a71f029607f0e0c703bd3c2ed9f8a20c4084e5754141d4e2bc35ed0ba6d0780d2789edfa9f6cf4b9f531713e45ea5
+EBUILD glibc-2.28-r6.ebuild 40596 BLAKE2B a3399bbdc64ae30dd885b7f4541be593bab6c551896ea4c954c224f716bae1e487640046cb1c95cdda074d71abc2bdf123850be49bdbe0c9802b127601829ca5 SHA512 898bb933c6b1f55042b14c46539efe6790558de54e140ffe5f6941fdfb0545c736611335b526f381f4cdab81bdc85f663b207fe6a34d2d5d66e432dd64dca012
+EBUILD glibc-2.29-r2.ebuild 41930 BLAKE2B bcb1911a391d7b7d60741a3a8f0084613894fd1fc6d74086433f8eac5afa1a834c4ffbb786fa9590f84b1c0dd619f7957863ef4d389a810df28474125146c8a6 SHA512 f3565011646ed6b5d1107fa32c0ba288235669f966a9fd15050e9d913e362c2bef68cc1565b527bf732ab53fa111f7ab5910a05212fc6383732568501a7eaeb7
+EBUILD glibc-2.29-r4.ebuild 42236 BLAKE2B 13a3249b2e56420e8587aeabded76157b2fa2a4f7bff84c25e9883af5334acb9a9e42d0d3f00abeaa3274f6b7d115afc9777b3deb0395cf91e67c140b08651f1 SHA512 1efb98c9cebfe87dcac0e51f7bb6294ac1e4e9cd5957830e3724fd45ff492195e5db450b590c7f4001bb54338902ed904bec2e34f50cc4a9d98a1e5e4eb140cc
+EBUILD glibc-2.29-r5.ebuild 42233 BLAKE2B 6a5918963b4f90b4e888bdb0c6153f50b536525db0fa7686c85cc0d79fc1fcfc1a3832145d2daea73cd8720bc8ffa92b3af4c17a27f59c5d141025f761067051 SHA512 f6bf65bf58c10803ab27e4b43167fa8bd6553bb7f4106732cab6fcb411e3289cb9aeb37bf3728a7d6c638851dfd7c2b267ead97716b23bf67513b6be8d475f6d
+EBUILD glibc-2.30-r1.ebuild 42522 BLAKE2B a2355b8c31b26e29591c7a9ac81db727cc0df5d84397f21880ccdfd30575d6e4d0bf5cdb2e1661dc38be65205e9f1feaa41f2adf7c4d13f53592e208ec6fb319 SHA512 6595471409756012d59a97246c6f0677e38eaffe1a077d5ff15e3ddef65acb5702818a36ab7ff22774d3c007a1642d36ee07fc449189a927f97703bf07052e43
+EBUILD glibc-2.30.ebuild 42525 BLAKE2B 3b7d542211e97f0ac15ea8c18c90c4742c622bad2dd07abf6cc2c8b4a283f8b905d92de7a4b288c0855ec5bd578f4f7dbd3974e5ddab7c8e6d4407bdff9299c5 SHA512 90fe39b77505e77ac3d086395f9b5186ae0333dbe3949b131b056f4ec52e69d4273f746a0445d119aedca1c8d07de5508b232c6c16b48f19d95197d915d31ab0
+EBUILD glibc-9999.ebuild 42487 BLAKE2B b1bd8cbe575183879f03471b29c0531f6c006da98a36bb14c73eabde308de0708ddd8870e71147502a2333841290bc909e3f6a1797809fe395d13a07967d98d0 SHA512 66e8e7c910d2662a4d0009b3cdaa1f2847aeb7a4936218b1444dc3d51d202dd6d406aa5c89bedeacc4bd45acc16086b3fcfe9f447a8d40d665c40663e77b347d
 MISC metadata.xml 1323 BLAKE2B 6a19ccbf9f068c6c3d3b945d3011dce3d7712dd74a2daeaa8244eef73fd86723b275ce018ec5557862278c23883fabfb27e91e0b88ff62c34fffdadd4b024411 SHA512 848adbf531103d69b8b0e7017c25de730daecccae220e337e475ba8dbcaa95c6d5e440330be56367974607050dfa1964026ed90bc699ab5f12fef35c88d67505
diff --git a/sys-libs/glibc/glibc-2.19-r2.ebuild b/sys-libs/glibc/glibc-2.19-r2.ebuild
index 42ed9d4e04de..75f849f69dc2 100644
--- a/sys-libs/glibc/glibc-2.19-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.19-r2.ebuild
@@ -9,7 +9,6 @@ inherit prefix eutils toolchain-funcs flag-o-matic gnuconfig usr-ldscript \
 DESCRIPTION="GNU libc C library"
 HOMEPAGE="https://www.gnu.org/software/libc/"
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-RESTRICT="strip" # Strip ourself #46186
 SLOT="2.2"
 
 EMULTILIB_PKG="true"
@@ -1197,23 +1196,6 @@ glibc_headers_install() {
 	dosym usr/include $(alt_prefix)/sys-include
 }
 
-src_strip() {
-	# gdb is lame and requires some debugging information to remain in
-	# libpthread, so we need to strip it by hand.  libthread_db makes no
-	# sense stripped as it is only used when debugging.
-	local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
-	env \
-		-uRESTRICT \
-		CHOST=${CTARGET} \
-		STRIP_MASK="/*/{,tls/}${pthread}*" \
-		prepallstrip
-	# if user has stripping enabled and does not have split debug turned on,
-	# then leave the debugging sections in libpthread.
-	if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
-		${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"/*/libpthread-*.so
-	fi
-}
-
 src_install() {
 	if just_headers ; then
 		export ABI=default
@@ -1222,7 +1204,6 @@ src_install() {
 	fi
 
 	foreach_abi glibc_do_src_install
-	src_strip
 }
 
 # Simple test to make sure our new glibc isn't completely broken.
diff --git a/sys-libs/glibc/glibc-2.24-r4.ebuild b/sys-libs/glibc/glibc-2.24-r4.ebuild
index 40f30a0b8ebe..b808611bd319 100644
--- a/sys-libs/glibc/glibc-2.24-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.24-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,6 @@ HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
 # Configuration variables
diff --git a/sys-libs/glibc/glibc-2.25-r11.ebuild b/sys-libs/glibc/glibc-2.25-r11.ebuild
index 67c8f98ebb74..e2a0f9131bbc 100644
--- a/sys-libs/glibc/glibc-2.25-r11.ebuild
+++ b/sys-libs/glibc/glibc-2.25-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,6 @@ HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
 # Configuration variables
diff --git a/sys-libs/glibc/glibc-2.26-r7.ebuild b/sys-libs/glibc/glibc-2.26-r7.ebuild
index 7caf7ba188cb..bfbe9b01b033 100644
--- a/sys-libs/glibc/glibc-2.26-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,6 @@ DESCRIPTION="GNU libc C library"
 HOMEPAGE="https://www.gnu.org/software/libc/"
 
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-RESTRICT="strip" # Strip ourself #46186
 EMULTILIB_PKG="true"
 
 # Configuration variables
@@ -784,7 +783,6 @@ src_install() {
 	fi
 
 	foreach_abi glibc_do_src_install
-	src_strip
 }
 
 pkg_preinst() {
diff --git a/sys-libs/glibc/glibc-2.27-r6.ebuild b/sys-libs/glibc/glibc-2.27-r6.ebuild
index fc6931ffb7cb..42be8144de45 100644
--- a/sys-libs/glibc/glibc-2.27-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.27-r6.ebuild
@@ -9,7 +9,6 @@ inherit prefix eutils versionator toolchain-funcs flag-o-matic gnuconfig usr-lds
 DESCRIPTION="GNU libc C library"
 HOMEPAGE="https://www.gnu.org/software/libc/"
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-RESTRICT="strip" # Strip ourself #46186
 SLOT="2.2"
 
 EMULTILIB_PKG="true"
@@ -1303,23 +1302,6 @@ glibc_headers_install() {
 	dosym usr/include $(alt_prefix)/sys-include
 }
 
-src_strip() {
-	# gdb is lame and requires some debugging information to remain in
-	# libpthread, so we need to strip it by hand.  libthread_db makes no
-	# sense stripped as it is only used when debugging.
-	local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
-	env \
-		-uRESTRICT \
-		CHOST=${CTARGET} \
-		STRIP_MASK="/*/{,tls/}${pthread}*" \
-		prepallstrip
-	# if user has stripping enabled and does not have split debug turned on,
-	# then leave the debugging sections in libpthread.
-	if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
-		${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"$(alt_prefix)/*/libpthread-*.so
-	fi
-}
-
 src_install() {
 	if just_headers ; then
 		export ABI=default
@@ -1328,7 +1310,6 @@ src_install() {
 	fi
 
 	foreach_abi glibc_do_src_install
-	src_strip
 }
 
 # Simple test to make sure our new glibc isn't completely broken.
diff --git a/sys-libs/glibc/glibc-2.28-r6.ebuild b/sys-libs/glibc/glibc-2.28-r6.ebuild
index 761c007900b2..d40991f16ab9 100644
--- a/sys-libs/glibc/glibc-2.28-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.28-r6.ebuild
@@ -9,7 +9,6 @@ inherit prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuconfig usr-ldscr
 DESCRIPTION="GNU libc C library"
 HOMEPAGE="https://www.gnu.org/software/libc/"
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-RESTRICT="strip" # Strip ourself #46186
 SLOT="2.2"
 
 EMULTILIB_PKG="true"
@@ -1301,23 +1300,6 @@ glibc_headers_install() {
 	dosym usr/include $(alt_prefix)/sys-include
 }
 
-src_strip() {
-	# gdb is lame and requires some debugging information to remain in
-	# libpthread, so we need to strip it by hand.  libthread_db makes no
-	# sense stripped as it is only used when debugging.
-	local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
-	env \
-		-uRESTRICT \
-		CHOST=${CTARGET} \
-		STRIP_MASK="/*/{,tls/}${pthread}*" \
-		prepallstrip
-	# if user has stripping enabled and does not have split debug turned on,
-	# then leave the debugging sections in libpthread.
-	if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
-		${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"$(alt_prefix)/*/libpthread-*.so
-	fi
-}
-
 src_install() {
 	if just_headers ; then
 		export ABI=default
@@ -1326,7 +1308,6 @@ src_install() {
 	fi
 
 	foreach_abi glibc_do_src_install
-	src_strip
 }
 
 # Simple test to make sure our new glibc isn't completely broken.
diff --git a/sys-libs/glibc/glibc-2.29-r2.ebuild b/sys-libs/glibc/glibc-2.29-r2.ebuild
index 5352ae1f92b3..b80ddd008144 100644
--- a/sys-libs/glibc/glibc-2.29-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r2.ebuild
@@ -11,7 +11,6 @@ inherit python-any-r1 prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuco
 DESCRIPTION="GNU libc C library"
 HOMEPAGE="https://www.gnu.org/software/libc/"
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-RESTRICT="strip" # Strip ourself #46186
 SLOT="2.2"
 
 EMULTILIB_PKG="true"
@@ -1343,23 +1342,6 @@ glibc_headers_install() {
 	dosym usr/include $(alt_prefix)/sys-include
 }
 
-src_strip() {
-	# gdb is lame and requires some debugging information to remain in
-	# libpthread, so we need to strip it by hand.  libthread_db makes no
-	# sense stripped as it is only used when debugging.
-	local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
-	env \
-		-uRESTRICT \
-		CHOST=${CTARGET} \
-		STRIP_MASK="/*/{,tls/}${pthread}*" \
-		prepallstrip
-	# if user has stripping enabled and does not have split debug turned on,
-	# then leave the debugging sections in libpthread.
-	if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
-		${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"$(alt_prefix)/*/libpthread-*.so
-	fi
-}
-
 src_install() {
 	if just_headers ; then
 		export ABI=default
@@ -1368,7 +1350,6 @@ src_install() {
 	fi
 
 	foreach_abi glibc_do_src_install
-	src_strip
 }
 
 # Simple test to make sure our new glibc isn't completely broken.
diff --git a/sys-libs/glibc/glibc-2.29-r4.ebuild b/sys-libs/glibc/glibc-2.29-r4.ebuild
index c49d82637267..7282d89d8eee 100644
--- a/sys-libs/glibc/glibc-2.29-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r4.ebuild
@@ -11,7 +11,6 @@ inherit python-any-r1 prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuco
 DESCRIPTION="GNU libc C library"
 HOMEPAGE="https://www.gnu.org/software/libc/"
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-RESTRICT="strip" # Strip ourself #46186
 SLOT="2.2"
 
 EMULTILIB_PKG="true"
@@ -1356,23 +1355,6 @@ glibc_headers_install() {
 	dosym usr/include $(alt_prefix)/sys-include
 }
 
-src_strip() {
-	# gdb is lame and requires some debugging information to remain in
-	# libpthread, so we need to strip it by hand.  libthread_db makes no
-	# sense stripped as it is only used when debugging.
-	local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
-	env \
-		-uRESTRICT \
-		CHOST=${CTARGET} \
-		STRIP_MASK="/*/{,tls/}${pthread}*" \
-		prepallstrip
-	# if user has stripping enabled and does not have split debug turned on,
-	# then leave the debugging sections in libpthread.
-	if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
-		${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"$(alt_prefix)/*/libpthread-*.so
-	fi
-}
-
 src_install() {
 	if just_headers ; then
 		export ABI=default
@@ -1381,7 +1363,6 @@ src_install() {
 	fi
 
 	foreach_abi glibc_do_src_install
-	src_strip
 }
 
 # Simple test to make sure our new glibc isn't completely broken.
diff --git a/sys-libs/glibc/glibc-2.29-r5.ebuild b/sys-libs/glibc/glibc-2.29-r5.ebuild
index d02d0fcb97d6..1c3f4a15dde7 100644
--- a/sys-libs/glibc/glibc-2.29-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r5.ebuild
@@ -11,7 +11,6 @@ inherit python-any-r1 prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuco
 DESCRIPTION="GNU libc C library"
 HOMEPAGE="https://www.gnu.org/software/libc/"
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-RESTRICT="strip" # Strip ourself #46186
 SLOT="2.2"
 
 EMULTILIB_PKG="true"
@@ -1356,23 +1355,6 @@ glibc_headers_install() {
 	dosym usr/include $(alt_prefix)/sys-include
 }
 
-src_strip() {
-	# gdb is lame and requires some debugging information to remain in
-	# libpthread, so we need to strip it by hand.  libthread_db makes no
-	# sense stripped as it is only used when debugging.
-	local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
-	env \
-		-uRESTRICT \
-		CHOST=${CTARGET} \
-		STRIP_MASK="/*/{,tls/}${pthread}*" \
-		prepallstrip
-	# if user has stripping enabled and does not have split debug turned on,
-	# then leave the debugging sections in libpthread.
-	if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
-		${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"$(alt_prefix)/*/libpthread-*.so
-	fi
-}
-
 src_install() {
 	if just_headers ; then
 		export ABI=default
@@ -1381,7 +1363,6 @@ src_install() {
 	fi
 
 	foreach_abi glibc_do_src_install
-	src_strip
 }
 
 # Simple test to make sure our new glibc isn't completely broken.
diff --git a/sys-libs/glibc/glibc-2.30-r1.ebuild b/sys-libs/glibc/glibc-2.30-r1.ebuild
index 2846ee6a61c4..b3da5c0345ed 100644
--- a/sys-libs/glibc/glibc-2.30-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.30-r1.ebuild
@@ -11,7 +11,6 @@ inherit python-any-r1 prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuco
 DESCRIPTION="GNU libc C library"
 HOMEPAGE="https://www.gnu.org/software/libc/"
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-RESTRICT="strip" # Strip ourself #46186
 SLOT="2.2"
 
 EMULTILIB_PKG="true"
@@ -1363,23 +1362,6 @@ glibc_headers_install() {
 	dosym usr/include $(alt_prefix)/sys-include
 }
 
-src_strip() {
-	# gdb is lame and requires some debugging information to remain in
-	# libpthread, so we need to strip it by hand.  libthread_db makes no
-	# sense stripped as it is only used when debugging.
-	local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
-	env \
-		-uRESTRICT \
-		CHOST=${CTARGET} \
-		STRIP_MASK="/*/{,tls/}${pthread}*" \
-		prepallstrip
-	# if user has stripping enabled and does not have split debug turned on,
-	# then leave the debugging sections in libpthread.
-	if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
-		${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"$(alt_prefix)/*/libpthread-*.so
-	fi
-}
-
 src_install() {
 	if just_headers ; then
 		export ABI=default
@@ -1393,8 +1375,6 @@ src_install() {
 		elog "Not installing static glibc libraries"
 		find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
 	fi
-
-	src_strip
 }
 
 # Simple test to make sure our new glibc isn't completely broken.
diff --git a/sys-libs/glibc/glibc-2.30.ebuild b/sys-libs/glibc/glibc-2.30.ebuild
index 743f14c253d4..5a8933d5d964 100644
--- a/sys-libs/glibc/glibc-2.30.ebuild
+++ b/sys-libs/glibc/glibc-2.30.ebuild
@@ -11,7 +11,6 @@ inherit python-any-r1 prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuco
 DESCRIPTION="GNU libc C library"
 HOMEPAGE="https://www.gnu.org/software/libc/"
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-RESTRICT="strip" # Strip ourself #46186
 SLOT="2.2"
 
 EMULTILIB_PKG="true"
@@ -1363,23 +1362,6 @@ glibc_headers_install() {
 	dosym usr/include $(alt_prefix)/sys-include
 }
 
-src_strip() {
-	# gdb is lame and requires some debugging information to remain in
-	# libpthread, so we need to strip it by hand.  libthread_db makes no
-	# sense stripped as it is only used when debugging.
-	local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
-	env \
-		-uRESTRICT \
-		CHOST=${CTARGET} \
-		STRIP_MASK="/*/{,tls/}${pthread}*" \
-		prepallstrip
-	# if user has stripping enabled and does not have split debug turned on,
-	# then leave the debugging sections in libpthread.
-	if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
-		${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"$(alt_prefix)/*/libpthread-*.so
-	fi
-}
-
 src_install() {
 	if just_headers ; then
 		export ABI=default
@@ -1393,8 +1375,6 @@ src_install() {
 		elog "Not installing static glibc libraries"
 		find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
 	fi
-
-	src_strip
 }
 
 # Simple test to make sure our new glibc isn't completely broken.
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index cd66539a9220..d529e346178e 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1181,11 +1181,6 @@ glibc_do_src_install() {
 	# '#define VERSION "2.26.90"' -> '2.26.90'
 	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
 
-	# gdb is lame and requires some debugging information to remain in
-	# libpthread.  libthread_db makes no sense stripped as it is only used when debugging.
-	dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
-	dostrip -x $(alt_libdir)/libthread_db-1.0.so
-
 	if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
 		# Move versioned .a file out of libdir to evade portage QA checks
 		# instead of using gen_usr_ldscript(). We fix ldscript as: