gentoo resync : 11.05.2021

11 files changed, 31 insertions, 168 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index d701f1688e16..8b8dfd168c53 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index c4fe562ebe06..f1bbe474e112 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -1,6 +1,4 @@
 AUX binutils-libs-2.35.1-cet.patch 2675 BLAKE2B b720e43514b25897a332648bfb15e16278f76606413991ce75c0233af27bbc434c36e85d36d4207339211382c0c5de5e9892f9e533e9d24b5257864939ac4874 SHA512 4fd4787c7ff2f7c2fed338ccc0f478b120d566959c0de5dde03cdcfdb37911bc22c5c11a124a000d84138a23c30ee3fa65c024eb72d1c924f926b04e079412a5
-AUX binutils-libs-2.36.1-bfd-ctf.patch 2861 BLAKE2B 18fe98e2352cfa7a63144f40df2ab6be925b4330bc7e4c0e65ee5d2911b9a5a9d5ddf3a118a7b2230c2b1d4d170b01b697ff66fcb5babc89815a7c628a008a73 SHA512 996b5e83efda52748c0f052fb32599c69c61674981c2f6a89cf5f148fa47b8932f763114ce69fd059600bb4ed2afa2d7757812cc7fc5f29a48215903e33c7f34
-AUX binutils-libs-2.36.1-ld-ctf.patch 1874 BLAKE2B 7bf0868b098e52dc58128507f6ea0cfa28c68de94ad5da3c4d62f7fed1119e34b7573a01333d216ed33931a3d9ab7c23be740277c1a47b24860762e6b7c04e29 SHA512 7e7a106bd8bc8f0f53a9d38368694f1cf56e66ca59c4bcac7ed233d751cb2f19acd8860cecf04ca39495610c766f94ff19598b4c83185051fad21313298fc864
 DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B d0e866d0941d2b550c7d7f23530c6ee393fa13b4f2f27832f07790989476f11d1beddb5ad5a9be5c65c1d4dff9d4598d21adcb00c1d0490f69a99127f4527447 SHA512 e05ed8886acb5cb95a3e97c5bc0564215f7d44b604610f5c4545997fd9625d6de909c37063127e819926cd1548a48d3529dd3e82e98ee6a5dbaced028c57355d
 DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
 DIST binutils-2.35.2-patches-1.tar.xz 11836 BLAKE2B 0141349c9618992d1ab1e0309f7ed8fbc43b60a58be1dfed05eae8a8fee857241d9e112ae673da6fc9778767675f536ece818cb85567367bb1c8f87a0693623f SHA512 35de5f227c745c5fb800784fe657b2a6216faf43e2498e8481e7b0dc79b0d2f86b3b6a10b896e060319a77a51c61d2e1b7a951ae962b3a6ef8c1a2a261d9bb6c
diff --git a/sys-libs/binutils-libs/files/binutils-libs-2.36.1-bfd-ctf.patch b/sys-libs/binutils-libs/files/binutils-libs-2.36.1-bfd-ctf.patch
deleted file mode 100644
index d7daf683669d..000000000000
--- a/sys-libs/binutils-libs/files/binutils-libs-2.36.1-bfd-ctf.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=755ba58ebef02e1be9fc6770d00243ba6ed0223c
-https://bugs.gentoo.org/783777
-
-From 755ba58ebef02e1be9fc6770d00243ba6ed0223c Mon Sep 17 00:00:00 2001
-From: Nick Alcock <nick.alcock@oracle.com>
-Date: Thu, 18 Mar 2021 12:37:52 +0000
-Subject: [PATCH] Add install dependencies for ld -> bfd and libctf -> bfd
-
-This stops problems parallel-installing if a relink of libctf is needed.
-
-Also adds corresponding install-strip dependencies.
-
-ChangeLog
-2021-03-18  Nick Alcock  <nick.alcock@oracle.com>
-
-	PR libctf/27482
-	* Makefile.def: Add install-bfd dependencies for install-libctf and
-	install-ld, and install-strip-bfd dependencies for
-	install-strip-libctf and install-strip-ld; move the install-ld
-	dependency on install-libctf to join it.
-	* Makefile.in: Regenerated.
----
---- a/Makefile.def
-+++ b/Makefile.def
-@@ -448,7 +448,6 @@ dependencies = { module=all-binutils; on=all-intl; };
- dependencies = { module=all-binutils; on=all-gas; };
- dependencies = { module=all-binutils; on=all-libctf; };
- dependencies = { module=all-ld; on=all-libctf; };
--dependencies = { module=install-ld; on=install-libctf; };
- 
- // We put install-opcodes before install-binutils because the installed
- // binutils might be on PATH, and they might need the shared opcodes
-@@ -456,6 +455,14 @@ dependencies = { module=install-ld; on=install-libctf; };
- dependencies = { module=install-binutils; on=install-opcodes; };
- dependencies = { module=install-strip-binutils; on=install-strip-opcodes; };
- 
-+// Likewise for ld, libctf, and bfd.
-+dependencies = { module=install-libctf; on=install-bfd; };
-+dependencies = { module=install-ld; on=install-bfd; };
-+dependencies = { module=install-ld; on=install-libctf; };
-+dependencies = { module=install-strip-libctf; on=install-strip-bfd; };
-+dependencies = { module=install-strip-ld; on=install-strip-bfd; };
-+dependencies = { module=install-strip-ld; on=install-strip-libctf; };
-+
- // libopcodes depends on libbfd
- dependencies = { module=install-opcodes; on=install-bfd; };
- dependencies = { module=install-strip-opcodes; on=install-strip-bfd; };
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52170,9 +52170,14 @@ all-stage3-ld: maybe-all-stage3-libctf
- all-stage4-ld: maybe-all-stage4-libctf
- all-stageprofile-ld: maybe-all-stageprofile-libctf
- all-stagefeedback-ld: maybe-all-stagefeedback-libctf
--install-ld: maybe-install-libctf
- install-binutils: maybe-install-opcodes
- install-strip-binutils: maybe-install-strip-opcodes
-+install-libctf: maybe-install-bfd
-+install-ld: maybe-install-bfd
-+install-ld: maybe-install-libctf
-+install-strip-libctf: maybe-install-strip-bfd
-+install-strip-ld: maybe-install-strip-bfd
-+install-strip-ld: maybe-install-strip-libctf
- install-opcodes: maybe-install-bfd
- install-strip-opcodes: maybe-install-strip-bfd
- configure-gas: maybe-configure-intl
--- 
-2.27.0
-
diff --git a/sys-libs/binutils-libs/files/binutils-libs-2.36.1-ld-ctf.patch b/sys-libs/binutils-libs/files/binutils-libs-2.36.1-ld-ctf.patch
deleted file mode 100644
index 012df3aed812..000000000000
--- a/sys-libs/binutils-libs/files/binutils-libs-2.36.1-ld-ctf.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=f04ce15e831b691d7610dba284e266919e757b10
-https://bugs.gentoo.org/783777
-
-From f04ce15e831b691d7610dba284e266919e757b10 Mon Sep 17 00:00:00 2001
-From: Nick Alcock <nick.alcock@oracle.com>
-Date: Tue, 26 Jan 2021 16:05:17 +0000
-Subject: [PATCH] ld: depend on libctf
-
-Since ld may depend on libctf (if present), and libctf may be relinked
-by the installation process, libctf must be installed before ld is,
-or the relink may fail if it calls on symbols or symbol versions that do
-not exist in any libctf already present on the system.  (If none is
-present, the copy in the build tree will be automatically used, but
-if one *is* present, it may take precedence and break things.)
-
-(This is a maybe- dependency, so it will work even if libctf is
-disabled.)
-
-ChangeLog
-2021-01-26  Nick Alcock  <nick.alcock@oracle.com>
-
-	PR 27250
-	* Makefile.def: Add install-libctf dependency to install-ld.
-	* Makefile.in: Regenerated.
----
---- a/Makefile.def
-+++ b/Makefile.def
-@@ -448,6 +448,7 @@ dependencies = { module=all-binutils; on=all-intl; };
- dependencies = { module=all-binutils; on=all-gas; };
- dependencies = { module=all-binutils; on=all-libctf; };
- dependencies = { module=all-ld; on=all-libctf; };
-+dependencies = { module=install-ld; on=install-libctf; };
- 
- // We put install-opcodes before install-binutils because the installed
- // binutils might be on PATH, and they might need the shared opcodes
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52170,6 +52170,7 @@ all-stage3-ld: maybe-all-stage3-libctf
- all-stage4-ld: maybe-all-stage4-libctf
- all-stageprofile-ld: maybe-all-stageprofile-libctf
- all-stagefeedback-ld: maybe-all-stagefeedback-libctf
-+install-ld: maybe-install-libctf
- install-binutils: maybe-install-opcodes
- install-strip-binutils: maybe-install-strip-opcodes
- install-opcodes: maybe-install-bfd
--- 
-2.27.0
-
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index c6ed2bee392d..0118c7e3398e 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1,3 +1,3 @@
 DIST cracklib-2.9.7.tar.bz2 603630 BLAKE2B 81a45b2fb9f34da84d4fb864e1a9f67a4b22c246f1e4db1c599a555f79d560a04d95afb01a89cd3a2e0936f0e8fc51ff5ada26098c24d7af0777a94f51b82bbd SHA512 f6bf65ac092ba46ff78ddbc115692260fb76dc71219cd679d2ea935ebfb9e709fbb30259a7406743ed00dbdc415335b3ac9d9fcba1d204ea36d5eb96bf1333a2
-EBUILD cracklib-2.9.7.ebuild 2490 BLAKE2B dadf2527fc0d48ecb40e0bc9d53ebe5b0ba869808125baa4ef541331c62fa6f55b684628e8cf7deafc497d7d163bacae355f7bcf9231378ee76e4886d63f2e14 SHA512 173d0385a15635041acc008f7a39687b7f9793b2a22ca47798ce889c8dc0f30f3d9a8bbc1d086b2ee9808001103f6fb62e44e5c9ff1a5ddeb32843d2ee982759
+EBUILD cracklib-2.9.7.ebuild 2541 BLAKE2B d30bbaecdb610d98d794ad2fa06f3d3eff5099dabfa6e6eb1e1c60c0fc30c59b7a5faa0b3dd1cc665ac21d9d092b31da0c299b69889de40d08eb25c8455dc927 SHA512 2408b3ed8a4942a38f4443724d1ecdede5aa9cff59211f720ae77a6aa4abd6fb17a9a4d95a0638f92ae9a9a08633c58ab64a95d44400fbc0e843d42e0ded106c
 MISC metadata.xml 384 BLAKE2B 68827917aeea5af1cc1b3c9badfc420c3e9652f3c79fa22b925f4e317c722bf43420c5cb7e4060ed63d5b5319aad1d4cbe3b09f47422a1be06d07c598ea1cff5 SHA512 773287176f56f1a0f11edc6cd1ca85453f998ad8e58b1e608562335f814aab18124bfb850063dd4fa35aba525b776bf2c202d8afa6d4b51e354276678f324bd1
diff --git a/sys-libs/cracklib/cracklib-2.9.7.ebuild b/sys-libs/cracklib/cracklib-2.9.7.ebuild
index 65506cf48985..84d00baa24db 100644
--- a/sys-libs/cracklib/cracklib-2.9.7.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.7.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+# Note: ideally bump with sys-apps/cracklib-words
+
 PYTHON_COMPAT=( python3_{7,8} )
 DISTUTILS_OPTIONAL=1
 
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 980c68928f54..3ea8f24c1dcb 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -35,6 +35,6 @@ EBUILD glibc-2.31-r7.ebuild 44397 BLAKE2B c43a3104751b92239d2bba5121d2d03d0c1279
 EBUILD glibc-2.32-r6.ebuild 44725 BLAKE2B d1bbd4f9362d42c262ccd2f2f99802d000fab7268347056bffcd9af24646bf8f9d64f24ac6efea50189cecb26c8b011853b1775ac7e070e8a4dd87072ecf0c68 SHA512 8127942411ae8494552f75a2134221df085c5d1330a1671173acae951c880786c8da4293fc23d206736cffd821c40e5a28eae862318b4c1983cb1fdefb45f3c8
 EBUILD glibc-2.32-r7.ebuild 44730 BLAKE2B b08d0de058282a9b974382d0856d9cb1bdf8df57a3d836aa3a1e6545270c75a63c648528b879573cb11da199814982f845cf191ee360ca3de1cbae86d8e23ff0 SHA512 239ce557537fb5eec32818f0aed9965913fa273d547c85b8f998196a3e9f98a04e02a937b5c09e432ffcfe464ef2f4e63c278226d467e0a79f50720ff16f87ac
 EBUILD glibc-2.32-r8.ebuild 44736 BLAKE2B d0536afe64d441de0c19686699e956dd9bc90af7d15ac12d392904eef552d54ddb209fcc00f36ddb010d0c77fa55e58b11a37b510654dee4012adfb7712118ec SHA512 5dab53cf1c940cad56004a91d4ced422193272d3994e8ee272958c22702392c891273343f59c62ab4c9660bcc130bc477c4e54c2b07c6d448ea597296efe707e
-EBUILD glibc-2.33.ebuild 44352 BLAKE2B f74aeb29c1ddb8e5e4ca27e549d7d9931259288d09a121b0ae040bb5321d3feb024ca8ab235a261700bb2ffc897320ba5ff4c00234830a212c21e52ecd12337b SHA512 525f6b9c03ef8da12effb47f577ad267f7fa188faf2c1f0991d6166376a93d9e99574173e10004fefb96b91343eef15560b3c18f9dae0f899f634eba06cef428
-EBUILD glibc-9999.ebuild 44364 BLAKE2B 6b04446bab70a41ede93f1584795abd2a20fbce85bec8d97655be0f5b9742db09be7b065dc0c5144384edaafedcb74a2f1058dbb77569c42ff6b9e45c363db67 SHA512 72bdd35b8abbdf166deefa1890b2c580741e423a422421a85e646c4041776f5effadc6f96f16dbcdcfed734648262f840963bc38d9adf8a1130f201fe7639e5f
+EBUILD glibc-2.33.ebuild 43872 BLAKE2B 1fa02900ff3267b5dcdba8ac22689b7de885187d30be8bc2d846e5ea58a0cb4b7fcf19cce90c40982e60c902b009af576fbf3ed7e3865c804fbdcf3a2dcba5c4 SHA512 cc0aeb068c178a4863bd9f25a5a48793afd683328b3b751cfb9634bc05d5b8e562856501dd1475ae5025d8f84aae51bcd9c006eb176d3a067d5862193fac959c
+EBUILD glibc-9999.ebuild 43884 BLAKE2B fdd6469d7669c168908fa1837dd14548d8001b526ab7973bc7fcd5e7841bc88abe25842812670fd57999b3d11fbc77e6863919a63e2b7aa2b5daa7caa25197f5 SHA512 b5f3ee60e142caf8fc652fdb2914b8cbf3a0ce497fb8d9d0d411a40d013b8a24ae226f25ba7f40dd6570ba6a4325803bf8e136ca0f0ed71b3248d84e78febdab
 MISC metadata.xml 1611 BLAKE2B 3bd777c160ea20cdbd86cca791d9fd4ff02f8d100344235ec74fff37d5cae1e7119e0ec26969707e75a983dcdb23e994559c8be128ef40fa0ec9ed655017466d SHA512 08be6d085ac47b140fff17a3be8cee77e066a4536cdce76fa44c77875dec2a9dc236ff67ff44301abf75cb196d1902feb2a139dda420220248b46dd9cdb16b9f
diff --git a/sys-libs/glibc/glibc-2.33.ebuild b/sys-libs/glibc/glibc-2.33.ebuild
index 332448bce7bc..f2eabcd84c0f 100644
--- a/sys-libs/glibc/glibc-2.33.ebuild
+++ b/sys-libs/glibc/glibc-2.33.ebuild
@@ -393,6 +393,10 @@ setup_flags() {
 	# glibc aborts if rpath is set by LDFLAGS
 	filter-ldflags '-Wl,-rpath=*'
 
+	# ld can't use -r & --relax at the same time, bug #788901
+	# https://sourceware.org/PR27837
+	filter-ldflags '-Wl,--relax'
+
 	# #492892
 	filter-flags -frecord-gcc-switches
 
@@ -645,21 +649,6 @@ sanity_prechecks() {
 		ewarn "hypervisor, which is probably not what you want."
 	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
-
 	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
 	# we test for...
 	if ! is_crosscompile ; then
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 7887443a98c7..d99367f1bca2 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -394,6 +394,10 @@ setup_flags() {
 	# glibc aborts if rpath is set by LDFLAGS
 	filter-ldflags '-Wl,-rpath=*'
 
+	# ld can't use -r & --relax at the same time, bug #788901
+	# https://sourceware.org/PR27837
+	filter-ldflags '-Wl,--relax'
+
 	# #492892
 	filter-flags -frecord-gcc-switches
 
@@ -646,21 +650,6 @@ sanity_prechecks() {
 		ewarn "hypervisor, which is probably not what you want."
 	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
-
 	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
 	# we test for...
 	if ! is_crosscompile ; then
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 56af8257b9f1..e2163e032660 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -11,4 +11,4 @@ DIST ncurses-6.2.tar.gz 3425862 BLAKE2B 6680cd7a369a4cb8234442a70869c283f0db6db9
 DIST ncurses-6.2_p20210123.patch.xz 519076 BLAKE2B 790ca80f0b7cdba2e75e3ace91e7f40a740594bdcb19930f64a5aaad8ba041f9ee6057e0a856050e5ef54f79ffe21f23897477dd186790fce9f8192d6149e8fc SHA512 f0d4ef317157472400f183e9ba65102e342e996c4f1d99924ece72305064c3d8616668bb2c81c6113b4bd145b1589844f8c948e6424d4372939752364bed6141
 EBUILD ncurses-6.2-r1.ebuild 10019 BLAKE2B 1dab9c2dfb96a3ee7af19c3e72c5cfaac44abbabf2193dcc9e5db801d76185b770938fe3ba01033e9b14ccecc139fc20a51c6528eafc13983f1bbe09f73f51ec SHA512 50c87e06dccda4d4837373e726839526f9500c6a406e3d985699c5c90500c47dbdbf60358affd6e491116d235ebf214c71f741046ae938c884e42144ca224b83
 EBUILD ncurses-6.2_p20210123.ebuild 10132 BLAKE2B 51a9717dcd8e5436fad19c7f1d0101a256a8a456829ab6b7fc50b8716fa23295d0d575677db0b1a389a46546bd878a6b13794a21f00477a40773574411189e8a SHA512 8f602f257a36ef8926397b31d6f73b89a7c9c599cce55f3b598f05cbfcd8457a320cc63d6d9648d1d6d26d2fa3c24d9e0df59a9494a0c232fed521d6d492b047
-MISC metadata.xml 696 BLAKE2B 00deabf0f9a310870a8080425ee4df0e581c6871565f5f3c42c823f51bb4fabac4a8980e371f2bd142a982b6369527bee184ecb941e5d5f31697a871cd0a8237 SHA512 ff73226dc25e761ad9106768fc7ad0d2c40b6fefd3beced9ba5dfcc31a499220408fb2f2a6fd8aa53bb360398154a3653bf0e0ddb16c4ef4e5e89fe60752b7b5
+MISC metadata.xml 784 BLAKE2B d195c69ac7dd1ac9b3e9d547e677f0c54ebb7f17ae2d480349bee487753f407091b94228d11ef44b901fc6a5f18cd27e4bf0cf55d16d405db9307d3199ce54a1 SHA512 83e7b30880f244e3756b357628b726832a5e02bce6225255ebe5710014e52914b2b9c87542ff5f3a6f93b547c1d029053ebda8cee5322a2e2ef6fbaa34eb11e1
diff --git a/sys-libs/ncurses/metadata.xml b/sys-libs/ncurses/metadata.xml
index 1030e9cebbae..87ea7dea8ed6 100644
--- a/sys-libs/ncurses/metadata.xml
+++ b/sys-libs/ncurses/metadata.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<use>
-	<flag name="ada">Add bindings for the ADA programming language</flag>
-	<flag name="tinfo">
-		Build curses library (libncurses) sep from the low-level terminfo
-		library (libtinfo) -- usually needed only for binary packages -- but
-		it is binary compatible in either mode
-	</flag>
-	<flag name="trace">Enable test trace() support in ncurses calls</flag>
-</use>
-<upstream>
-	<remote-id type="cpe">cpe:/a:gnu:ncurses</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="ada">Add bindings for the ADA programming language</flag>
+		<flag name="tinfo">
+			Build curses library (libncurses) sep from the low-level terminfo
+			library (libtinfo) -- usually needed only for binary packages -- but
+			it is binary compatible in either mode
+		</flag>
+		<flag name="trace">Enable test trace() support in ncurses calls</flag>
+	</use>
+	<upstream>
+		<changelog>https://invisible-island.net/ncurses/NEWS.html</changelog>
+		<remote-id type="cpe">cpe:/a:gnu:ncurses</remote-id>
+	</upstream>
 </pkgmetadata>