add sqlite, doc and nls USE flags; rework the patch so really all unnecessary CFLAGS are removed; prevent auto-detection of some programs

Package-Manager: portage-2.1.3.19

4 files changed, 41 insertions, 24 deletions

diff --git a/dev-libs/qof/ChangeLog b/dev-libs/qof/ChangeLog
index 73a0c9c21cec..c4d7a14a7148 100644
--- a/dev-libs/qof/ChangeLog
+++ b/dev-libs/qof/ChangeLog
@@ -1,6 +1,11 @@
 # 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.12 2008/01/30 11:51:06 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/ChangeLog,v 1.13 2008/01/30 12:09:51 opfer Exp $
+
+  30 Jan 2008; Christian Faulhammer <opfer@gentoo.org>
+  files/qof-0.7.4-remove_spurious_CFLAGS.patch, qof-0.7.4.ebuild:
+  add sqlite, doc and nls USE flags; rework the patch so really all
+  unnecessary CFLAGS are removed; prevent auto-detection of some programs
 
 *qof-0.7.4 (30 Jan 2008)
 
diff --git a/dev-libs/qof/Manifest b/dev-libs/qof/Manifest
index 2282c61ac7f2..421dbacbe30f 100644
--- a/dev-libs/qof/Manifest
+++ b/dev-libs/qof/Manifest
@@ -5,24 +5,24 @@ AUX qof-0.7.2-remove_spurious_CFLAGS.patch 1871 RMD160 04969f05620d71466886120d3
 MD5 164b3b9fa0c12e453ba09dc8bac1c2a9 files/qof-0.7.2-remove_spurious_CFLAGS.patch 1871
 RMD160 04969f05620d71466886120d3c0fe6453f0b92f1 files/qof-0.7.2-remove_spurious_CFLAGS.patch 1871
 SHA256 129f672ede55a1772eeaa933c6eee6c2602ddc691c08f653f9cfd62194d60bf5 files/qof-0.7.2-remove_spurious_CFLAGS.patch 1871
-AUX qof-0.7.4-remove_spurious_CFLAGS.patch 1809 RMD160 ed6a28504588c4bb6082b1d326a2f0b7476970cf SHA1 60a60d38fa76b22dd2182140eb9f6e65c63e5188 SHA256 53ba5466c7eb501d403973ddb566c23aadbb7af198233107d34cad3847531b38
-MD5 db2492f0317c261aa315ff8d2d9fd8e8 files/qof-0.7.4-remove_spurious_CFLAGS.patch 1809
-RMD160 ed6a28504588c4bb6082b1d326a2f0b7476970cf files/qof-0.7.4-remove_spurious_CFLAGS.patch 1809
-SHA256 53ba5466c7eb501d403973ddb566c23aadbb7af198233107d34cad3847531b38 files/qof-0.7.4-remove_spurious_CFLAGS.patch 1809
+AUX qof-0.7.4-remove_spurious_CFLAGS.patch 1971 RMD160 98537cbac64fdc709d5ccd09276184359eaa8874 SHA1 e3a19561bbf2b364e37c62589954c39d94012770 SHA256 65120ddf0d29dcc21d64ff873c875affc024a61f2f9a6a8685d843fd54c5fce1
+MD5 412ef7f3144a228c75f87beef38cbe4f files/qof-0.7.4-remove_spurious_CFLAGS.patch 1971
+RMD160 98537cbac64fdc709d5ccd09276184359eaa8874 files/qof-0.7.4-remove_spurious_CFLAGS.patch 1971
+SHA256 65120ddf0d29dcc21d64ff873c875affc024a61f2f9a6a8685d843fd54c5fce1 files/qof-0.7.4-remove_spurious_CFLAGS.patch 1971
 DIST qof-0.7.2.tar.gz 866343 RMD160 6cbfec970c8cddda9a6ac1520c67361eb77ce92a SHA1 d23455835cdb513a2f1a4c6bfa286a2d0886dd4c SHA256 643359de7833c9fe661fcfc6fc0dc6e3f390bce55041eba123a495e661366990
 DIST qof-0.7.4.tar.gz 905986 RMD160 6258fafeb35c260aff4f576f3a2eac4903c073c0 SHA1 d867aff74136a15bd8bc151c39bbca17a2505f86 SHA256 87b33cd2823cc5d7bf659eadbe9b9c83be0d4257c4827284093704e33ac8abb8
 EBUILD qof-0.7.2.ebuild 684 RMD160 ca25f9916bd626274791864858dcb789c3cb9ad5 SHA1 4e24966f64a17c7566e6b83bf9abc0bd4fe49511 SHA256 1170b454785eb568519a0567a307d49f3c0b031802887e5ac20fbb80c31aa44e
 MD5 b60def4117ad5b1f2cb90f7528dae073 qof-0.7.2.ebuild 684
 RMD160 ca25f9916bd626274791864858dcb789c3cb9ad5 qof-0.7.2.ebuild 684
 SHA256 1170b454785eb568519a0567a307d49f3c0b031802887e5ac20fbb80c31aa44e qof-0.7.2.ebuild 684
-EBUILD qof-0.7.4.ebuild 703 RMD160 c1dd16e1aeee6580d15f6b0bcf0d31693d17bbd7 SHA1 9406dddb8f934127a2e79bc2cedac6e6dd94a76f SHA256 b4a51a49c962c7813e66d5e1fe4d24291d9155387c4cdda7340faf1aaf521005
-MD5 55c0573c313734c66fbb0f383df04e6b qof-0.7.4.ebuild 703
-RMD160 c1dd16e1aeee6580d15f6b0bcf0d31693d17bbd7 qof-0.7.4.ebuild 703
-SHA256 b4a51a49c962c7813e66d5e1fe4d24291d9155387c4cdda7340faf1aaf521005 qof-0.7.4.ebuild 703
-MISC ChangeLog 1954 RMD160 253e4d2e961d3a18558d77138f482ae21f17f959 SHA1 030b898690dbd433f7c3c52e5d6927aa33cfe61a SHA256 2d8c0d9cfb781e5d1379982a26a8a1d0f2a9c0bd98064af644012f5537604f4c
-MD5 d78d10ffb6c6f9ff4f3c95a2125b9494 ChangeLog 1954
-RMD160 253e4d2e961d3a18558d77138f482ae21f17f959 ChangeLog 1954
-SHA256 2d8c0d9cfb781e5d1379982a26a8a1d0f2a9c0bd98064af644012f5537604f4c ChangeLog 1954
+EBUILD qof-0.7.4.ebuild 1026 RMD160 598eb2b0ba96883b816f75a258edbc35c35d21fa SHA1 5422819adad24135f73044f112a9e5566c670b26 SHA256 69ae1120e1959e42b4f0a45b6d29efc6bc46eebb62a88c3b4de48b79bcbba402
+MD5 fa457478d9643630cb4eebdae761bee9 qof-0.7.4.ebuild 1026
+RMD160 598eb2b0ba96883b816f75a258edbc35c35d21fa qof-0.7.4.ebuild 1026
+SHA256 69ae1120e1959e42b4f0a45b6d29efc6bc46eebb62a88c3b4de48b79bcbba402 qof-0.7.4.ebuild 1026
+MISC ChangeLog 2218 RMD160 71acdce1bdd3c0557f319b6d0e3c4c6edd338111 SHA1 3065e18da89f700848c0ca6754ebd898b261de43 SHA256 63461219706727d23a6f91d7b16e741f9f3083b28c7d6eefa6a5913557c0f0b6
+MD5 cd7b57c4f3c05a7041db4395ef39c003 ChangeLog 2218
+RMD160 71acdce1bdd3c0557f319b6d0e3c4c6edd338111 ChangeLog 2218
+SHA256 63461219706727d23a6f91d7b16e741f9f3083b28c7d6eefa6a5913557c0f0b6 ChangeLog 2218
 MISC metadata.xml 266 RMD160 5fab2514b0096eb1d0710e344d8828acbae236f6 SHA1 082dda7e7d22e86401cba8b8ff225120298f397c SHA256 992d6326c9154489d434561200ae16feff9c42d7c0075e0a6b9dfa39f554f86f
 MD5 9d61188e18e5568b1bc3925103aef9da metadata.xml 266
 RMD160 5fab2514b0096eb1d0710e344d8828acbae236f6 metadata.xml 266
@@ -36,7 +36,7 @@ SHA256 bf36668d51e26f238e7a0b20a6669a40059560d542cf6fecd40ff9d72e57aafa files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHoGTaNQqtfCuFneMRAsuuAJsHyrpc9OwSrvfCb94gTAvh9jIhZwCgkvCE
-QAKtByjbV9HMDrGJpJdDkVM=
-=MGeJ
+iD8DBQFHoGk+NQqtfCuFneMRArbBAJ9fCmYoOs+l6ASsnL4cWEDMEjW0iQCeMZbj
+TlAL/RRVQ7j1RzTqfZNEp8Q=
+=jReM
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/qof/files/qof-0.7.4-remove_spurious_CFLAGS.patch b/dev-libs/qof/files/qof-0.7.4-remove_spurious_CFLAGS.patch
index 263cf3ca61dc..eb7b2ecf06f4 100644
--- a/dev-libs/qof/files/qof-0.7.4-remove_spurious_CFLAGS.patch
+++ b/dev-libs/qof/files/qof-0.7.4-remove_spurious_CFLAGS.patch
@@ -1,6 +1,6 @@
---- configure.orig	2008-01-30 12:40:59.000000000 +0100
-+++ configure	2008-01-30 12:43:25.000000000 +0100
-@@ -26894,11 +26894,11 @@
+--- configure.orig	2008-01-30 13:06:35.000000000 +0100
++++ configure	2008-01-30 13:06:45.000000000 +0100
+@@ -26894,18 +26894,18 @@
  echo $ECHO_N "checking what extra warning flags to pass to the C compiler... $ECHO_C" >&6; }
  if test ${GCC}x = yesx; then
    warnFLAGS=
@@ -14,6 +14,14 @@
          no)  ;;
          *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-error-on-warning" >&5
  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`
 @@ -26913,10 +26913,10 @@
       # This is gcc >= 3.x.x
       if test `echo ${GCC_VERSION} | cut -d. -f2` -ge 4; then
diff --git a/dev-libs/qof/qof-0.7.4.ebuild b/dev-libs/qof/qof-0.7.4.ebuild
index 2b3d7727fea0..e997456c0321 100644
--- a/dev-libs/qof/qof-0.7.4.ebuild
+++ b/dev-libs/qof/qof-0.7.4.ebuild
@@ -1,6 +1,6 @@
- # Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/qof-0.7.4.ebuild,v 1.1 2008/01/30 11:51:06 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/qof-0.7.4.ebuild,v 1.2 2008/01/30 12:09:51 opfer Exp $
 
 inherit eutils
 
@@ -13,20 +13,24 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
 
-IUSE=""
+IUSE="doc nls sqlite"
 
+# Raise dependency to gnome-extra/libgda-3* once it is unmasked
 DEPEND="gnome-extra/libgda
-	=dev-db/sqlite-2*"
+	dev-libs/libxml2
+	sqlite? ( =dev-db/sqlite-2* )
+	doc? ( app-doc/doxygen )"
 RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	# Upstream not willing to remove those stupid flags...
 	epatch "${FILESDIR}/${P}-remove_spurious_CFLAGS.patch"
 }
 
 src_compile() {
-	econf || die
+	econf $(use_enable doc html-docs) --disable-error-on-warning $(use_enable nls) $(use_enable sqlite) $(use_enable doc doxygen) --disable-dot || die
 	emake -j1 || die
 }