Rev bumping to 1.6c-r2

4 files changed, 80 insertions, 2 deletions

diff --git a/media-libs/nas/ChangeLog b/media-libs/nas/ChangeLog
index a90506f29aad..a4a7d2c30d47 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.25 2004/07/10 15:02:32 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.26 2004/07/10 17:21:52 kugelfang Exp $
+
+*nas-1.6c-r2 10 Jul 2004
+
+  10 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> +nas-1.6c-r1.ebuild:
+  Doing Jeremy a favour. Rev-bumping to -r2 and applying -header patch
+  unconditionally.
 
   10 Jul 2004; Danny van Dyk <kugelfang@gentoo.org>
   +files/nas-1.6c-header.patch, nas-1.6c-r1.ebuild:
diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index 50ac22845c5f..11830b073c90 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -1,9 +1,10 @@
-MD5 de222f905161fe54e5eab13b19ab5927 ChangeLog 3461
+MD5 0c09bef2faa312de6d093c17262358b1 ChangeLog 3651
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 002163cc6cfa0bf0a83c4f1c6d5e1607 nas-1.6.ebuild 1020
 MD5 d29c3d9ae8bbe352ef6c1c5e9c17ba31 nas-1.6c-r1.ebuild 1839
 MD5 13a61d04a20b645099bd84d72891bcd2 nas-1.6c.ebuild 1027
 MD5 af8c4ec9066a4de4e9fa29f7d2fab1be nas-1.5-r1.ebuild 1111
+MD5 348e8ac6e839ad076bbfb2858cf3063d nas-1.6c-r2.ebuild 1827
 MD5 410aefeb0f6a2d7a50d485282f9cac71 files/nas-1.6c-header.patch 313
 MD5 4a7327fe2c6fba8c4315133a522358a3 files/digest-nas-1.6 64
 MD5 8d4c92b527f79724412d1d1a77631c14 files/digest-nas-1.6c 65
@@ -12,3 +13,4 @@ MD5 83023e52672dc59996f4f620563b072a files/nas.conf.d 235
 MD5 e7719afac1d96eae6dbcd095d8161ef2 files/nas.init.d 572
 MD5 ac506d33fb676e68c2a77d95d3f6027e files/digest-nas-1.5-r1 63
 MD5 f0200b3a05bd59ab92413ec1eee10a5b files/nas-1.5-libaudioMakefile.patch 300
+MD5 8d4c92b527f79724412d1d1a77631c14 files/digest-nas-1.6c-r2 65
diff --git a/media-libs/nas/files/digest-nas-1.6c-r2 b/media-libs/nas/files/digest-nas-1.6c-r2
new file mode 100644
index 000000000000..7bd4854014e2
--- /dev/null
+++ b/media-libs/nas/files/digest-nas-1.6c-r2
@@ -0,0 +1 @@
+MD5 0cae31069e6855ceb198757285faaec4 nas-1.6c.src.tar.gz 1114367
diff --git a/media-libs/nas/nas-1.6c-r2.ebuild b/media-libs/nas/nas-1.6c-r2.ebuild
new file mode 100644
index 000000000000..f89190c5246c
--- /dev/null
+++ b/media-libs/nas/nas-1.6c-r2.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.6c-r2.ebuild,v 1.1 2004/07/10 17:21:52 kugelfang Exp $
+
+inherit eutils
+
+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 ~ppc64"
+
+IUSE="static"
+
+# 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}/${P}-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"
+}