gentoo resync : 13.06.2020

5 files changed, 55 insertions, 5 deletions

diff --git a/sys-process/unixtop/Manifest b/sys-process/unixtop/Manifest
index 34e447df1306..c2a2b831c22f 100644
--- a/sys-process/unixtop/Manifest
+++ b/sys-process/unixtop/Manifest
@@ -1,9 +1,11 @@
 AUX unixtop-3.8_beta1-high-threadid-crash.patch 1649 BLAKE2B 1a4a01b99ab4c404406451017ab88d74081617edb4400368ce2ab638bd54e0bc70b298c43e641f827c63150b73547c25eb5e513816237721a8afb0b5734ec124 SHA512 44d02d0f7843379674cf55b0c8250833b53741bbe39ab33eb72ca24745b1b71363402641a6f365862f8b671e8e34e36e17a0cab9889892d30ba23ca08685de32
 AUX unixtop-3.8_beta1-memleak-fix-v2.patch 730 BLAKE2B 483f161fb64ec1c9bd2e3e86c604026e7b7e84540bf3ef02393e8f58569231e7ba0613d227ef7930d8c748e5e4cc24c9c1ffa26ce067096f975e36f4bd2b355c SHA512 e4c83d939fcd29726f63c34483fc60dd09cc6c777f8cff0469a5c386acfdf85a49dacfa5e2e0ea44c78b7abb139a0933c72db87a3100524011d09d69838d767e
-AUX unixtop-3.8_beta1-ncurses.patch 440 BLAKE2B 9036fe2ff33e610cf210e9819c4d67b4463b0cb919042d58d73a23e10dfd6229c143e634978f9823e71009a182756c64e54966f4e5096f315fc2cbbceed4213c SHA512 b3d1f5e30a38fc2a7516258f264c18a2aafae4ee38bd65efdba9bb1617399aa31a9b6582388de38551437a84fefdd73226989d80e4381adfb172b08062034ba8
+AUX unixtop-3.8_beta1-ncurses.patch 504 BLAKE2B 56247678c06c22dcefabdc6be1f9b59851dc26c1b32ccaaf4918ec8b491de68f0aaf48280bf7beadb1f53ea4a11806d948a3717f0f4342070f592a582e7fbc4a SHA512 59083cf2af98141c4eadb4ccb79000663e29dcf2c1a3fe3fd4b4c200ae94c3cd02333425671a1cebe7fd9b13faa1c3d6f02fbb2e7e956ba5f2cb05f09afb6a13
 AUX unixtop-3.8_beta1-no-AX-macros.patch 613 BLAKE2B 1e33613a9956527ecd3248c56d98a31b9191945f4eef4758cc31f32d9350b6db12a8750520ad1ac0cd0fbb1c309f1d7838a86f78de49022d04dc1d0162e78a13 SHA512 49af9bac713bd64af5cd0162090e1aab9c9af3d331574f0786f565715841b8c9fe0ae0fa29d1309d2b9ffe442a522bd1eecb295fc1e026e5fd4a70d804579255
 AUX unixtop-3.8_beta1-percent-cpu.patch 903 BLAKE2B 57873c687e6a3ddf62c79524738bbb30984ebc85db5c8dd36aeb3d33284da1c621a7bbb8e1d178ee4e00f377cee9684e47f31150d16e72b89fa691d80c71ea7d SHA512 6867b2c9951e801aeefc464e7903b719c6acfee7db33e65c7c51da2055daef5990d5a8d1131dc069334bca54f866b25db2891fdb7c15a9d8c468047f090e327c
+AUX unixtop-3.8_beta1-recent-linux.patch 344 BLAKE2B cbf426d5f97704a5a24f87ed33af97d171f8021fb9074ff5e2488372338e7856ca2f71828611040e96ad1b54db0f6d80c2ca98cbcaf79ff65dc99d62c67e796d SHA512 a79c6837547bfa3437b42d17387895b72fe0abbd2832de3c646741a5563eaea063a76b711fcc3800c7befe33323f6f10262dbe54cc7591894415e4d24eb8e0c9
 AUX unixtop-3.8_beta1-renice-segfault.patch 518 BLAKE2B fb81d2053fd5de006b9a229f0cc6bb6be6107fa26d22488e20ba76ca021a98298f035af3daee5d5cecb1d68100d5dd3062399578c60e83fe2b4f90052f0c838f SHA512 2d74ee0e67136a59d6745522ea7671404a9d0a026311f6dfa47dc78d12ecb12da63aab915b969cdecbdf9f3ba9dd86babeebc5c1b61713adbb7c98f70adf56f6
+AUX unixtop-3.8_beta1-winch-segfault.patch 813 BLAKE2B 3d9143cafe1f72ba5dc4847d3bfdcfcb9f7ad0b905242d58d27251cfbaeb5d529211fd533b8305a2df1a1291af02399dc6b1c7c0976d29c094d1bfb1cec280e4 SHA512 0d79c47dc83a66339bcdc988511186d7ba0bfb4e8353221a0f16f55dfc8d8898bb8a5ebbabcc8ac7deb34de60b9de0c8debc0ba0c3a916206658f89743883e77
 DIST top-3.8beta1.tar.bz2 233880 BLAKE2B 126ed2ef1e89bcd00e989350d0bdd2b78308400eadf0208d7c1bb1abac6b46cecfb0db514576cf6a272038329b1bc0fce4ada37bed42a2e2a662778bcdaf465b SHA512 c66d786e34070afd00dc2225ce4cddcf0fdaee0e2a6c6e2dfadadcd97bbe84c6668041ff5b075137630b99240c711fbfda8b85fb09c6a39e3067798cbe612671
-EBUILD unixtop-3.8_beta1-r3.ebuild 1118 BLAKE2B 5d0a0e094b63a144e0fc40ad0bfd66b88bff75225f0c702fdb4466c425016ca3e1c011f3edea03f4dea6b359d1a77d74b80efa77d3dc20cbf4ce3581c26c4263 SHA512 c5c35c6f707f6a1ba15d7429e675822f8478927ad13ba7a3c5815aa3e6ae0139d8782670fc2dbcb1009823b0d54af1dcebf988b90123b22dd4646607efee8661
+EBUILD unixtop-3.8_beta1-r3.ebuild 1238 BLAKE2B b5bf0d5d01af87b6cae1b47159f969849f36dd88125feb6f8dc6dbb5b25dfcd32f1790217cfb7fb93b52ecfd75d07e1edf60357bd1b4eb9d5e6f09cdf41ee774 SHA512 97afedca9fd3952143b69abb059848ac7f0c29eb06ce95922e55ade5b293b89c2f13b5834268b665dd192358e902a47173e0064e5941e559235eafe35fdb11cd
 MISC metadata.xml 324 BLAKE2B 3fc9d4e7659f62ded757066d234e3ae7182283c646807988045ade34f146fb490ae01748196ef0a9535daa01ab578d6e5ccdc1cc03fc5a1b952092ac99b1f11c SHA512 9d0285bab5e9e40597de61a2dd87370aa693ea943f63a6163d5fc3100e9ca8dd7198a309e0d4735a9cb6bbfdb850a06f1e082758d71df21ab1eb0af34361968d
diff --git a/sys-process/unixtop/files/unixtop-3.8_beta1-ncurses.patch b/sys-process/unixtop/files/unixtop-3.8_beta1-ncurses.patch
index a2da4b47da6a..476093c7e565 100644
--- a/sys-process/unixtop/files/unixtop-3.8_beta1-ncurses.patch
+++ b/sys-process/unixtop/files/unixtop-3.8_beta1-ncurses.patch
@@ -1,5 +1,6 @@
 * check ncurses first, such that we only link agains (system) termcap if
   necessary (never the case in prefix) -- grobian@gentoo.org
+* check tinfo in case of ncurses[tinfo] -- jer@gentoo.org
 
 --- a/configure.ac
 +++ b/configure.ac
@@ -8,7 +9,7 @@
  # -lmld -lmach
  AC_CHECK_LIB(mach, vm_statistics)
 -AC_SEARCH_LIBS(tgetent, termcap curses ncurses)
-+AC_SEARCH_LIBS(tgetent, ncurses curses termcap)
++AC_SEARCH_LIBS(tgetent, ncurses tinfo curses termcap)
  AC_CHECK_LIB(m, exp)
  
  # check for libraries required by extension
diff --git a/sys-process/unixtop/files/unixtop-3.8_beta1-recent-linux.patch b/sys-process/unixtop/files/unixtop-3.8_beta1-recent-linux.patch
new file mode 100644
index 000000000000..f3777dacb80a
--- /dev/null
+++ b/sys-process/unixtop/files/unixtop-3.8_beta1-recent-linux.patch
@@ -0,0 +1,13 @@
+grab PAGE_SHIFT from a location where it is defined nowadays
+
+--- a/machine/m_linux.c
++++ b/machine/m_linux.c
+@@ -68,7 +68,7 @@
+ #include <sys/vfs.h>
+ 
+ #include <sys/param.h>		/* for HZ */
+-#include <asm/page.h>		/* for PAGE_SHIFT */
++#include <sys/user.h>		/* for PAGE_SHIFT */
+ 
+ #if 0
+ #include <linux/proc_fs.h>	/* for PROC_SUPER_MAGIC */
diff --git a/sys-process/unixtop/files/unixtop-3.8_beta1-winch-segfault.patch b/sys-process/unixtop/files/unixtop-3.8_beta1-winch-segfault.patch
new file mode 100644
index 000000000000..e00e4052eb4f
--- /dev/null
+++ b/sys-process/unixtop/files/unixtop-3.8_beta1-winch-segfault.patch
@@ -0,0 +1,31 @@
+https://sourceforge.net/p/unixtop/patches/22/
+
+diff -u top-3.8beta1/top.c top-3.8beta1-rivoreo-r1/top.c
+--- top-3.8beta1/top.c	2008-05-07 11:41:39.000000000 +0800
++++ top-3.8beta1-rivoreo-r1/top.c	2017-01-15 18:32:50.000000000 +0800
+@@ -257,14 +258,14 @@
+ }
+ 
+ void
+-set_signals()
++set_signals(int set_winch)
+ 
+ {
+     (void) set_signal(SIGINT, sig_leave);
+     (void) set_signal(SIGQUIT, sig_leave);
+     (void) set_signal(SIGTSTP, sig_tstop);
+ #ifdef SIGWINCH
+-    (void) set_signal(SIGWINCH, sig_winch);
++    if(set_winch) set_signal(SIGWINCH, sig_winch);
+ #endif
+ }
+ 
+@@ -905,7 +906,7 @@
+     screen_init();
+ 
+     /* set the signal handlers */
+-    set_signals();
++    set_signals(gstate->interactive);
+ 
+     /* longjmp re-entry point */
+     /* set the jump buffer for long jumps out of signal handlers */
diff --git a/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild b/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
index c4f9598cf00b..c4ee3dd47486 100644
--- a/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
+++ b/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,8 @@ KEYWORDS="~amd64-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 IUSE=""
 
 RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	!sys-process/procps"
 
 S=${WORKDIR}/top-${PV/_/}
 
@@ -26,6 +27,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.8_beta1-memleak-fix-v2.patch
 	"${FILESDIR}"/${PN}-3.8_beta1-high-threadid-crash.patch
 	"${FILESDIR}"/${PN}-3.8_beta1-percent-cpu.patch
+	"${FILESDIR}"/${PN}-3.8_beta1-winch-segfault.patch
+	"${FILESDIR}"/${PN}-3.8_beta1-recent-linux.patch
 )
 
 src_prepare() {