Fix implicit declaration of inet_ntoa wrt #323511 by Michał Górny.

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

4 files changed, 98 insertions, 2 deletions

diff --git a/media-libs/nas/ChangeLog b/media-libs/nas/ChangeLog
index 72d52199ae8a..b1948cb9acae 100644
--- a/media-libs/nas/ChangeLog
+++ b/media-libs/nas/ChangeLog
@@ -1,6 +1,12 @@
 # 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.71 2010/04/16 17:35:39 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.72 2010/10/31 11:08:59 ssuominen Exp $
+
+*nas-1.9.2-r1 (31 Oct 2010)
+
+  31 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> +nas-1.9.2-r1.ebuild,
+  +files/nas-1.9.2-implicit-inet_ntoa-amd64.patch:
+  Fix implicit declaration of inet_ntoa wrt #323511 by Michał Górny.
 
   16 Apr 2010; Brent Baude <ranger@gentoo.org> nas-1.9.2.ebuild:
   stable ppc, bug 303715
diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index 25ea3b6cfa66..e24846111cf5 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -1,7 +1,9 @@
 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
+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 8625 RMD160 bb8ff4d8df06276b3efbcba3c8cb8969c4f65b03 SHA1 ceb4f997f2356052db1e66a2a8c674d2a87aac74 SHA256 ff1a9e3647f195650338c9241560d860693d1e5a61085fe92ed43fa4f1d4297e
+MISC ChangeLog 8856 RMD160 6ed413b9c4cc213ede8bcd98ca84cb3ad8a661a3 SHA1 2e13c6301145401ea0384e16b2307aa546e5ad39 SHA256 f83b0eb583f258345e52866ef8adb3bc34cdf9779641126b452d739f9aaab669
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
diff --git a/media-libs/nas/files/nas-1.9.2-implicit-inet_ntoa-amd64.patch b/media-libs/nas/files/nas-1.9.2-implicit-inet_ntoa-amd64.patch
new file mode 100644
index 000000000000..978a2f11fdf3
--- /dev/null
+++ b/media-libs/nas/files/nas-1.9.2-implicit-inet_ntoa-amd64.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/323511
+
+--- server/os/connection.c
++++ server/os/connection.c
+@@ -75,9 +75,9 @@ SOFTWARE.
+ #include <sys/socket.h>
+ #include <sys/stat.h>
+ #include <netinet/in.h>
+-#include <arpa/inet.h>
+ #include <netdb.h>
+ #endif
++#include <arpa/inet.h>
+ 
+ 
+ 
+
diff --git a/media-libs/nas/nas-1.9.2-r1.ebuild b/media-libs/nas/nas-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..31884e20c7ca
--- /dev/null
+++ b/media-libs/nas/nas-1.9.2-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.9.2-r1.ebuild,v 1.1 2010/10/31 11:08:59 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="MIT as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="x11-libs/libXt
+	x11-libs/libXau
+	x11-libs/libXaw
+	x11-libs/libX11
+	x11-libs/libXres
+	x11-libs/libXTrap
+	x11-libs/libXp"
+DEPEND="${RDEPEND}
+	x11-misc/gccmakedep
+	x11-misc/imake
+	app-text/rman
+	x11-proto/xproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-implicit-inet_ntoa-amd64.patch
+}
+
+src_compile() {
+	xmkmf || die "xmkmf failed"
+	touch doc/man/lib/tmp.{_man,man}
+	emake \
+		MAKE="${MAKE:-gmake}" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		CXXDEBUFLAGS="${CXXFLAGS}" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR) clq" \
+		AS="$(tc-getAS)" \
+		LD="$(tc-getLD)" \
+		RANLIB="$(tc-getRANLIB)" World || die "emake World failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install install.man || die "emake install failed"
+	dodoc BUILDNOTES FAQ HISTORY README RELEASE TODO
+
+	if use doc; then
+		docinto doc
+		dodoc doc/{actions,protocol.txt,README}
+		insinto /usr/share/doc/${PF}/pdf
+		doins doc/pdf/*.pdf
+	fi
+
+	mv "${D}"/etc/nas/nasd.conf{.eg,}
+
+	newconfd "${FILESDIR}"/nas.conf.d nas
+	newinitd "${FILESDIR}"/nas.init.d nas
+}
+
+pkg_postinst() {
+	elog "To enable NAS on boot you will have to add it to the"
+	elog "default profile, issue the following command as root:"
+	elog "# rc-update add nas default"
+}