gentoo auto-resync : 08:11:2024 - 03:03:27HEADmaster

3 files changed, 61 insertions, 6 deletions

diff --git a/net-analyzer/nsat/Manifest b/net-analyzer/nsat/Manifest
index d3dc29f9153c..634f48453792 100644
--- a/net-analyzer/nsat/Manifest
+++ b/net-analyzer/nsat/Manifest
@@ -4,8 +4,9 @@ AUX nsat-1.5-configure.patch 741 BLAKE2B 51904c7d4b64c1207fbe771ef28ebc72ff2cedb
 AUX nsat-1.5-libtirpc.patch 977 BLAKE2B 4846aea97ef9ee6157e47531f306bd46cbc93ca380d47b347a5d6417814e219572ac7bb315d7e6f86453c88dca53a01980682698d8077e1e663f48960684db14 SHA512 509b6c0ecd545893ee49f810c54b11c5c8f527ce14acf92a282f9d993392ab1e40a807a5a4646eb7b62c80f7e21593f2996dc83d0636344ca4273209bdc551bc
 AUX nsat-1.5-lvalue-gcc4.patch 375 BLAKE2B afd39e903b900b7996ad650b1382f4e6a600bd38a04531c4dc7da1365cf635c4363677566d39242facd5a80bbca83474ff9be9fba0c9978944fa0cb8ac1a42d4 SHA512 4768bbc1e1e9ed2b4efe70ec55214827e2dfe59e9c838d8934fee43c886b386c5942e93d862c37f220bc5e019642b3d914e2fde175a2aeee4691c7933c1aa3b5
 AUX nsat-1.5-misc.patch 2422 BLAKE2B 093cbcb9ec6201f6674a0d191db23fc462c9e6bcdf159b750d7f5facb38b252e1f239f1bfbc003918a1947c1191e690018a76f8057869798001bd2e0407354ef SHA512 e000011099c7cd5507d91af0d89ea94d2e44d257b3133d6788302733b2615dfa0148f758daa336be3221fde6de0e2e2994104bc8d0729850ed5b60e0eff82ab9
+AUX nsat-1.5-no-ansi.patch 1774 BLAKE2B 33c52675a9884fd1e114e9c6a50bae68bf7bb4d3a986c987fb52d9110e12f75bac3a586334b09b3d3f8c141fe21b2455b2d15294077436d626b67ad99ea15b59 SHA512 cd424e607b9b6c8ddc9745a4b8ec6615b7674dfa5d2b2eaabf19bb89cf78da610aa4f4b6358f73d4750f812d943bb32de87d11bffc5e1986293d560c0f9d435c
 AUX nsat-1.5-strip.patch 205 BLAKE2B ac4b4b54ff6f8cf1771f57497317040eb40be829c8bcbb03c2f063fcaa190419e74b8ff5481f8fab4332af223d9a8ba7526d793d084be1f1498d0046db820227 SHA512 3e8b312e704f08fbe86caea37a8491851474cb0b773a73f4b2995532086fefa85a5240f49084bb0e1195089bfbfa937e68c45c0908a2bb7f427775ccb4535e8e
 AUX nsat-1.5-va_list.patch 470 BLAKE2B 2ac6936d216b497ecbd47cc167f9f142fd6bf20f834b123ce6ace47d9fa999102f8606e856b55db4b03243c6a427931ee56092c5e0dbc8e9357b139f26e28892 SHA512 1963419110a34b826d27b5b34e22ae71906380bc8a2ce130d374c00ad91827fab3781e97aadf417613f042d195ee9e85e50b898befff82190c7e031276903baa
 DIST nsat-1.5.tgz 410603 BLAKE2B 083ac2879afae87d1282bb643d0988b2f858f9c934fe7a6e24407c0f5cf90ceba7be17aeeae8e7cb9d0f7a31cce171fed6382351ea8413b13d3e4343339f0c9c SHA512 1a5b8e88f7bcacdbe1144a719a2e446c0ea025ad4e5f8c79ccb939083308cd2c1b2c1f3d7ab3b791924d5855994cbc3fded95aa36df23c12fd76fc20341a87d0
-EBUILD nsat-1.5-r6.ebuild 1593 BLAKE2B 1b21b0e1a896145c9487da4294097d45017b668fcaf49d73ad70abf06a3bc063df983ceb9d2b20fbdcd9fcff38ff83a2972f2b973166666064c94c82983db60f SHA512 77d1b5fb2fa91c02481e46f9f427ae8154556adcca3d1f56fe5b1ed78ad4ee98a0aa511cd86de0b4f1ce5cf734d36f86c30ff5089181697040bd9493aab91a15
+EBUILD nsat-1.5-r7.ebuild 1635 BLAKE2B 7950140cbbbeb29a0408569d1c5f23dc30f88ba1dd9f9614bd89d84fbd08ea871688e26843d0f5168ea64b851a038cbf2e8285d377a42c6af11b2939190d33ae SHA512 b099d63a865ba297e7a9989cdd4b5b1d57498650828c69c3e860e191873f9846bb45129e99c6fe3a903b00caa578a823487c98e9334a1495d15bb5f33a6ce2db
 MISC metadata.xml 355 BLAKE2B 976cc6f61d985577911ef3b3cb66c8d94a78084415c1b2cbf3f52bbe9c19d2476f229ff93c5ca551c33cac585e3c4327869a92be76f98735f6f31fde10dc2a31 SHA512 814ba6fb019f44469cc5af1d52fe6825b9beeacf91bacc360232767f8a0eba8682f66fde6464e1265a64e0f17179794808c39ef80d290042169dd801524b0a52
diff --git a/net-analyzer/nsat/files/nsat-1.5-no-ansi.patch b/net-analyzer/nsat/files/nsat-1.5-no-ansi.patch
new file mode 100644
index 000000000000..80e96ea7a8f2
--- /dev/null
+++ b/net-analyzer/nsat/files/nsat-1.5-no-ansi.patch
@@ -0,0 +1,53 @@
+--- a/configure.in
++++ b/configure.in
+@@ -42,20 +42,20 @@ case "`${UNAME}`" in
+   AC_DEFINE(HAVE_LINUX)
+   AC_DEFINE(MY_HDRINCL,3)
+ if test x$LEETCC = xyes; then
+-    CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DLINUX'
++    CCOPTS='-Wall -O6 -funroll-loops -fPIC -DLINUX'
+ else
+     CCOPTS="${CFLAGS} -DLINUX"
+ fi
+     SMBCFLAGS="${CCOPTS} -Wall -DLINUX -DNETGROUP -DALLOW_CHANGE_PASSWORD -DFAST_SHARE_MODES -DNO_ASMSIGNALH -DGLIBC2"
+     SMBLFLAGS="-lnsl -lcrypt"
+-    CFLAGS="${CCOPTS} -Wall -ansi -fPIC -DLINUX"
++    CFLAGS="${CCOPTS} -Wall -fPIC -DLINUX"
+  ;;
+  *Darwin* | *Mac* | *MAC*)
+   AC_MSG_RESULT(found MAC OS X)
+   AC_DEFINE(HAVE_BSD)
+   AC_DEFINE(MY_HDRINCL,2)
+ if test x$LEETCC = xyes; then
+-   CCOPTS='-Wall -O -funroll-loops -ansi -fPIC -DBSD44 -DDARWIN'
++   CCOPTS='-Wall -O -funroll-loops -fPIC -DBSD44 -DDARWIN'
+ else
+    CCOPTS='-DBSD44 -DOBSD'
+ fi
+@@ -68,7 +68,7 @@ fi
+   AC_DEFINE(HAVE_BSD)
+   AC_DEFINE(MY_HDRINCL,2)
+ if test x$LEETCC = xyes; then
+-   CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DBSD44 -DOBSD'
++   CCOPTS='-Wall -O6 -funroll-loops -fPIC -DBSD44 -DOBSD'
+ else
+    CCOPTS='-DBSD44 -DOBSD'
+ fi
+@@ -81,7 +81,7 @@ fi
+   AC_DEFINE(HAVE_BSD)
+   AC_DEFINE(MY_HDRINCL,2)
+ if test x$LEETCC = xyes; then
+-    CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DBSD44'
++    CCOPTS='-Wall -O6 -funroll-loops -fPIC -DBSD44'
+ else
+     CCOPTS='-DBSD44'
+ fi
+@@ -96,7 +96,7 @@ fi
+   AC_CHECK_LIB(socket, socket, [ CLIB="$CLIB -lsocket " ], AC_MSG_ERROR(libsocket not found.))
+   AC_CHECK_LIB(nsl, gethostbyname, [ CLIB="$CLIB -lnsl " ], AC_MSG_ERROR(libnsl not found.))
+ if test x$LEETCC = xyes; then
+-    CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DSOLARIS'
++    CCOPTS='-Wall -O6 -funroll-loops -fPIC -DSOLARIS'
+ else
+     CCOPTS='-DSOLARIS'
+ fi
diff --git a/net-analyzer/nsat/nsat-1.5-r6.ebuild b/net-analyzer/nsat/nsat-1.5-r7.ebuild
index 47f0c0c1f494..e24b1507e0a3 100644
--- a/net-analyzer/nsat/nsat-1.5-r6.ebuild
+++ b/net-analyzer/nsat/nsat-1.5-r7.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools toolchain-funcs
 
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
-IUSE="X"
+IUSE="gui"
 
 RDEPEND="
 	dev-libs/libmix
@@ -21,7 +21,7 @@ RDEPEND="
 	net-libs/libpcap
 	net-libs/libtirpc:=
 	net-libs/rpcsvc-proto
-	X? (
+	gui? (
 		dev-lang/tk:*
 		x11-libs/libX11
 	)
@@ -37,6 +37,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-libtirpc.patch
 	"${FILESDIR}"/${P}-amd64-compat.patch
 	"${FILESDIR}"/${P}-configure-dash.patch
+	"${FILESDIR}"/${P}-no-ansi.patch
 )
 
 src_prepare() {
@@ -58,7 +59,7 @@ src_prepare() {
 
 src_configure() {
 	tc-export CC
-	econf $(use_with X x)
+	econf $(use_with gui x)
 }
 
 src_compile() {
@@ -67,7 +68,7 @@ src_compile() {
 
 src_install() {
 	dobin nsat smb-ns
-	use X && dobin tools/xnsat
+	use gui && dobin tools/xnsat
 
 	insinto /usr/share/nsat
 	doins nsat.cgi