Prioritized mysql over postgresql, closes #53439.

3 files changed, 43 insertions, 42 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 72039816342f..09edce49cb9d 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 Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.27 2004/06/24 22:08:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.28 2004/07/01 17:04:29 eldad Exp $
+
+  01 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r1.ebuild:
+  Prioritized mysql over postgresql, in case both USE flags are enabled. Closes
+  #53439.
 
   09 Jun 2004; Aron Griffis <agriffis@gentoo.org> nagios-core-1.1-r4.ebuild,
   nagios-core-1.1-r5.ebuild, nagios-core-1.1-r6.ebuild,
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 1d927cf73b4d..315a21d5e696 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,28 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6ad46d2a4e0f1a13eaeab5f7700712d5 ChangeLog 4481
-MD5 ed199f8b068fe43e6f35a046a043ee54 nagios-core-1.1-r4.ebuild 5228
-MD5 67125e899e40330692585273a7839c41 metadata.xml 980
-MD5 eea47d7e6c49708d4a15ec39fd56c6a0 nagios-core-1.1-r5.ebuild 5810
 MD5 9da4171ce0f4b285f1a4b65f803b93d4 nagios-core-1.1-r6.ebuild 5809
+MD5 eea47d7e6c49708d4a15ec39fd56c6a0 nagios-core-1.1-r5.ebuild 5810
+MD5 9d024973cc062c0b12f5f501a063340d ChangeLog 4641
+MD5 67125e899e40330692585273a7839c41 metadata.xml 980
+MD5 ae9c427bc3d73f1a10c19fac9a9ed415 nagios-core-1.2-r1.ebuild 5961
 MD5 1639df35f22bf259cda07f7445b332bd nagios-core-1.2.ebuild 5757
-MD5 9fe6b9e0291e55150125e0b2133818b9 nagios-core-1.2-r1.ebuild 5646
-MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
+MD5 ed199f8b068fe43e6f35a046a043ee54 nagios-core-1.1-r4.ebuild 5228
+MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
 MD5 565ce2a690d50aeb542e7afe44b8c733 files/Makefile-distclean.diff.bz2 1133
-MD5 de44d331b40a2395b74c5ebf887b7675 files/digest-nagios-core-1.1-r4 63
-MD5 d00719dedf55c1dec74c09a767a4c737 files/nagios 923
+MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2 63
+MD5 7d2fb7655d8cc9a0dc953a5531879960 files/nagios 922
+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
-MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2 63
 MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r1 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFA4vwUHTu7gpaalycRAvagAKCrDIh+oUs2wny2l1+E5fuSVj8aQgCgjycn
-N4I/e8JZRqVPIt85sxxddSw=
-=+0/w
------END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r1.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r1.ebuild
index 40b057faf4e0..264aeb9bfb90 100644
--- a/net-analyzer/nagios-core/nagios-core-1.2-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r1.ebuild,v 1.5 2004/06/30 17:44:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r1.ebuild,v 1.6 2004/07/01 17:04:29 eldad Exp $
 
 inherit eutils
 
@@ -8,10 +8,11 @@ MY_P=${P/-core}
 DESCRIPTION="Nagios  core - Host and service monitor cgi, docs etc..."
 HOMEPAGE="http://www.nagios.org/"
 SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz"
+RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 IUSE="noweb mysql postgres perl debug apache2"
 
 DEPEND=">=mail-client/mailx-8.1
@@ -26,7 +27,7 @@ DEPEND=">=mail-client/mailx-8.1
 
 	perl? ( >=dev-lang/perl-5.6.1-r7 )
 	mysql? ( >=dev-db/mysql-3.23.56 )
-	postgres? ( >=dev-db/postgresql-7.3.2 )"
+	postgres? ( !mysql? ( >=dev-db/postgresql-7.3.2 ) )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -42,23 +43,31 @@ src_unpack() {
 }
 
 src_compile() {
+	local myconf
+
 	if use mysql && use postgres; then
-		eerror "Unfortunatly you can't have both MySQL and PostgreSQL enabled at the same time."
-		eerror "You have to remove either 'mysql' or 'postgres' from your USE flags before emerging this."
+		ewarn "Unfortunatly you can't have both MySQL and PostgreSQL enabled at the same time."
+		ewarn "Using MySQL as default."
 
 		has_version ">=sys-apps/portage-2.0.50" && (
-			einfo "You can add:"
+			einfo "You can add -"
+			echo ""
 			einfo "net-analyzer/nagios-core [use flags]"
-			einfo "to the file:"
-			einfo "/etc/portage/package.use"
-			einfo "to permamently set this package's USE flags"
+			echo ""
+			einfo "to /etc/portage/package.use to permanently set this package's USE flags"
+			einfo "More info on package.use is available on:"
+			einfo "     man 5 portage"
 		)
-
-		exit 1
+	elif use postgres ; then
+		myconf="${myconf} \
+		--with-pgsql-xdata \
+		--with-pgsql-status \
+		--with-pgsql-comments \
+		--with-pgsql-extinfo \
+		--with-pgsql-retention \
+		--with-pgsql-downtime"
 	fi
 
-	local myconf
-
 	use mysql && myconf="${myconf} \
 		--with-mysql-xdata \
 		--with-mysql-status \
@@ -67,14 +76,6 @@ src_compile() {
 		--with-mysql-retention \
 		--with-mysql-downtime"
 
-	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"
@@ -190,6 +191,12 @@ pkg_postinst() {
 		einfo "Thank you!"
 	fi
 
+	if use mysql && use postgres; then
+		ewarn "Unfortunatly you can't have both MySQL and PostgreSQL enabled at the same time."
+		ewarn "as a default, MySQL support was built."
+		ewarn "To build nagios with PostgreSQL you'll have to emerge nagios without the mysql useflag."
+	fi
+
 	einfo "If your kernel has /proc protection, nagios"
 	einfo "will not be happy as it relies on accessing the proc"
 	einfo "filesystem. You can fix this by adding nagios into"