diff options
Diffstat (limited to 'media-libs/nas')
| -rw-r--r-- | media-libs/nas/Manifest | 5 | ||||
| -rw-r--r-- | media-libs/nas/files/nas-1.9.2-asneeded.patch | 4 | ||||
| -rw-r--r-- | media-libs/nas/files/nas-1.9.4-libfl.patch | 12 | ||||
| -rw-r--r-- | media-libs/nas/nas-1.9.4-r2.ebuild | 26 |
4 files changed, 34 insertions, 13 deletions
diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest index 4036bda541cf..fadb67d63e4b 100644 --- a/media-libs/nas/Manifest +++ b/media-libs/nas/Manifest @@ -1,9 +1,10 @@ -AUX nas-1.9.2-asneeded.patch 370 BLAKE2B 4deff0ad4c2638facb8c166e722e02a467c7bc8599681696709fafdfa7f65cea569572f5b9052d0bba373cb3bd80fc7b8fbee1baddf14737e53c7c25991a5afe SHA512 09675986d17ca8273a4ea86946385b40bad76e377d70f0f74f3c997b90cbd2d0ae272b78d6cb63590832e3515a1b28c07330fde75cc3484986d88b8b55083fd0 +AUX nas-1.9.2-asneeded.patch 374 BLAKE2B a142f505190214db4f235ef8ec6283029c127b9b3c313b2405e6222a6f3d6d89931066d64a71b350b289ed07bed198bbc71a862396ef77d3fb5e7a2426b5abad SHA512 ad9275577d2e10f5201556e21f6251065d392a9620c475e1451b673fa62dc50ac8e45248862a802a70cd0efb19ad67205b50e05df1588f91ef854e66860334a3 +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-r1.ebuild 2290 BLAKE2B 5b7430bf135bff1254da018c4d430be7a064a021563789fc1c4ad95e8a67fded25c57b4ea310eacb05228575019f65466bcdf0f2fd4710d0dd5241386f0f76cc SHA512 db3dce97cbebeb460f7bde498526cf4b5a0554aca02458fa7a9030e968ff2d59b8d9110e8694cd446276c73f5e53fb2f35b981c2b59c6c6bb5de4e8cf8401187 -EBUILD nas-1.9.4-r2.ebuild 2400 BLAKE2B 3beb32f3da7b45b6d758f971e0f90e20841037b6fa78fa5cf34c01c87e70e1e92002fc23e42e272e5112b34c57a36ab59c9a5bb304667fd66e2f341f9d4773fe SHA512 6e9997c03681b545e040b92cb6438cfda3acb1fb675b5a7eb35e1f6d012f427de8d65b3102b7bafced8642c9442d7eb2e559d0f54dad3c10107ed9e14ab360fb +EBUILD nas-1.9.4-r2.ebuild 2452 BLAKE2B e55e420d62dad1ef02e082bf06ea305f1785cc4ed59f4814d83dc84ca79edd7cfe85b2d9aa8ee948e58d9a8d3983d750ee6de8e749bc414ff60780fd6daffe86 SHA512 871818d27a19eb361c055cac52b8afd798e3918c64ea4668309922ca2b47597583534b3b859b77357f05ff3eda2da23741acb4cc1ca9618620e1b9166c83d115 EBUILD nas-1.9.4.ebuild 2234 BLAKE2B 67b5e2f22991ea8418c40947790fddb5ac3b33edbe950d533bb5450b2e9bdba47f2a4a5bb7bf330390d7b970a31d988c3984985cd6fb0d405127d95feebfcb45 SHA512 312cb7a453b619d8d1cd95d347a145305d5033f9c7e25ce1c5dad0266bbc937af1dba5a571c270b0039f87cdddedab46c2007e18a2546476cd689553851938b5 MISC metadata.xml 326 BLAKE2B 837bd2d88bfc59121d0e166ae65c8d4732b8cdc6a898183bfb1fd984b5bc3e8e3a2c3f22d763a26664da7f97c9091fc9c3af8c419b3e9e39a7410989434ed739 SHA512 7a2a048b46af5cfd9167aec79f8a4f4e8a10f8327d1aec4b59330cdfdc7e4b90d9b9ab85e73e2b0a0e5db6b71bb729e7886dc3763a4d75d8ed4602b7b6cb61e7 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 2ac89487a2c8..8c588be136f2 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/files/nas-1.9.4-libfl.patch b/media-libs/nas/files/nas-1.9.4-libfl.patch new file mode 100644 index 000000000000..cea30f46ba69 --- /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.000000000 +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 f1d536a4f7b9..44e154e0af40 100644 --- a/media-libs/nas/nas-1.9.4-r2.ebuild +++ b/media-libs/nas/nas-1.9.4-r2.ebuild @@ -1,19 +1,21 @@ # 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" 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="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,14 @@ 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 + "${FILESDIR}"/${PN}-1.9.4-libfl.patch +) +src_prepare() { + default multilib_copy_sources } @@ -99,5 +105,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 } |