Version bump for security bug 171428.

(Portage version: 2.1.2.3)

6 files changed, 31 insertions, 98 deletions

diff --git a/media-libs/nas/ChangeLog b/media-libs/nas/ChangeLog
index 2a856db9f00c..f3323cf0e6ca 100644
--- a/media-libs/nas/ChangeLog
+++ b/media-libs/nas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/nas
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.51 2007/03/09 03:08:07 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.52 2007/04/02 14:22:38 drac Exp $
+
+*nas-1.8b (02 Apr 2007)
+
+  02 Apr 2007; Samuli Suominen <drac@gentoo.org> -nas-1.8.ebuild,
+  -nas-1.8-r1.ebuild, +nas-1.8b.ebuild:
+  Version bump for security bug 171428.
 
 *nas-1.8-r1 (09 Mar 2007)
 *nas-1.7-r2 (09 Mar 2007)
diff --git a/media-libs/nas/files/digest-nas-1.8 b/media-libs/nas/files/digest-nas-1.8
deleted file mode 100644
index f4e08f1e7597..000000000000
--- a/media-libs/nas/files/digest-nas-1.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7e5ecab75a48c75b0c6305fcced34a97 nas-1.8.src.tar.gz 1290578
-RMD160 c7c99d7c3f66d8255bd5708325bd5c71c73b0a47 nas-1.8.src.tar.gz 1290578
-SHA256 e9b1e17f469c5db04f693c233886b78fce92fb48fe967976257eebadb09eb98d nas-1.8.src.tar.gz 1290578
diff --git a/media-libs/nas/files/digest-nas-1.8-r1 b/media-libs/nas/files/digest-nas-1.8-r1
deleted file mode 100644
index f4e08f1e7597..000000000000
--- a/media-libs/nas/files/digest-nas-1.8-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7e5ecab75a48c75b0c6305fcced34a97 nas-1.8.src.tar.gz 1290578
-RMD160 c7c99d7c3f66d8255bd5708325bd5c71c73b0a47 nas-1.8.src.tar.gz 1290578
-SHA256 e9b1e17f469c5db04f693c233886b78fce92fb48fe967976257eebadb09eb98d nas-1.8.src.tar.gz 1290578
diff --git a/media-libs/nas/files/digest-nas-1.8b b/media-libs/nas/files/digest-nas-1.8b
new file mode 100644
index 000000000000..bb32f195421e
--- /dev/null
+++ b/media-libs/nas/files/digest-nas-1.8b
@@ -0,0 +1,3 @@
+MD5 fcb9a74f4bf08f422a3d12c7e3698307 nas-1.8b.src.tar.gz 1465387
+RMD160 b3a4ee72ddc2d9a2e72d239ea2500b717022197a nas-1.8b.src.tar.gz 1465387
+SHA256 0030978ecf0f48722bed434b3bf538c7c5d6f6ce345ba63ec0b8aef4923723e6 nas-1.8b.src.tar.gz 1465387
diff --git a/media-libs/nas/nas-1.8-r1.ebuild b/media-libs/nas/nas-1.8-r1.ebuild
deleted file mode 100644
index 2bda4e617be4..000000000000
--- a/media-libs/nas/nas-1.8-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.8-r1.ebuild,v 1.1 2007/03/09 03:08:07 beandog Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Network Audio System"
-HOMEPAGE="http://radscan.com/nas.html"
-SRC_URI="http://radscan.com/nas/${P}.src.tar.gz"
-LICENSE="X11"
-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
-		)
-		virtual/x11
-	)"
-DEPEND="${RDEPEND}
-	|| (
-		( x11-misc/gccmakedep x11-misc/imake app-text/rman x11-proto/xproto )
-		virtual/x11
-	)"
-
-src_compile() {
-	xmkmf || die
-	touch doc/man/lib/tmp.{_man,man}
-	emake \
-		MAKE="${MAKE:-gmake}" CDEBUGFLAGS="${CFLAGS}" CXXDEBUFLAGS="${CXXFLAGS}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
-		RANLIB="$(tc-getRANLIB)" World || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	make DESTDIR=${D} install.man || die
-
-	dodoc BUGS BUILDNOTES FAQ HISTORY README RELEASE TODO
-	mv ${D}/usr/lib/X11/doc/html ${D}/usr/share/doc/${P}/
-	rmdir ${D}/usr/lib/X11/doc
-	use doc && dodoc doc/*.ps doc/protocol.txt doc/pdf/*.pdf doc/actions
-
-	# 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,}
-	sed -i -e 's,\(MixerInit.*\)"\(.*\)",\1"no",' ${D}/etc/nas/nasd.conf
-
-	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 to do so."
-	elog ""
-	elog "rc-update add nas default"
-}
diff --git a/media-libs/nas/nas-1.8.ebuild b/media-libs/nas/nas-1.8b.ebuild
index f0d4044525da..770f60d97043 100644
--- a/media-libs/nas/nas-1.8.ebuild
+++ b/media-libs/nas/nas-1.8b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.8.ebuild,v 1.1 2007/01/31 14:46:56 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.8b.ebuild,v 1.1 2007/04/02 14:22:38 drac Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,47 +11,41 @@ SRC_URI="http://radscan.com/nas/${P}.src.tar.gz"
 LICENSE="X11"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="|| (
-		(
-			x11-libs/libXt
-			x11-libs/libXau
-			x11-libs/libXaw
-			x11-libs/libX11
-			x11-libs/libXres
-			x11-libs/libXTrap
-			x11-libs/libXp
-		)
-		virtual/x11
-	)"
+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 )
-		virtual/x11
-	)"
+	x11-misc/gccmakedep
+	x11-misc/imake
+	app-text/rman
+	x11-proto/xproto"
 
 src_compile() {
-	xmkmf || die
+	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)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
-		RANLIB="$(tc-getRANLIB)" World || die
+		RANLIB="$(tc-getRANLIB)" World || die "emake failed."
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
-	make DESTDIR=${D} install.man || die
+	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install.man || die "emake install.man failed."
 
 	dodoc BUGS BUILDNOTES FAQ HISTORY README RELEASE TODO
-	mv ${D}/usr/lib/X11/doc/html ${D}/usr/share/doc/${P}/
-	rmdir ${D}/usr/lib/X11/doc
+	use doc && dodoc doc/*.ps doc/{actions,README} doc/pdf/*.pdf doc/*.txt
 
 	# 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,}
-	sed -i -e 's,\(MixerInit.*\)"\(.*\)",\1"no",' ${D}/etc/nas/nasd.conf
+	mv "${D}"/etc/nas/nasd.conf{.eg,}
+	sed -i -e 's,\(MixerInit.*\)"\(.*\)",\1"no",' "${D}"/etc/nas/nasd.conf
 
 	newconfd "${FILESDIR}"/nas.conf.d nas
 	newinitd "${FILESDIR}"/nas.init.d nas