diff options
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/qof/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/qof/qof-0.7.5-r1.ebuild | 9 | ||||
| -rw-r--r-- | dev-libs/qof/qof-0.8.1.ebuild | 13 |
3 files changed, 16 insertions, 13 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/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 } |