version bump, ported to EAPI 2 and played around with econf switches. This is a new SLOT as API/ABI compatability is not guaranteed (app-office/gnotime fails with it anyway)

(Portage version: 2.1.6.13/cvs/Linux i686)

5 files changed, 121 insertions, 6 deletions

diff --git a/dev-libs/qof/ChangeLog b/dev-libs/qof/ChangeLog
index 6480e0bea244..4ead04d12c64 100644
--- a/dev-libs/qof/ChangeLog
+++ b/dev-libs/qof/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/qof
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/ChangeLog,v 1.23 2008/11/28 12:31:46 fauli Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/ChangeLog,v 1.24 2009/06/09 18:38:56 fauli Exp $
+
+*qof-0.8.0 (09 Jun 2009)
+
+  09 Jun 2009; Christian Faulhammer <fauli@gentoo.org> qof-0.7.5.ebuild,
+  qof-0.7.5-r1.ebuild, +qof-0.8.0.ebuild,
+  +files/qof-0.8.0-remove_spurious_CFLAGS.patch:
+  version bump, ported to EAPI 2 and played around with econf switches. This
+  is a new SLOT as API/ABI compatability is not guaranteed
+  (app-office/gnotime fails with it anyway)
 
   28 Nov 2008; Christian Faulhammer <fauli@gentoo.org> metadata.xml:
   change my email address
diff --git a/dev-libs/qof/files/qof-0.8.0-remove_spurious_CFLAGS.patch b/dev-libs/qof/files/qof-0.8.0-remove_spurious_CFLAGS.patch
new file mode 100644
index 000000000000..56c217592e2f
--- /dev/null
+++ b/dev-libs/qof/files/qof-0.8.0-remove_spurious_CFLAGS.patch
@@ -0,0 +1,57 @@
+--- configure.orig	2009-06-09 19:15:07.000384982 +0200
++++ configure	2009-06-09 19:17:31.320384334 +0200
+@@ -22653,18 +22653,18 @@
+ $as_echo_n "checking what extra warning flags to pass to the C compiler... " >&6; }
+ if test ${GCC}x = yesx; then
+   warnFLAGS=
+-  CFLAGS="${CFLAGS} -g2 -Wall"
++  CFLAGS="${CFLAGS}"
+   # Check whether --enable-error-on-warning was given.
+ if test "${enable_error_on_warning+set}" = set; then
+   enableval=$enable_error_on_warning; case "${enableval}" in
+-        yes) warnFLAGS="${warnFLAGS} -Werror" ;;
++        yes) warnFLAGS="${warnFLAGS}" ;;
+         no)  ;;
+         *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-error-on-warning" >&5
+ $as_echo "$as_me: error: bad value ${enableval} for --enable-error-on-warning" >&2;}
+    { (exit 1); exit 1; }; } ;;
+         esac
+ else
+-    warnFLAGS="${warnFLAGS} -Werror"
++    warnFLAGS="${warnFLAGS}"
+ fi
+ 
+   GCC_VERSION=`${CC} -dumpversion`
+@@ -22672,10 +22672,10 @@
+      # This is gcc >= 3.x.x
+      if test `echo ${GCC_VERSION} | cut -d. -f2` -ge 4; then
+         # This is gcc >= 3.4.x
+-        warnFLAGS="${warnFLAGS} -Wdeclaration-after-statement"
++        warnFLAGS="${warnFLAGS}"
+      else if test `echo ${GCC_VERSION} | cut -d. -f1` -ge 4; then
+         # This is gcc == 4.x.x
+-        warnFLAGS="${warnFLAGS} -Wdeclaration-after-statement -Wno-pointer-sign"
++        warnFLAGS="${warnFLAGS}"
+         fi
+      fi
+   fi
+@@ -22693,19 +22693,6 @@
+   enableval=$enable_compile_warnings; set_compile_warnings=yes
+ fi
+ 
+-
+-if test "$GCC" = "yes" -a "$set_compile_warnings" != "no"; then
+-        warnFLAGS="$warnFLAGS -Wcast-align -Wsign-compare \
+- -Wmissing-prototypes -Wmissing-declarations -Werror -Wmissing-include-dirs \
+- -Wstrict-prototypes -Winline -Wnested-externs -Wpointer-arith \
+- -Wmissing-field-initializers"
+-# LDFLAGS="$LDFLAGS -Wl,-z,defs"
+-fi
+-
+-
+-
+-
+-
+ DATADIR=`eval echo $datadir`
+ QSF_SCHEMA_DIR=`eval echo $DATADIR`"/xml/qof/qsf"
+ 
diff --git a/dev-libs/qof/qof-0.7.5-r1.ebuild b/dev-libs/qof/qof-0.7.5-r1.ebuild
index 31fec6fad3d9..b340f786e658 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-2008 Gentoo Foundation
+# Copyright 1999-2009 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.1 2008/09/07 02:25:27 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/qof-0.7.5-r1.ebuild,v 1.2 2009/06/09 18:38:56 fauli Exp $
 
 EAPI=1
 
@@ -22,6 +22,7 @@ RDEPEND="gnome-extra/libgda:3
 	sqlite? ( =dev-db/sqlite-2* )"
 DEPEND="${DEPEND}
 	dev-util/pkgconfig
+	!dev-libs/qof:2
 	doc? ( app-doc/doxygen )"
 
 src_unpack() {
diff --git a/dev-libs/qof/qof-0.7.5.ebuild b/dev-libs/qof/qof-0.7.5.ebuild
index 78ca9205faf6..2a0a131cfe6e 100644
--- a/dev-libs/qof/qof-0.7.5.ebuild
+++ b/dev-libs/qof/qof-0.7.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.ebuild,v 1.8 2008/09/07 02:25:27 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/qof-0.7.5.ebuild,v 1.9 2009/06/09 18:38:56 fauli Exp $
 
 EAPI=1
 
@@ -23,6 +23,7 @@ RDEPEND="gnome-extra/libgda:1
 	sqlite? ( =dev-db/sqlite-2* )"
 DEPEND="${DEPEND}
 	dev-util/pkgconfig
+	!dev-libs/qof:2
 	doc? ( app-doc/doxygen )"
 
 src_unpack() {
diff --git a/dev-libs/qof/qof-0.8.0.ebuild b/dev-libs/qof/qof-0.8.0.ebuild
new file mode 100644
index 000000000000..ac0096bd27e2
--- /dev/null
+++ b/dev-libs/qof/qof-0.8.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/qof-0.8.0.ebuild,v 1.1 2009/06/09 18:38:56 fauli Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="A Query Object Framework"
+HOMEPAGE="http://qof.alioth.debian.org/"
+SRC_URI="https://alioth.debian.org/frs/download.php/3029/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="doc nls"
+
+RDEPEND="gnome-extra/libgda:3
+	dev-libs/libxml2
+	>=dev-db/sqlite-2.8.0:0"
+DEPEND="${DEPEND}
+	dev-util/pkgconfig
+	!dev-libs/qof:0
+	doc? ( app-doc/doxygen
+		dev-texlive/texlive-latex )"
+
+src_prepare() {
+	# Upstream not willing to remove those stupid flags...
+	epatch "${FILESDIR}/${P}-remove_spurious_CFLAGS.patch"
+}
+
+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 \
+		--disable-deprecated-glib --disable-dot \
+		|| die
+}
+src_compile() {
+	emake -j1 || die
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die
+}