gentoo resync : 30.05.2020

3 files changed, 48 insertions, 4 deletions

diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index 81ebbf36ab4e..93fdefef2923 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -1,8 +1,9 @@
 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 2430 BLAKE2B 0d35757c1281174fb718b6c3c0c98fe9140902938b205c68bf6a105ee7ca5e32d1498e3ef541a77fd20337f94eee9b194afcd8dcb33bf8c9c53698309ef488ef SHA512 741300d9b381ed29175da4dbbad2986a418745d533946649212923167cff664428ae5e061a81d7d639b1feb368c3833c57c5226c0361987c3a571198e73bd268
+EBUILD nas-1.9.4-r2.ebuild 2453 BLAKE2B c774cff40be416f75b4ce9a8e5b4c8d94bb5a4df38f1a9fbe2ef525eb22b522087b59381764b9adc2350a7facc2dda561b86cfa57fad13457ec9e8b9429b2b47 SHA512 7133590ecd846dee2b73f5b0a7e2e6e43332f6e3fc952ac1f4c95b102053c4352ee345bca7b83bceec39884276c2f5c7754cb67c6176acfe2ab276a6871e4e1f
 MISC metadata.xml 326 BLAKE2B 837bd2d88bfc59121d0e166ae65c8d4732b8cdc6a898183bfb1fd984b5bc3e8e3a2c3f22d763a26664da7f97c9091fc9c3af8c419b3e9e39a7410989434ed739 SHA512 7a2a048b46af5cfd9167aec79f8a4f4e8a10f8327d1aec4b59330cdfdc7e4b90d9b9ab85e73e2b0a0e5db6b71bb729e7886dc3763a4d75d8ed4602b7b6cb61e7
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
new file mode 100644
index 000000000000..e5ce72d37d9a
--- /dev/null
+++ b/media-libs/nas/files/nas-1.9.4-fno-config.patch
@@ -0,0 +1,42 @@
+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/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.4-r2.ebuild
index f83d66bb9d9a..2965f1bf3de9 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -35,9 +35,10 @@ DEPEND="${RDEPEND}
 DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.2-asneeded.patch
-	"${FILESDIR}"/${PN}-1.9.4-remove-abs-fabs.patch
-	"${FILESDIR}"/${PN}-1.9.4-libfl.patch
+	"${FILESDIR}/${PN}-1.9.2-asneeded.patch"
+	"${FILESDIR}/${P}-remove-abs-fabs.patch"
+	"${FILESDIR}/${P}-libfl.patch"
+	"${FILESDIR}/${P}-fno-config.patch"
 )
 
 src_prepare() {