6 files changed, 51 insertions, 6 deletions
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index 7a85841b42c5..1c7c714cde6d 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -9,6 +9,6 @@ DIST binutils-2.29.1.tar.bz2 29123355 SHA256 1509dff41369fb70aed23682351b663b56d
 EBUILD binutils-libs-2.25.1-r2.ebuild 2737 SHA256 dc287dfc75930e05a4b093910afe8691c1b62416a214fa462f1d52393191daa2 SHA512 e74c54f9a73d1f0193879fd181ec42951e24c89a0458461293982c19999e86d0c99ce6417bb53261763ea5012526e566b1adb5fef4f68a5d540489b9c0f78018 WHIRLPOOL e73510acb481ce1331b840375714ef3d6af7dfc9a8128322d6eef7f5758c53df8687a284cdd5f38df25045c6aa6d93667aeca98bcd1333a7cc428084bf9d8075
 EBUILD binutils-libs-2.27.ebuild 2859 SHA256 174df4582ed73d0c4338234654cb420d3498d88c65089a808b9551171c14b2d8 SHA512 f0307817eed7b1fa5559543027d5e8ad3609021a92e06ee810e8008da9bfdba9559fd29d44cd961a40df735b4b78c38ba1156415b5f63d2ab43283b515a09bd0 WHIRLPOOL 64ca7992e22e2d7ef152c6d11f5e0181c6be3ef7dd101d53575d308a88ded765ccb72df6a5c244855c4b60e967fae2e6702107d04437ac5b7edd02ff72c35bfc
 EBUILD binutils-libs-2.28.1.ebuild 2884 SHA256 48e3af891fcca61715264c2054c1e145ef910b4e5d0d9fba97d830d4a0579340 SHA512 d9679950c09f4381d441772b5c1906aa517399fac42eadf5a778c2fb40e72fd7846b04059c5f3331fbb4eb5dba2e50adc7281bfb55febbdd150b6dfceb1a45b8 WHIRLPOOL 0f1795e3164eebcf886dc84ffa918a527c028d4bb702ae79602280c140bb5ea0bb56fb8a3b738ba395a5cfbe624f932dab0f2a87292cb050f2a30bfe230c1d10
-EBUILD binutils-libs-2.29.1-r1.ebuild 2930 SHA256 b931423d40f675730fbbbafec811841f896b8a4b8420b3c460a07c513d1cc6c7 SHA512 5da19d149e8857feb2bd1fcfef5b173f7ccf599c8e6d63851ec335e110b608e04297f9e25b1d13d67400a2fc2e2f41d9a4c976b708dbe48f58fcfa05c35de3b1 WHIRLPOOL a3e3ecfc18403d2c5157122b2817a256a841cbc9597b67e299bad8d230f130d4a888aa8af3ef7cb48637b887f375920a08148e2665f93b976411e1d0c75394e1
+EBUILD binutils-libs-2.29.1-r1.ebuild 2928 SHA256 725acd306086f0901fd7886131f8b05526876a4b1110696d13567a952fae6025 SHA512 3c1f6b16803ab9f4565fabc43bcaa9f02056075ef9db8731ff13466c092af36a81ee1dd38e2e3ce10023bcac8707e40820478ba6955ada5a68aa5897d1f8e0b5 WHIRLPOOL 7a81647a1661dc35e1821a67aaceac7fc857001e37b7bd02a669390f514ea4df0f44d2e7ba2c8dce095cb24bbbfe0ce1ce4aad361857f1987b05a5b996e943a8
 MISC ChangeLog 3434 SHA256 f4018d2351e0d680631a883a78ca749fc99a4efc915b4d32a302a7a495a4d43e SHA512 e1e028672b70cfc2c02ad2328c67f4d0cbeefcb4fa08417ce449b64e821d401c5b39d884c098febd83370590b9907eaf8a072750d27fd6fbc8b260549e3a260c WHIRLPOOL a8814d517a9762e9d303dc9c278271db9572ef3d5cecc24b26048580a42ff9d078d030f8b749aaf5ef1d47656cf1200f72406514623a2df37c35b082c9c2c7a7
 MISC metadata.xml 524 SHA256 03d92323b98033273689c9031e2a364b893f3796b4089ae6fe4ec9a96d958d7c SHA512 9db7c7a3082ee848ec4963831da06cced596d543e53660747fb56ac33998c219e1d7252892ffc32132d7db3c99ce9746fb6d9e85f866c3cba97552c31948342c WHIRLPOOL af84fdd4aca89713c10a087507e30631ddeea5b6002005db7c198588890df38573229618499eb0e7f4bb87782aaa38589c556d5fa4348a1e636561a1595309b0
diff --git a/sys-libs/binutils-libs/binutils-libs-2.29.1-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.29.1-r1.ebuild
index 8dd5034f9105..1821cf3fdb76 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.29.1-r1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.29.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.bz2
 LICENSE="|| ( GPL-3 LGPL-3 )"
 # The shared lib SONAMEs use the ${PV} in them.
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="64-bit-bfd multitarget nls static-libs"
 
 COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index c4301e77e733..2b00cd126a68 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -50,9 +50,9 @@ EBUILD glibc-2.23-r3.ebuild 4890 SHA256 364b764f399b9525f719563cf2d50c0c75c09241
 EBUILD glibc-2.23-r4.ebuild 5011 SHA256 3690a8b559bd563dc9af89d1217f5021c7da1b89eb5ec513e8b725e04cb45e0e SHA512 3695c8acea09838cc79c33379cfcaf0eb774759f3af5863892ff9c63732926764a8a5187ab9aaccdfd358d62c0884feab95a7055735c9295549d5c8f0c198221 WHIRLPOOL d6a6404e9968ea604d578d500ff7cd550097c1cc30713d61253a130d6a26f9f228ea83189abc611b4704e58be2b74323ab8f106faf4d3db92f7c61f27bf43d93
 EBUILD glibc-2.24-r4.ebuild 5047 SHA256 c200272f9c19ce196e788572aa0ff5e0e0a24b37b6fd3b0a85236406b6ea8f11 SHA512 d93834a9012716293c1992d6217eed6364782e6e01c692e349c6edb00bbda6dd5f227f70977e438b46de0861e9a2d4bc8c04270873cec75b1eb395b1328ea8e2 WHIRLPOOL 4dfbf4334444fb77baca96eb14911738f3253709816a6e87ddc2d53c5eebfec22abc32dd61dece00dd250a13574a35df5b8bb3d6812b6fb27e05e192c5d44297
 EBUILD glibc-2.25-r8.ebuild 5040 SHA256 3a4f5ba8e69de50e0e454aba133307a8bd778fdaa06e8869769572cffa203e82 SHA512 e1794aca6c71a8ea5e93388ef4b86e426d19053b32ba606f9392c3c1586a410461921a847a191dc4c774230b48446f412aa1350774cea4aa85f4d3058f14f25a WHIRLPOOL a29f7b356bb02ea996a4c1b9e7f6aa2056fc624cb8fd47fde8fb89cd1ecc9e3964193a25e723ad32d29033fafae481db6313264b3561a30717bd0bd2c7634409
-EBUILD glibc-2.25-r9.ebuild 5041 SHA256 7c8f81684b564a1811e186da9ad31430f623c9f4220488795e3714148ede420d SHA512 08862c8a16318b7c10eb76b542d4b6b555c3db7a941556e4f24d98014da204c696e9156ad06a82dc25d4c796c645091964bc00a5565e499c5f93d9eb81c91cff WHIRLPOOL 4cd043b79007d0bf26459609c08756b7847eb5c51eec31702ef85126275027650186b90a71a23ddd5bd73b74375833d41738ea59b2ad5f7a62ccc9d78a9f0109
-EBUILD glibc-2.26-r3.ebuild 24110 SHA256 a57eaa1a94490cec32d622cc835f9d02c0e0b0ec0450a1aee80f25aee8670d44 SHA512 3ae2aea40c6760cf26a55c447bc12db432e3a8ff68c773e16215b9c265697ada49e3c161498a254397b5f341e98d06dd74ff9aaa4cebe9acb1565111ba7acd43 WHIRLPOOL d613c0ca056cfdb26b523525f1d7acecdd449cc6918fe8834803a39f7d2ef6e2d1a018d6a1a9e92255b0b67234a4ff7d2249123fe7b3485b160b2e5cedf1db1a
-EBUILD glibc-9999.ebuild 23748 SHA256 a930433b65ca897992f5803751a6ac2aa1b81b211ee5c4c70f66cd941742528e SHA512 aec196aa351d008f01520fe7b0805ffcff2b3a8c37c64282889c3e45ba9a08676e8b9e41e1d759b3d5087f4857776b371009f3dc749c77428643047159ee4318 WHIRLPOOL 406f255b67982e3c98207b3c8d8799e2eddce662c8664c19c70359b4c19ef806bbd0fa8b05d4c5539d1b7d6950ec0d1162a0fc2567f639c4c56388d46f62d38e
+EBUILD glibc-2.25-r9.ebuild 5040 SHA256 a83bc110a3634115e4bd81638f27f192bae15460579d75fcc759a7d61a5e8d71 SHA512 7b6a9a0fbcdfb89a843a4d59e8ebfb9bbdbbf314eb897b133bdc43a69da3cec8ff91727a8a1239c5bba0a23514ff634adbf02c40b9055359ca3da5eef78c6563 WHIRLPOOL cd22e24ed191d739bc9e4e93c1c1a9a1a58f578660fd976922042e7f180ff28445289b8212011148bc6f91756c423a508c3283e5742ea80c10793d8ecc32c3fb
+EBUILD glibc-2.26-r3.ebuild 24654 SHA256 6438ce73ada6cbbabb4226a6200a81281ae13341fcfeb217b844377b7cd36079 SHA512 501feeb307e9b581f563d96c92a4456ac880b7783f993476b24ac3ae643f2ea423b19316b93afe064bcbf9be43e710155a5d300fcc8041cbd36f1e2356446966 WHIRLPOOL c633b85b6fe9c6ea7530046e9d7322a51b5eb281f2d0c96e0bf229d4fb1b3ff2ecd7cb52ea959e2516c7d0e73fe988d006c861e6a370bcc18514c7139e991e7d
+EBUILD glibc-9999.ebuild 24896 SHA256 c236687a6e8c65332f1ad0503e6d47912198b9ad14f31cd7add05f9b80f72ddb SHA512 4a0e7d1e7bff6d932a5a2a54a09a855619677336eb91f0f5da8a55ba0d09c68b55861afa43954661c9b8f65ba0887dd39d4d6008c1b2249aa1b7c433729b8ece WHIRLPOOL 6b8fd0edc9fb12d013dd6370561f2d10cc65015c5faf1861f2e35ed5e9a888f84df7d633f431bb22382c511bf87ef1fcf82aac4084d97be0492a0a21aa17c5d4
 MISC ChangeLog 17234 SHA256 6aa54d20b4de284c51e7d0691f861af52e68376d48e91788c79f8ee821300a91 SHA512 39aa17d86df6c1d53c9c2ad268b2123bafccd45a226e064e3b759bda73294c7896d43f9846bf2fa401d29fa04efecee414674d923bb632915175adf7e8b24b2b WHIRLPOOL d60c804c21d7b0065aca45a3f761f0c81f96fe681d60df7f33ce13c879325d23a9908a134f948e50f3c57b5c596c93d1b04932bfb501e88d6d1d88847df62d32
 MISC ChangeLog-2007 108548 SHA256 d622be202eb0d61a363b0ae4065012cd1d494fefaa0c03d4aa7986177cdde6d0 SHA512 fdb3f311a3be4b97a6acfceb1763af5ea69e74d8195522c5d03307f75e15a9382991e9e29dbfdec79e74f1c36328f82648768749bc929e5050ff64b628c7ca98 WHIRLPOOL e550f354394569069e000a7e70ec69c94388a0f415c19b427203f0dcbcbeeec0f5e379ee2af7886cd2d68559e749fab8122e7e077985729d7e0e728ae9096d7a
 MISC ChangeLog-2015 77895 SHA256 d7c16b77521b14a7e1c148f1ad699128e4fcf7caf41a77b46844508ba68acf15 SHA512 1a7fee53e1ec55d0b16b949543b01ad6f429f74293cb6ed730f05a3ddfc4a21fdaf7ee80c0c839d456587a207780ccfefdaf68a236989db5129ffba30c77ff5e WHIRLPOOL 48d46ac586309e415b7d669598c330062afd6fcb2668600d5c62e234d5ab8c3dfd2e81d4f528689efb6d5fb5e2ca5e24c68a4c58be52e1c336127d63224e18fd
diff --git a/sys-libs/glibc/glibc-2.25-r9.ebuild b/sys-libs/glibc/glibc-2.25-r9.ebuild
index ac362fe42e88..b8e8ec81073d 100644
--- a/sys-libs/glibc/glibc-2.25-r9.ebuild
+++ b/sys-libs/glibc/glibc-2.25-r9.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 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"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
diff --git a/sys-libs/glibc/glibc-2.26-r3.ebuild b/sys-libs/glibc/glibc-2.26-r3.ebuild
index d66113063e92..13aa5ad8bfb6 100644
--- a/sys-libs/glibc/glibc-2.26-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r3.ebuild
@@ -800,4 +800,19 @@ pkg_postinst() {
 		fi
 		locale-gen -j $(makeopts_jobs) --config "${locale_list}"
 	fi
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
 }
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 25412dcedbb8..732d684a7281 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -196,6 +196,21 @@ pkg_pretend() {
 			die "old __guard detected"
 		fi
 	fi
+
+	# Check for sanity of /etc/nsswitch.conf
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] ; then
+		local entry
+		for entry in passwd group shadow; do
+			if ! egrep -q "^[ \t]*${entry}:.*files" "${EROOT}"/etc/nsswitch.conf; then
+				eerror "Your ${EROOT}/etc/nsswitch.conf is out of date."
+				eerror "Please make sure you have 'files' entries for"
+				eerror "'passwd:', 'group:' and 'shadow:' databases."
+				eerror "For more details see:"
+				eerror "  https://wiki.gentoo.org/wiki/Project:Toolchain/nsswitch.conf_in_glibc-2.26"
+				die "nsswitch.conf has no 'files' provider in '${entry}'."
+			fi
+		done
+	fi
 }
 # todo: shouldn't most of these checks be called also in src_configure again?
 # (since consistency is not guaranteed between pkg_ and src_)
@@ -793,4 +808,19 @@ pkg_postinst() {
 
 		use compile-locales || run_locale_gen "${EROOT}"
 	fi
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
 }