commit: 7463af2dd6beced4cdfdb0ca441f298bd07e6846 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Aug 22 22:17:09 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Aug 22 22:23:23 2018 +0000 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 }
