gentoo resync : 20.03.2022

4 files changed, 9 insertions, 91 deletions

diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index 867aa7b9cec7..36cefc3a5a24 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -1,9 +1,7 @@
 AUX nas-1.9.2-asneeded.patch 374 BLAKE2B a142f505190214db4f235ef8ec6283029c127b9b3c313b2405e6222a6f3d6d89931066d64a71b350b289ed07bed198bbc71a862396ef77d3fb5e7a2426b5abad SHA512 ad9275577d2e10f5201556e21f6251065d392a9620c475e1451b673fa62dc50ac8e45248862a802a70cd0efb19ad67205b50e05df1588f91ef854e66860334a3
-AUX nas-1.9.4-fno-config.patch 1525 BLAKE2B 82c6158ccad4b4de043309022fe8ecbbf02f1f934aaa6f41524920b9725e027d983eff49d85ea55ce866409c31137e9293c5f5b04a10b24f759fefc1043f540a SHA512 4619e6027590763195483af3b77b1802f8d3c9a2c54dbcbccd4a0c6814c0add7d8f89c85cfd5a6bb39654a1e2f95f1b4762f2b6f038b781f35773b5541b0d0fd
 AUX nas-1.9.4-libfl.patch 349 BLAKE2B ee8d3ec8859fc47c87bf5d9a40cc2b468c136983a6b8dfb22d4c6469630b5dae92d3ec382ff7afc5ac2f94435ac8208059f90313a03700c4da7b93a19e34c05c SHA512 e4291fce8199f4340b969da6e2742e26ef6589e71ecc947a0fb1d68b9f995ae7dd514ad98232a4c11d1ebc7ea0ab3ea95674893fedbae7626c97c06c9ba88459
-AUX nas-1.9.4-remove-abs-fabs.patch 1164 BLAKE2B 1fd8fb65a12cb340c47ee80929e2617d278c84bca2231ed55806301fbbd69f2b820327d06aad9f3ac5b763183fabc0282470bf396e08193ce35d4482d742e821 SHA512 bb8753e6dac817ec5df490ee385619ce39fff6c033aa6171e7ff3da5df649fd30dbf405729b1d27d2e37a24be5c6e7782a713f5cf452a2b68dab63d639e39ffb
 AUX nas.conf.d 229 BLAKE2B 2ac8a6d914d02bc92258d7dfe3118e89ed6e3fe9d98e7a24eb8d72ded22dbb68a2d8129d066dc1457c0b8959f1762197b61f90502d3c60cdefd8aaeced04bbb3 SHA512 53cb9906d169b63b3592443bc0b63d59c4d0683e4b2194c60b1bc4297e6556f04b3ee9bf81da3a7f144757354de9aebe08c8445fccaa9a458a3b6537da68a2ac
 AUX nas.init.d 347 BLAKE2B 8b87c877fafd0e5993f909a4e132ed9f7042a3d8bdced8c7487afc962dfcad24a586ac754b99cbff815475f1326f44d52effb8eefd65cd0e25e6bc45991233af SHA512 556fc5d5135f789b0691de889aeaadce29319964443052787db5cb4cda480ed68c547c772de97c07ba2e0800f25cfa859376a3d80e9518995aae8136fe171468
-DIST nas-1.9.4.src.tar.gz 1464598 BLAKE2B d79ecda9f86a89d2d61bfadfeee4bb6a9feca6754bb88249b1eb3c1964e784d18098465f30f1b5bbb13d0550aebf48bb1b98aeb1b7c712f344a2eddc7720531b SHA512 3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb
-EBUILD nas-1.9.4-r2.ebuild 2603 BLAKE2B b1f3c96feeca4d97adef678829617ce2ae3c0adf39e2064228e7b8a5001b70002963ea4fea84250f1a4f806d9815ac21a26bbb11aceb966c17482c1d6047087e SHA512 77d9c6d62161e9f0191be43ceb0a8ceb28569a048e219fa65e94df3f80e42ea546012186ee7187f616a59a557d0de4ee9469907eeff8466ad944f16f37a14215
+DIST nas-1.9.5.tar.gz 1170144 BLAKE2B 81b063f888d66534f8779d6b0534397ada703868ff711c49b998fbf56bc6e4313fa245b6168fe9913936afa0685bab595df24f9f4bd5663dfa560c4b64534466 SHA512 051b32593e7ace09cf2d12720fb80e38d4f83f36858debacfb828c759e98b3e29401c76e3e3770f57fbbd1750a84b17a18e712f0de3dbe0ff56f2505c2488d9a
+EBUILD nas-1.9.5.ebuild 2497 BLAKE2B e9f53faa88c9b56e3712234da1f8ace27ef3f11d3f22357c316367ba9f793a4b11e7166dbfcc8a7b5db0558c7a89de04feb16f6fab77667aab951e5868a7228d SHA512 fed3e19e17354b67c05b127a608335f46a1cd775431e55f0cc7706f5b0659d4fe13fa70bef6091ea1eecda564c7804dab0292295690b9cccbca9db21ddef32de
 MISC metadata.xml 327 BLAKE2B 61fd2aff2796ecff70b16eb84bc90e9242cc3b08d8fb8fff9eb702310ad248ed2c0946fa3f974a420684ad9db4c47f871111ec1170e7d44eca89f263ce533f80 SHA512 bc1d1fa01d3ae21da48bc805c5f822cdff2f14f6a9c6c1ad5ee65063c265bd1c62efb3f45746fe9d1cbf55ff742c7812113f94068a47907042952016067310a7
diff --git a/media-libs/nas/files/nas-1.9.4-fno-config.patch b/media-libs/nas/files/nas-1.9.4-fno-config.patch
deleted file mode 100644
index e5ce72d37d9a..000000000000
--- a/media-libs/nas/files/nas-1.9.4-fno-config.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From f1e8e0da221152560efcb097c00539476071047c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Thu, 23 Jan 2020 13:43:12 +0100
-Subject: [PATCH] Fix building with GCC 10
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 10 defaults to -fno-common and as a result raises an arror when
-linking nasd:
-
-gcc -o nasd -O2 -fno-strict-aliasing   -Wl,-z,relro -Wl,--as-needed  -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld  -L../lib/audio -L/usr/lib64 -L/usr/lib64    dia/libdia.a dda/voxware/libvoxware.a os/libos.a
-/usr/bin/ld: dia/libdia.a(lex.o): in function `$d':
-lex.c:(.bss+0x48): multiple definition of `yyin'; dia/libdia.a(main.o):/builddir/build/BUILD/nas-1.9.4/server/dia/main.c:79: first defined here
-collect2: error: ld returned 1 exit status
-
-The reason is that both lex.c (generated from lex.l) and main.c
-define yyin global variable.
-
-This patch changes the main.c definition into a declaration.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- server/dia/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/server/dia/main.c b/server/dia/main.c
-index 462e89b..9ea2a12 100644
---- a/server/dia/main.c
-+++ b/server/dia/main.c
-@@ -76,7 +76,7 @@ static char *AuServerName(void);
- extern char *display;
- 
- static int restart = 0;
--FILE *yyin;                     /* for the config parser */
-+extern FILE *yyin;                     /* for the config parser */
- 
- void
- NotImplemented()
--- 
-2.26.2
-
diff --git a/media-libs/nas/files/nas-1.9.4-remove-abs-fabs.patch b/media-libs/nas/files/nas-1.9.4-remove-abs-fabs.patch
deleted file mode 100644
index 46ef6bb4610e..000000000000
--- a/media-libs/nas/files/nas-1.9.4-remove-abs-fabs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 212309075d26668f6e25f30754e646952843cf61 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Tue, 28 Apr 2015 18:56:46 -0600
-Subject: [PATCH] 
-
-On a uClibc system, the macro definitions of abs() and fabs()
- cause the build to fail.  Since these are specified by POSIX, it is safe to
- just drop their definition.  This has been tested on uClibc, glibc and musl.
-
-See: https://bugs.gentoo.org/show_bug.cgi?id=510766
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
----
- server/include/misc.h | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/server/include/misc.h b/server/include/misc.h
-index 2267ae0..fb904c8 100644
---- a/server/include/misc.h
-+++ b/server/include/misc.h
-@@ -71,12 +71,6 @@ typedef int Bool;
- 
- #define min(a, b) (((a) < (b)) ? (a) : (b))
- #define max(a, b) (((a) > (b)) ? (a) : (b))
--#ifndef abs
--#define abs(a) ((a) > 0 ? (a) : -(a))
--#endif
--#ifndef fabs
--#define fabs(a) ((a) > 0.0 ? (a) : -(a))        /* floating absolute value */
--#endif
- #define sign(x) ((x) < 0 ? -1 : ((x) > 0 ? 1 : 0))
- /* this assumes b > 0 */
- #define modulus(a, b, d)    if (((d) = (a) % (b)) < 0) (d) += (b)
--- 
-2.0.5
-
diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.5.ebuild
index de678c811d99..5087f4f1231a 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="Network Audio System"
 HOMEPAGE="https://radscan.com/nas.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
@@ -18,12 +18,12 @@ RDEPEND="
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+	x11-libs/libXau[${MULTILIB_USEDEP}]
 	x11-libs/libXaw
 	x11-libs/libXext
 	x11-libs/libXmu
 	x11-libs/libXpm
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
+	x11-libs/libXt[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/rman
@@ -31,16 +31,14 @@ BDEPEND="
 	sys-devel/flex
 	x11-base/xorg-proto
 	x11-misc/gccmakedep
-	riscv? ( >=x11-misc/xorg-cf-files-1.0.7-r1 )
+	riscv? ( x11-misc/xorg-cf-files )
 	>=x11-misc/imake-1.0.8-r1"
 
 DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.9.2-asneeded.patch"
-	"${FILESDIR}/${P}-remove-abs-fabs.patch"
-	"${FILESDIR}/${P}-libfl.patch"
-	"${FILESDIR}/${P}-fno-config.patch"
+	"${FILESDIR}/${PN}-1.9.4-libfl.patch"
 )
 
 src_prepare() {