Fix build on uclibc. Bug #510766.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

diff --git a/media-libs/nas/ChangeLog b/media-libs/nas/ChangeLog
index 07c0e06550b6bb646a3817026f27cb8f142acd17..f048f37de576e49c9a38ad8953f13bc9a4aee886 100644 (file)
--- a/media-libs/nas/ChangeLog
+++ b/media-libs/nas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/nas
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.92 2014/06/18 19:52:13 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.93 2015/04/29 16:40:13 blueness Exp $
+
+*nas-1.9.4-r1 (29 Apr 2015)
+
+  29 Apr 2015; Anthony G. Basile <blueness@gentoo.org>
+  +files/nas-1.9.4-remove-abs-fabs.patch, +nas-1.9.4-r1.ebuild:
+  Fix build on uclibc.  Bug #510766.
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> nas-1.9.4.ebuild:
   Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug

diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index dfde62021cf36964f64564f75c640ec8c76d14e4..321e7f968d7bcf59a564b09197b2b891aeb26f40 100644 (file)
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -2,28 +2,28 @@
 Hash: SHA256
 
 AUX nas-1.9.2-asneeded.patch 370 SHA256 edd82ef54414d0ded2d0e70ae1f3539099472014f774402caf919341d43e6b11 SHA512 09675986d17ca8273a4ea86946385b40bad76e377d70f0f74f3c997b90cbd2d0ae272b78d6cb63590832e3515a1b28c07330fde75cc3484986d88b8b55083fd0 WHIRLPOOL 787600fe626782f9b31a85904f2cff6439f85a49d389cb5e88f40a8a5eed8664ef480d6fdd1ddded7cf2f8b01fea2e2bcb57b116e07fff0ab32b8a6d0de54167
+AUX nas-1.9.4-remove-abs-fabs.patch 1164 SHA256 d9bce06f64387f6f25e08626561a56cf0d96de72ab7a2a9f1a1e9c19f4d32e31 SHA512 bb8753e6dac817ec5df490ee385619ce39fff6c033aa6171e7ff3da5df649fd30dbf405729b1d27d2e37a24be5c6e7782a713f5cf452a2b68dab63d639e39ffb WHIRLPOOL 9546e1f516514e976b24140078f3930fdc838f949e3e235e6ad0ce76301eb1a91e7c27289a22777c7f66f4d39db63b4507d219b3f5ed4e755747cb9229ca9ff6
 AUX nas.conf.d 229 SHA256 ff677ac27bfc0e38f044029e4320c119adf76e1d8519d369fb21513a36fb2660 SHA512 53cb9906d169b63b3592443bc0b63d59c4d0683e4b2194c60b1bc4297e6556f04b3ee9bf81da3a7f144757354de9aebe08c8445fccaa9a458a3b6537da68a2ac WHIRLPOOL bfda664542e9e15c1013ec3a6d8e0ec2761d0ead239d5c1a51bb5297602727279d273f1f55415a59aa2f24b243e0c7a603f10061dd1556a4966039ccba2249a6
 AUX nas.init.d 346 SHA256 740b41c4f1e40f69951fcaaf5a2b060cf6e371c9077e84286037d0f3613dc3b8 SHA512 4ca793aecc146c3e65f133e78cf80c1e0d7ca38bafed0c9f90c0d572fa22799491c1c8402e1d7ef35cb09ed92d8a8bab79c5714667c01f174832e814f11f0ce8 WHIRLPOOL 2369f560747c6aa9811138393fdd6b3f73b892f849939302475af78d2544e5921ee4c80594c93c5ff86043d08f888dc25983704664a2f51db6595f6f197a9130
 DIST nas-1.9.4.src.tar.gz 1464598 SHA256 cf36ea63751ce86cfd3b76c1659ce0d6a361a2e7cb34069854e156532703b39d SHA512 3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb WHIRLPOOL 6c8e13d18bb9824dafc722ae6bb29d8adbfb778c9feddef56b41da77faceb730a5dc265fc7b613ae491fab0e6dbc4ede47d2abb98b313d3408783aee4e9a5db2
+EBUILD nas-1.9.4-r1.ebuild 2436 SHA256 cba9d20db6177236f213f21864ac3a9fb60d86a68f86402c35ac1ef4b316f5f1 SHA512 058e3ee5090c60bab1962eac3595492d9de3c348e2a2140ff0d7950df861aed3d3f4e4e4a296bf5d18a97daed88f11f82618b2b9d20d00c5ad718f22bb23fc53 WHIRLPOOL 479431c3c57efa63728a52b794d0dba3accd0040fc440083d60841c3a2bf442bd70847f08ba00f8ef32fdb467e120b38325932932a0d5e03f9b31a3908f82985
 EBUILD nas-1.9.4.ebuild 2367 SHA256 e6a605f3e2053c9cd8511cf834328384c183ba54755de600e4db1abd04bd962f SHA512 cd059e7b214f98a6853222f421c7fa343eb002d93e33ff1167be9890458c6a496d7db729a1de02f2a83e9eb280dd4a584994884d802d6e5173e81111618ae60b WHIRLPOOL 1b23079814f721539331e99d1b58d64b55800d8e7c5b056edd92a4abfb7ce1ef6ef4c550f6274aea9d7ad4182b852e4a371a8137994466e88682823d84abf50a
-MISC ChangeLog 11418 SHA256 737a7ad4eeee6d0e4570cd23d4a1b9303844054b844ba766af06dd8cb0e12aed SHA512 f73c69967b8b5248d210a1e6731e5740c47bbc82ff147941c5d242ed472ba10c26357bb5ad8f842933fbb68d9b684531ff56826de065d0ea3e3bb4fe105875e8 WHIRLPOOL 0b8aa35f2a149a6f37adf938e6c8ab34d35408ed3f6bb85ce10184c7cfceebe4513507f7416fc5006cc661f0b3878ae38f36b5800941e9097fbed264e0c5340d
+MISC ChangeLog 11606 SHA256 5da46b09bd090cfe29c52d77df5a15deb86f1ffc935c8f45e2a44ec9c319e100 SHA512 bfa50c2e542ef986be1bb4cae94403fe5fc98a27f4b28a7f5d5afe3e9f46aedd30c0d81962e2b888f74d57f66a6e2a32c185096731f417b7ce0730c987bd1ccb WHIRLPOOL 3b860a34a6bf7b0b8e28ca864b1550d30e64c3c04d42e063acf1dfb2feec1d6aab79c437911d5328647eeab225f628f0e6208ae4616d8f284a000c131499ea71
 MISC metadata.xml 159 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369 SHA512 a77b80f2ab1799aab052edd575ad80daae01c717af7bd5bf3dcda15714b9afd2e9fd6553cc20b000bc3157915b7082641a92fda56de3a9b8362ae2488925e4b1 WHIRLPOOL 913c53cb00341537eff621357b1c5b8379bb63df52d18b88fdef0173cdfd7c60f6d1ece1d42b5d0fcda69ed73ab4138f4268c6394851b07a9411a8306fef9173
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJToe3vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOU50P/jWXnT0E5Z9iBOwIoQ4qKhx7
-FXoUglFVaWfRIJior3ZMTTBiJyVR7/q0NTdaTPOozpR1sU+G0I8yUA+PeQMq086+
-5Bb5DHYXCi3hHPOTdYzhSQmwvDy6wQGrViDMGpdV4azMABNtsLI7bdQ6Z4izXOHd
-eBUwtejlWj8/nFeNyUpaxjRtaItp1ZQPdAPd3kEnyhOlJOS6VQHMrXRR7ECNKIPM
-fCCVqUMS9HJyl0lB2f4MKT6NmvmX7orrDBVUzQL1+DNvzK8Rm4v52msK9IpSGpAp
-e+OBf0TBOa/hx3bUHX3S7e5dxcmNYJ7JJn4k3O2q1FxYQ0h8rLgm663ceLBonIRV
-vsX9VB0xoFCFS5PpbibOvjrIjbfhy4YLiTYmzDnkeHFdXNKcxzXvEBE2+O1HhM9U
-lyP9eiy5Im8/Tzb9IiQLm3RPHy71+FAiI9P3JBTCxhIlBtYeyLx1PWQ4XtxF3HXy
-7aaU5jz4asHBq8scguZBywNBj3X5WxqepXHWM4aDG1KbmqLx3uLNWuMWa7kGITb1
-q3fYDIlgh7cTj7lT/hAdY+6pwk/46qG1wNYDkqnwEcmgsV3Zni30y1Nkp3AJbROD
-oXTlT9qHAMqeZquQQbTytOB5m2A9VscPGUE/oqCcsAzOlawU0V5HBj6Rc9o+OoZP
-EV53kpG33KxcsFAz4ZKN
-=C1cj
+iQIcBAEBCAAGBQJVQQnCAAoJEJOE+m71LUu66O4P/1Ki1yaxGQEsHquB+DmO32No
+iU1SOXwruq58+t1TcUC1JBztEEMXPWl7rl3xZ/EUyz6HiWT5aUZ8GbefmjVngo+/
+qCTbxoEvxMtlIAcBH+/DlAYm17bPfHRN7kLCmdUzCWx3fYDyW4KN+Za4xkiQ+2dQ
+R6uETYtpbdqZZIfoE8JqK0fX9UB6r5TUr918ky4rEjrW1I86g0GRdwYNnjn3cnmD
+Oxd0uRoOkAjKMTs1y1e5D5IytlLckNyCVBPPl73f0bI7IfvLJuGC8NuqopmLYPWA
+HS65/O9il3mIarLexUK+nTIT448U3Muq1D7P2tzxeLHOv9rtk8/AWQgwDFX9YZdi
+JNuPULEzTQoe4pfgPa1LT7DUcyK3bGHQBguhIh+v+FcOVaVTGxUH23rrGW9qdPQL
+v8AihiNlIS5W6tkSHCj6tu3+uhBMRCg4Ig2jlgfuA8jL0yBV6t4vhBe+I6YQIFe2
+fSEsCEWa3Bd78JHx5gGgdAM7ea0+il8A0rhyKwSzgrJto7mG6wvZg73jwWS3LY/z
+OPUIo4QmxmeTgPotVhgx/CywANRlJ7J6J+hlweOI4CdqgslF2cUHLXNX3G58HNDM
+kxBXcGlxYaneBQiIieF8Uhp2o8we/K6M082j7dhUeKbY5YyvtPzrxXozv4HCEV1S
+GEiT71gB23u69C07O8SO
+=kIua
 -----END PGP SIGNATURE-----

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
new file mode 100644 (file)
index 0000000..46ef6bb
--- /dev/null
+++ b/media-libs/nas/files/nas-1.9.4-remove-abs-fabs.patch
@@ -0,0 +1,36 @@
+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-r1.ebuild b/media-libs/nas/nas-1.9.4-r1.ebuild
new file mode 100644 (file)
index 0000000..30abea6
--- /dev/null
+++ b/media-libs/nas/nas-1.9.4-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.9.4-r1.ebuild,v 1.1 2015/04/29 16:40:13 blueness Exp $
+
+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() {
+       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
+}