Correct handling of mysql and postgres dependencies.

(Portage version: 2.0.51.22-r3)

2 files changed, 24 insertions, 8 deletions

diff --git a/kde-misc/krecipes/ChangeLog b/kde-misc/krecipes/ChangeLog
index 01829ead248a..d5b295c060e8 100644
--- a/kde-misc/krecipes/ChangeLog
+++ b/kde-misc/krecipes/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-misc/krecipes
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krecipes/ChangeLog,v 1.13 2005/07/31 23:10:14 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krecipes/ChangeLog,v 1.14 2005/10/19 10:37:45 greg_g Exp $
+
+  19 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> krecipes-0.8.1.ebuild:
+  Correct handling of mysql and postgres dependencies.
 
 *krecipes-0.8.1 (31 Jul 2005)
 
diff --git a/kde-misc/krecipes/krecipes-0.8.1.ebuild b/kde-misc/krecipes/krecipes-0.8.1.ebuild
index 28ded45baacb..d5ad71f20148 100644
--- a/kde-misc/krecipes/krecipes-0.8.1.ebuild
+++ b/kde-misc/krecipes/krecipes-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krecipes/krecipes-0.8.1.ebuild,v 1.1 2005/07/31 23:10:14 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krecipes/krecipes-0.8.1.ebuild,v 1.2 2005/10/19 10:37:45 greg_g Exp $
 
 inherit kde
 
@@ -14,22 +14,35 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="mysql postgres sqlite"
 
 DEPEND="sqlite? ( dev-db/sqlite )"
-RDEPEND="${DEPEND}
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-db/postgresql )"
 
 need-kde 3
 
 pkg_setup() {
 	if ! use sqlite && ! use mysql && ! use postgres; then
-		eerror krecipes needs either SQLite, MySQL or PostgreSQL to work,
-		eerror please try again with USE=\"sqlite\", USE=\"mysql\" or USE=\"postgres\".
+		eerror "krecipes needs either SQLite, MySQL or PostgreSQL to work,"
+		eerror "please try again with USE=\"sqlite\","
+		eerror "USE=\"mysql\" (and Qt compiled with USE=\"mysql\") or"
+		eerror "USE=\"postgres\" (and Qt compiled with USE=\"postgres\")."
 		die
 	fi
+
+	if use mysql && ! built_with_use x11-libs/qt mysql; then
+		eerror "MySQL support was requested, but Qt"
+		eerror "was compiled without MySQL support."
+		eerror "Please reemerge Qt with USE=\"mysql\"."
+		die "MySQL support for Qt not found"
+	fi
+
+	if use postgres && ! built_with_use x11-libs/qt postgres; then
+		eerror "PostgreSQL support was requested, but Qt"
+		eerror "was compiled without PostgreSQL support."
+		eerror "Please reemerge Qt with USE=\"postgres\"."
+		die "PostgreSQL support for Qt not found"
+	fi
 }
 
 src_compile() {
-	myconf="$(use_with sqlite) $(use_with mysql) $(use_with postgres postgresql)"
+	local myconf="$(use_with sqlite) $(use_with mysql) $(use_with postgres postgresql)"
 
 	kde_src_compile
 }