Version bump wrt #369737 by Tim Harder. Exit in src_install() if the destination directory is missing the "nasd" executable to catch errors wrt #314631.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

2 files changed, 88 insertions, 2 deletions

diff --git a/media-libs/nas/ChangeLog b/media-libs/nas/ChangeLog
index b1948cb9acae..941b30a30db9 100644
--- a/media-libs/nas/ChangeLog
+++ b/media-libs/nas/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/nas
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.72 2010/10/31 11:08:59 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.73 2012/01/20 21:58:43 ssuominen Exp $
+
+*nas-1.9.3 (20 Jan 2012)
+
+  20 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> +nas-1.9.3.ebuild:
+  Version bump wrt #369737 by Tim Harder. Exit in src_install() if the
+  destination directory is missing the "nasd" executable to catch errors wrt
+  #314631.
 
 *nas-1.9.2-r1 (31 Oct 2010)
 
diff --git a/media-libs/nas/nas-1.9.3.ebuild b/media-libs/nas/nas-1.9.3.ebuild
new file mode 100644
index 000000000000..f8c86ef364de
--- /dev/null
+++ b/media-libs/nas/nas-1.9.3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.9.3.ebuild,v 1.1 2012/01/20 21:58:43 ssuominen Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Network Audio System"
+HOMEPAGE="http://radscan.com/nas.html"
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
+
+LICENSE="as-is MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc static-libs"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXaw
+	x11-libs/libXp
+	x11-libs/libXres
+	x11-libs/libXt
+	x11-libs/libXTrap"
+DEPEND="${RDEPEND}
+	app-text/rman
+	x11-misc/gccmakedep
+	x11-misc/imake
+	x11-proto/xproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch \
+		"${FILESDIR}"/${PN}-1.9.2-asneeded.patch \
+		"${FILESDIR}"/${PN}-1.9.2-implicit-inet_ntoa-amd64.patch
+}
+
+src_compile() {
+	xmkmf -a || die
+
+# I *think* this was because of missing -a switch in xmkmf, lets test without:
+#	touch doc/man/lib/tmp.{_man,man}
+
+	# EXTRA_LDOPTIONS, SHLIBGLOBALSFLAGS #336564#c2
+	emake \
+		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}" \
+		World || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.man || die
+	dodoc BUILDNOTES FAQ HISTORY README RELEASE TODO
+
+	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 || die
+	newinitd "${FILESDIR}"/nas.init.d nas || die
+
+	use static-libs || rm -f "${D}"/usr/lib*/libaudio.a
+
+	[[ -e ${D}/usr/bin/nasd ]] || \
+		die "Missing nasd executable in the destination directory. Exiting." #314631
+}