gentoo resync : 05.02.2020

5 files changed, 65 insertions, 6 deletions

diff --git a/net-analyzer/iftop/Manifest b/net-analyzer/iftop/Manifest
index 37e911b72f00..c240a0bd0604 100644
--- a/net-analyzer/iftop/Manifest
+++ b/net-analyzer/iftop/Manifest
@@ -2,12 +2,13 @@ AUX ax_pthread.m4 12983 BLAKE2B b1cbb45242493f9bf998ec82cf754b894d77ee4e1d3ed33b
 AUX iftop-1.0_pre4-Makefile.am.patch 378 BLAKE2B 52029c14bc6afcd4d8cb86099fa78f00720af3d26384cdf059d005d768b8c226b459b5c1ebe2c936f20bb1afa033aa4560c488f98400b6cef162ebdcff3b7e03 SHA512 c7a81669de83701054493ee0f9979da8bfa481bd0769a501364598889cfb5aa762473e5099904ee13dad9052bfdd27913306df8ad4a91132532ac874504321fa
 AUX iftop-1.0_pre4-configure.ac.patch 9916 BLAKE2B deab542e4b33905e0ad215aa70498671cf5c4f7118a1ab3b8639bd992f540068a0cd3c7f846120686662825db864be9e3307cc1691b1ef86c8bc73b0e847d0f0 SHA512 5b83cdb69805d3ed8b188b1390d1d536dc99732312fa49951fad38810c7eb9c931d04daaaea7152d5289352dd3d167907ac5a25a994e4b1584b7b5a578fc0698
 AUX iftop-1.0_pre4-fix-MAC-formatting.patch 681 BLAKE2B b2e08269284722d55d08329d45c2628c0813d72ba96df76280e601c3dbbbd6eeb02b7b53a35ae921e0625321c5c91e64ddffa84cc611490747dfdb4445f313f8 SHA512 7a7a2fdc756d0f31a1950f8c1c26f76eda09f9ea673f8224f98deb82026c0c3ec00d7001a5ba3175a4e4660927604334988a6b08b6208bfdd16be9afd4a5ed37
+AUX iftop-1.0_pre4-fno-common.patch 1194 BLAKE2B 4270667d232ade7db8d99f215789f00f8dde7550e6677b66a924ab8d74e22a0f6e4298e85cc05a0dc707208788ff37a74345966d3c4778d29098e70d6ea836ac SHA512 7a98fe8dbcaab0164b34916c4ab9538781531b8eabb46ac452c369ff06968632bd0e5c865c133e18b7f0cf2ea77fb806002195ec183593e54b119806ea56b9b0
 AUX iftop-1.0_pre4-ip6.arpa.patch 1857 BLAKE2B 920b5393366d0fe1ccf7619a862fb6a919abcaf578babc2d7de05b7828a7c847a2ad65ece44e91bab29aead849d0f65bffae0ed680e03fe07f218a15cefe13fd SHA512 8fed0043412a25a702d252f0bbf36b199c9222c18ac9bb47ef725885a9faaacb12bf6e5debd5885544ace68065bfda12c2b6ccf7e11f2834cf3f86f6657bfcba
 AUX iftop-1.0_pre4-tsent-set-but-not-used.patch 229 BLAKE2B 42318fa63e40a2a0b3f50d33c6ca3fef69c837290272f132d63dde276a4302254378f8ab31ab49dbb0b50e821594a2979c713f9119eb4ec852971b585648b344 SHA512 06d26d9497c6afc6b7eb5db508def08c8945408e89127f3938667973f8a8b7884dc0e7b005c115a7acd66d62107de5d47d49a869b89f25f24dd999161b0fb0bf
 AUX iftoprc 1391 BLAKE2B b2558509d0f8e9dfade1bcb1a1b50569510cada2629fb3b0cb772d2fa0642455ed6e4c18024a19b656bb9d42eefd4e2db2ea066dae28528ad51f12b439307f0a SHA512 01373add0177399e7cf4ae0ecba893fdd9c73bad5243478b4ac9ac5e936647738a22906ee1e8b22b51d541cc4150d0e0619f134666a1e3d0cb78a59a5c04b95b
 DIST iftop-1.0pre4.tar.gz 204665 BLAKE2B 181385c3fbf43abd4ead975aac11b5ff196de94d9a8d6f195b3f0068aba6ae953067995d19f0175b49ab15c447c99d531542ae786603ee390e080e79bdcd7ae3 SHA512 abd74e8025bb82fef9ebab4997b1d018201a523d47c0128128ca37797490046538d74758dc4471735c22b890e5bd238ad6b2a30776d465138ede367cdd263d22
-EBUILD iftop-1.0_pre4-r2.ebuild 932 BLAKE2B 8366d108b7c183a5dbda391f4ca3e134b6e794840faed54609b63ff8eca3e34a6344f369ba8787f6dc16302bb857daf73a243a7688cf3c45a4405ec684c009a9 SHA512 49523a3f3ac3e61e0e93b2cbcecc058dcd32aab67691e62c18e37b9d432539340dd22a0a174d778aac5d164773f1ba816b9ee681c3861b7a49340d3091e2dccb
+EBUILD iftop-1.0_pre4-r2.ebuild 933 BLAKE2B ce758a0de766e481f8f1186145fd8cb1e2f5a7a96a62739ee6ddfd187329b3e9d2f5b7c32d80d6ad7e851c65fa8a864c2f4995c7c43054b5a970de7583e117a6 SHA512 1c3324960619e5513d6ace90ff71455f84161107fd19233e66ca24495b7a0fbc08ad4dd10dfb5ebecea23854506601c154305d746148516db43bfb140e88aa22
 EBUILD iftop-1.0_pre4-r3.ebuild 967 BLAKE2B 3c772cb506cb89668fec11e768e7fd3a8867883c553a91d12c718391afc7c6f66236a5a298f8181a5e9b497e347e3e56ffb2abf6800730325bf02a728b6da0af SHA512 99150916518329e9af9b0c005f728f9280405ed5c6aab1caa01b035481d11c97e68d898bcaa5a742224c081bc1b9b4b3cd100ba12ccbcef0cb9c074d5e848af6
-EBUILD iftop-1.0_pre4-r4.ebuild 1059 BLAKE2B 6f1da490a679870a64d3a6e7a332142c0b1b3e5db264f51b008298d22a85161cbe5d24be17a7f428394cda43dae3e273dbb0aef09468675223f305b32bc89156 SHA512 e6230f7bfc694be260f7f842cc1c436ee6d54be1a37eef53310e5437ae0667d1401c0123c322b2a7929758f022c6c706bc6beb2fc40330dcb048a6ed3e4eccfa
-EBUILD iftop-9999999.ebuild 832 BLAKE2B feb1cc2f49365a06098ec2d90cbe02edb4edd0a598f390431473b829edc88ddcd415fbc902ab3f392481bda43085641e4fdd7ed875219209285b4d2abd64b199 SHA512 ce61354496ce1eb4e5e6073b61ac5eccd39b836c981a44f81e63b455d0206e0b4096642627554b01a0b6c5cb758f5a12e1a2859d3d66b078423d8b6a21ff3337
+EBUILD iftop-1.0_pre4-r4.ebuild 1106 BLAKE2B 3ee1172d92c73c97245755b626d11ca1b6763714e2add23dfebec41b764d7e666c99a44e1d6ddb144f9468968c1ed12b77206c375b86d75e266c6e8160aa2e8e SHA512 ccec613b80b771d0de500c6aaf07e079f59933a4dad5fd30d888468e8bf3b66bc9f933c0277d4a5e5611a8d9ac361f2f48a89f6f3435370d8564b2dbbca5b186
+EBUILD iftop-9999999.ebuild 879 BLAKE2B e9dec0c2587a447d304892be2b038542a3ac00e0cb47ce2465a8979c10829cf0d5a453ca4c40d5bfe3828900f855288eda1387225a5b6978d19344483d7eb64d SHA512 c8e2c9f166973105ae8786d98e790fa79cd9add436504ecdc4cfb5f154e485070b9b8d630485ed2c08f98945104c274ab5b807da0b1e3890496e8a3f20447e11
 MISC metadata.xml 286 BLAKE2B a278f67a760b977849da10dfbc6f2da19da66b553e51f6a7f32403dbb8eca85432dcec745815bc9b55596bf5eece7916ddd7657360d110d91a83b6077eec2619 SHA512 cfd1ca7999686b831b0b459f5b06ea80fd28b4f24d3404a8ad90bb4d6461a011f6a2b338ebbf45c2eac621ec828dcc397b26c2ae82068e5b703271a85c76e760
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-fno-common.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-fno-common.patch
new file mode 100644
index 000000000000..13e0f1058f40
--- /dev/null
+++ b/net-analyzer/iftop/files/iftop-1.0_pre4-fno-common.patch
@@ -0,0 +1,56 @@
+--- a/ui_common.c
++++ b/ui_common.c
+@@ -28,6 +28,13 @@
+ extern int history_pos;
+ extern int history_len;
+ 
++sorted_list_type screen_list;
++host_pair_line totals;
++int peaksent, peakrecv, peaktotal;
++history_type history_totals;
++hash_type* screen_hash;
++hash_type* service_hash;
++
+ /*
+  * Compare two screen lines based on bandwidth.  Start comparing from the 
+  * specified column
+--- a/ui_common.h
++++ b/ui_common.h
+@@ -33,12 +33,12 @@
+ 
+ extern options_t options;
+ 
+-sorted_list_type screen_list;
+-host_pair_line totals;
+-int peaksent, peakrecv, peaktotal;
++extern sorted_list_type screen_list;
++extern host_pair_line totals;
++extern int peaksent, peakrecv, peaktotal;
+ extern history_type history_totals;
+-hash_type* screen_hash;
+-hash_type* service_hash;
++extern hash_type* screen_hash;
++extern hash_type* service_hash;
+ 
+ void analyse_data(void);
+ void screen_list_init(void);
+--- a/ui.c
++++ b/ui.c
+@@ -253,7 +253,6 @@
+     }
+ }
+ 
+-extern history_type history_totals;
+ 
+ 
+ void ui_print() {
+--- a/iftop.c
++++ b/iftop.c
+@@ -66,7 +66,6 @@
+ extern options_t options;
+ 
+ hash_type* history;
+-history_type history_totals;
+ time_t last_timestamp;
+ time_t first_timestamp;
+ int history_pos = 0;
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild
index 66d4ef612643..c283ad552512 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
index 8221ce61ddb3..3f9d11ed9b42 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,6 +26,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.0_pre4-tsent-set-but-not-used.patch
 	"${FILESDIR}"/${PN}-1.0_pre4-ip6.arpa.patch
 	"${FILESDIR}"/${PN}-1.0_pre4-fix-MAC-formatting.patch
+	"${FILESDIR}"/${PN}-1.0_pre4-fno-common.patch
 )
 S="${WORKDIR}"/${P/_/}
 
diff --git a/net-analyzer/iftop/iftop-9999999.ebuild b/net-analyzer/iftop/iftop-9999999.ebuild
index 5e2de84db474..f67befd3bc29 100644
--- a/net-analyzer/iftop/iftop-9999999.ebuild
+++ b/net-analyzer/iftop/iftop-9999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,6 +25,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.0_pre4-configure.ac.patch
 	"${FILESDIR}"/${PN}-1.0_pre4-Makefile.am.patch
 	"${FILESDIR}"/${PN}-1.0_pre4-fix-MAC-formatting.patch
+	"${FILESDIR}"/${PN}-1.0_pre4-fno-common.patch
 )
 
 src_prepare() {