Touchup ebuild, add support for modular X, and add arm KEYWORDS.

Package-Manager: portage-2.1_pre3-r1

3 files changed, 50 insertions, 35 deletions

diff --git a/media-libs/nas/ChangeLog b/media-libs/nas/ChangeLog
index c141e0700718..a7cfeb99a85a 100644
--- a/media-libs/nas/ChangeLog
+++ b/media-libs/nas/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/nas
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.43 2005/08/24 16:54:19 flameeyes Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.44 2006/01/05 04:33:34 vapier Exp $
+
+  05 Jan 2006; Mike Frysinger <vapier@gentoo.org> nas-1.7-r1.ebuild:
+  Touchup ebuild, add support for modular X, and add arm KEYWORDS.
 
   24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> nas-1.7-r1.ebuild:
   Use newconfd/newinitd.
diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index 338198923e29..40d3c1606e10 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ce54d0007584484f97f65f7801764cd4 ChangeLog 5440
-MD5 b8146b42d6df26229f2cdffcf4d549d7 nas-1.6c-r2.ebuild 1820
-MD5 3b67c96b73c8cb790b25e8b1bf14df3c nas-1.5-r1.ebuild 1109
-MD5 9de655765f4ba715b60ffd73a62c74e1 nas-1.6.ebuild 1018
-MD5 52c62b4ba503baefb212d945d46ee1a1 nas-1.7-r1.ebuild 1632
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 0626f895b20c5da1096b952a129cf277 nas-1.7.ebuild 1827
-MD5 8d4c92b527f79724412d1d1a77631c14 files/digest-nas-1.6c-r2 65
-MD5 f0200b3a05bd59ab92413ec1eee10a5b files/nas-1.5-libaudioMakefile.patch 300
+MD5 27ded6a87530cbd81347cf32d2d1e5ba ChangeLog 5574
 MD5 ac506d33fb676e68c2a77d95d3f6027e files/digest-nas-1.5-r1 63
 MD5 4a7327fe2c6fba8c4315133a522358a3 files/digest-nas-1.6 64
-MD5 fa86b591efa17e2e000c996127a2c77f files/nas-1.6c-header.patch 264
+MD5 8d4c92b527f79724412d1d1a77631c14 files/digest-nas-1.6c-r2 65
+MD5 520a4d59a7e5ce53b6130d9e920c064c files/digest-nas-1.7 64
 MD5 520a4d59a7e5ce53b6130d9e920c064c files/digest-nas-1.7-r1 64
+MD5 f0200b3a05bd59ab92413ec1eee10a5b files/nas-1.5-libaudioMakefile.patch 300
+MD5 fa86b591efa17e2e000c996127a2c77f files/nas-1.6c-header.patch 264
 MD5 7967799b246c81b4ee91254561192584 files/nas-1.7-gcc4.patch 442
 MD5 53c1b622336ab2a0dabb9da8e69f7f56 files/nas-1.7-header.patch 774
-MD5 520a4d59a7e5ce53b6130d9e920c064c files/digest-nas-1.7 64
 MD5 83023e52672dc59996f4f620563b072a files/nas.conf.d 235
 MD5 e533db5e64a7cf585a37091b49735c64 files/nas.init.d 569
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 3b67c96b73c8cb790b25e8b1bf14df3c nas-1.5-r1.ebuild 1109
+MD5 9de655765f4ba715b60ffd73a62c74e1 nas-1.6.ebuild 1018
+MD5 b8146b42d6df26229f2cdffcf4d549d7 nas-1.6c-r2.ebuild 1820
+MD5 ab4759c7c3c6f9cde27b03c101e1e544 nas-1.7-r1.ebuild 1902
+MD5 0626f895b20c5da1096b952a129cf277 nas-1.7.ebuild 1827
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDDKZXj5H05b2HAEkRAuOpAJ0b6n1EXyQWORaZkKAUMHAkoEjYqACfVz8Z
-37sOhFBKV+7B7oQays4rGq0=
-=HhGU
+iD8DBQFDvKHd2+ySkm8kpY0RAvGVAJ0SY2I3uvnLDjE078q3vO94oD2XZACeJ1EL
+dJz8x0lnIf+a7qhhx1ayhho=
+=JNNe
 -----END PGP SIGNATURE-----
diff --git a/media-libs/nas/nas-1.7-r1.ebuild b/media-libs/nas/nas-1.7-r1.ebuild
index 588c6fe1dec7..24f9fc9fbbcb 100644
--- a/media-libs/nas/nas-1.7-r1.ebuild
+++ b/media-libs/nas/nas-1.7-r1.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.7-r1.ebuild,v 1.8 2005/08/24 16:54:19 flameeyes Exp $
-
-IUSE="static"
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.7-r1.ebuild,v 1.9 2006/01/05 04:33:34 vapier Exp $
 
 inherit eutils
 
@@ -10,26 +8,43 @@ 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"
-
-RDEPEND="virtual/x11"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
 
+RDEPEND="|| (
+		(
+			x11-libs/libXt
+			x11-libs/libXau
+			x11-libs/libXaw
+			x11-libs/libX11
+			x11-libs/libXres
+			x11-libs/libXTrap
+		)
+		virtual/x11
+	)"
 DEPEND="${RDEPEND}
-	sys-apps/sed"
+	|| (
+		( x11-misc/gccmakedep x11-misc/imake app-text/rman x11-proto/xproto )
+		virtual/x11
+	)"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-header.patch
-	epatch ${FILESDIR}/${P}-gcc4.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-header.patch
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+	sed -i \
+		-e "/^[ 	]*CDEBUGFLAGS/s:=.*:=${CFLAGS}:" \
+		-e "/^[ 	]*CXXDEBUGFLAGS/s:=.*:=${CXXFLAGS}:" \
+		$(find -name Makefile) || die
 }
 
 src_compile() {
-	xmkmf
+	xmkmf || die
 	touch doc/man/lib/tmp.{_man,man}
-	CFLAGS="-O2 -ggdb" emake World || die
+	emake World || die
 }
 
 src_install () {
@@ -50,11 +65,8 @@ src_install () {
 	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
-
-	newconfd ${FILESDIR}/nas.conf.d nas
-	newinitd ${FILESDIR}/nas.init.d nas
+	newconfd "${FILESDIR}"/nas.conf.d nas
+	newinitd "${FILESDIR}"/nas.init.d nas
 }
 
 pkg_postinst() {