Correct handling of mysql and postgres dependencies.

Package-Manager: portage-2.0.51.22-r3

3 files changed, 31 insertions, 15 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/Manifest b/kde-misc/krecipes/Manifest
index c036c6702471..66387317a2f9 100644
--- a/kde-misc/krecipes/Manifest
+++ b/kde-misc/krecipes/Manifest
@@ -1,10 +1,10 @@
-MD5 6a2df3ac1e6d059b998e09d77420e98a krecipes-0.8.1.ebuild 926
-MD5 61216635310e25918699db773c2e79da krecipes-0.6.2.ebuild 729
-MD5 4410a07415be79fd4586a58403add2a1 krecipes-0.8.ebuild 936
-MD5 53f701d833b47b725e29875a6116ed35 krecipes-0.7.1.ebuild 934
-MD5 adbe9cb96397679e2a5381f4cffb1e56 ChangeLog 2118
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 80e835a04c9e0b2dcb98285e4a0a2f8f files/digest-krecipes-0.6.2 72
+MD5 53f701d833b47b725e29875a6116ed35 krecipes-0.7.1.ebuild 934
+MD5 69e2fb800d8af9a1db4a54d0e72095e7 ChangeLog 2248
+MD5 4410a07415be79fd4586a58403add2a1 krecipes-0.8.ebuild 936
+MD5 61216635310e25918699db773c2e79da krecipes-0.6.2.ebuild 729
+MD5 f7d94de6316d6f4776b851902da3fbc4 krecipes-0.8.1.ebuild 1474
 MD5 ac2c77f4c2dac4b10437291117132b89 files/digest-krecipes-0.7.1 72
-MD5 d00a1f7bbd75711a0e4f8b8c102be821 files/digest-krecipes-0.8.1 67
 MD5 bc16a9f75213a67c72cbdfa3be0d8f10 files/digest-krecipes-0.8 70
+MD5 d00a1f7bbd75711a0e4f8b8c102be821 files/digest-krecipes-0.8.1 67
+MD5 80e835a04c9e0b2dcb98285e4a0a2f8f files/digest-krecipes-0.6.2 72
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
 }