[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/files/, media-libs/nas/

2024-03-20 Thread Sam James 
commit: 2034f4dc27f765d1d8ab8eddaf4142a3286dfa29
Author: Eli Schwartz  gmail  com>
AuthorDate: Wed Mar 20 03:13:48 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 20 06:17:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2034f4dc

media-libs/nas: backport upstreamed patches to fix Modern C bugs

Closes: https://bugs.gentoo.org/873619
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 ...as-1.9.5-Correct-pointer-types-for-GCC-14.patch | 108 +++
 ...o-implicit-ints-and-function-declarations.patch | 834 +
 media-libs/nas/nas-1.9.5-r1.ebuild | 121 +++
 3 files changed, 1063 insertions(+)

diff --git 
a/media-libs/nas/files/nas-1.9.5-Correct-pointer-types-for-GCC-14.patch 
b/media-libs/nas/files/nas-1.9.5-Correct-pointer-types-for-GCC-14.patch
new file mode 100644
index ..1ed7dae2d48c
--- /dev/null
+++ b/media-libs/nas/files/nas-1.9.5-Correct-pointer-types-for-GCC-14.patch
@@ -0,0 +1,108 @@
+From cffa7bbc124f775520914a0cfb0ede619a05e07d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= 
+Date: Fri, 2 Feb 2024 16:05:11 +0100
+Subject: [PATCH] Correct pointer types for GCC 14
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GCC 14 became pickier about pointer types:
+
+auth.c:71:26: error: initialization of ‘int (*)()’ from incompatible pointer 
type ‘int (*)(short unsigned int,  char *)’ [-Wincompatible-pointer-types]
+   71 |  MitToID, MitFromID, MitRemoveCookie,
+  |  ^~~
+
+Including const correctness:
+
+audemo.c: In function ‘rescanCB’:
+audemo.c:524:23: error: passing argument 2 of ‘XawListChange’ from 
incompatible pointer type [-Wincompatible-pointer-types]
+  524 |   makeFileList(globals->fileNames, 
globals->numFiles),
+  |   
^~~
+  |   |
+  |   char **
+
+This patch fixes these errors.
+
+Signed-off-by: Petr Písař 
+---
+ clients/audio/audemo/audemo.c | 28 ++--
+ server/os/auth.c  |  2 +-
+ 2 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/clients/audio/audemo/audemo.c b/clients/audio/audemo/audemo.c
+index 5617cf7..e77b95d 100644
+--- a/clients/audio/audemo/audemo.c
 b/clients/audio/audemo/audemo.c
+@@ -500,11 +500,11 @@ newBucketCB(Widget w, XtPointer globalsp, XtPointer 
call_data)
+ static void
+ rescanCB(Widget w, XtPointer globalsp, XtPointer call_data)
+ {
+-GlobalDataPtr   globals = (GlobalDataPtr) globalsp;
+-static char*noFilesString = "No files found";
+-char   *dir,
+-   *template;
+-int i;
++GlobalDataPtr   globals = (GlobalDataPtr) globalsp;
++static const char   *noFilesString = "No files found";
++char*dir,
++*template;
++int i;
+ 
+ if (globals->numFiles)
+ {
+@@ -521,7 +521,7 @@ rescanCB(Widget w, XtPointer globalsp, XtPointer call_data)
+ if (globals->numFiles)
+ {
+   XawListChange(globals->samples,
+-makeFileList(globals->fileNames, globals->numFiles),
++(const char **)makeFileList(globals->fileNames, 
globals->numFiles),
+ globals->numFiles, -1, True);
+   XtSetSensitive(globals->samples, True);
+ }
+@@ -591,13 +591,13 @@ bucketPlayCB(Widget w, XtPointer globalsp, XtPointer 
call_data)
+ static void
+ bucketQueryCB(Widget w, XtPointer globalsp, XtPointer call_data)
+ {
+-GlobalDataPtr   globals = (GlobalDataPtr) globalsp;
++GlobalDataPtr   globals = (GlobalDataPtr) globalsp;
+ BucketDialogDataPtr buf = >buf;
+-chartmp[200],
+-access[4],
+-desc[COMMENT_LEN];
+-int i;
+-static char*noBucketString = "No buckets";
++chartmp[200],
++access[4],
++  desc[COMMENT_LEN];
++int i;
++static const char  *noBucketString = "No buckets";
+ 
+ if (buf->numBuckets)
+ {
+@@ -652,8 +652,8 @@ bucketQueryCB(Widget w, XtPointer globalsp, XtPointer 
call_data)
+ 
+ if (buf->numBuckets)
+ {
+-  XawListChange(buf->bucketList, buf->bucketText, buf->numBuckets, -1,
+-True);
++  XawListChange(buf->bucketList, (const char **)buf->bucketText,
++buf->numBuckets, -1, True);
+   XtSetSensitive(buf->bucketList, True);
+ }
+ else
+diff --git a/server/os/auth.c b/server/os/auth.c
+index a80a257..9488db7 100644
+--- a/server/os/auth.c
 b/server/os/auth.c
+@@ -55,7 +55,7 @@ struct protocol {
+ int (*Reset) ();/* delete all authorization data entries */
+ AuID(*ToID) (); /*

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/files/, media-libs/nas/

2024-03-20 Thread Sam James 
commit: 7818f58b4434cc9365e5ed88197a867cba381000
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 20 06:25:51 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 20 06:25:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7818f58b

media-libs/nas: move patches to devspace

Signed-off-by: Sam James  gentoo.org>

 media-libs/nas/Manifest|   1 +
 ...as-1.9.5-Correct-pointer-types-for-GCC-14.patch | 108 ---
 ...o-implicit-ints-and-function-declarations.patch | 834 -
 media-libs/nas/nas-1.9.5-r1.ebuild |   7 +-
 4 files changed, 3 insertions(+), 947 deletions(-)

diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index 350414fb2ed0..e2f9dc3ff219 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -1 +1,2 @@
+DIST nas-1.9.5-patches.tar.xz 7788 BLAKE2B 
54172eba6547b0890cdef7b87a38b7d85bf05ffbec2d459da6b66b48ce7e627a9c7a4c4d4550729d0c4acd3de99a0299d57d2cc75ecea74f745764f284a9d0e7
 SHA512 
dce3e68c3018aa0553b4c48baa66e37db4db54ed33aad388902e2b05c9dcc6e696b69b1c00f9adbcfddcd262ed65758ea5897a13856315edd522297814df0899
 DIST nas-1.9.5.tar.gz 1170144 BLAKE2B 
81b063f888d66534f8779d6b0534397ada703868ff711c49b998fbf56bc6e4313fa245b6168fe9913936afa0685bab595df24f9f4bd5663dfa560c4b64534466
 SHA512 
051b32593e7ace09cf2d12720fb80e38d4f83f36858debacfb828c759e98b3e29401c76e3e3770f57fbbd1750a84b17a18e712f0de3dbe0ff56f2505c2488d9a

diff --git 
a/media-libs/nas/files/nas-1.9.5-Correct-pointer-types-for-GCC-14.patch 
b/media-libs/nas/files/nas-1.9.5-Correct-pointer-types-for-GCC-14.patch
deleted file mode 100644
index 1ed7dae2d48c..
--- a/media-libs/nas/files/nas-1.9.5-Correct-pointer-types-for-GCC-14.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From cffa7bbc124f775520914a0cfb0ede619a05e07d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= 
-Date: Fri, 2 Feb 2024 16:05:11 +0100
-Subject: [PATCH] Correct pointer types for GCC 14
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 14 became pickier about pointer types:
-
-auth.c:71:26: error: initialization of ‘int (*)()’ from incompatible pointer 
type ‘int (*)(short unsigned int,  char *)’ [-Wincompatible-pointer-types]
-   71 |  MitToID, MitFromID, MitRemoveCookie,
-  |  ^~~
-
-Including const correctness:
-
-audemo.c: In function ‘rescanCB’:
-audemo.c:524:23: error: passing argument 2 of ‘XawListChange’ from 
incompatible pointer type [-Wincompatible-pointer-types]
-  524 |   makeFileList(globals->fileNames, 
globals->numFiles),
-  |   
^~~
-  |   |
-  |   char **
-
-This patch fixes these errors.
-
-Signed-off-by: Petr Písař 

- clients/audio/audemo/audemo.c | 28 ++--
- server/os/auth.c  |  2 +-
- 2 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/clients/audio/audemo/audemo.c b/clients/audio/audemo/audemo.c
-index 5617cf7..e77b95d 100644
 a/clients/audio/audemo/audemo.c
-+++ b/clients/audio/audemo/audemo.c
-@@ -500,11 +500,11 @@ newBucketCB(Widget w, XtPointer globalsp, XtPointer 
call_data)
- static void
- rescanCB(Widget w, XtPointer globalsp, XtPointer call_data)
- {
--GlobalDataPtr   globals = (GlobalDataPtr) globalsp;
--static char*noFilesString = "No files found";
--char   *dir,
--   *template;
--int i;
-+GlobalDataPtr   globals = (GlobalDataPtr) globalsp;
-+static const char   *noFilesString = "No files found";
-+char*dir,
-+*template;
-+int i;
- 
- if (globals->numFiles)
- {
-@@ -521,7 +521,7 @@ rescanCB(Widget w, XtPointer globalsp, XtPointer call_data)
- if (globals->numFiles)
- {
-   XawListChange(globals->samples,
--makeFileList(globals->fileNames, globals->numFiles),
-+(const char **)makeFileList(globals->fileNames, 
globals->numFiles),
- globals->numFiles, -1, True);
-   XtSetSensitive(globals->samples, True);
- }
-@@ -591,13 +591,13 @@ bucketPlayCB(Widget w, XtPointer globalsp, XtPointer 
call_data)
- static void
- bucketQueryCB(Widget w, XtPointer globalsp, XtPointer call_data)
- {
--GlobalDataPtr   globals = (GlobalDataPtr) globalsp;
-+GlobalDataPtr   globals = (GlobalDataPtr) globalsp;
- BucketDialogDataPtr buf = >buf;
--chartmp[200],
--access[4],
--desc[COMMENT_LEN];
--int i;
--static char*noBucketString = "No buckets";
-+chartmp[200],
-+access[4],
-+  desc[COMMENT_LEN];
-+int i;
-+static const char

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2024-03-20 Thread Sam James 
commit: b0be20cb5f11819c24b8418d2298995afa3379f8
Author: Eli Schwartz  gmail  com>
AuthorDate: Wed Mar 20 03:28:58 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 20 06:17:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0be20cb

media-libs/nas: mark as LTO-unsafe

Closes: https://bugs.gentoo.org/859934
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-libs/nas/nas-1.9.5-r1.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.5-r1.ebuild 
b/media-libs/nas/nas-1.9.5-r1.ebuild
index 8e1276acd78a..f8dd1d5ac36b 100644
--- a/media-libs/nas/nas-1.9.5-r1.ebuild
+++ b/media-libs/nas/nas-1.9.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit multilib multilib-minimal toolchain-funcs
+inherit flag-o-matic multilib multilib-minimal toolchain-funcs
 
 DESCRIPTION="Network Audio System"
 HOMEPAGE="https://radscan.com/nas.html;
@@ -52,6 +52,11 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+   # -Werror=lto-type-mismatch
+   # https://bugs.gentoo.org/859934
+   # https://sourceforge.net/p/nas/bugs/13/
+   filter-lto
+
# Need to run econf so that config.guess is updated
pushd config || die
econf

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2022-12-03 Thread Ionen Wolkens 
commit: 3b414dbc1a8f3b4025c9b629a3a0fa3d8e756ec1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Dec  4 05:26:58 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Dec  4 05:38:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b414dbc

media-libs/nas: workaround imake argument splitting

IMAKECPP normally doesn't support arguments but was given
the same basic support as IMAKEINCLUDE which doesn't handle
multiple spaces or tab, and an empty get_abi_CFLAGS would
result in two spaces without an argument.

So use an array and word splitting to normalize.

Closes: https://bugs.gentoo.org/884203
Signed-off-by: Ionen Wolkens  gentoo.org>

 media-libs/nas/nas-1.9.5.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.5.ebuild b/media-libs/nas/nas-1.9.5.ebuild
index d7e197596b34..361d40334d52 100644
--- a/media-libs/nas/nas-1.9.5.ebuild
+++ b/media-libs/nas/nas-1.9.5.ebuild
@@ -53,8 +53,10 @@ multilib_src_configure() {
pushd config || die
econf
popd || die
+
+   local cpp=($(get_abi_CHOST ${DEFAULT_ABI})-gcc $(get_abi_CFLAGS) -E) 
#884203
CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-   IMAKECPP="${IMAKECPP:-$(get_abi_CHOST ${DEFAULT_ABI})-gcc 
$(get_abi_CFLAGS) -E}" \
+   IMAKECPP="${IMAKECPP:-${cpp[*]}}" \
xmkmf -a || die
 }

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/files/, media-libs/nas/

2022-03-18 Thread Miroslav Šulc 
commit: 621b535d366a74524bfc90a075b353a9f96879da
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Mar 18 09:23:45 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Mar 18 09:23:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=621b535d

media-libs/nas: removed obsolete 1.9.4-r2

Bug: https://bugs.gentoo.org/show_bug.cgi?id=835124
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-libs/nas/Manifest|   1 -
 media-libs/nas/files/nas-1.9.4-fno-config.patch|  42 
 .../nas/files/nas-1.9.4-remove-abs-fabs.patch  |  36 ---
 media-libs/nas/nas-1.9.4-r2.ebuild | 115 -
 4 files changed, 194 deletions(-)

diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index ec48daf7ff4a..350414fb2ed0 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -1,2 +1 @@
-DIST nas-1.9.4.src.tar.gz 1464598 BLAKE2B 
d79ecda9f86a89d2d61bfadfeee4bb6a9feca6754bb88249b1eb3c1964e784d18098465f30f1b5bbb13d0550aebf48bb1b98aeb1b7c712f344a2eddc7720531b
 SHA512 
3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb
 DIST nas-1.9.5.tar.gz 1170144 BLAKE2B 
81b063f888d66534f8779d6b0534397ada703868ff711c49b998fbf56bc6e4313fa245b6168fe9913936afa0685bab595df24f9f4bd5663dfa560c4b64534466
 SHA512 
051b32593e7ace09cf2d12720fb80e38d4f83f36858debacfb828c759e98b3e29401c76e3e3770f57fbbd1750a84b17a18e712f0de3dbe0ff56f2505c2488d9a

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..
--- 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?= 
-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/lib64dia/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ř 

- 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..
--- 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" 
-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 

- 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.4-r2.ebuild
deleted file mode 100644
index de678c811d99..
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2022-03-18 Thread Arthur Zamarin 
commit: d658dacbbdb3ba7adef47c44d61dee384ccbef6b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 18 08:22:46 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 18 08:22:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d658dacb

media-libs/nas: Stabilize 1.9.5 arm, #835124

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/nas/nas-1.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.5.ebuild b/media-libs/nas/nas-1.9.5.ebuild
index ca009dd15609..5087f4f1231a 100644
--- a/media-libs/nas/nas-1.9.5.ebuild
+++ b/media-libs/nas/nas-1.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2022-03-16 Thread Jakov Smolić 
commit: ecc99fd9119f218605457b2f88438f7654722e7c
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Mar 16 08:09:28 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Mar 16 08:12:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecc99fd9

media-libs/nas: Stabilize 1.9.5 amd64, #835124

Signed-off-by: Jakov Smolić  gentoo.org>

 media-libs/nas/nas-1.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.5.ebuild b/media-libs/nas/nas-1.9.5.ebuild
index a2444e4130e4..ca009dd15609 100644
--- a/media-libs/nas/nas-1.9.5.ebuild
+++ b/media-libs/nas/nas-1.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc 
x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2022-03-15 Thread Jakov Smolić 
commit: 389134e693b5b836e2023c92527ccd9643f3e9bb
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Mar 15 12:33:15 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Mar 15 12:33:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=389134e6

media-libs/nas: Stabilize 1.9.5 arm64, #835124

Signed-off-by: Jakov Smolić  gentoo.org>

 media-libs/nas/nas-1.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.5.ebuild b/media-libs/nas/nas-1.9.5.ebuild
index 6befcc9f69fb..a2444e4130e4 100644
--- a/media-libs/nas/nas-1.9.5.ebuild
+++ b/media-libs/nas/nas-1.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc 
x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc 
x86"
 IUSE="doc static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2022-03-15 Thread Jakov Smolić 
commit: 00097e0e87f76a126aa68a6033b97c8881b87fd9
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Mar 15 09:38:33 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Mar 15 09:38:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00097e0e

media-libs/nas: Stabilize 1.9.5 x86, #835124

Signed-off-by: Jakov Smolić  gentoo.org>

 media-libs/nas/nas-1.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.5.ebuild b/media-libs/nas/nas-1.9.5.ebuild
index 4e8cf63d837e..6befcc9f69fb 100644
--- a/media-libs/nas/nas-1.9.5.ebuild
+++ b/media-libs/nas/nas-1.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc 
~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc 
x86"
 IUSE="doc static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2022-03-15 Thread Agostino Sarubbo 
commit: 4d18ecc69dd9d24d37228f2f5ae9fe6021b7a9cd
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Mar 15 07:41:19 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Mar 15 07:41:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d18ecc6

media-libs/nas: sparc stable wrt bug #835124

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/nas/nas-1.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.5.ebuild b/media-libs/nas/nas-1.9.5.ebuild
index 40fd0261ae7e..4e8cf63d837e 100644
--- a/media-libs/nas/nas-1.9.5.ebuild
+++ b/media-libs/nas/nas-1.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc 
~x86"
 IUSE="doc static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2022-03-15 Thread Agostino Sarubbo 
commit: 78fa6af265f45b3f0a1b99b8bdebd52d49b4f510
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Mar 15 07:41:03 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Mar 15 07:41:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78fa6af2

media-libs/nas: ppc64 stable wrt bug #835124

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/nas/nas-1.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.5.ebuild b/media-libs/nas/nas-1.9.5.ebuild
index fe53a272a79a..40fd0261ae7e 100644
--- a/media-libs/nas/nas-1.9.5.ebuild
+++ b/media-libs/nas/nas-1.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc 
~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
~x86"
 IUSE="doc static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2022-03-15 Thread Agostino Sarubbo 
commit: 28fc44b4eda26cafd4995357c1efabaf0d297be0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Mar 15 07:40:27 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Mar 15 07:40:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28fc44b4

media-libs/nas: ppc stable wrt bug #835124

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/nas/nas-1.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.5.ebuild b/media-libs/nas/nas-1.9.5.ebuild
index 187f2582bca7..fe53a272a79a 100644
--- a/media-libs/nas/nas-1.9.5.ebuild
+++ b/media-libs/nas/nas-1.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc 
~x86"
 IUSE="doc static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2022-02-04 Thread Miroslav Šulc 
commit: 80b16eb53a1cf575f086296cecc8ea125b486310
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Feb  4 08:44:16 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Feb  4 08:45:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b16eb5

media-libs/nas: bump to 1.9.5

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-libs/nas/Manifest |   1 +
 media-libs/nas/nas-1.9.5.ebuild | 113 
 2 files changed, 114 insertions(+)

diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index 07ffc8b6d401..ec48daf7ff4a 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -1 +1,2 @@
 DIST nas-1.9.4.src.tar.gz 1464598 BLAKE2B 
d79ecda9f86a89d2d61bfadfeee4bb6a9feca6754bb88249b1eb3c1964e784d18098465f30f1b5bbb13d0550aebf48bb1b98aeb1b7c712f344a2eddc7720531b
 SHA512 
3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb
+DIST nas-1.9.5.tar.gz 1170144 BLAKE2B 
81b063f888d66534f8779d6b0534397ada703868ff711c49b998fbf56bc6e4313fa245b6168fe9913936afa0685bab595df24f9f4bd5663dfa560c4b64534466
 SHA512 
051b32593e7ace09cf2d12720fb80e38d4f83f36858debacfb828c759e98b3e29401c76e3e3770f57fbbd1750a84b17a18e712f0de3dbe0ff56f2505c2488d9a

diff --git a/media-libs/nas/nas-1.9.5.ebuild b/media-libs/nas/nas-1.9.5.ebuild
new file mode 100644
index ..187f2582bca7
--- /dev/null
+++ b/media-libs/nas/nas-1.9.5.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Network Audio System"
+HOMEPAGE="https://radscan.com/nas.html;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="HPND MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+   x11-libs/libICE
+   x11-libs/libSM
+   x11-libs/libX11
+   x11-libs/libXau[${MULTILIB_USEDEP}]
+   x11-libs/libXaw
+   x11-libs/libXext
+   x11-libs/libXmu
+   x11-libs/libXpm
+   x11-libs/libXt[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   app-text/rman
+   sys-devel/bison
+   sys-devel/flex
+   x11-base/xorg-proto
+   x11-misc/gccmakedep
+   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}/${PN}-1.9.4-libfl.patch"
+)
+
+src_prepare() {
+   default
+   multilib_copy_sources
+}
+
+multilib_src_configure() {
+   # Need to run econf so that config.guess is updated
+   pushd config || die
+   econf
+   popd || die
+   CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+   IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
+}
+
+multilib_src_compile() {
+   # EXTRA_LDOPTIONS, SHLIBGLOBALSFLAGS #336564#c2
+   local emakeopts=(
+   AR="$(tc-getAR) cq"
+   AS="$(tc-getAS)"
+   CC="$(tc-getCC)"
+   CDEBUGFLAGS="${CFLAGS}"
+   CXX="$(tc-getCXX)"
+   CXXDEBUFLAGS="${CXXFLAGS}"
+   EXTRA_LDOPTIONS="${LDFLAGS}"
+   LD="$(tc-getLD)"
+   MAKE="${MAKE:-gmake}"
+   RANLIB="$(tc-getRANLIB)"
+   SHLIBGLOBALSFLAGS="${LDFLAGS}"
+   WORLDOPTS=
+   )
+
+   if multilib_is_native_abi ; then
+   # dumb fix for parallel make issue wrt #446598, Imake sux
+   emake "${emakeopts[@]}" -C server/dia all
+   emake "${emakeopts[@]}" -C server/dda/voxware all
+   emake "${emakeopts[@]}" -C server/os all
+   else
+   sed -i \
+   -e 's/SUBDIRS =.*/SUBDIRS = include lib config/' \
+   Makefile || die
+   fi
+
+   emake "${emakeopts[@]}"
+}
+
+multilib_src_install() {
+   # ranlib is used at install phase too wrt #446600
+   emake RANLIB="$(tc-getRANLIB)" \
+   DESTDIR="${D}" USRLIBDIR=/usr/$(get_libdir) \
+   install install.man
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   if use doc; then
+   docinto doc
+   dodoc doc/{actions,protocol.txt,README}
+   docinto pdf
+   dodoc doc/pdf/*.pdf
+   fi
+
+   mv -vf "${D}"/etc/nas/nasd.conf{.eg,} || die
+
+   newconfd "${FILESDIR}"/nas.conf.d nas
+   newinitd "${FILESDIR}"/nas.init.d nas
+
+   if ! use static-libs; then
+   rm -f "${D}"/usr/lib*/libaudio.a || die
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/, media-libs/nas/files/

2020-05-15 Thread Aaron Bauman 
commit: 78368340e8df47f36adcd144c744197eebadfff5
Author: Azamat H. Hackimov  gmail  com>
AuthorDate: Wed Mar 18 12:08:52 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri May 15 18:19:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78368340

media-libs/nas: fix compiling on gcc 10 (#707968)

Closes: https://bugs.gentoo.org/707968
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Azamat H. Hackimov  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15001
Signed-off-by: Aaron Bauman  gentoo.org>

 media-libs/nas/files/nas-1.9.4-fno-config.patch | 42 +
 media-libs/nas/nas-1.9.4-r2.ebuild  |  7 +++--
 2 files changed, 46 insertions(+), 3 deletions(-)

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 000..e5ce72d37d9
--- /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?= 
+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/lib64dia/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ř 
+---
+ 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 f83d66bb9d9..2965f1bf3de 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() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2019-05-14 Thread Aaron Bauman 
commit: 5e6f57acb6084131836ff651404d798719407cdd
Author: Aaron Bauman  gentoo  org>
AuthorDate: Wed May 15 01:03:55 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed May 15 01:04:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e6f57ac

media-libs/nas: arm64 stable

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"

 media-libs/nas/nas-1.9.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild 
b/media-libs/nas/nas-1.9.4-r2.ebuild
index 92f6289c98c..89172705683 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2019-04-20 Thread Sergei Trofimovich 
commit: 6716d68d72ce99869a493ba1f395bde7ab184b55
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Apr 20 07:29:43 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Apr 20 07:46:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6716d68d

media-libs/nas: stable 1.9.4-r2 for hppa, bug #664320

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/nas/nas-1.9.4-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild 
b/media-libs/nas/nas-1.9.4-r2.ebuild
index 6da098d928a..92f6289c98c 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2018-10-04 Thread Andreas Sturmlechner 
commit: b831f023e4eb9fc736f13b8faf5cb1dc9fe9558c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Oct  5 05:03:44 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Oct  5 05:48:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b831f023

media-libs/nas: Drop 1.9.4-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 media-libs/nas/nas-1.9.4-r1.ebuild | 99 --
 1 file changed, 99 deletions(-)

diff --git a/media-libs/nas/nas-1.9.4-r1.ebuild 
b/media-libs/nas/nas-1.9.4-r1.ebuild
deleted file mode 100644
index b32a29ee5f5..000
--- a/media-libs/nas/nas-1.9.4-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib toolchain-funcs multilib-minimal
-
-DESCRIPTION="Network Audio System"
-HOMEPAGE="http://radscan.com/nas.html;
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
-
-LICENSE="HPND MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="doc static-libs"
-
-RDEPEND="x11-libs/libICE
-   x11-libs/libSM
-   x11-libs/libX11
-   >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-   x11-libs/libXaw
-   x11-libs/libXext
-   x11-libs/libXmu
-   x11-libs/libXpm
-   >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-   app-text/rman
-   sys-devel/bison
-   sys-devel/flex
-   x11-base/xorg-proto
-   x11-misc/gccmakedep
-   x11-misc/imake"
-
-DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-1.9.2-asneeded.patch
-   epatch "${FILESDIR}"/${PN}-1.9.4-remove-abs-fabs.patch
-
-   multilib_copy_sources
-}
-
-multilib_src_configure() {
-   xmkmf -a || die
-}
-
-multilib_src_compile() {
-   # EXTRA_LDOPTIONS, SHLIBGLOBALSFLAGS #336564#c2
-   local emakeopts=(
-   AR="$(tc-getAR) clq"
-   AS="$(tc-getAS)"
-   CC="$(tc-getCC)"
-   CDEBUGFLAGS="${CFLAGS}"
-   CXX="$(tc-getCXX)"
-   CXXDEBUFLAGS="${CXXFLAGS}"
-   EXTRA_LDOPTIONS="${LDFLAGS}"
-   LD="$(tc-getLD)"
-   MAKE="${MAKE:-gmake}"
-   RANLIB="$(tc-getRANLIB)"
-   SHLIBGLOBALSFLAGS="${LDFLAGS}"
-   WORLDOPTS=
-   )
-
-   if multilib_is_native_abi ; then
-   # dumb fix for parallel make issue wrt #446598, Imake sux
-   emake "${emakeopts[@]}" -C server/dia all
-   emake "${emakeopts[@]}" -C server/dda/voxware all
-   emake "${emakeopts[@]}" -C server/os all
-   else
-   sed -i \
-   -e 's/SUBDIRS =.*/SUBDIRS = include lib config/' \
-   Makefile || die
-   fi
-
-   emake "${emakeopts[@]}" World
-}
-
-multilib_src_install() {
-   # ranlib is used at install phase too wrt #446600
-   emake RANLIB="$(tc-getRANLIB)" \
-   DESTDIR="${D}" USRLIBDIR=/usr/$(get_libdir) \
-   install install.man
-}
-
-multilib_src_install_all() {
-   einstalldocs
-   if use doc; then
-   docinto doc
-   dodoc doc/{actions,protocol.txt,README}
-   docinto pdf
-   dodoc doc/pdf/*.pdf
-   fi
-
-   mv -vf "${D}"/etc/nas/nasd.conf{.eg,} || die
-
-   newconfd "${FILESDIR}"/nas.conf.d nas
-   newinitd "${FILESDIR}"/nas.init.d nas
-
-   use static-libs || rm -f "${D}"/usr/lib*/libaudio.a
-}

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2018-10-04 Thread Markus Meier 
commit: bb4066edc90b428dfee85da554c7f703a547d9c2
Author: Markus Meier  gentoo  org>
AuthorDate: Fri Oct  5 04:48:16 2018 +
Commit: Markus Meier  gentoo  org>
CommitDate: Fri Oct  5 04:48:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb4066ed

media-libs/nas: arm stable, bug #664320

Signed-off-by: Markus Meier  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
RepoMan-Options: --include-arches="arm"

 media-libs/nas/nas-1.9.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild 
b/media-libs/nas/nas-1.9.4-r2.ebuild
index f7233ec5f96..6da098d928a 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2018-09-14 Thread Andreas Sturmlechner 
commit: 958a5bf6eda9e292bf9f1d8be02a29864e99acda
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Sep 14 20:10:13 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep 15 02:30:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=958a5bf6

media-libs/nas: Drop 1.9.4 (r0)

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-libs/nas/nas-1.9.4.ebuild | 98 -
 1 file changed, 98 deletions(-)

diff --git a/media-libs/nas/nas-1.9.4.ebuild b/media-libs/nas/nas-1.9.4.ebuild
deleted file mode 100644
index b4d725430ae..000
--- a/media-libs/nas/nas-1.9.4.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib toolchain-funcs multilib-minimal
-
-DESCRIPTION="Network Audio System"
-HOMEPAGE="http://radscan.com/nas.html;
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
-
-LICENSE="HPND MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="doc static-libs"
-
-RDEPEND="x11-libs/libICE
-   x11-libs/libSM
-   x11-libs/libX11
-   >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-   x11-libs/libXaw
-   x11-libs/libXext
-   x11-libs/libXmu
-   x11-libs/libXpm
-   >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-   app-text/rman
-   sys-devel/bison
-   sys-devel/flex
-   x11-base/xorg-proto
-   x11-misc/gccmakedep
-   x11-misc/imake"
-
-DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-1.9.2-asneeded.patch
-
-   multilib_copy_sources
-}
-
-multilib_src_configure() {
-   xmkmf -a || die
-}
-
-multilib_src_compile() {
-   # EXTRA_LDOPTIONS, SHLIBGLOBALSFLAGS #336564#c2
-   local emakeopts=(
-   AR="$(tc-getAR) clq"
-   AS="$(tc-getAS)"
-   CC="$(tc-getCC)"
-   CDEBUGFLAGS="${CFLAGS}"
-   CXX="$(tc-getCXX)"
-   CXXDEBUFLAGS="${CXXFLAGS}"
-   EXTRA_LDOPTIONS="${LDFLAGS}"
-   LD="$(tc-getLD)"
-   MAKE="${MAKE:-gmake}"
-   RANLIB="$(tc-getRANLIB)"
-   SHLIBGLOBALSFLAGS="${LDFLAGS}"
-   WORLDOPTS=
-   )
-
-   if multilib_is_native_abi ; then
-   # dumb fix for parallel make issue wrt #446598, Imake sux
-   emake "${emakeopts[@]}" -C server/dia all
-   emake "${emakeopts[@]}" -C server/dda/voxware all
-   emake "${emakeopts[@]}" -C server/os all
-   else
-   sed -i \
-   -e 's/SUBDIRS =.*/SUBDIRS = include lib config/' \
-   Makefile || die
-   fi
-
-   emake "${emakeopts[@]}" World
-}
-
-multilib_src_install() {
-   # ranlib is used at install phase too wrt #446600
-   emake RANLIB="$(tc-getRANLIB)" \
-   DESTDIR="${D}" USRLIBDIR=/usr/$(get_libdir) \
-   install install.man
-}
-
-multilib_src_install_all() {
-   einstalldocs
-   if use doc; then
-   docinto doc
-   dodoc doc/{actions,protocol.txt,README}
-   docinto pdf
-   dodoc doc/pdf/*.pdf
-   fi
-
-   mv -vf "${D}"/etc/nas/nasd.conf{.eg,} || die
-
-   newconfd "${FILESDIR}"/nas.conf.d nas
-   newinitd "${FILESDIR}"/nas.init.d nas
-
-   use static-libs || rm -f "${D}"/usr/lib*/libaudio.a
-}

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2018-09-14 Thread Tobias Klausmann 
commit: 7ff05bf551cb37512d34da2608bb24836c5360f2
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Fri Sep 14 10:17:38 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Fri Sep 14 10:17:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ff05bf5

media-libs/nas-1.9.4-r2: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/664320

 media-libs/nas/nas-1.9.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild 
b/media-libs/nas/nas-1.9.4-r2.ebuild
index 71eb1dabfaa..f7233ec5f96 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2018-08-25 Thread Sergei Trofimovich 
commit: 5de39fed46327c1bde4d2e51d8300f34cb103898
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Aug 25 18:47:46 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Aug 25 18:55:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5de39fed

media-libs/nas: stable 1.9.4-r2 for ppc64, bug #664320

Package-Manager: Portage-2.3.48, Repoman-2.3.10
RepoMan-Options: --include-arches="ppc64"

 media-libs/nas/nas-1.9.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild 
b/media-libs/nas/nas-1.9.4-r2.ebuild
index 289c2fdb112..71eb1dabfaa 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 
~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2018-08-25 Thread Sergei Trofimovich 
commit: b0a6374986c273807acb82d93030da8714b449fd
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Aug 25 18:18:23 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Aug 25 18:18:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0a63749

media-libs/nas: stable 1.9.4-r2 for ppc, bug #664320

Package-Manager: Portage-2.3.48, Repoman-2.3.10
RepoMan-Options: --include-arches="ppc"

 media-libs/nas/nas-1.9.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild 
b/media-libs/nas/nas-1.9.4-r2.ebuild
index bac82dad881..289c2fdb112 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 
~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 
~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2018-08-25 Thread Sergei Trofimovich 
commit: 0d3dc96fae62d8b3a3fe6381f04384c7a74e66df
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Aug 25 18:10:49 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Aug 25 18:10:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d3dc96f

media-libs/nas: stable 1.9.4-r2 for ia64, bug #664320

Package-Manager: Portage-2.3.48, Repoman-2.3.10
RepoMan-Options: --include-arches="ia64"

 media-libs/nas/nas-1.9.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild 
b/media-libs/nas/nas-1.9.4-r2.ebuild
index 44e154e0af4..bac82dad881 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 
~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 
~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2018-08-23 Thread Sergei Trofimovich 
commit: b4fcaa067f2084aaa5ccddec6338112ca4993831
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Aug 23 20:09:39 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Aug 23 20:13:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4fcaa06

media-libs/nas: stable 1.9.4-r2 for sparc, bug #664320

Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="sparc"

 media-libs/nas/nas-1.9.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild 
b/media-libs/nas/nas-1.9.4-r2.ebuild
index 6aefededb94..44e154e0af4 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 
~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2018-08-22 Thread Mikle Kolyada 
commit: 3083b45c35b404560c13f212bf087479e35b0931
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Aug 23 02:35:25 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Aug 23 02:35:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3083b45c

media-libs/nas: amd64 stable wrt bug #664320

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/nas/nas-1.9.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild 
b/media-libs/nas/nas-1.9.4-r2.ebuild
index 8f03e04d9cf..6aefededb94 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
x86 ~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2018-08-22 Thread Thomas Deutschmann 
commit: 0b5bd085dc3a8ef73cdbb796c1981d2d8eb1402c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Aug 23 01:36:38 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Aug 23 01:36:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b5bd085

media-libs/nas: x86 stable (bug #664320)

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-libs/nas/nas-1.9.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild 
b/media-libs/nas/nas-1.9.4-r2.ebuild
index 0d4e1ea4136..8f03e04d9cf 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
x86 ~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/files/, media-libs/nas/

2018-08-22 Thread Andreas Sturmlechner 
commit: 7463af2dd6beced4cdfdb0ca441f298bd07e6846
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug 22 22:17:09 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug 22 22:23:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7463af2d

media-libs/nas: EAPI-7, https, drop unused eutils,multilib

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-libs/nas/files/nas-1.9.2-asneeded.patch |  4 ++--
 media-libs/nas/nas-1.9.4-r2.ebuild| 23 +++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/media-libs/nas/files/nas-1.9.2-asneeded.patch 
b/media-libs/nas/files/nas-1.9.2-asneeded.patch
index 2ac89487a2c..8c588be136f 100644
--- a/media-libs/nas/files/nas-1.9.2-asneeded.patch
+++ b/media-libs/nas/files/nas-1.9.2-asneeded.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/show_bug.cgi?id=247761
 
 config/NetAudio.tmpl
-+++ config/NetAudio.tmpl
+--- a/config/NetAudio.tmpl
 b/config/NetAudio.tmpl
 @@ -162,7 +162,7 @@
  
AUDIODEPLIBS = $(DEPAULIB) $(DEPXTOOLLIB) $(DEPXLIB)

diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild 
b/media-libs/nas/nas-1.9.4-r2.ebuild
index f1d536a4f7b..909424ef8e2 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils multilib toolchain-funcs multilib-minimal
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="Network Audio System"
-HOMEPAGE="http://radscan.com/nas.html;
+HOMEPAGE="https://radscan.com/nas.html;
 SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
@@ -13,7 +14,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
~x86 ~x86-fbsd"
 IUSE="doc static-libs"
 
-RDEPEND="x11-libs/libICE
+RDEPEND="
+   x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
@@ -32,10 +34,13 @@ DEPEND="${RDEPEND}
 
 DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
 
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-1.9.2-asneeded.patch
-   epatch "${FILESDIR}"/${PN}-1.9.4-remove-abs-fabs.patch
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.9.2-asneeded.patch
+   "${FILESDIR}"/${PN}-1.9.4-remove-abs-fabs.patch
+)
 
+src_prepare() {
+   default
multilib_copy_sources
 }
 
@@ -99,5 +104,7 @@ multilib_src_install_all() {
newconfd "${FILESDIR}"/nas.conf.d nas
newinitd "${FILESDIR}"/nas.init.d nas
 
-   use static-libs || rm -f "${D}"/usr/lib*/libaudio.a
+   if ! use static-libs; then
+   rm -f "${D}"/usr/lib*/libaudio.a || die
+   fi
 }

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/, media-libs/nas/files/

2018-08-22 Thread Andreas Sturmlechner 
commit: 751e74cd39901a3f71efadaaa201e51ea50eb775
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug 22 22:23:01 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug 22 22:23:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=751e74cd

media-libs/nas: link against libfl

Thanks-to: Mihai Moldovan  ionic.de>
Closes: https://bugs.gentoo.org/612270
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-libs/nas/files/nas-1.9.4-libfl.patch | 12 
 media-libs/nas/nas-1.9.4-r2.ebuild |  1 +
 2 files changed, 13 insertions(+)

diff --git a/media-libs/nas/files/nas-1.9.4-libfl.patch 
b/media-libs/nas/files/nas-1.9.4-libfl.patch
new file mode 100644
index 000..cea30f46ba6
--- /dev/null
+++ b/media-libs/nas/files/nas-1.9.4-libfl.patch
@@ -0,0 +1,12 @@
+diff -pur nas-1.9.4-orig/server/Imakefile nas-1.9.4/server/Imakefile
+--- a/server/Imakefile 2013-04-27 02:41:06.0 +0200
 b/server/Imakefile 2017-03-14 18:58:27.445311356 +0100
+@@ -57,7 +57,7 @@ XCOMM $NCDId: @(#)Imakefile,v 1.17 1995/
+ 
+ # endif
+ #else
+-SYSLIBS =
++SYSLIBS = $(LEXLIB)
+ #endif
+ 
+ #ifdef NetBSDArchitecture

diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild 
b/media-libs/nas/nas-1.9.4-r2.ebuild
index 909424ef8e2..0d4e1ea4136 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -37,6 +37,7 @@ 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
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2017-06-19 Thread Alexis Ballier 
commit: 3ecb3f6f967d3664ff50fb7e1e8a0881b7c23c79
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Jun 19 11:41:51 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Jun 19 11:41:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ecb3f6f

media-libs/nas: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-libs/nas/nas-1.9.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild 
b/media-libs/nas/nas-1.9.4-r2.ebuild
index b7cf68e7935..dd390c7ea58 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
~x86 ~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="x11-libs/libICE

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2017-06-19 Thread Alexis Ballier 
commit: eea6d3c38330d2200b3021d828fb55dc7508e72e
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Jun 19 10:58:49 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Jun 19 10:58:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eea6d3c3

media-libs/nas: Run econf instead of letting the build system run configure 
itself.

It allows updating config.guess & co, needed for arm64. The build system also 
calls econf after unsetting CFLAGS...

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-libs/nas/nas-1.9.4-r2.ebuild | 103 +
 1 file changed, 103 insertions(+)

diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild 
b/media-libs/nas/nas-1.9.4-r2.ebuild
new file mode 100644
index 000..b7cf68e7935
--- /dev/null
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="Network Audio System"
+HOMEPAGE="http://radscan.com/nas.html;
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
+
+LICENSE="HPND MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~x86-fbsd"
+IUSE="doc static-libs"
+
+RDEPEND="x11-libs/libICE
+   x11-libs/libSM
+   x11-libs/libX11
+   >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+   x11-libs/libXaw
+   x11-libs/libXext
+   x11-libs/libXmu
+   x11-libs/libXpm
+   >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+   app-text/rman
+   sys-devel/bison
+   sys-devel/flex
+   x11-misc/gccmakedep
+   x11-misc/imake
+   >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+
+DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
+
+src_prepare() {
+   epatch "${FILESDIR}"/${PN}-1.9.2-asneeded.patch
+   epatch "${FILESDIR}"/${PN}-1.9.4-remove-abs-fabs.patch
+
+   multilib_copy_sources
+}
+
+multilib_src_configure() {
+   # Need to run econf so that config.guess is updated
+   pushd config || die
+   econf
+   popd || die
+   xmkmf -a || die
+}
+
+multilib_src_compile() {
+   # EXTRA_LDOPTIONS, SHLIBGLOBALSFLAGS #336564#c2
+   local emakeopts=(
+   AR="$(tc-getAR) clq"
+   AS="$(tc-getAS)"
+   CC="$(tc-getCC)"
+   CDEBUGFLAGS="${CFLAGS}"
+   CXX="$(tc-getCXX)"
+   CXXDEBUFLAGS="${CXXFLAGS}"
+   EXTRA_LDOPTIONS="${LDFLAGS}"
+   LD="$(tc-getLD)"
+   MAKE="${MAKE:-gmake}"
+   RANLIB="$(tc-getRANLIB)"
+   SHLIBGLOBALSFLAGS="${LDFLAGS}"
+   WORLDOPTS=
+   )
+
+   if multilib_is_native_abi ; then
+   # dumb fix for parallel make issue wrt #446598, Imake sux
+   emake "${emakeopts[@]}" -C server/dia all
+   emake "${emakeopts[@]}" -C server/dda/voxware all
+   emake "${emakeopts[@]}" -C server/os all
+   else
+   sed -i \
+   -e 's/SUBDIRS =.*/SUBDIRS = include lib config/' \
+   Makefile || die
+   fi
+
+   emake "${emakeopts[@]}" World
+}
+
+multilib_src_install() {
+   # ranlib is used at install phase too wrt #446600
+   emake RANLIB="$(tc-getRANLIB)" \
+   DESTDIR="${D}" USRLIBDIR=/usr/$(get_libdir) \
+   install install.man
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   if use doc; then
+   docinto doc
+   dodoc doc/{actions,protocol.txt,README}
+   docinto pdf
+   dodoc doc/pdf/*.pdf
+   fi
+
+   mv -vf "${D}"/etc/nas/nasd.conf{.eg,} || die
+
+   newconfd "${FILESDIR}"/nas.conf.d nas
+   newinitd "${FILESDIR}"/nas.init.d nas
+
+   use static-libs || rm -f "${D}"/usr/lib*/libaudio.a
+}

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2015-09-12 Thread Jeroen Roovers 
commit: 15840ebc0b39938ab06d17e0550c00bf877174e7
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Sep 12 09:46:24 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Sep 12 09:46:44 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15840ebc

media-libs/nas: Stable for HPPA (bug #559106).

Package-Manager: portage-2.2.20.1

 media-libs/nas/nas-1.9.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.4-r1.ebuild 
b/media-libs/nas/nas-1.9.4-r1.ebuild
index 443843d..5b124f5 100644
--- a/media-libs/nas/nas-1.9.4-r1.ebuild
+++ b/media-libs/nas/nas-1.9.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 
~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="x11-libs/libICE

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2015-09-05 Thread Mikle Kolyada 
commit: 2ac89e9363f98cf7e2b3d6442c4bb3a99bc91c80
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Sep  5 17:09:50 2015 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Sep  5 17:10:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ac89e93

media-libs/nas: amd64 stable wrt bug #559106

Package-Manager: portage-2.2.20.1

 media-libs/nas/nas-1.9.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.4-r1.ebuild 
b/media-libs/nas/nas-1.9.4-r1.ebuild
index 045d1cd..a25e2d8 100644
--- a/media-libs/nas/nas-1.9.4-r1.ebuild
+++ b/media-libs/nas/nas-1.9.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="x11-libs/libICE

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2015-09-05 Thread Anthony G. Basile 
commit: 27bf2447b813f7e724345994e0cfaae37b6b06de
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Sep  5 17:20:05 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Sep  5 17:20:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27bf2447

media-libs/nas: stable on arm, ppc, ppc64.  bug #559106.

Package-Manager: portage-2.2.20.1

 media-libs/nas/nas-1.9.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.4-r1.ebuild 
b/media-libs/nas/nas-1.9.4-r1.ebuild
index a25e2d8..443843d 100644
--- a/media-libs/nas/nas-1.9.4-r1.ebuild
+++ b/media-libs/nas/nas-1.9.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 
~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="x11-libs/libICE

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/

2015-08-30 Thread Tobias Klausmann 
commit: a3415dd453afec582a1cdd9c8d0e287a38f56f96
Author: Tobias Klausmann klausman AT gentoo DOT org
AuthorDate: Sun Aug 30 15:37:27 2015 +
Commit: Tobias Klausmann klausman AT gentoo DOT org
CommitDate: Sun Aug 30 15:37:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3415dd4

media-libs/nas: add alpha keyword

Gentoo-Bug: 559106

Package-Manager: portage-2.2.20.1

 media-libs/nas/nas-1.9.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/nas/nas-1.9.4-r1.ebuild 
b/media-libs/nas/nas-1.9.4-r1.ebuild
index 69107ee..045d1cd 100644
--- a/media-libs/nas/nas-1.9.4-r1.ebuild
+++ b/media-libs/nas/nas-1.9.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=mirror://sourceforge/${PN}/${P}.src.tar.gz
 
 LICENSE=HPND MIT
 SLOT=0
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~x86-fbsd
 IUSE=doc static-libs
 
 RDEPEND=x11-libs/libICE