Removed explicit S=. Added explicit IUSE=. Added init script provided by Vaclav Slavik <vaclav.slavik@matfyz.cz> in bug #45689.

9 files changed, 117 insertions, 11 deletions

diff --git a/media-libs/nas/ChangeLog b/media-libs/nas/ChangeLog
index cabd303feb80..a3806332c659 100644
--- a/media-libs/nas/ChangeLog
+++ b/media-libs/nas/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/nas
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.14 2004/03/15 02:19:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.15 2004/03/26 17:04:51 eradicator Exp $
+
+*nas-1.6c-r1 (26 Mar 2004)
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> nas-1.5.ebuild,
+  nas-1.6.ebuild, nas-1.6c-r1.ebuild, nas-1.6c.ebuild, files/nas.conf.d,
+  files/nas.init.d:
+  Removed explicit S=. Added explicit IUSE=. Added init script provided by
+  Vaclav Slavik <vaclav.slavik@matfyz.cz> in bug #45689.
 
 *nas-1.6c (14 Mar 2004)
 
diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index 9a593986c430..65c3dededba9 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -1,8 +1,12 @@
-MD5 349e3777e5a6770759550050cb7d1290 nas-1.6.ebuild 1037
-MD5 656c347fefcb8191065a55072fa70341 nas-1.5.ebuild 1024
-MD5 428a1e0c2edfc70d6482d55ce2f9846b ChangeLog 2042
+MD5 a1a5ec5a44baaef186de48dc217d11d8 nas-1.6.ebuild 1028
+MD5 17771133e4a92570534ab713d3123bcf nas-1.6c-r1.ebuild 1638
+MD5 0910e69a977368e1153c628c46da50c3 nas-1.5.ebuild 1015
+MD5 0b32ed2f486545f7fafa2dd13c9ee48b ChangeLog 2369
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 d360d200f2ba87314077224670ef1b9b nas-1.6c.ebuild 1047
+MD5 285544271544eade372c0ae345d2a26e nas-1.6c.ebuild 1038
+MD5 83023e52672dc59996f4f620563b072a files/nas.conf.d 235
+MD5 3a25a8aa8628a950d4be1ad40514c01e files/nas.init.d 417
 MD5 8d4c92b527f79724412d1d1a77631c14 files/digest-nas-1.6c 65
+MD5 8d4c92b527f79724412d1d1a77631c14 files/digest-nas-1.6c-r1 65
 MD5 ac506d33fb676e68c2a77d95d3f6027e files/digest-nas-1.5 63
 MD5 4a7327fe2c6fba8c4315133a522358a3 files/digest-nas-1.6 64
diff --git a/media-libs/nas/files/digest-nas-1.6c-r1 b/media-libs/nas/files/digest-nas-1.6c-r1
new file mode 100644
index 000000000000..7bd4854014e2
--- /dev/null
+++ b/media-libs/nas/files/digest-nas-1.6c-r1
@@ -0,0 +1 @@
+MD5 0cae31069e6855ceb198757285faaec4 nas-1.6c.src.tar.gz 1114367
diff --git a/media-libs/nas/files/nas.conf.d b/media-libs/nas/files/nas.conf.d
new file mode 100644
index 000000000000..5c069e13203e
--- /dev/null
+++ b/media-libs/nas/files/nas.conf.d
@@ -0,0 +1,11 @@
+# Config file for /etc/init.d/nas
+
+# For information on options, see "/usr/X11R6/bin/nasd -h".
+
+NAS_OPTIONS=""
+
+# Allow only clients on local network to connect:
+#NAS_OPTIONS="-local"
+
+# Allow any client to connect:
+#NAS_OPTIONS="-aa"
diff --git a/media-libs/nas/files/nas.init.d b/media-libs/nas/files/nas.init.d
new file mode 100644
index 000000000000..4ad30c4add07
--- /dev/null
+++ b/media-libs/nas/files/nas.init.d
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/files/nas.init.d,v 1.1 2004/03/26 17:04:51 eradicator Exp $
+
+depend() {
+	need net
+	use alsasound
+}
+
+start() {
+	ebegin "Starting nas"
+	start-stop-daemon --start --quiet --exec /usr/X11R6/bin/nasd -- -b $NAS_OPTIONS
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping nas"
+	start-stop-daemon --stop --quiet --exec /usr/X11R6/bin/nasd
+	eend $?
+}
diff --git a/media-libs/nas/nas-1.5.ebuild b/media-libs/nas/nas-1.5.ebuild
index 004e3f1bb075..f873f84a0ba2 100644
--- a/media-libs/nas/nas-1.5.ebuild
+++ b/media-libs/nas/nas-1.5.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.5.ebuild,v 1.11 2004/03/15 02:19:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.5.ebuild,v 1.12 2004/03/26 17:04:51 eradicator Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Network Audio System"
 SRC_URI="http://radscan.com/nas/${P}.src.tar.gz"
 HOMEPAGE="http://radscan.com/nas.html"
@@ -11,6 +10,8 @@ SLOT="0"
 LICENSE="X11"
 KEYWORDS="x86 sparc ~ppc hppa alpha"
 
+IUSE=""
+
 # 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.
diff --git a/media-libs/nas/nas-1.6.ebuild b/media-libs/nas/nas-1.6.ebuild
index f27c1002ce50..41787b500e5d 100644
--- a/media-libs/nas/nas-1.6.ebuild
+++ b/media-libs/nas/nas-1.6.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.6.ebuild,v 1.11 2004/03/14 01:08:13 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.6.ebuild,v 1.12 2004/03/26 17:04:51 eradicator Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Network Audio System"
 SRC_URI="http://radscan.com/nas/${P}.src.tar.gz"
 HOMEPAGE="http://radscan.com/nas.html"
@@ -11,6 +10,8 @@ SLOT="0"
 LICENSE="X11"
 KEYWORDS="x86 ~sparc ppc hppa alpha amd64 ia64 ~mips"
 
+IUSE=""
+
 # 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.
diff --git a/media-libs/nas/nas-1.6c-r1.ebuild b/media-libs/nas/nas-1.6c-r1.ebuild
new file mode 100644
index 000000000000..71a1b5e56b19
--- /dev/null
+++ b/media-libs/nas/nas-1.6c-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.6c-r1.ebuild,v 1.1 2004/03/26 17:04:51 eradicator Exp $
+
+DESCRIPTION="Network Audio System"
+SRC_URI="http://radscan.com/nas/${P}.src.tar.gz"
+HOMEPAGE="http://radscan.com/nas.html"
+
+SLOT="0"
+LICENSE="X11"
+KEYWORDS="~x86 ~sparc ~ppc ~hppa ~alpha ~amd64 ~ia64 ~mips"
+
+IUSE=""
+
+# 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_compile() {
+	xmkmf
+	touch doc/man/lib/tmp.{_man,man}
+	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.eg
+
+	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"
+}
diff --git a/media-libs/nas/nas-1.6c.ebuild b/media-libs/nas/nas-1.6c.ebuild
index 5a7beac8ab0b..c8ea970f2e0f 100644
--- a/media-libs/nas/nas-1.6c.ebuild
+++ b/media-libs/nas/nas-1.6c.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.6c.ebuild,v 1.1 2004/03/15 02:19:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.6c.ebuild,v 1.2 2004/03/26 17:04:51 eradicator Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Network Audio System"
 SRC_URI="http://radscan.com/nas/${P}.src.tar.gz"
 HOMEPAGE="http://radscan.com/nas.html"
@@ -11,6 +10,8 @@ SLOT="0"
 LICENSE="X11"
 KEYWORDS="~x86 ~sparc ~ppc ~hppa ~alpha ~amd64 ~ia64 ~mips"
 
+IUSE=""
+
 # 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.