gentoo auto-resync : 27:07:2022 - 09:01:23

6 files changed, 96 insertions, 47 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 57d51f7c3fed..4ae80ae19efe 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/iftop/Manifest b/net-analyzer/iftop/Manifest
index f7de044dfff0..ed5a5187adb7 100644
--- a/net-analyzer/iftop/Manifest
+++ b/net-analyzer/iftop/Manifest
@@ -1,5 +1,6 @@
 AUX ax_pthread.m4 12983 BLAKE2B b1cbb45242493f9bf998ec82cf754b894d77ee4e1d3ed33b2e44e52c63c3114809ad4e42253579f9b3177a2b3de60aa8dac26311191b0ce7e82cf1f25f1a2123 SHA512 93c7ba3bb00712308de95273563f41814d05a6650ae2eec25f2b198f757b7f0206ae2e5679ff436da939be9bd962f37317978759ac08c1d14df0beb03440f84a
 AUX iftop-1.0_pre4-Makefile.am.patch 378 BLAKE2B 52029c14bc6afcd4d8cb86099fa78f00720af3d26384cdf059d005d768b8c226b459b5c1ebe2c936f20bb1afa033aa4560c488f98400b6cef162ebdcff3b7e03 SHA512 c7a81669de83701054493ee0f9979da8bfa481bd0769a501364598889cfb5aa762473e5099904ee13dad9052bfdd27913306df8ad4a91132532ac874504321fa
+AUX iftop-1.0_pre4-allow-scales-beyond-1gbps.patch 1236 BLAKE2B 262509989a135303b09e406dd551002aed6b2b6afe4978e2d01c8371d403191057bd571fe34dd02e17e0085d5d877709502c8dae78eb42b1b0646e7aff73a16b SHA512 42b6e58bdc7dde61a8b931858450204cd99ef6212a2748d525bd1edc1e12336d44a177e0394234499a33b0ba2e66dcee72954b419bcdcca577e94b9a47ff4d0d
 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
@@ -7,6 +8,6 @@ AUX iftop-1.0_pre4-ip6.arpa.patch 1857 BLAKE2B 920b5393366d0fe1ccf7619a862fb6a91
 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-r4.ebuild 1085 BLAKE2B 29aa639e4021d09969b038934307c7a2cb4f1518069288cb1684496d89a45be9094f82aeb67fd9a25c9d16a8850d12f44936d6b7a1b0cd1f3d00bb2653ba3e6c SHA512 ab93e3cdb492dda21170356170b3fe8430a89d9aeb9e137917c6dbaf3d1f542d66bce7213b6ae739f49155e1f11937ba767a35479a38d43bdf58f597f1384329
-EBUILD iftop-9999999.ebuild 879 BLAKE2B e9dec0c2587a447d304892be2b038542a3ac00e0cb47ce2465a8979c10829cf0d5a453ca4c40d5bfe3828900f855288eda1387225a5b6978d19344483d7eb64d SHA512 c8e2c9f166973105ae8786d98e790fa79cd9add436504ecdc4cfb5f154e485070b9b8d630485ed2c08f98945104c274ab5b807da0b1e3890496e8a3f20447e11
+EBUILD iftop-1.0_pre4-r4.ebuild 1121 BLAKE2B 349a2caba75d488cd69c4693d6b210e8ebaf7a8bee252092072e14deb4031bc9d594d4bf298d0ab11aae203c28d971cb6ae5bfe649648a8e513d8139a952eab9 SHA512 34819e806b24cd082f3be291b7ca89be0b4d6cfeaa38ceee3edcf5551e5e8f4950d7366577638c10d9ec0818a19b233919fb37fd4fc1ed37a52e6e063c2d04bf
+EBUILD iftop-1.0_pre4-r5.ebuild 1195 BLAKE2B 784710a04cee85d1a77703ce510de63411e0db7be9514cad4a45f0bd1e8606c275d55a300711fca5b36408871e8b57c1650526de22c231dcd95cc0894372c15c SHA512 e10b30f520f737e5175230dbff4244ffa993f57257d962bef68ef684fe81b9f07fa2068a8ee95c7eef5caa3720f8cfc77a8495c84891da0cfa0c8f0415bd7885
 MISC metadata.xml 287 BLAKE2B f19164a15f9d23702c60e146fcf4397bdceb885848c02ca219c14841ecf18066f94c8fff216a6d84e5480545161ead3535bf56e949b037fe61e2dbfd0ab33c48 SHA512 ec0634c44ec4f2564927d307807236bf9e623c63ebb6a5a2c8fcf9dc68f0f871eeee52e04675aa30a3aef2d73cbef0446d0ca7675da82e62cc57a1fd593855f0
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-allow-scales-beyond-1gbps.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-allow-scales-beyond-1gbps.patch
new file mode 100644
index 000000000000..9c9892147df5
--- /dev/null
+++ b/net-analyzer/iftop/files/iftop-1.0_pre4-allow-scales-beyond-1gbps.patch
@@ -0,0 +1,43 @@
+https://code.blinkace.com/pdw/iftop/-/commit/77901c8c53e01359d83b8090aacfe62214658183
+https://bugs.gentoo.org/857837
+
+From: Paul Warren <pdw@ex-parrot.com>
+Date: Wed, 3 Oct 2018 18:02:36 +0100
+Subject: [PATCH] Support scales beyond 1Gbps
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Guido Jäkel <Guido.Jaekel@GMX.DE>
+--- a/ui.c
++++ b/ui.c
+@@ -71,7 +71,7 @@ int dontshowdisplay = 0;
+ 
+ /* Barchart scales. */
+ static struct {
+-    int max, interval;
++    long max; int interval;
+ } scale[] = {
+         {      64000,     10 },     /* 64 kbit/s */
+         {     128000,     10 },
+@@ -79,7 +79,9 @@ static struct {
+         {    1000000,     10 },     /* 1 Mbit/s */
+         {   10000000,     10 },     
+         {  100000000,    100 },
+-        { 1000000000,    100 }      /* 1 Gbit/s */
++        { 1000000000,    100 },     /* 1 Gbit/s */
++        {10000000000,    100 },
++       {100000000000,    100 }
+     };
+ static int rateidx = 0, wantbiggerrate;
+ 
+@@ -105,7 +107,7 @@ static float get_max_bandwidth() {
+ }
+ 
+ /* rate in bits */
+-static int get_bar_length(const int rate) {
++static int get_bar_length(const long rate) {
+     float l;
+     if (rate <= 0)
+         return 0;
+GitLab
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
index bf47434f2ea8..859e1521f633 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
@@ -6,7 +6,7 @@ inherit autotools
 
 DESCRIPTION="display bandwidth usage on an interface"
 SRC_URI="http://www.ex-parrot.com/pdw/iftop/download/${P/_/}.tar.gz"
-HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
+HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/ https://code.blinkace.com/pdw/iftop"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r5.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r5.ebuild
new file mode 100644
index 000000000000..41dff4aa6914
--- /dev/null
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Display bandwidth usage on an interface"
+HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/ https://code.blinkace.com/pdw/iftop"
+SRC_URI="http://www.ex-parrot.com/pdw/iftop/download/${P/_/}.tar.gz"
+S="${WORKDIR}"/${P/_/}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:=
+"
+DEPEND="${RDEPEND}"
+# autoconf-archive for ax_pthread, bug #490168
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0_pre4-configure.ac.patch
+	"${FILESDIR}"/${PN}-1.0_pre4-Makefile.am.patch
+	"${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
+	"${FILESDIR}"/${PN}-1.0_pre4-allow-scales-beyond-1gbps.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	dosbin iftop
+	doman iftop.8
+
+	dodoc AUTHORS ChangeLog README "${FILESDIR}"/iftoprc
+}
diff --git a/net-analyzer/iftop/iftop-9999999.ebuild b/net-analyzer/iftop/iftop-9999999.ebuild
deleted file mode 100644
index f67befd3bc29..000000000000
--- a/net-analyzer/iftop/iftop-9999999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools git-r3
-
-DESCRIPTION="display bandwidth usage on an interface"
-HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
-EGIT_REPO_URI="https://code.blinkace.com/pdw/iftop"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-
-RDEPEND="
-	net-libs/libpcap
-	sys-libs/ncurses:0=
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-S="${WORKDIR}"/${P/_/}
-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() {
-	default
-	# bug 490168
-	cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die
-
-	eautoreconf
-}
-
-src_install() {
-	dosbin iftop
-	doman iftop.8
-
-	dodoc AUTHORS ChangeLog README "${FILESDIR}"/iftoprc
-}