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.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 105 insertions, 3 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/Manifest b/media-libs/nas/Manifest
index e24846111cf5..0dfcea0ffce6 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -1,9 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nas-1.9.2-asneeded.patch 370 RMD160 dec7fec2b1a6a5447ef91522e2466eaf827b7d67 SHA1 b76be3bb0e71013460b6caebe770eb0044482fe1 SHA256 edd82ef54414d0ded2d0e70ae1f3539099472014f774402caf919341d43e6b11
 AUX nas-1.9.2-implicit-inet_ntoa-amd64.patch 269 RMD160 e3f581f4c6e7375e9c3a70f6b772ac19cc381739 SHA1 2166dd541b47a6cd5cffda47cfc4642b7fc99516 SHA256 3edc7c229a656b4b7da3cb03b637407e3242a7f731dedcb128a88fd31dd9db0b
 AUX nas.conf.d 229 RMD160 78a872de5559e9d49c75b51121b5f3987a852db4 SHA1 3c1ba61a2bf0b6d212044a9758b29de205ce1bec SHA256 ff677ac27bfc0e38f044029e4320c119adf76e1d8519d369fb21513a36fb2660
 AUX nas.init.d 557 RMD160 8a64d23e4eb61d9893989153e8efff58a33b0b55 SHA1 228bbc1e1c4a4246e1e7c417b8468f82eced41ad SHA256 49a2e6b93c17703bb98691aa1c32586cb1431ee3683acaef487cb0dd4c2b8775
 DIST nas-1.9.2.src.tar.gz 1484369 RMD160 89664029d76ad1e0aae9caceb207b92c1294c8ea SHA1 b1d439c87eef89838ad463c140d0b9ca0f823f5e SHA256 722d4f567f61e89e735277a0c1d3cfed98842160e3349bf956b1db525eacd2d3
+DIST nas-1.9.3.src.tar.gz 1485222 RMD160 693c97658885a9bea02b27376c3a5a142b49e57a SHA1 dca770ddd10936ad1f19bf3c51f941c10d7bf84b SHA256 cd2c12980f812d6c7e08f48d00a2b7f85a040b3f587b177d4c1f03600a6ae7a9
 EBUILD nas-1.9.2-r1.ebuild 1784 RMD160 ab3fd7bcc84d955726f77b26d525955325126504 SHA1 c060ae78c3e800dee99f02e95e424043b520895b SHA256 6e9fef5c39c6d0f88804f196e51ef084f27f9db8c17e7b868d7019335a0665ef
 EBUILD nas-1.9.2.ebuild 1714 RMD160 cf5112ee2df1889453a26cb3445c3cfc8b2ad238 SHA1 62aa3ea7075b5414ce1e891d758311a4217818ba SHA256 02254997d49d92fc75378393cb037d7cf8a70bfa3ea59f2f066666eb89bb2966
-MISC ChangeLog 8856 RMD160 6ed413b9c4cc213ede8bcd98ca84cb3ad8a661a3 SHA1 2e13c6301145401ea0384e16b2307aa546e5ad39 SHA256 f83b0eb583f258345e52866ef8adb3bc34cdf9779641126b452d739f9aaab669
+EBUILD nas-1.9.3.ebuild 1949 RMD160 fe3fc01d906cd049dee76b60f830fd583698ecda SHA1 05afc70efc963d7ccf1eb85a1eeffc479686dab7 SHA256 273efd42f35b2bf164413bb73a8f8775b78900a2b86575a49578354ea97bdb43
+MISC ChangeLog 9115 RMD160 719c5989217abf34d332a83854341ff3efcbfbeb SHA1 bb9355526597eeb635688c37657d16f0590592e4 SHA256 ad6ad9008ebe83fb76ac2f79fd1755ecd05a5febdea7d6c0671915b044e76f03
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPGeMaAAoJEEdUh39IaPFN00QIAJK8Ezk/vkL0RO5rcEuKVR1u
+/1rPyrlyMSe9D4KHeaibqjxo+8T+oUdWIADDv5ZArQa//78tDTxapeuvMbVIEf9G
+TdLMFxdcs8bQ517RawwgteR4MpWICLCu3C3dS+zP9VdjokXP5EXvNoi5WHDMB6lV
+hqhkld96O/1F/hH4b6QuEe0mVkzV9TZlzRsXpdgBZjXgYi5PGtGYztOqr0NPrK0X
+YUdazjzkCpaqebJalYtuVbVds5f72qtjgVY5OP0XvmVx7qkZqR7muR5+ZXrbYjpu
+lwWe1IsjbQoqVW4b5kTg6TIZh0/DUgugg4C0Npe5LlyZjJkMqnU1I8/OUctilrk=
+=E0zl
+-----END PGP SIGNATURE-----
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
+}