QA: IUSE variable was incorrect, set propper USE flags tests.

4 files changed, 28 insertions, 22 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 3353a54c21a2..a7defc332962 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.21 2004/03/19 09:44:52 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.22 2004/03/21 12:51:38 mboman Exp $
+
+  21 Mar 2004; Michael Boman <mboman@gentoo.org> nagios-core-1.1-r4.ebuild,
+  nagios-core-1.1-r5.ebuild:
+  QA: IUSE variable was incorrect, set propper USE flags tests.
 
 *nagios-core-1.2 (27 Feb 2004)
 
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 0adfd4ae49eb..81d5b58def34 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,16 +1,16 @@
-MD5 eed050933cf757e8502115d64e7d3ea8 nagios-core-1.1-r6.ebuild 5888
-MD5 c021fb80c0b58d3e8bc32b80c10edc46 nagios-core-1.1-r5.ebuild 5903
-MD5 747495d73b2b1cadd7b88f1473fc182a ChangeLog 3569
+MD5 df6da879a0e7a0cf40086e0eb48bd174 ChangeLog 3741
 MD5 67125e899e40330692585273a7839c41 metadata.xml 980
+MD5 49ea43e0a9b2721d772feb8d480ba97a nagios-core-1.1-r4.ebuild 5301
+MD5 972d6a4f2bf23eeb6849e7ee8060e132 nagios-core-1.1-r5.ebuild 5905
+MD5 eed050933cf757e8502115d64e7d3ea8 nagios-core-1.1-r6.ebuild 5888
 MD5 34b222d6de70a7b5521128334e32bf24 nagios-core-1.2.ebuild 5836
-MD5 b34e6544fe21738587370b0ca4ff95d5 nagios-core-1.1-r4.ebuild 5317
-MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
+MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
 MD5 565ce2a690d50aeb542e7afe44b8c733 files/Makefile-distclean.diff.bz2 1133
+MD5 de44d331b40a2395b74c5ebf887b7675 files/digest-nagios-core-1.1-r4 63
+MD5 de44d331b40a2395b74c5ebf887b7675 files/digest-nagios-core-1.1-r5 63
+MD5 de44d331b40a2395b74c5ebf887b7675 files/digest-nagios-core-1.1-r6 63
 MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2 63
 MD5 d00719dedf55c1dec74c09a767a4c737 files/nagios 923
-MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
 MD5 93fc29972ca48db69fc84adba9754c62 files/nagios.cfg-sample 22287
+MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
 MD5 f4f0b07e1a52477f83cbb9158db70391 files/tac.cgi.diff.bz2 204
-MD5 de44d331b40a2395b74c5ebf887b7675 files/digest-nagios-core-1.1-r4 63
-MD5 de44d331b40a2395b74c5ebf887b7675 files/digest-nagios-core-1.1-r5 63
-MD5 de44d331b40a2395b74c5ebf887b7675 files/digest-nagios-core-1.1-r6 63
diff --git a/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild b/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild
index 4c883a1ed6f7..0efbe2ebace4 100644
--- a/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild,v 1.9 2004/03/10 19:10:06 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild,v 1.10 2004/03/21 12:51:38 mboman Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~sparc ~ppc ~amd64"
-IUSE="gd apache2 perl"
+IUSE="gd apache2 perl mysql postgres debug"
 
 DEPEND=">=net-mail/mailx-8.1
 	apache2? ( >=net-www/apache-2.0.43-r1 )
@@ -24,7 +24,7 @@ DEPEND=">=net-mail/mailx-8.1
 	)
 	perl? ( >=perl-5.6.1-r7 )
 	mysql? ( >=dev-db/mysql-3.23.56 )
-	pgsql? ( >=dev-db/postgresql-7.3.2 )"
+	postgres? ( >=dev-db/postgresql-7.3.2 )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -47,18 +47,20 @@ src_compile() {
 	--with-mysql-status --with-mysql-comments --with-mysql-extinfo \
 	--with-mysql-retention --with-mysql-downtime"
 
-	use pgsql && myconf="${myconf} --with-pgsql-xdata \
+	use postgres && myconf="${myconf} --with-pgsql-xdata \
 	--with-pgsql-status --with-pgsql-comments --with-pgsql-extinfo \
 	--with-pgsql-retention --with-pgsql-downtime"
 
 	use perl && myconf="${myconf} --enable-embedded-perl --with-perlcache"
 
-	use debug0 && myconf="${myconf} --enable-DEBUG0"
-	use debug1 && myconf="${myconf} --enable-DEBUG1"
-	use debug2 && myconf="${myconf} --enable-DEBUG2"
-	use debug3 && myconf="${myconf} --enable-DEBUG3"
-	use debug4 && myconf="${myconf} --enable-DEBUG4"
-	use debug5 && myconf="${myconf} --enable-DEBUG5"
+	if [ -n "`use debug`" ]; then
+		myconf="${myconf} --enable-DEBUG0"
+		myconf="${myconf} --enable-DEBUG1"
+		myconf="${myconf} --enable-DEBUG2"
+		myconf="${myconf} --enable-DEBUG3"
+		myconf="${myconf} --enable-DEBUG4"
+		myconf="${myconf} --enable-DEBUG5"
+	fi
 
 	./configure ${myconf} \
 		--host=${CHOST} \
diff --git a/net-analyzer/nagios-core/nagios-core-1.1-r5.ebuild b/net-analyzer/nagios-core/nagios-core-1.1-r5.ebuild
index 706ebb252235..98ddd5d7117a 100644
--- a/net-analyzer/nagios-core/nagios-core-1.1-r5.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.1-r5.ebuild,v 1.3 2004/03/10 19:10:06 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.1-r5.ebuild,v 1.4 2004/03/21 12:51:38 mboman Exp $
 
 inherit eutils
 
@@ -27,7 +27,7 @@ DEPEND=">=net-mail/mailx-8.1
 
 	perl? ( >=dev-lang/perl-5.6.1-r7 )
 	mysql? ( >=dev-db/mysql-3.23.56 )
-	pgsql? ( >=dev-db/postgresql-7.3.2 )"
+	postgres? ( >=dev-db/postgresql-7.3.2 )"
 
 
 S="${WORKDIR}/${MY_P}"