[gentoo-commits] repo/gentoo:master commit in: net-analyzer/netwatch/, net-analyzer/netwatch/files/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/netwatch/, net-analyzer/netwatch/files/

[Ionen Wolkens]

commit:     9f16edcdcdb68ccb69d94998d81174faae673fb3
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  9 11:02:52 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Oct  9 11:46:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f16edcd

net-analyzer/netwatch: EAPI7->8, drop dead urls, lto+clang16 fixes

Also remove IUSE=doc and install the single pre-gen html
file uncoditionally.

May be an easy fix wrt #861203 but haven't looked, passing
-fno-strict-aliasing just as better than nothing (did need
a patch for lto mismatch either way).

Closes: https://bugs.gentoo.org/861203
Closes: https://bugs.gentoo.org/871375
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../netwatch/files/netwatch-1.3.0.1-clang16.patch  | 22 +++++++++++++
 .../files/netwatch-1.3.0.1-lto-mismatch.patch      |  8 +++++
 ....3.0.1-r4.ebuild => netwatch-1.3.0.1-r5.ebuild} | 36 +++++++++++-----------
 3 files changed, 48 insertions(+), 18 deletions(-)

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
similarity index 53%
rename from net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild
rename to 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
 }