Version bump.

6 files changed, 92 insertions, 14 deletions

diff --git a/media-libs/nas/ChangeLog b/media-libs/nas/ChangeLog
index d4ca9cfeb134..6bc263d057e2 100644
--- a/media-libs/nas/ChangeLog
+++ b/media-libs/nas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/nas
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.33 2004/10/13 13:38:01 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.34 2004/11/17 06:00:08 eradicator Exp $
+
+*nas-1.7 (16 Nov 2004)
+
+  16 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> nas-1.5-r1.ebuild,
+  nas-1.6c-r2.ebuild, +nas-1.7.ebuild:
+  Version bump.
 
   13 Oct 2004; Guy Martin <gmsoft@gentoo.org> nas-1.6c-r2.ebuild:
   Stable on hppa.
diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index 8a6e48e771a5..f2574bc18492 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -1,12 +1,14 @@
-MD5 c7e340c2f81473bef7c252e6f8e40345 ChangeLog 4239
+MD5 fd167f62d4f9af42ecc241f44f8b39f5 nas-1.7.ebuild 1833
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 af8c4ec9066a4de4e9fa29f7d2fab1be nas-1.5-r1.ebuild 1111
 MD5 002163cc6cfa0bf0a83c4f1c6d5e1607 nas-1.6.ebuild 1020
+MD5 c7e340c2f81473bef7c252e6f8e40345 ChangeLog 4239
 MD5 e097b11db343641551e149214df3e191 nas-1.6c-r2.ebuild 1820
+MD5 520a4d59a7e5ce53b6130d9e920c064c files/digest-nas-1.7 64
 MD5 ac506d33fb676e68c2a77d95d3f6027e files/digest-nas-1.5-r1 63
 MD5 4a7327fe2c6fba8c4315133a522358a3 files/digest-nas-1.6 64
-MD5 8d4c92b527f79724412d1d1a77631c14 files/digest-nas-1.6c-r2 65
 MD5 f0200b3a05bd59ab92413ec1eee10a5b files/nas-1.5-libaudioMakefile.patch 300
-MD5 fa86b591efa17e2e000c996127a2c77f files/nas-1.6c-header.patch 264
 MD5 83023e52672dc59996f4f620563b072a files/nas.conf.d 235
 MD5 e533db5e64a7cf585a37091b49735c64 files/nas.init.d 569
+MD5 fa86b591efa17e2e000c996127a2c77f files/nas-1.6c-header.patch 264
+MD5 8d4c92b527f79724412d1d1a77631c14 files/digest-nas-1.6c-r2 65
diff --git a/media-libs/nas/files/digest-nas-1.7 b/media-libs/nas/files/digest-nas-1.7
new file mode 100644
index 000000000000..03723dcf4b59
--- /dev/null
+++ b/media-libs/nas/files/digest-nas-1.7
@@ -0,0 +1 @@
+MD5 c9918e9c9c95d587a95b455bbabe3b49 nas-1.7.src.tar.gz 1288569
diff --git a/media-libs/nas/nas-1.5-r1.ebuild b/media-libs/nas/nas-1.5-r1.ebuild
index 8bc65f65cddf..da2608964edb 100644
--- a/media-libs/nas/nas-1.5-r1.ebuild
+++ b/media-libs/nas/nas-1.5-r1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.5-r1.ebuild,v 1.2 2004/06/24 23:17:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.5-r1.ebuild,v 1.3 2004/11/17 06:00:08 eradicator Exp $
+
+IUSE=""
 
 inherit eutils
 
 DESCRIPTION="Network Audio System"
-SRC_URI="http://radscan.com/nas/${P}.src.tar.gz"
 HOMEPAGE="http://radscan.com/nas.html"
+SRC_URI="http://radscan.com/nas/${P}.src.tar.gz"
 
 SLOT="0"
 LICENSE="X11"
-KEYWORDS="x86 sparc ~ppc hppa alpha"
-
-IUSE=""
+KEYWORDS="alpha hppa ~ppc sparc x86"
 
 # This is ridculuous, we only need xmkmf, but no other package
 # provides it. 20020607 (Seemant): Actually, the homepage says it needs
diff --git a/media-libs/nas/nas-1.6c-r2.ebuild b/media-libs/nas/nas-1.6c-r2.ebuild
index 66bea600fe0f..170737e5a38f 100644
--- a/media-libs/nas/nas-1.6c-r2.ebuild
+++ b/media-libs/nas/nas-1.6c-r2.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.6c-r2.ebuild,v 1.5 2004/10/13 13:38:01 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.6c-r2.ebuild,v 1.6 2004/11/17 06:00:08 eradicator Exp $
+
+IUSE="static"
 
 inherit eutils
 
 DESCRIPTION="Network Audio System"
-SRC_URI="http://radscan.com/nas/${P}.src.tar.gz"
 HOMEPAGE="http://radscan.com/nas.html"
+SRC_URI="http://radscan.com/nas/${P}.src.tar.gz"
 
 SLOT="0"
 LICENSE="X11"
-KEYWORDS="x86 ~sparc ~ppc hppa alpha amd64 ~ia64 ~mips ppc64"
-
-IUSE="static"
+KEYWORDS="alpha amd64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86"
 
 # This is ridculuous, we only need xmkmf, but no other package
 # provides it. 20020607 (Seemant): Actually, the homepage says it needs
diff --git a/media-libs/nas/nas-1.7.ebuild b/media-libs/nas/nas-1.7.ebuild
new file mode 100644
index 000000000000..aaadd1d25861
--- /dev/null
+++ b/media-libs/nas/nas-1.7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.7.ebuild,v 1.1 2004/11/17 06:00:08 eradicator Exp $
+
+IUSE="static"
+
+inherit eutils
+
+DESCRIPTION="Network Audio System"
+HOMEPAGE="http://radscan.com/nas.html"
+SRC_URI="http://radscan.com/nas/${P}.src.tar.gz"
+
+SLOT="0"
+LICENSE="X11"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+# This is ridculuous, we only need xmkmf, but no other package
+# provides it. 20020607 (Seemant): Actually, the homepage says it needs
+# the entire X11 build environment, so this is ok.
+RDEPEND="virtual/x11"
+
+DEPEND="${RDEPEND}
+	sys-apps/sed"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.6c-header.patch
+}
+
+src_compile() {
+	xmkmf
+	touch doc/man/lib/tmp.{_man,man}
+	CFLAGS="-O2 -ggdb" emake World || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install.man || die
+
+	for i in ${D}/usr/X11R6/man/man?/*.?x
+	do
+		gzip -9 $i
+	done
+
+	dodoc BUGS BUILDNOTES FAQ HISTORY README RELEASE TODO
+	mv ${D}/usr/X11R6/lib/X11/doc/html ${D}/usr/share/doc/${P}/
+	rmdir ${D}/usr/X11R6/lib/X11/doc
+
+	# rename example nasd.conf.eg to nasd.conf and change it so that NAS
+	# doesn't change mixer's settings (inspired by Debian package):
+	mv ${D}/etc/nas/nasd.conf.eg ${D}/etc/nas/nasd.conf
+	dosed 's,\(MixerInit.*\)"\(.*\)",\1"no",' /etc/nas/nasd.conf
+
+	# Remove the static lib
+	use static || rm ${D}/usr/X11R6/lib/libaudio.a
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/nas.conf.d nas
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/nas.init.d nas
+}
+
+pkg_postinst() {
+	einfo "To enable NAS on boot you will have to add it to the"
+	einfo "default profile, issue the following command as root to do so."
+	einfo ""
+	einfo "rc-update add nas default"
+}