summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2015-05-07 19:06:54 +0000
committerPacho Ramos <pacho@gentoo.org>2015-05-07 19:06:54 +0000
commit1375827d93a391ecc5316acb33ea576e6bceeb27 (patch)
tree3f29086568390d1535d0a66e033495dde4f6ddaf /dev-libs/qof
parentMULTILIB_USEDEP is needed for consistent 32bits support with pulseaudio and a... (diff)
downloadgentoo-2-1375827d93a391ecc5316acb33ea576e6bceeb27.tar.gz
gentoo-2-1375827d93a391ecc5316acb33ea576e6bceeb27.tar.bz2
gentoo-2-1375827d93a391ecc5316acb33ea576e6bceeb27.zip
Drop sqlite2 support (#548670)
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'dev-libs/qof')
-rw-r--r--dev-libs/qof/ChangeLog8
-rw-r--r--dev-libs/qof/qof-0.8.8-r1.ebuild (renamed from dev-libs/qof/qof-0.8.7.ebuild)32
2 files changed, 26 insertions, 14 deletions
diff --git a/dev-libs/qof/ChangeLog b/dev-libs/qof/ChangeLog
index cef413c0d164..c0df2a132b7b 100644
--- a/dev-libs/qof/ChangeLog
+++ b/dev-libs/qof/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/qof
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/ChangeLog,v 1.45 2015/05/05 19:34:23 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/ChangeLog,v 1.46 2015/05/07 19:06:54 pacho Exp $
+
+*qof-0.8.8-r1 (07 May 2015)
+
+ 07 May 2015; Pacho Ramos <pacho@gentoo.org> +qof-0.8.8-r1.ebuild,
+ -qof-0.8.7.ebuild:
+ Drop sqlite2 support (#548670)
05 May 2015; Manuel Rüger <mrueg@gentoo.org> -qof-0.8.1.ebuild:
Remove old.
diff --git a/dev-libs/qof/qof-0.8.7.ebuild b/dev-libs/qof/qof-0.8.8-r1.ebuild
index 222f2dedde4d..5dcf11c0b886 100644
--- a/dev-libs/qof/qof-0.8.7.ebuild
+++ b/dev-libs/qof/qof-0.8.8-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/qof-0.8.7.ebuild,v 1.4 2014/09/15 08:18:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/qof-0.8.8-r1.ebuild,v 1.1 2015/05/07 19:06:54 pacho Exp $
EAPI=5
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit autotools gnome2
+inherit autotools eutils gnome2
DESCRIPTION="A Query Object Framework"
HOMEPAGE="https://alioth.debian.org/projects/qof/"
@@ -14,16 +14,17 @@ SRC_URI="mirror://debian//pool/main/q/${PN}/${PN}_${PV}.orig.tar.gz"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="amd64 ~ppc ~ppc64 sparc x86"
-IUSE="doc nls sqlite"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc nls"
RDEPEND="
dev-libs/libxml2
dev-libs/glib:2
- sqlite? ( >=dev-db/sqlite-2.8.0:0 )
"
DEPEND="${RDEPEND}
virtual/pkgconfig
+ virtual/yacc
+ >=sys-devel/gettext-0.19.2
!dev-libs/qof:0
doc? (
app-doc/doxygen
@@ -31,7 +32,17 @@ DEPEND="${RDEPEND}
"
src_prepare() {
- sed -i -e 's/-g2 //' configure.ac || die
+ # Remove some CFLAGS
+ epatch "${FILESDIR}"/${PN}-0.8.8-cflags.patch
+
+ # Delay build of unittests, bug #197999
+ epatch "${FILESDIR}"/${PN}-0.8.8-unittest.patch
+
+ # Fix use and build with yacc
+ epatch "${FILESDIR}"/${PN}-0.8.8-unistd-define.patch
+ epatch "${FILESDIR}"/${PN}-0.8.8-yacc-build.patch
+ rm lib/libsql/{lexer.c,parser.c,parser.h} || die
+
eautoreconf
gnome2_src_prepare
}
@@ -42,14 +53,9 @@ src_configure() {
--disable-static \
--disable-gdasql \
--disable-gdabackend \
+ --disable-sqlite \
$(use_enable nls) \
- $(use_enable sqlite) \
$(use_enable doc doxygen) \
$(use_enable doc latex-docs) \
$(use_enable doc html-docs)
}
-
-src_compile() {
- # upstream bug ????
- MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile
-}