Modify the ebuild to force sqlite as a dep if no database type if specified, per bug #124330

(Portage version: 2.1_pre5-r1)

2 files changed, 12 insertions, 11 deletions

diff --git a/kde-misc/krecipes/ChangeLog b/kde-misc/krecipes/ChangeLog
index 6dc041eab5ed..524e59fd5088 100644
--- a/kde-misc/krecipes/ChangeLog
+++ b/kde-misc/krecipes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/krecipes
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krecipes/ChangeLog,v 1.23 2006/02/28 00:51:18 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krecipes/ChangeLog,v 1.24 2006/03/01 00:10:20 caleb Exp $
+
+  01 Mar 2006; Caleb Tennis <caleb@gentoo.org> krecipes-0.9.1.ebuild:
+  Modify the ebuild to force sqlite as a dep if no database type if specified,
+  per bug #124330
 
   28 Feb 2006; Gustavo Zacarias <gustavoz@gentoo.org> krecipes-0.9.1.ebuild:
   Stable on sparc wrt #124070
diff --git a/kde-misc/krecipes/krecipes-0.9.1.ebuild b/kde-misc/krecipes/krecipes-0.9.1.ebuild
index 83c0ea7153b1..8d46d2afbbbc 100644
--- a/kde-misc/krecipes/krecipes-0.9.1.ebuild
+++ b/kde-misc/krecipes/krecipes-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krecipes/krecipes-0.9.1.ebuild,v 1.4 2006/02/28 00:51:18 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krecipes/krecipes-0.9.1.ebuild,v 1.5 2006/03/01 00:10:20 caleb Exp $
 
 inherit kde
 
@@ -13,23 +13,20 @@ SLOT="0"
 KEYWORDS="~amd64 ppc sparc x86"
 IUSE="mysql postgres sqlite"
 
-DEPEND="sqlite? ( dev-db/sqlite )"
+DEPEND="sqlite? ( dev-db/sqlite )
+		!sqlite? ( !mysql? ( !postgres? ( dev-db/sqlite ) ) )"
 RDEPEND="${DEPEND}
 	mysql? ( dev-db/mysql )
 	postgres? ( dev-db/postgresql )"
 
 need-kde 3
 
-pkg_setup() {
+src_compile() {
 	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\".
-		die
+		myconf="--with-sqlite"
+	else
+		myconf="$(use_with sqlite) $(use_with mysql) $(use_with postgres postgresql)"
 	fi
-}
-
-src_compile() {
-	myconf="$(use_with sqlite) $(use_with mysql) $(use_with postgres postgresql)"
 
 	kde_src_compile
 }