Make SQLite optional by USE flag everywhere and depend on the proper SLOT of SQLite; disable GDBA backend everywhere for bug 343685

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 23 insertions, 20 deletions

diff --git a/dev-libs/qof/ChangeLog b/dev-libs/qof/ChangeLog
index 9b9fd6710270..99aaeba8c9bd 100644
--- a/dev-libs/qof/ChangeLog
+++ b/dev-libs/qof/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/qof
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/ChangeLog,v 1.29 2010/02/01 08:58:23 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/ChangeLog,v 1.30 2010/11/01 14:19:04 fauli Exp $
+
+  01 Nov 2010; Christian Faulhammer <fauli@gentoo.org> qof-0.7.5-r1.ebuild,
+  qof-0.8.1.ebuild:
+  Make SQLite optional by USE flag everywhere and depend on the proper SLOT
+  of SQLite; disable GDBA backend everywhere for bug 343685
 
   01 Feb 2010; Christian Faulhammer <fauli@gentoo.org> -qof-0.7.5.ebuild:
   clean up
diff --git a/dev-libs/qof/Manifest b/dev-libs/qof/Manifest
index ae19e940d400..7a09330520d0 100644
--- a/dev-libs/qof/Manifest
+++ b/dev-libs/qof/Manifest
@@ -5,14 +5,14 @@ AUX qof-0.7.4-remove_spurious_CFLAGS.patch 1971 RMD160 98537cbac64fdc709d5ccd092
 AUX qof-0.8.0-remove_spurious_CFLAGS.patch 1970 RMD160 09d5813c72e4e3a1e628e0d63eaa1ebdcd5d8275 SHA1 f7c22cca90e970ed12aaa1a1125c786fab595450 SHA256 cfa4858633a9784c9b6a236244d196c58213c4b17bad0c94727bb6ede44b7dbc
 DIST qof-0.7.5.tar.gz 906010 RMD160 3e0ab118c2c5c1d760f2a9445183e77659f692c7 SHA1 9d7453fca0910c401180b8c8eda7443442633803 SHA256 39dbb47f59ef33d4754f622c4afcc201862743dbd974172f19be0c19cb53428c
 DIST qof-0.8.1.tar.gz 885073 RMD160 c99d10c436bb178a7e43f54df50e7f22e2b63ca3 SHA1 0e24bc4c1849428195c0e08434958ac88fabbb36 SHA256 53fa6db79140ae5ff0863298bdd1c09cfdf187d3967a90ca519a5713fec9c154
-EBUILD qof-0.7.5-r1.ebuild 1025 RMD160 52c8a6d08d4d374186db49b0691e4d480c04bd04 SHA1 b48640025323a63f0529823a805b5156ac4a0fb5 SHA256 f724ffb87a411441552bfed2cd42347ec3ecfd7a8a9f3803891f7daa2b15134f
-EBUILD qof-0.8.1.ebuild 1161 RMD160 97be00dd096570d5c128e0c12779433afbfbe9a2 SHA1 8a7be20f44819547e24f219947236ce741507f72 SHA256 4a134c331dd0c806d2f5e89e9df0d05c65d6e84d9c939bd87fe88a9582d0d8d1
-MISC ChangeLog 4418 RMD160 463c88a1c06a8cca3d93fd7c6b1f70774295c013 SHA1 b107154c2ee8baaf2b5a2bdfa5ef8f2287d12679 SHA256 97550a7da191ed68f3c168e9e294bdf0bc9ba3ac8d881384a088e044809ac9d6
+EBUILD qof-0.7.5-r1.ebuild 1037 RMD160 2b17c2bbcddbe4097267b11fc247d8a3128df933 SHA1 93915f83b449e2d806094c50e2e93c71ca65ae3f SHA256 8a7a1b51281d64bd2fce62259797cfab7562b30adbc7436e966eb9832e047335
+EBUILD qof-0.8.1.ebuild 1165 RMD160 7b153b5568b9786128560944a456e266535a4d01 SHA1 8315fc25daa19c5833b507c9d29cd2bc45f5983e SHA256 e815a86cb8fdc888c09866631f0c4d6cb935aae2e1806fac50707401dad37aee
+MISC ChangeLog 4651 RMD160 c6b93ab53cf23f75d7df7d718dbbe985fd57aa5f SHA1 537cf027321eb25108942ce9d5a51d31c685d44a SHA256 b54b1310f170a95eb9b0fbd081eaa834ab521570b91e4c15490ab2aea70ca54d
 MISC metadata.xml 266 RMD160 55253778685aac885188dd83bac281fb811bbcaf SHA1 c31e5708d35de474a023be7dc2d08b41d9459bdc SHA256 053b98148c9c20298e6486e77ec00a20a046ebc0471c484969e0c1285fc98022
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAktml78ACgkQNQqtfCuFneM1UgCeMTLCZj8WXXKah+If5eH0d0BA
-CRMAn1pxH++RWEIEXhxCfnLL1HxaqFuU
-=cE2t
+iEYEARECAAYFAkzO2yQACgkQNQqtfCuFneOezwCglt2Sj15TwojbB6vVXhxHudWc
+dQIAn2KyG0CYs9/RcENDJseFHxX73cCR
+=yW+L
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/qof/qof-0.7.5-r1.ebuild b/dev-libs/qof/qof-0.7.5-r1.ebuild
index 6e7848343ddd..d2f976c28d4a 100644
--- a/dev-libs/qof/qof-0.7.5-r1.ebuild
+++ b/dev-libs/qof/qof-0.7.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/qof-0.7.5-r1.ebuild,v 1.5 2010/01/30 18:16:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/qof-0.7.5-r1.ebuild,v 1.6 2010/11/01 14:19:04 fauli Exp $
 
 EAPI=1
 
@@ -17,9 +17,8 @@ KEYWORDS="amd64 ~ppc ~ppc64 sparc x86"
 
 IUSE="doc nls sqlite"
 
-RDEPEND="gnome-extra/libgda:3
-	dev-libs/libxml2
-	sqlite? ( =dev-db/sqlite-2* )"
+RDEPEND="dev-libs/libxml2
+	sqlite? ( dev-db/sqlite:0 )"
 DEPEND="${DEPEND}
 	dev-util/pkgconfig
 	!dev-libs/qof:2
@@ -33,7 +32,7 @@ src_unpack() {
 }
 
 src_compile() {
-	econf $(use_enable doc html-docs) --disable-error-on-warning $(use_enable nls) $(use_enable sqlite) $(use_enable doc doxygen) --disable-dot || die
+	econf $(use_enable doc html-docs) --disable-error-on-warning $(use_enable nls) $(use_enable doc doxygen) --disable-dot $(use_enable sqlite) --disable-gdabackend --disable-gdasql || die
 	emake -j1 || die
 }
 
diff --git a/dev-libs/qof/qof-0.8.1.ebuild b/dev-libs/qof/qof-0.8.1.ebuild
index 1dd53154fa5c..3202b9a616ee 100644
--- a/dev-libs/qof/qof-0.8.1.ebuild
+++ b/dev-libs/qof/qof-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/qof-0.8.1.ebuild,v 1.1 2010/01/04 13:31:29 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/qof-0.8.1.ebuild,v 1.2 2010/11/01 14:19:04 fauli Exp $
 
 EAPI=2
 
@@ -15,11 +15,10 @@ SLOT="2"
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="doc nls"
+IUSE="doc nls sqlite"
 
-RDEPEND="gnome-extra/libgda:3
-	dev-libs/libxml2
-	>=dev-db/sqlite-2.8.0:0"
+RDEPEND="dev-libs/libxml2
+	sqlite? ( >=dev-db/sqlite-2.8.0:0 )"
 DEPEND="${DEPEND}
 	dev-util/pkgconfig
 	!dev-libs/qof:0
@@ -33,8 +32,8 @@ src_prepare() {
 
 src_configure() {
 	econf $(use_enable doc html-docs) --disable-error-on-warning \
-		$(use_enable nls) --enable-sqlite  $(use_enable doc doxygen) \
-		$(use_enable doc latex-docs) --enable-gdabackend --enable-gdasql \
+		$(use_enable nls) $(use_enable sqlite)  $(use_enable doc doxygen) \
+		$(use_enable doc latex-docs) --disable-gdabackend --disable-gdasql \
 		--disable-deprecated-glib --disable-dot \
 		|| die
 }