gentoo resync : 25.11.2020

8 files changed, 53 insertions, 360 deletions

diff --git a/sys-libs/ncurses-compat/Manifest b/sys-libs/ncurses-compat/Manifest
index 83c5f6f591a9..0f46f1b616fd 100644
--- a/sys-libs/ncurses-compat/Manifest
+++ b/sys-libs/ncurses-compat/Manifest
@@ -1,17 +1,12 @@
 AUX ncurses-5.7-nongnu.patch 361 BLAKE2B 9260be98295203137327e37a15480bf96742ec5a62a693af04e929ba7ac8528e2810b267960d7cde5b20e8ee72bb447e34a681b567e74d5e4e9325a3613292c1 SHA512 818a3ac1c68c1a11f23471195a32793c5546c5b37a724989cc58f3fad50fd3c8608762efc5d72e986f3c77ccdfbb72f27224f64ef415a96d71924a9f1d3b1b5f
-AUX ncurses-5.8-gfbsd.patch 695 BLAKE2B 0a7e27a1e7327cee5eafc34e702742b544d59960de52e316753eeffd5eac5efbdcd7fca910fe31b5a7e8b2aa4e4d8095db6f91fd3fc974244ffd3531d44074b9 SHA512 d4c375107415b7eaf5f8e04b697ef16998855b5f1d745766a14a7e9523d12b24d0841e6559217eccf62535f54e0d240eabaa3da1571964f1bb150b0c0cd102a2
-AUX ncurses-5.9-fix-clang-build.patch 1291 BLAKE2B a0fdd4eced0f52ae8368c02e5de66be4aa3ed7a021d6842c982c5ad293f258face7632b42cba51f9194fcdb5479717ca92b3802f5291d15795387b99d11aae10 SHA512 d911441e2e2e2a752236f1eee42955b43ffabe37e47c337a86562c3708aca1fc2650ce77fe5aa6197eb8e9a67958a4b4db8f4344d22fe15868e25b933b175bb1
 AUX ncurses-5.9-gcc-5.patch 1367 BLAKE2B ecbf3c307e5543c4f32a4db54f0e7c97ef0e5f68ebef9a974265e4f002a4789f5e3629a68eb455e45f6cc43f7b05a9eb6db6675dc0c9b83d61785fc10d67fb4b SHA512 200388ee1e8d8f656620d067e8993f79a50ed1a6ebee41ce8bd32b2a61cbe10c93347e2604229b58299c457640b247261a4d05afe60802dd4cce80d17bc2f10c
-AUX ncurses-5.9-no-I-usr-include.patch 1431 BLAKE2B 1dcc533936ba22fcb07a3ad4252391becb57aec0878304254236148c9d022ebf4d7d698c97e9f199baf83995e4de72ff7979539dae1a4222dbadeab93d643bf4 SHA512 a58aec17e4c2edb3f8ed3f414ec6a89afe9f5fcc7cea898774a1fd7e7e892f9b66b1c2bdc74381dd5e8c9cf6968ad922406974f9ece8b38095b29e32d3ff0805
-AUX ncurses-5.9-pkg-config.patch 1022 BLAKE2B dcaa045919e22eb174cb7c155ef05fa7c2c29d64eb586947f2afb243a13dfdc503460452be0f8075bc91b166d5b7f12ea34b39234d0832ef6bd432496932719f SHA512 a5578a4a6c2a334a77084da21d61d4a9edd7b82f027d7f54ed7be194ace5076fe86dc51ada916388feeb970255bf3bfbb09cd33072b1ef21de0dbaa5ee45fdf6
-AUX ncurses-5.9-rxvt-unicode-9.15.patch 3804 BLAKE2B b88b028246c4177cac148837063b8dd76fa8dc215cb47ace2dd58b38eb8547273ac29930e2fe1c209bc8047462fe1319ac253955af445674410e21e8fe1c39b9 SHA512 82c0a9600f6ca8f36bbdce6f11a96906983fc9efd6b5f1e17134e12283e29b16d04f5e66c10edbcb7087cc4cb8fc23ddd065f9b6c8b0bf72ca684b68383e5131
 AUX ncurses-6.0-cppflags-cross.patch 1240 BLAKE2B 56fbe4810c28e089a8ceb8fa8c983df744d40573b4fc2488d3f26f40ed77aba2d15da2a006e56217216740e26a295c9ab9c4be78df201514040376a986cf1b30 SHA512 db333b400ad23110bff80d86eca39e5656870caa06083b6d7098503fe34a46e387d207b135bf9aa9a0a1f2eca2a9b094f1d189ea8f8a17caaec4fc14b819fcc4
 AUX ncurses-6.0-pkg-config.patch 386 BLAKE2B 27a61878d45aa781291e18a2e18b8e861dd88f523083a54032511ceea2784b5020c500d0d277fe448381a969989d896ca32c46af35ad29f35dace97511dda9eb SHA512 8065f50a1d0b2ccd8c8d9b5b6bcf10b07351e2f5e51c17a825057235a63459839771ea249aac7fa50e09c7bacde5179a92f3efe587cf3cf6697ec663faf6caf3
 AUX ncurses-6.0-rxvt-unicode-9.15.patch 3759 BLAKE2B 88e1b6145c5d1afa9d319fdf1bb70967705cc0460fb87cb3897d0e86678b065bc365573859d1cb96ac4209e61a4c43a84cd0cc3b86680e965e3bf404271354ef SHA512 5601446d34421453fb8ed0e7172b4a5230ab4f10a6ded27e6dc52f82f121cb0af510dfc8f60d9ba0d3b9a1d90a8a832c38e24256e394d8ffccbbf12a109e2da4
 AUX ncurses-6.0-ticlib.patch 492 BLAKE2B df9e747a773b532aab42def40fa048a08ae4d02b83c78bfb5fd89b70b9b753534769c5c52a0d1adde7447cd25a286fc8b5d9f52f395c6287d7cd568f184242d7 SHA512 291ed033118673aed1bc5d3b54730d099dffccad7bbe9cb47275bb216125ef9016225eaccae620fa3b06533b7633061a8029e19c8cb9f73c3e30499f587353d6
-DIST ncurses-5.9.tar.gz 2826473 BLAKE2B 91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1 SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1
 DIST ncurses-6.1-20190609-patch.sh.bz2 602174 BLAKE2B 38b1cb1f376b8fdfddc7cf9ed8e10190dd50fc2315f11eaf3a14c0299167c0e6bbd82a3684fa83d6e8fa6d2f02ea14e88ea065f8bb886905d85788bde13731c0 SHA512 efd009f5087a7b16413b94ce37ad19da0df8974be579b742d57bc64e034792ccf03b9967593a0ac5c90522ccfde4b6d23ef763d6fbeb91a5f327f8d7a0970872
 DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee
-EBUILD ncurses-compat-5.9.ebuild 5312 BLAKE2B a29e2ed14edcf1b32e8bec26c005f1b7b96836d93ea9ffb5daa49b8b147ad7c1e76e31633eb8016fa07d95ffa4ff00e8075d20c62cf1c449e156944b0c8478ab SHA512 b94046b43b3b333bb0811db83d2558bee1f772873b22037b99713ef78ed2345cf5f417a7e5acc352cd35f49350ebc7bc5327493d0f0f7a8fa5d2b81eca0ef2da
-EBUILD ncurses-compat-6.1_p20190609.ebuild 6347 BLAKE2B dc3d9d21d249e82238ad26d4008148d8eb196df7b870812e94c8b37c4b1fa92c0a42e9582364b1082497b9a1b7cbc508bb2e06d752dcbadfc5b0d13ff7821d94 SHA512 70222053eee9773ce7e002dad3b48b215a3bda54ee4fc860d46b4236588306dbf09101ff48d639b5b61f9d4fbaf356d7263edb2fa373523e5c2848bf6a0d564f
+DIST ncurses-6.2.tar.gz 3425862 BLAKE2B 6680cd7a369a4cb8234442a70869c283f0db6db9d7da1da2a7a5c519eb862a2c9b9411957d99f9ebb5089cad00b42e1ca6bc0784327461113df2eeaec695913c SHA512 4c1333dcc30e858e8a9525d4b9aefb60000cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d
+EBUILD ncurses-compat-6.1_p20190609.ebuild 6338 BLAKE2B 51df8f9e77a524f5aec85fab3bfdb0e943bbd0b245a9d8b22ef5cdb939e3b411a41e28a847c6c9b6a48c4514f869544e5fd885ea59f8417b985e715738359adb SHA512 71a465227862d9989217e705dd88d76cc7a2a2203ac831ce062637fb52322d63e914e96abc08343213aa28fe4657945ff30a1634f837b0f9643246c8b2ef52f6
+EBUILD ncurses-compat-6.2.ebuild 6347 BLAKE2B dc3d9d21d249e82238ad26d4008148d8eb196df7b870812e94c8b37c4b1fa92c0a42e9582364b1082497b9a1b7cbc508bb2e06d752dcbadfc5b0d13ff7821d94 SHA512 70222053eee9773ce7e002dad3b48b215a3bda54ee4fc860d46b4236588306dbf09101ff48d639b5b61f9d4fbaf356d7263edb2fa373523e5c2848bf6a0d564f
 MISC metadata.xml 553 BLAKE2B b4d08cf9605063f09966cab08e095e0ed0194e03d941aceab3c3990aac37e143a2d0b0f69488c621fe200195c639ff4f3fdbf7969869edc4e237d994b8802084 SHA512 96895eee198c9686f03715f854fceab32e726f2944c357fb9c59915756132d57a919e0e10bb8bd093315b0102831ddd6db32060723997bc9134bf6f3e34e84e9
diff --git a/sys-libs/ncurses-compat/files/ncurses-5.8-gfbsd.patch b/sys-libs/ncurses-compat/files/ncurses-5.8-gfbsd.patch
deleted file mode 100644
index 0200a14462af..000000000000
--- a/sys-libs/ncurses-compat/files/ncurses-5.8-gfbsd.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-we'll hijack the freebsd* case that comes later
-
---- ncurses-5.6/aclocal.m4
-+++ ncurses-5.6/aclocal.m4
-@@ -3806,7 +3806,7 @@
- 		fi
- 		cf_cv_rm_so_locs=yes
- 		;;
--	linux*|gnu*|k*bsd*-gnu) #(vi
-+	linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) #(vi
- 		if test "$DFT_LWR_MODEL" = "shared" ; then
- 			LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
---- ncurses-5.6/configure
-+++ ncurses-5.6/configure
-@@ -3806,7 +3806,7 @@
- 		fi
- 		cf_cv_rm_so_locs=yes
- 		;;
--	linux*|gnu*|k*bsd*-gnu) #(vi
-+	linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) #(vi
- 		if test "$DFT_LWR_MODEL" = "shared" ; then
- 			LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
diff --git a/sys-libs/ncurses-compat/files/ncurses-5.9-fix-clang-build.patch b/sys-libs/ncurses-compat/files/ncurses-5.9-fix-clang-build.patch
deleted file mode 100644
index 0c6ca7acc4fc..000000000000
--- a/sys-libs/ncurses-compat/files/ncurses-5.9-fix-clang-build.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/ncurses-5.9/c++/cursesf.h b/ncurses-5.9/c++/cursesf.h
-index 70a30c3..db38063 100644
---- a/ncurses-5.9/c++/cursesf.h
-+++ b/ncurses-5.9/c++/cursesf.h
-@@ -677,7 +677,7 @@ protected:
-   }
- 
- public:
--  NCursesUserForm (NCursesFormField Fields[],
-+  NCursesUserForm (NCursesFormField* Fields[],
- 		   const T* p_UserData = STATIC_CAST(T*)(0),
- 		   bool with_frame=FALSE,
- 		   bool autoDelete_Fields=FALSE)
-@@ -686,7 +686,7 @@ public:
- 	set_user (const_cast<void *>(p_UserData));
-   };
- 
--  NCursesUserForm (NCursesFormField Fields[],
-+  NCursesUserForm (NCursesFormField* Fields[],
- 		   int nlines,
- 		   int ncols,
- 		   int begin_y = 0,
-diff --git a/ncurses-5.9/c++/cursesm.h b/ncurses-5.9/c++/cursesm.h
-index d9c2273..2d5b79a 100644
---- a/ncurses-5.9/c++/cursesm.h
-+++ b/ncurses-5.9/c++/cursesm.h
-@@ -635,7 +635,7 @@ protected:
-   }
- 
- public:
--  NCursesUserMenu (NCursesMenuItem Items[],
-+  NCursesUserMenu (NCursesMenuItem* Items[],
- 		   const T* p_UserData = STATIC_CAST(T*)(0),
- 		   bool with_frame=FALSE,
- 		   bool autoDelete_Items=FALSE)
-@@ -644,7 +644,7 @@ public:
- 	set_user (const_cast<void *>(p_UserData));
-   };
- 
--  NCursesUserMenu (NCursesMenuItem Items[],
-+  NCursesUserMenu (NCursesMenuItem* Items[],
- 		   int nlines,
- 		   int ncols,
- 		   int begin_y = 0,
diff --git a/sys-libs/ncurses-compat/files/ncurses-5.9-no-I-usr-include.patch b/sys-libs/ncurses-compat/files/ncurses-5.9-no-I-usr-include.patch
deleted file mode 100644
index 5c968e76c378..000000000000
--- a/sys-libs/ncurses-compat/files/ncurses-5.9-no-I-usr-include.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://bugs.gentoo.org/522586
-
-delete the -I$includedir paths that get added to CPPFLAGS.  these are never
-needed when building natively or cross-compiling and really get in the way
-in both cases (upgrades/cross-compiling/etc...).
-
-extracted from the upstream change:
-http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff;h=9ee3995474454b7d956885e0fe5c8cac2ae25d42#patch5
-
---- a/configure
-+++ b/configure
-@@ -18596,33 +18596,11 @@ CPPFLAGS="$CPPFLAGS -I. -I../include"
- if test "$srcdir" != "."; then
- 	CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
- fi
--if test "$GCC" != yes; then
--	CPPFLAGS="$CPPFLAGS -I\${includedir}"
--elif test "$includedir" != "/usr/include"; then
--	if test "$includedir" = '${prefix}/include' ; then
--		if test $prefix != /usr ; then
--			CPPFLAGS="$CPPFLAGS -I\${includedir}"
--		fi
--	else
--		CPPFLAGS="$CPPFLAGS -I\${includedir}"
--	fi
--fi
- 
- ACPPFLAGS="-I. -I../include -I../../include $ACPPFLAGS"
- if test "$srcdir" != "."; then
- 	ACPPFLAGS="-I\${srcdir}/../../include $ACPPFLAGS"
- fi
--if test "$GCC" != yes; then
--	ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
--elif test "$includedir" != "/usr/include"; then
--	if test "$includedir" = '${prefix}/include' ; then
--		if test $prefix != /usr ; then
--			ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
--		fi
--	else
--		ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
--	fi
--fi
- 
- ### Build up pieces for makefile rules
- echo "$as_me:18628: checking default library suffix" >&5
diff --git a/sys-libs/ncurses-compat/files/ncurses-5.9-pkg-config.patch b/sys-libs/ncurses-compat/files/ncurses-5.9-pkg-config.patch
deleted file mode 100644
index 7c3c04a449f8..000000000000
--- a/sys-libs/ncurses-compat/files/ncurses-5.9-pkg-config.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-disable the $PATH search for the PKG_CONFIG tool.  it isn't needed and just
-gets in the way when setting to a value that might not yet exist.
-
-disable the existence test for the PKG_CONFIG_LIBDIR dir.  it breaks when you
-cross-compile for an ABI that doesn't exist in the root dir (--build).
-
---- a/configure
-+++ b/configure
-@@ -3582,7 +3582,7 @@ fi
- esac
- 
- test -z "$PKG_CONFIG" && PKG_CONFIG=none
--if test "$PKG_CONFIG" != none ; then
-+if false ; then
- 
- if test "x$prefix" != xNONE; then
-   cf_path_syntax="$prefix"
-@@ -3626,7 +3626,7 @@ echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C
- 		PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig
- 	fi
- 	PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'`
--	if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
-+	if test -n "$PKG_CONFIG_LIBDIR" ; then
- 
- # Check whether --enable-pc-files or --disable-pc-files was given.
- if test "${enable_pc_files+set}" = set; then
diff --git a/sys-libs/ncurses-compat/files/ncurses-5.9-rxvt-unicode-9.15.patch b/sys-libs/ncurses-compat/files/ncurses-5.9-rxvt-unicode-9.15.patch
deleted file mode 100644
index b6d1924cbe7e..000000000000
--- a/sys-libs/ncurses-compat/files/ncurses-5.9-rxvt-unicode-9.15.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-Add rxvt-unicode terminfo, required by rxvt-unicode to function properly.
-
-Providing this in ncurses makes it widely available, much better than having to
-install rxvt-unicode everywhere.
-
-http://bugs.gentoo.org/show_bug.cgi?id=192083
-
-This patch uses the updated rxvt-unicode-9.15 terminfo
-which includes 256 color support and fixes Gentoo bug 383871
-
-http://bugs.gentoo.org/show_bug.cgi?id=383871
-
---- misc/terminfo.src
-+++ misc/terminfo.src
-@@ -4208,6 +4208,176 @@
- rxvt-16color|xterm with 16 colors like aixterm,
- 	ncv#32, use=ibm+16color, use=rxvt,
- 
-+# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
-+# Updated: Özgür Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
-+# Updated: Marc Lehmann <schmorp@schmorp.de>, 17 Feb 2005
-+# Updated: Marc Lehmann <schmorp@schmorp.de>, 04 Nov 2008: change init/reset sequences
-+rxvt-unicode|rxvt-unicode terminal (X Window System),
-+	am,
-+	bce,
-+	eo,
-+	km,
-+	msgr,
-+	xenl,
-+	hs,
-+	cols#80,
-+	it#8,
-+	lines#24,
-+	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG,
-+	bel=^G,
-+	blink=\E[5m,
-+	bold=\E[1m,
-+	civis=\E[?25l,
-+	clear=\E[H\E[2J,
-+	cnorm=\E[?25h,
-+	cr=^M,
-+	csr=\E[%i%p1%d;%p2%dr,
-+	cub=\E[%p1%dD,
-+	cub1=^H,
-+	cud=\E[%p1%dB,
-+	cud1=^J,
-+	cuf=\E[%p1%dC,
-+	cuf1=\E[C,
-+	cup=\E[%i%p1%d;%p2%dH,
-+	cuu=\E[%p1%dA,
-+	cuu1=\E[A,
-+	cvvis=\E[?25h,
-+	dch=\E[%p1%dP,
-+	dch1=\E[P,
-+	dl=\E[%p1%dM,
-+	dl1=\E[M,
-+	ed=\E[J,
-+	el=\E[K,
-+	el1=\E[1K,
-+	flash=\E[?5h$<20/>\E[?5l,
-+	home=\E[H,
-+	hpa=\E[%i%p1%dG,
-+	ht=^I,
-+	hts=\EH,
-+	ich=\E[%p1%d@,
-+	ich1=\E[@,
-+	il=\E[%p1%dL,
-+	il1=\E[L,
-+	ind=^J,
-+	is1=\E[\041p,
-+	is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
-+	kDC=\E[3$,
-+	kIC=\E[2$,
-+	kEND=\E[8$,
-+	kHOM=\E[7$,
-+	kLFT=\E[d,
-+	kNXT=\E[6$,
-+	kPRV=\E[5$,
-+	kRIT=\E[c,
-+	kbs=\177,
-+	ka1=\EOw,
-+	ka3=\EOy,
-+	kb2=\EOu,
-+	kc1=\EOq,
-+	kc3=\EOs,
-+	kcbt=\E[Z,
-+	kcub1=\E[D,
-+	kcud1=\E[B,
-+	kcuf1=\E[C,
-+	kcuu1=\E[A,
-+	kdch1=\E[3~,
-+	kel=\E[8\^,
-+	kend=\E[8~,
-+	kent=\EOM,
-+	kf1=\E[11~,
-+	kf10=\E[21~,
-+	kf11=\E[23~,
-+	kf12=\E[24~,
-+	kf13=\E[25~,
-+	kf14=\E[26~,
-+	kf15=\E[28~,
-+	kf16=\E[29~,
-+	kf17=\E[31~,
-+	kf18=\E[32~,
-+	kf19=\E[33~,
-+	kf2=\E[12~,
-+	kf20=\E[34~,
-+	kf3=\E[13~,
-+	kf4=\E[14~,
-+	kf5=\E[15~,
-+	kf6=\E[17~,
-+	kf7=\E[18~,
-+	kf8=\E[19~,
-+	kf9=\E[20~,
-+	kfnd=\E[1~,
-+	khome=\E[7~,
-+	kich1=\E[2~,
-+	kmous=\E[M,
-+	knp=\E[6~,
-+	kpp=\E[5~,
-+	kslt=\E[4~,
-+	rc=\E8,
-+	rev=\E[7m,
-+	ri=\EM,
-+	rmso=\E[27m,
-+	rmul=\E[24m,
-+	rs1=\Ec,
-+	rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
-+	sgr0=\E[m\E(B,
-+	enacs=,
-+	smacs=\E(0,
-+	rmacs=\E(B,
-+	smso=\E[7m,
-+	smul=\E[4m,
-+	tbc=\E[3g,
-+	vpa=\E[%i%p1%dd,
-+	colors#88,
-+	pairs#7744,
-+	btns#5,
-+	lm#0,
-+	ccc,
-+	npc,
-+	mc5i,
-+	ncv#0,
-+	mir,
-+	xon,
-+	bw,
-+	ech=\E[%p1%dX,
-+	mc0=\E[i,
-+	mc4=\E[4i,
-+	mc5=\E[5i,
-+	sitm=\E[3m,
-+	ritm=\E[23m,
-+	smam=\E[?7h,
-+	rmam=\E[?7l,
-+	smir=\E[4h,
-+	rmir=\E[4l,
-+	smcup=\E[?1049h,
-+	rmcup=\E[r\E[?1049l,
-+	smkx=\E=,
-+	rmkx=\E>,
-+	indn=\E[%p1%dS,
-+	rin=\E[%p1%dT,
-+	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
-+	op=\E[39;49m,
-+	setaf=\E[38;5;%p1%dm,
-+	setab=\E[48;5;%p1%dm,
-+	setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
-+	setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
-+	initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\,
-+	sc=\E7,
-+	s0ds=\E(B,
-+	s1ds=\E(0,
-+	s2ds=\E*B,
-+	s3ds=\E+B,
-+	u6=\E[%i%d;%dR,
-+	u7=\E[6n,
-+	u8=\E[?1;2c,
-+	u9=\E[c,
-+	tsl=\E]2;,
-+	fsl=\007,
-+	dsl=\E]2;\007,
-+
-+rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window System),
-+	colors#256,
-+	pairs#32767,
-+	use=rxvt-unicode,
-+
- # mrxvt 0.5.4
- #
- # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which
diff --git a/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild b/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild
index 13a0da5e700c..074ff990dfab 100644
--- a/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild
+++ b/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild
@@ -23,7 +23,7 @@ fi
 LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="5/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="gpm tinfo unicode"
 
 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
diff --git a/sys-libs/ncurses-compat/ncurses-compat-5.9.ebuild b/sys-libs/ncurses-compat/ncurses-compat-6.2.ebuild
index 5288b2e397f5..13a0da5e700c 100644
--- a/sys-libs/ncurses-compat/ncurses-compat-5.9.ebuild
+++ b/sys-libs/ncurses-compat/ncurses-compat-6.2.ebuild
@@ -3,20 +3,27 @@
 
 # This version is just for the ABI .5 library
 
-EAPI="5"
+EAPI=7
 
-inherit eutils toolchain-funcs multilib-minimal
+inherit flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript
 
-MY_PV=${PV:0:3}
-MY_P=ncurses-${MY_PV}
-DESCRIPTION="console display library"
+MY_PV="${PV:0:3}"
+MY_P="${PN/-compat}-${MY_PV}"
+MY_PN="${PN/-compat}"
+
+DESCRIPTION="console display library (ABI version 5)"
 HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/"
 SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
 
+if [[ "${PV}" == *_p* ]] ; then
+	SRC_URI+=" ftp://ftp.invisible-island.net/ncurses/${PV/_p*}/${MY_PN}-${PV/_p/-}-patch.sh.bz2
+		https://invisible-mirror.net/archives/ncurses/${PV/_p*}/${MY_PN}-${PV/_p/-}-patch.sh.bz2"
+fi
+
 LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="5/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="gpm tinfo unicode"
 
 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
@@ -25,20 +32,22 @@ RDEPEND="${DEPEND}
 	!<sys-libs/ncurses-6:0
 	!sys-libs/ncurses:5"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/ncurses-5.8-gfbsd.patch
-	"${FILESDIR}"/ncurses-5.7-nongnu.patch
-	"${FILESDIR}"/ncurses-5.9-rxvt-unicode-9.15.patch #192083 #383871
-	"${FILESDIR}"/ncurses-5.9-fix-clang-build.patch #417763
-	"${FILESDIR}"/ncurses-5.9-pkg-config.patch
-	"${FILESDIR}"/ncurses-5.9-no-I-usr-include.patch #522586
-	"${FILESDIR}"/ncurses-5.9-gcc-5.patch #545114
+	"${FILESDIR}/ncurses-5.7-nongnu.patch"
+	"${FILESDIR}/ncurses-6.0-rxvt-unicode-9.15.patch" #192083 #383871
+	"${FILESDIR}/ncurses-6.0-pkg-config.patch"
+	"${FILESDIR}/ncurses-5.9-gcc-5.patch" #545114
+	"${FILESDIR}/ncurses-6.0-ticlib.patch" #557360
+	"${FILESDIR}/ncurses-6.0-cppflags-cross.patch" #601426
 )
 
 src_prepare() {
-	epatch "${PATCHES[@]}"
+	if [[ "${PV}" == *_p* ]] ; then
+		eapply "${WORKDIR}/${MY_PN}-${PV/_p/-}-patch.sh"
+	fi
+	default
 }
 
 src_configure() {
@@ -60,14 +69,26 @@ src_configure() {
 	# This comes up when cross-compiling, doing multilib builds, upgrading,
 	# or installing for the first time.  Build a local copy of tic whenever
 	# the host version isn't available. #249363 #557598
-	if ! ROOT=/ has_version "~sys-libs/${P}" ; then
+	if ! ROOT=/ has_version -b "~sys-libs/${P}:0" ; then
+		local lbuildflags="-static"
+
+		# some toolchains don't quite support static linking
+		local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
+		case ${CHOST} in
+			*-darwin*)  dbuildflags=     ;;
+			*-aix*)     dbuildflags=     ;;
+		esac
+		echo "int main() {}" | \
+			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
+			|| lbuildflags="${dbuildflags}"
+
 		# We can't re-use the multilib BUILD_DIR because we run outside of it.
 		BUILD_DIR="${WORKDIR}" \
 		CHOST=${CBUILD} \
 		CFLAGS=${BUILD_CFLAGS} \
 		CXXFLAGS=${BUILD_CXXFLAGS} \
 		CPPFLAGS=${BUILD_CPPFLAGS} \
-		LDFLAGS="${BUILD_LDFLAGS} -static" \
+		LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
 		do_configure cross --without-shared --with-normal
 	fi
 	multilib-minimal_src_configure
@@ -84,13 +105,15 @@ do_configure() {
 	local target=$1
 	shift
 
-	mkdir "${BUILD_DIR}/${target}"
+	mkdir "${BUILD_DIR}/${target}" || die
 	cd "${BUILD_DIR}/${target}" || die
 
 	local conf=(
 		# We need the basic terminfo files in /etc, bug #37026.  We will
 		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
 		# src_install() ...
+		##--with-rel-version=5.9 ??
+		--with-abi-version=5
 		--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
 
 		# Now the rest of the various standard flags.
@@ -151,14 +174,14 @@ do_configure() {
 
 	# Force bash until upstream rebuilds the configure script with a newer
 	# version of autotools. #545532
-	CONFIG_SHELL=/bin/bash \
-	ECONF_SOURCE=${S} \
+	CONFIG_SHELL="${EPREFIX}"/bin/bash \
+	ECONF_SOURCE="${S}" \
 	econf "${conf[@]}" "$@"
 }
 
 src_compile() {
 	# See comments in src_configure.
-	if ! ROOT=/ has_version "~sys-libs/${P}" ; then
+	if ! ROOT=/ has_version -b "~sys-libs/${P}:0" ; then
 		BUILD_DIR="${WORKDIR}" \
 		do_compile cross -C progs tic
 	fi
@@ -185,6 +208,11 @@ do_compile() {
 	# in parallel.  This is not really a perf hit since the source
 	# generation is quite small.
 	emake -j1 sources
+	# For some reason, sources depends on pc-files which depends on
+	# compiled libraries which depends on sources which ...
+	# Manually delete the pc-files file so the install step will
+	# create the .pc files we want.
+	rm -f misc/pc-files || die
 	emake "$@"
 }