gentoo resync : 17.02.2020

5 files changed, 86 insertions, 4 deletions

diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 4ae5faa4c6d7..494a1fd61953 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,6 +1,8 @@
 AUX htop-2.1.0-header_updates.patch 1213 BLAKE2B 4bf06329ee553b29c40c46b8dd0a267d19d17c0b19e8f7938b9276cfced5ba734924c2228408e7e2bee8088250c85d9cfa1cee508c1f3b4f8554d4be8e47cd2b SHA512 63644982da6a92a5477286df4c2cc16097aee8b6f8fcee6c37448d36074770b2f5f8f5a1dbac32728db79dbfb4a094fdd31128cec1ba322ada0b6a0968e53f98
+AUX htop-2.2.0-gcc-10.patch 535 BLAKE2B 19342dbf6c2cab4c73ebd0aac664b706867e24c7f7934779fbc940fee953bfdab06396b31e419a4b308abb8bdcb1b95648b13786234848833bc11a57d12f8776 SHA512 a1f436e2ea7ef40dc403877c51a58b0af7bd252db2471479a08f1a95dd03501df77406e1171d1e3848aa308dc5c2b46ba038d53336e56b4d1d2da6e6d7a23cc5
+AUX htop-3.0.0_beta5-gcc-10.patch 1251 BLAKE2B bb9f107c9cffe7ce16d74faeb29da22a4a327e16dc763657edd14b36720392fc31fa69575a44aa26c1d1a313405259750685d72fad60b96459f495701a573242 SHA512 455e1209fd5ada557acb841046cdd2895e9ca230e576cc54cef23a2889d8c2ac048b30d34d24f47bde3bb28e30dfcaab2877ad0e2f9f1f2d450deda7c4a80ed0
 DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e
 DIST htop-3.0.0_beta5.tar.gz 175780 BLAKE2B f7d03485e74387c656e5a576f0a53c832bac668cee79750402335b2051a17d405392b99316f1546cc76fa83dc3bc85055ca58b928225df0e162ffdb9c1889a5f SHA512 eaa04a278257a1447cd60825083c864d3c23a4a5607447ce05356d550f42ff68a810f14bf91314b7266f9741aab8141d67d98316a31fa7806fb6b858cc804344
-EBUILD htop-2.2.0.ebuild 1434 BLAKE2B 6db92471770e97f429483bec65359b0d5aede2cbf10aff4670b03efc9e66e2d9ba03cf5105d4c8c4bcb06d522521680ca92b029efea7293ebdfbbc4bb2939959 SHA512 856b3e55f4c263eb7e6c3be98596ad54a5600db4da34368fea0b0817ec55e3c5833f55dddde4a58147e77b407744821221e5e0b686ea68763e804d3c5fa9f41c
-EBUILD htop-3.0.0_beta5.ebuild 1798 BLAKE2B 9f6a5db2e2d990cb23107af07ef575e07e19274d671e2710506b808acf7771d015ead2524b9d7130c1a7a9bfd1eb6cd974ad7207fc21b0273cf7205b2bd1ffe1 SHA512 5a7a3e7bdf31236e50db0d5fb96854a24188c5ccab62bcae2886422ac548a3930cf63c7a0d77d228e13fb9472c5987bae0b26568daf018abd417eafe1f35785e
+EBUILD htop-2.2.0.ebuild 1478 BLAKE2B 852cf410fe869e7472bc706f0abaa48b8782f9e6eb48fc8e0e5517806a807717627bf37a38f25740b7214eb7772cfd698b6cc02b9479708970b8c58f125a3f27 SHA512 0b301bb51680cd04587ea20573990de5b1911efb77264a352fbba2f1ac7a856f2c3cd5d670871aaf061e4ef187be3d7032aa4ac794b3169a9ceb811f7c629f47
+EBUILD htop-3.0.0_beta5.ebuild 1843 BLAKE2B 84ae5b00fb994fbcbd6a60d907a3b4c5ba8a9ba34660f6cd201926bf70ae4e4c0d2344f639545138ec8c69f2980558999583680f655913829dcf8bfc514cd592 SHA512 117f53fea534dfeb756dadacd7b5c9cd9f9f57cd2bd9de2b1559b0dc84540d53ae4d1608033cc6c8164464a92530932585cb48ce299b644094d458ee36d994b2
 MISC metadata.xml 750 BLAKE2B 57d419667fbc0053cb2f24908a4e43fefecca832bd86e8d562a4a43090b82f049c62457388ffe8bc4c1f3d49e1119da50f8221686b69956f4ea9426259fb6f3a SHA512 e35d8a5177f9e5bb3136759a7c4c0de5dee4366e3380952c8d72dbdfab46be5f880b77450046f02846c7baa1892e88835c8480808333934ec1bec04c34cd9072
diff --git a/sys-process/htop/files/htop-2.2.0-gcc-10.patch b/sys-process/htop/files/htop-2.2.0-gcc-10.patch
new file mode 100644
index 000000000000..dc49b0bb8508
--- /dev/null
+++ b/sys-process/htop/files/htop-2.2.0-gcc-10.patch
@@ -0,0 +1,27 @@
+--- a/CRT.h
++++ b/CRT.h
+@@ -140,7 +140,7 @@ extern const char **CRT_treeStr;
+ 
+ extern int CRT_delay;
+ 
+-int* CRT_colors;
++extern int* CRT_colors;
+ 
+ extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT];
+ 
+@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount;
+ 
+ extern int CRT_scrollWheelVAmount;
+ 
+-char* CRT_termType;
++extern char* CRT_termType;
+ 
+ // TODO move color scheme to Settings, perhaps?
+ 
+ extern int CRT_colorScheme;
+ 
+-void *backtraceArray[128];
++extern void *backtraceArray[128];
+ 
+ #if HAVE_SETUID_ENABLED
+ 
diff --git a/sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch b/sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch
new file mode 100644
index 000000000000..6a2004b3cf77
--- /dev/null
+++ b/sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch
@@ -0,0 +1,52 @@
+From ee711740d2809e7aa3ebd57d58bfc02b1e9b034b Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Thu, 23 Jan 2020 17:27:10 +0100
+Subject: [PATCH] Fix GCC 10 switch to `-fno-common` default
+
+---
+ CRT.h                | 6 +++---
+ linux/LinuxProcess.h | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/CRT.h b/CRT.h
+index 933fe068..65998ac6 100644
+--- a/CRT.h
++++ b/CRT.h
+@@ -140,7 +140,7 @@ extern const char **CRT_treeStr;
+ 
+ extern int CRT_delay;
+ 
+-int* CRT_colors;
++extern int* CRT_colors;
+ 
+ extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT];
+ 
+@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount;
+ 
+ extern int CRT_scrollWheelVAmount;
+ 
+-char* CRT_termType;
++extern char* CRT_termType;
+ 
+ // TODO move color scheme to Settings, perhaps?
+ 
+ extern int CRT_colorScheme;
+ 
+-void *backtraceArray[128];
++extern void *backtraceArray[128];
+ 
+ #if HAVE_SETUID_ENABLED
+ 
+diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h
+index 6ce3037d..cbd77be9 100644
+--- a/linux/LinuxProcess.h
++++ b/linux/LinuxProcess.h
+@@ -144,7 +144,7 @@ typedef struct LinuxProcess_ {
+ #endif
+ 
+ 
+-long long btime; /* semi-global */
++extern long long btime; /* semi-global */
+ 
+ extern ProcessFieldData Process_fields[];
+ 
diff --git a/sys-process/htop/htop-2.2.0.ebuild b/sys-process/htop/htop-2.2.0.ebuild
index 8e121bcacff1..318bdf97c5c0 100644
--- a/sys-process/htop/htop-2.2.0.ebuild
+++ b/sys-process/htop/htop-2.2.0.ebuild
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
 DOCS=( ChangeLog README )
 
 CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
diff --git a/sys-process/htop/htop-3.0.0_beta5.ebuild b/sys-process/htop/htop-3.0.0_beta5.ebuild
index 9ee899432723..3351359ceb60 100644
--- a/sys-process/htop/htop-3.0.0_beta5.ebuild
+++ b/sys-process/htop/htop-3.0.0_beta5.ebuild
@@ -30,9 +30,9 @@ DOCS=( ChangeLog README )
 CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
 
 PATCHES=(
-
 	# Fixes from upstream (can usually be removed with next version bump)
-	"${FILESDIR}/${PN}-2.1.0-header_updates.patch"
+	"${FILESDIR}"/${PN}-2.1.0-header_updates.patch
+	"${FILESDIR}"/${PN}-3.0.0_beta5-gcc-10.patch
 )
 
 pkg_setup() {