Fix some QA issues

(Portage version: 2.1.6.11/cvs/Linux x86_64)

4 files changed, 23 insertions, 21 deletions

diff --git a/net-im/naim/ChangeLog b/net-im/naim/ChangeLog
index 6b1da9cdf9a4..82af99045812 100644
--- a/net-im/naim/ChangeLog
+++ b/net-im/naim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/naim
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/naim/ChangeLog,v 1.68 2008/08/05 17:45:05 gentoofan23 Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/naim/ChangeLog,v 1.69 2009/05/09 20:13:29 gentoofan23 Exp $
+
+  09 May 2009; Thomas Anderson <gentoofan23@gentoo.org>
+  naim-0.11.7.2.ebuild, naim-0.11.8.2.1.ebuild, naim-0.11.8.3.1.ebuild:
+  Fix some QA issues
 
   05 Aug 2008; Thomas Anderson <gentoofan23@gentoo.org> metadata.xml:
   Add USE flag description to metadata as per GLEP 56.
diff --git a/net-im/naim/naim-0.11.7.2.ebuild b/net-im/naim/naim-0.11.7.2.ebuild
index 5cc9259cfe6e..4133a377571c 100644
--- a/net-im/naim/naim-0.11.7.2.ebuild
+++ b/net-im/naim/naim-0.11.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.7.2.ebuild,v 1.15 2008/02/05 21:13:31 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.7.2.ebuild,v 1.16 2009/05/09 20:13:29 gentoofan23 Exp $
 
 DESCRIPTION="An ncurses based AOL Instant Messenger"
 HOMEPAGE="http://naim.n.ml.org"
@@ -13,6 +13,7 @@ IUSE="debug"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	app-misc/screen"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	# --enable-profile
@@ -23,12 +24,11 @@ src_compile() {
 	econf \
 		--with-pkgdocdir=/usr/share/doc/${PF} \
 		--enable-detach \
-		${myconf} \
-		|| die "configure failed"
+		${myconf}
 	emake || die "make failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS FAQ BUGS README NEWS ChangeLog doc/*.hlp
 }
diff --git a/net-im/naim/naim-0.11.8.2.1.ebuild b/net-im/naim/naim-0.11.8.2.1.ebuild
index 934d5869512c..d2edbdd69627 100644
--- a/net-im/naim/naim-0.11.8.2.1.ebuild
+++ b/net-im/naim/naim-0.11.8.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.8.2.1.ebuild,v 1.5 2008/02/05 21:13:31 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.8.2.1.ebuild,v 1.6 2009/05/09 20:13:29 gentoofan23 Exp $
 
 DESCRIPTION="An ncurses based AOL Instant Messenger"
 HOMEPAGE="http://naim.n.ml.org"
@@ -16,15 +16,16 @@ RESTRICT=test
 
 DEPEND=">=sys-libs/ncurses-5.2
 		screen? ( app-misc/screen )"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 
 	# Alter makefile so firetalk-int.h is installed
-	cd ${S}
 	sed -i 's/include_HEADERS = firetalk.h/include_HEADERS = firetalk.h firetalk-int.h/' \
 		libfiretalk/Makefile.am \
-		libfiretalk/Makefile.in
+		libfiretalk/Makefile.in || die "Sed failed!"
 }
 
 src_compile() {
@@ -36,8 +37,7 @@ src_compile() {
 
 	econf \
 		--with-pkgdocdir=/usr/share/doc/${PF} \
-		${myconf} \
-		|| die "configure failed"
+		${myconf}
 
 	# Use -j1, because naim doesn't compile with ${MAKEOPTS} > 1
 	# see bug #139329
@@ -45,7 +45,6 @@ src_compile() {
 }
 
 src_install() {
-	cd ${S}
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS FAQ BUGS README NEWS ChangeLog doc/*.hlp
 }
diff --git a/net-im/naim/naim-0.11.8.3.1.ebuild b/net-im/naim/naim-0.11.8.3.1.ebuild
index 68185f8d33af..b75b6cd4119e 100644
--- a/net-im/naim/naim-0.11.8.3.1.ebuild
+++ b/net-im/naim/naim-0.11.8.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.8.3.1.ebuild,v 1.2 2008/03/31 02:08:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.8.3.1.ebuild,v 1.3 2009/05/09 20:13:29 gentoofan23 Exp $
 
 DESCRIPTION="An ncurses based AOL Instant Messenger"
 HOMEPAGE="http://naim.n.ml.org"
@@ -19,12 +19,12 @@ RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 
 	# Alter makefile so firetalk-int.h is installed
-	cd "${S}"
 	sed -i 's/include_HEADERS = firetalk.h/include_HEADERS = firetalk.h firetalk-int.h/' \
 		libfiretalk/Makefile.am \
-		libfiretalk/Makefile.in
+		libfiretalk/Makefile.in || die "Sed failed!"
 }
 
 src_compile() {
@@ -36,8 +36,7 @@ src_compile() {
 
 	econf \
 		--with-pkgdocdir=/usr/share/doc/${PF} \
-		${myconf} \
-		|| die "configure failed"
+		${myconf}
 
 	emake || die "make failed"
 }