gentoo auto-resync : 15:03:2024 - 06:47:25

10 files changed, 18 insertions, 152 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 308de029e244..906b598e08bf 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest
index 73b033d6062c..dc508dd758af 100644
--- a/net-analyzer/hping/Manifest
+++ b/net-analyzer/hping/Manifest
@@ -9,5 +9,5 @@ AUX hping-3_pre20141226-pcap-bpf.patch 421 BLAKE2B ff0b48788abe2151c60ab3a99c880
 AUX hping-3_pre20141226-scan-overflow.patch 316 BLAKE2B 7d43d98fe736dc78a2e104c0daa0d206dd30175c8133168fc390b308c3889cf306bcbc1c10265474bbd9397694585b9b16667ca80d91d1175b2daa41aa9ba501 SHA512 ddef839e98f48de04aac8015468808d1e3201f0752cb82a4650e35c27a903d2ceca0603415d8a19f39dd827a8ca249d778312a0f272a4605b3ea67af4a18846b
 AUX hping-3_pre20141226-unused-but-set.patch 1272 BLAKE2B 8ae0bfad0bab0c8f0f7592b5ec370ebe146bb31c2dd5a53651d2bd27441c605114f46ab98ec9a97e9f5d386cae5a561c80c420c4c15d6d9424440ac4a53736ef SHA512 a9f031c39a448b0d1f6b076193a07c7a9628756af46a06c2f0d8a2859a02e55bbff5ae55ee4341297b19c4e1ba041b5dd2cdee9b64bdf35e6aff5dc4b8faf6db
 DIST hping-3_pre20141226.tar.gz 572322 BLAKE2B d7bacdd6ae7ba7589825bb9157fc6501740f2a684bc9045483a57c40af3ccf89a09f2f7ddc31c939886e5173b7c4d29233d87e044df14b86e6fcba7bda4f8abc SHA512 d03c27ec25b813c74d57b4e26acf1a5b1ade15abd93c5f8cbf29a5464c6dc3a8679e1d255d99ad232462d6cda70dcd3b68df13e70e950cac0943cb69bdb14b4c
-EBUILD hping-3_pre20141226.ebuild 1557 BLAKE2B b5a12e57ae718238f3c61b2eac6240b86ba01a337707ad091785349253a4caf617f36d5e42d429c725691c0d5a4df8a2dbff9022798d26859cf22fac9d65a614 SHA512 93a42d929561fa848d1fb4ffe20da4de39fa5ca1f855602c4793825a6bae9000b147c4a970ee60e579c857fbb3b740e63c5f057dc34357945fa7ad79e5a3d958
+EBUILD hping-3_pre20141226.ebuild 1598 BLAKE2B 3cb4b72c21bbf41e3008a49d90ba1f1ed699358a3137ace5aaac27ddec3ed89f540e9fc7c3769197a3fbf50c0261924ac6eb9882d0dafddcb149eea8a4120778 SHA512 f403bcd1740f59fb9db09b42585a0259b87d5285beb22fae5f09f7ab665b342071af82cdfd610c0d1df34f6b61c812cd80826ab4673570e8dd9a47732e28e423
 MISC metadata.xml 359 BLAKE2B e643654c1c57fc317fffb986113fbecd6d7f86649ebd17e541c84ef4cd3ee76f63b8ffb64d3db4fb850c16462aa4aed92bcbafc3c09d3ebf7ab87645620ee793 SHA512 257a02be63583a9645b90ee020d3caa8ae894e6c45cb5da6a8fbb2ae300114ebedd43b36e2f551880426032b9812b5bdd272e9c871d73ab6b63c54cc1cb3d863
diff --git a/net-analyzer/hping/hping-3_pre20141226.ebuild b/net-analyzer/hping/hping-3_pre20141226.ebuild
index 6036cfa7f52a..ea7237270ec2 100644
--- a/net-analyzer/hping/hping-3_pre20141226.ebuild
+++ b/net-analyzer/hping/hping-3_pre20141226.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 HPING_COMMIT="3547c7691742c6eaa31f8402e0ccbb81387c1b99"
 DESCRIPTION="A ping-like TCP/IP packet assembler/analyzer"
@@ -36,6 +36,9 @@ PATCHES=(
 )
 
 src_configure() {
+	# bug #861161
+	filter-lto
+
 	tc-export CC
 
 	# Not an autotools type configure:
diff --git a/net-analyzer/nload/Manifest b/net-analyzer/nload/Manifest
index 9b46a2f1e868..0f5ac4f442b4 100644
--- a/net-analyzer/nload/Manifest
+++ b/net-analyzer/nload/Manifest
@@ -1,10 +1,5 @@
-AUX nload-0.7.4-Eliminate-flicker-on-some-terminals.patch 624 BLAKE2B acf0b86e62d7b243ecc96fb73bb84800b4c738761c976f02ad785ddcae27399c64e413b67c7bd1cbe5818da549f8e653c58e7854334157dc5cf17093cda43187 SHA512 f761605b66cdda1e17a508b9c2d532a3ea955a86f4eb4dc61ca00c2b51c162e57bb2d292d9232144ab67e52162cb58e73b6cd1e4bf6f1de003a2f72ac93e7199
-AUX nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch 2166 BLAKE2B f2c5ba5a5924bcaefe67665721ff9224944ee9af53be51869f0c0d45f447fdb7041181a5040bade84f01c3c22585865f3ac420a7c6a7320099a8b9cfc884d825 SHA512 c728d1fbf5aa3c97ff38fa9684230d5af3ccaac1240a915cbe603d5c04cd649a26ef4f2a37125514c7e4fd0afbb85404bbe412d783e934eed89ebad4fe718220
-AUX nload-0.7.4-tinfo.patch 264 BLAKE2B aa77538dd412c4956d61449e9c6494de70d42208d806e103a18d12e12751d7619483bb13dab1934b076e5aaf7ea7d3368c9a5b9403340dab7f03c5a0430b3bb0 SHA512 1191ef64ab895402a54d05e4b119627ddc6db884f8385493bf00c030d1c82b88fa77973e3d6ea0bf2e5e7211dc07ddec7d95e426a60d99f216b23b683fd8a83e
 AUX nload-0.7.5_pre-Makefile-spec-don-t-compress-man-page.patch 2096 BLAKE2B fcbbf03277416adc1be91bf16dfd59b51467b9f92e5a63e3ae4817f49f8d8698947229bd6a3fc1012967fe4124736dedcf031f4ef4577de506a77119284cc6bb SHA512 3c448817fbfb5b7be0bc0e459ec0664cfa22e52d495be913364b4ddb0e9d48a266bf18610d1c07df6f48bacf921d0592adf72d0ab288ea7bea92c9fe783297b0
 AUX nload-0.7.5_pre-tinfo.patch 264 BLAKE2B 2254acea32b1a4ac1a6e8af1e5ca91dfb7afd0be540c22559fbb6c3e5737977a444abcbd150e715121826e5ea89a303a21722d8cb061c901b96dcf1f46b5345f SHA512 7ea0265fc65dfd812bdc99e8f7cef74e87f0e2f8d227768e7fa8ac0da8ac8becae6cdce1560986c5277a224c1d0e27456a75b22729004922b5d01b032e9bf5d3
-DIST nload-0.7.4.tar.gz 151005 BLAKE2B a98903652e21d2b9b2e446bfc8c8f5fc66559b6663893603f4040c6e80c8c977d305e952dc0108c9efa66490dfba91e42857337095ddb731ececf2e3747e0b97 SHA512 ca3e36d3f77c5a7994a3261042fb65a1458a29c769e6bebbe3b8e49b3045aca6f4d047065d11431b28368e0d881c24c92533fa24f0e54ac270f1f5bccfb5c0af
 DIST nload-0.7.5_pre20180309.tar.gz 43405 BLAKE2B b5d8aeffc5de52c8574a8d11f133b2c5a38d09fd5a1abb75e2a9ea99551b018947844348ab73a26d806c575a387f1d4a5354144612ac7ea0f45bab5bd7d05115 SHA512 5942d706ac1f8acf57c832ee832a6b96add3c3d80fb45d3a5f6eb2397d20d49c4cc52e754328259bb52b06bd4e4b15e92d86103a531ae4ac546fcb87e3e5131b
-EBUILD nload-0.7.4-r1.ebuild 793 BLAKE2B 5d8ea1b075e9dc4a8a9a6cd96b73aab3d39fa357a18c50176bef28e4ed3faeeb446532baeaaa82653bf4ce91c9bb4c089e4841ea4a5b016c7eeed3448a21080d SHA512 769c1c492c1986127ab5201d7686e3144361d69de3c7eb36affb8c2338819fcb1e9bb25e470f7f9577c9010a106c17de20e957cbb0def5aea562b91ea34aa0c9
 EBUILD nload-0.7.5_pre20180309.ebuild 910 BLAKE2B b3579d5dcafbcd4787102ca11f303aeccd9ac2342e61e8fa0f24867dfde67cd930c155e89b3363413761aab3fc235f06f3f814bc26e3a1c7b51dcb4038ba0038 SHA512 9f397ccaaf591d39370e5369156ef955177a7cdf0936b20a15c45c1feabbda0ad6fbcff3c4dc6a42d071bebdd9242f2f5362dbe7ef01ee9f296f0f403c218705
 MISC metadata.xml 633 BLAKE2B 500af61f87ae184f2545715a94aa5fcfba212b350e45a6b6b6b5c82a9148081bc15a094a387b989411f20c6ed5161a0e863bfc72609bf227b1c706c636a2e4ff SHA512 b7f8cffe82009df815e6dfb87976129b346e8e530a1277cb9b15f03d4a9a31d1eb8c143c1e2da65a2950dae541be39ee97a33ccb25b1471bdd81946238123e40
diff --git a/net-analyzer/nload/files/nload-0.7.4-Eliminate-flicker-on-some-terminals.patch b/net-analyzer/nload/files/nload-0.7.4-Eliminate-flicker-on-some-terminals.patch
deleted file mode 100644
index 8d13545c786c..000000000000
--- a/net-analyzer/nload/files/nload-0.7.4-Eliminate-flicker-on-some-terminals.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8a93886e0fb33a81b8fe32e88ee106a581fedd34 Mon Sep 17 00:00:00 2001
-From: Roland Riegel <roland@roland-riegel.de>
-Date: Sun, 28 Jan 2018 16:59:39 +0100
-Subject: [PATCH 1/1] Eliminate flicker on some terminals like rxvt (thanks to
- Alex Wilson)
-
----
- src/window.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/window.cpp b/src/window.cpp
-index bfa7701..2083fd0 100644
---- a/src/window.cpp
-+++ b/src/window.cpp
-@@ -108,7 +108,7 @@ void Window::refresh()
- void Window::clear()
- {
-     if(m_window)
--        wclear(m_window);
-+        werase(m_window);
- }
- 
- // move and resize window
--- 
-2.16.4
-
diff --git a/net-analyzer/nload/files/nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch b/net-analyzer/nload/files/nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch
deleted file mode 100644
index 705f92ea0e81..000000000000
--- a/net-analyzer/nload/files/nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 04d5af489f998568553dc54f39c56ef740a27f1b Mon Sep 17 00:00:00 2001
-From: Andrey Mazo <ahippo@yandex.com>
-Date: Sun, 26 Aug 2018 00:00:35 +0300
-Subject: [PATCH 1/1] Makefile,spec: don't compress the man-page
-
-Package managers like to compress man-pages on their own,
-because the type of compression for man-pages is user-configurable.
-In particular, Gentoo [1] doesn't want packages to compress their man-pages.
-Gentoo Portage has workarounds for this,
-but this is not specified in Package Manager Specification and
-results in extra compression-decompression pass.
-
-RPM also compresses man-pages itself (in `brp-compress`)
-(and similarly recompresses them as needed)
-rather than relying on packages to install compressed man-pages.
-
-Automake can handle installation of man-pages without the explicit "install" target,
-so use the standard automake-provided way of installing man-pages.
-It's also smart enough to package `nload.1.in` automatically.
-
-Don't specify an explicit man-page extension in .spec file as recommended by Fedora.
-
-[1] https://github.com/gentoo/gentoo/pull/9543#issuecomment-415662844
-
-(cherry picked from commit 096df0d1282a8c8c535e730d28fe281ea290b58d)
-
-Upstream: https://github.com/rolandriegel/nload/pull/4
----
- docs/Makefile.am | 10 +---------
- nload.spec.in    |  2 +-
- 2 files changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/docs/Makefile.am b/docs/Makefile.am
-index 646d438..9032a02 100644
---- a/docs/Makefile.am
-+++ b/docs/Makefile.am
-@@ -1,11 +1,3 @@
- ## Helder Correia <helder.correia@netcabo.pt>
- 
--man1_MAN = nload.1
--
--install:
--	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
--	$(INSTALL_DATA) $(top_srcdir)/docs/$(PACKAGE).1 $(DESTDIR)$(mandir)/man1
--	gzip -f $(DESTDIR)$(mandir)/man1/$(PACKAGE).1
--
--uninstall:
--	rm $(DESTDIR)$(mandir)/man1/$(PACKAGE).1.gz
-+man1_MANS = nload.1
-diff --git a/nload.spec.in b/nload.spec.in
-index 36496fd..53f6f19 100644
---- a/nload.spec.in
-+++ b/nload.spec.in
-@@ -41,7 +41,7 @@ rm -rf %{buildroot}
- %defattr(-,root,root)
- %doc AUTHORS COPYING ChangeLog NEWS README
- %attr(0755,root,root) %{_bindir}/%{name}
--%{_mandir}/man1/%{name}.1.gz
-+%{_mandir}/man1/%{name}.1*
- 
- 
- %changelog
--- 
-2.16.4
-
diff --git a/net-analyzer/nload/files/nload-0.7.4-tinfo.patch b/net-analyzer/nload/files/nload-0.7.4-tinfo.patch
deleted file mode 100644
index dcab6ec324f4..000000000000
--- a/net-analyzer/nload/files/nload-0.7.4-tinfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -70,6 +70,7 @@
- esac
- 
- dnl Checks for libraries.
-+PKG_CHECK_MODULES([NCURSES],[ncurses],[LIBS="$LIBS $NCURSES_LIBS"],[AC_MSG_ERROR([ncurses was not found])])
- AC_CHECK_LIB(ncurses, initscr)
- AC_CHECK_LIB(form, new_form)
- 
diff --git a/net-analyzer/nload/nload-0.7.4-r1.ebuild b/net-analyzer/nload/nload-0.7.4-r1.ebuild
deleted file mode 100644
index fd389da2dfc6..000000000000
--- a/net-analyzer/nload/nload-0.7.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Real time network traffic monitor for the command line interface"
-HOMEPAGE="http://www.roland-riegel.de/nload/index.html"
-SRC_URI="http://www.roland-riegel.de/nload/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-
-RDEPEND=">=sys-libs/ncurses-5.2:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tinfo.patch
-	"${FILESDIR}"/${P}-Eliminate-flicker-on-some-terminals.patch
-	"${FILESDIR}"/${P}-Makefile-spec-don-t-compress-man-page.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# --enable-debug means do not strip debugging symbols (default no)
-	econf --enable-debug
-}
diff --git a/net-analyzer/nstats/Manifest b/net-analyzer/nstats/Manifest
index aa4b4953f2cc..b047ff829451 100644
--- a/net-analyzer/nstats/Manifest
+++ b/net-analyzer/nstats/Manifest
@@ -2,5 +2,5 @@ AUX nstats-0.4-glibc24.patch 4546 BLAKE2B 1ddaf23e1ac6ccad95993b903a3d6637f4e6d2
 AUX nstats-0.4-makefile.patch 611 BLAKE2B a876d89f3ecc8c7dddf8ef5b83342bad300acd8b4e0d56e1634cf6d3741163b9d2b77ac1286435fb031608271308178aa822751c23a1de52c4fa6b615febbdf1 SHA512 e47cffad1562f767556baf5086db8039f7b504ca4e4f1ebe458d4ce9b9a65cde5f4d7131e4ff8992379ca3db6ffcf30c5e8499a2993e29874f50b00be2d9b8af
 AUX nstats-0.4-tinfo.patch 469 BLAKE2B f75ad2c31a66a30c3bbf2cd667a60914289e228ef7a356132f6d5abb93e40c9786bdbf99e2899f735c3c78ed0c87de3a8c30ff363678174de4af8155898d7e8d SHA512 e7c99f91adacd33222f1f9c4fa1b0b342dfc8309a459b9239eb099f1a79972a3065d76560df0b0455c20f994c343f43b5be55de0464031f064c03b4e1dfba843
 DIST nstats-0.4.tar.gz 71526 BLAKE2B bc9e4baab1c425d1248b8669a598f85843465c62a3990ea8ea99f979bee9be8eb351111e58b0ece4748b3e199278acd4f0a06ddde2b4cd6e55ca9ff99096e7e8 SHA512 89e88eb0f707cb125fbf02bef93a0bbbd1409f3516d4b333e06d0a3ffe42f5e8d2b655fa6c7a0c63b7d71c7a2f74f6207e5ed158f7d102f6d47ac6e436da3315
-EBUILD nstats-0.4-r3.ebuild 725 BLAKE2B f5f01d63b00dc45b3d80cc7f6995375213ed34cfd9e153a8b107432f739a7c9a9fc4001a1f891104d45f3f34453b4b30a6ed75b191e296e62520bb03ddd6c0ea SHA512 e3d3472060b5d7b75f03b69bb53a68d4a33ff621d7228346efd86b5f61f7c644572d57642629602f1854ffec503608d7b1dd8c60cf763d571d5ca068c176322b
+EBUILD nstats-0.4-r4.ebuild 797 BLAKE2B 2060bbca0b8ced96f6e13fc0c611b28849b62c5b252584843ded7a39e3ae410b8004180ba4cff176e3e2bb2c26d27ca9ab9ea9218fa91488f44b618473905c48 SHA512 c5ed035caf5bcfe63280edd09e335ddc544efa9ad2b305fa4e69d95572060df85a63ab6d433a12f50f3c59261e7be9a1782e00f7f5f79ba3864f2e45323e5411
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/nstats/nstats-0.4-r3.ebuild b/net-analyzer/nstats/nstats-0.4-r4.ebuild
index 65b96057aa7b..29ee8957fee9 100644
--- a/net-analyzer/nstats/nstats-0.4-r3.ebuild
+++ b/net-analyzer/nstats/nstats-0.4-r4.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit autotools flag-o-matic
 
 DESCRIPTION="Displays statistics about ethernet traffic including protocol breakdown"
-SRC_URI="http://trash.net/~reeler/nstats/files/${P}.tar.gz"
 HOMEPAGE="http://trash.net/~reeler/nstats/"
-LICENSE="Artistic"
+SRC_URI="http://trash.net/~reeler/nstats/files/${P}.tar.gz"
 
+LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
@@ -16,15 +17,15 @@ RDEPEND="
 	net-libs/libpcap
 	sys-libs/ncurses
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
 	"${FILESDIR}"/${P}-glibc24.patch
 	"${FILESDIR}"/${P}-makefile.patch
 	"${FILESDIR}"/${P}-tinfo.patch
 )
+
 DOCS=( BUGS doc/TODO doc/ChangeLog )
 
 src_prepare() {
@@ -34,5 +35,7 @@ src_prepare() {
 
 src_configure() {
 	append-cflags -fcommon
+	# Conflicting definitions of quit() (bug #861227)
+	filter-lto
 	default
 }