gentoo auto-resync : 09:10:2022 - 19:32:30

5 files changed, 51 insertions, 19 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 8d125bf1e561..ccd5e3251f5f 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/netwatch/Manifest b/net-analyzer/netwatch/Manifest
index 62d1dc874ace..22cbef0db0f0 100644
--- a/net-analyzer/netwatch/Manifest
+++ b/net-analyzer/netwatch/Manifest
@@ -1,10 +1,12 @@
 AUX netwatch-1.3.0.1-append_ldflags.patch 558 BLAKE2B cdfe908ef103ba484ab6e375dabd6b7bd60bd1c93d4b834d1da640a73ce3912541f75632ac8ee51c3dbf38a4168b7301c73c3986bbe043890071da761f4e73dd SHA512 afee222f8f0c18de7b1c5f62d0f3705e40dccb09827410c67f61da9a0dc951c2d01b0e02cc4b6154d17ef8aaa625dd4265c4514a97d7df9dd9dc14da8a851338
+AUX netwatch-1.3.0.1-clang16.patch 448 BLAKE2B 4a13862cdc3414a74177637c535d105205b13e33b7b72e64f07a5886df2c17bf5e403a55dd77a0d3a402aea106438295d9b92d5df999fa85a56695d809b709f9 SHA512 e228fdcce607c8cd6fd4bc62a7d64979af1c98fd00de33c1bbacf0cc9a7a84288cbe9d6840751767980fc09c1d356eca0a1e0e6fd0e0f60294be8185e8fcb7b1
 AUX netwatch-1.3.0.1-do-not-call.patch 307 BLAKE2B 686d4d6d5ada26620ca8a2b02021be1fef17d3ba8da8149bb7dc037c386e1590f44a62357d779ce87732496cc8f9957a1df9e29947f6def7d18cf4e8b3dc29cb SHA512 988516e66e0f02edd484854488fe232c6ae8158d135a2e26837b9c2178650111cf2d33c29bee3f9c0b01b21d7ded0eebf93b39fa7a714a04e3d99f490f7690ea
 AUX netwatch-1.3.0.1-fix-fortify.patch 313 BLAKE2B 1f5d672118dfd3ef9b907e77b8a575f1e025d66b584dc4c74ac500ccf03a353dda5841a19a920a97224cd6fe784adfb40878ccd43ed82387d0ffa4ffd76f2ccb SHA512 ed33d1df73293c172982f016d033bf2bd35fca50e89e20433ae867b418446a44614da49b161f190c7579b21cfb1d01e514fc77fddb3ca5f469f0daec2acab0cf
 AUX netwatch-1.3.0.1-fno-common.patch 1075 BLAKE2B a2329a590a088ff0a5b4e985945d6f92cbe02dd2865ed0f4caaa356671aba03cabbf9850c3f0651416fc93d5e794b528b72814d478fe32d90b1cb5f8dfb5504f SHA512 a257ce4ca20abcdc268cdf86a2ceee683f016f67af78622f620f18d9aaa4a0f3c0cfbae0edf8fefa718996d86353f094a4c6b886edda6ccd906f408398377789
 AUX netwatch-1.3.0.1-includes.patch 489 BLAKE2B 9528ed80f11b33652824e9239022b85e1ec8331b2b1e31c5000d8f8ae863d572fd12d15d003b829c4487faee09b28fd29ec51579072b2a731f01990b597ddfbf SHA512 dd1005f58772aeef3909342df0b4a1f14bbd509b51361ab52f752b274fb51ab3a45a93b6af4feaaedb4fbace94ae55c7e153c9f1eb8257f66549c72a957885f1
+AUX netwatch-1.3.0.1-lto-mismatch.patch 215 BLAKE2B c453e8cf574253cd6b3b82e2c0b5b80b0625dc380a580dd99ca4dd657706588ab64b2e33b2740672e31394bd0950a8dffa6ec4188454ea20ee5a51c2dde074b2 SHA512 9c5f10c8f83892438ec6da49ae7788b411b86edecc2b04bb981675a99d05933b3a0e4ae9dece4d31ed0c797fcdbaa123a181778ae23458fab39b34faf19d29db
 AUX netwatch-1.3.0.1-open.patch 446 BLAKE2B 37fcc069b4fa7867cb1ec2bffd2930fb7fcc6b89a215c979bc3086b3d4a5834af9a4c461dc24ffee4163c6d544f1e3f2eaf2fba7e638eb0ceecd11e1c00396e0 SHA512 1de8f6290efcce43eac22d65c5c266d9048ad7346c654bcbaa65f325d380e180ddbc9586836a8334c416c608e5abeee1e49281e3bb226b709e57763138fa7f54
 AUX netwatch-1.3.0.1-tinfo.patch 1444 BLAKE2B 9160adbe768a7306bd46a832e4761864c6d05347d310fe130427fde56958714edeef121e56879ffeb3263ead7b2b53fc45b41ccf5b79611bc9b8b4d89c80b9f4 SHA512 675545527013a67de3a8dc32fab9b197f90d7ff24847e6e2d6959dd97ff4bc2838446807c7948d68c34790aac1d45d322506f94b99c47534af5d33e1bf85903d
 DIST netwatch-1.3.0-1.tgz 187936 BLAKE2B 9b7b9f822f344eb707977b13cfb603e5bfe8387d04b826182e667740953ef1315b646c521995185190b1dffa5d725f0001f1f6bdeca11ce1332786ca571421b7 SHA512 c0feddf01d118c7d8ff1fd8344692db5ad6f1bbaf375a7ed296756314454a7b1fb430f73d698156aca7a4391578215b3e6cb0f899044be228827a0acb4caba2a
-EBUILD netwatch-1.3.0.1-r4.ebuild 999 BLAKE2B a3b45439e6990af3dc189ecf97ea0fdd9f0bdd85b37282f8e6cf548fa82a03513058fd52fe8738baf2cb2704b7a6c0b458805739aee9baf3995d3b35de6af1ee SHA512 789bceef3363ee9724fda0f52add9abc898122c32ef862ebd535363821ada9dd75ce76c1bc1839e9ec14e547e14969f21990c0cf1eb408cc087b6a03b1f94e3a
+EBUILD netwatch-1.3.0.1-r5.ebuild 1031 BLAKE2B e1f73c25447540421611ca037d04b678bdb973f23b837f76941c6cbcb5f51e27a8640edf3b35bdf494cd1853959e53acb2f9fa43b6f65254fe922d74b6412760 SHA512 93c3d018b1c438b0ce1492919804e0c8ccfa9daae699c983c91d60ab38310bd13906c6f418c782f8f25914ba14733ca5dc17714027bbb9bc0275e26f0104c449
 MISC metadata.xml 275 BLAKE2B 79c07c01842dd8c7c484b4c0858920f89194e28b6758abe7a609d581acc1ea2a497477cb475ac5fee7eabef706c6979440deceef97a2ae217d022d0209cf3aa4 SHA512 70ffec14d622d6e1b030e86a35278c2967b1d0a374f43bdd6b4ee89a4afbcfc8541f8400643bd317693ce91b3e108ccdd3715176e3058548d51340ad9a40bf67
diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-clang16.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-clang16.patch
new file mode 100644
index 000000000000..e1b0cbd115b2
--- /dev/null
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-clang16.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/871375
+--- a/dispdata.c
++++ b/dispdata.c
+@@ -42,3 +42,3 @@
+ 
+-extern destroy_program;
++extern int destroy_program;
+ extern Semaphore masterdo;
+--- a/netwatch.c
++++ b/netwatch.c
+@@ -608,2 +608,4 @@
+ void findaddr (u_int32_t searchaddr);
++int doeth ();
++int gh (int opt);
+ 
+--- a/netwatch.h
++++ b/netwatch.h
+@@ -220,2 +220,4 @@
+ char *servicenm( char *s, int port);
++void uthread_wait( long usec);
++int dokeyin (int force);
+ 
diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-lto-mismatch.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-lto-mismatch.patch
new file mode 100644
index 000000000000..7a89ce111e9a
--- /dev/null
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-lto-mismatch.patch
@@ -0,0 +1,8 @@
+Fix failure with -Werror=lto-type-mismatch
+--- a/dispdata.c
++++ b/dispdata.c
+@@ -96,3 +96,3 @@
+ #define MAXSTATUS 14
+-#define STATUSSIZE 200
++#define STATUSSIZE 256
+ extern char status_lines[MAXSTATUS][STATUSSIZE];
diff --git a/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild b/net-analyzer/netwatch/netwatch-1.3.0.1-r5.ebuild
index df2471e3538e..a7215c4e36d0 100644
--- a/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild
+++ b/net-analyzer/netwatch/netwatch-1.3.0.1-r5.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit autotools
+EAPI=8
 
-MY_PV=$(ver_cut 1-3)-$(ver_cut 4)
+inherit autotools flag-o-matic
 
 DESCRIPTION="Ethernet/PPP IP Packet Monitor"
-HOMEPAGE="http://www.slctech.org/~mackay/netwatch.html"
-SRC_URI="http://www.slctech.org/~mackay/NETWATCH/${PN}-${MY_PV}.tgz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${PN}-$(ver_rs 3 -).tgz"
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE="doc"
 
-RDEPEND="sys-libs/ncurses"
+RDEPEND="sys-libs/ncurses:="
 DEPEND="
 	${RDEPEND}
-	sys-kernel/linux-headers
-	virtual/pkgconfig
-"
+	sys-kernel/linux-headers"
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
 	"${FILESDIR}"/${P}-append_ldflags.patch
 	"${FILESDIR}"/${P}-open.patch
@@ -29,22 +28,23 @@ PATCHES=(
 	"${FILESDIR}"/${P}-includes.patch
 	"${FILESDIR}"/${P}-tinfo.patch
 	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-lto-mismatch.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )
-S=${WORKDIR}/${PN}-$(ver_cut 1-3)
 
 src_prepare() {
 	default
+
 	eautoreconf
+
+	append-flags -fno-strict-aliasing #861203
 }
 
 src_install() {
 	dosbin netresolv netwatch
-
 	doman netwatch.1
-	dodoc BUGS CHANGES README* TODO
+	einstalldocs
 
-	if use doc; then
-		docinto html
-		dodoc NetwatchKeyCommands.html
-	fi
+	docinto html
+	dodoc NetwatchKeyCommands.html
 }