Include fix for USE="berkdb -sqlite"

Package-Manager: portage-2.1.2-r12

diff --git a/mail-filter/bogofilter/ChangeLog b/mail-filter/bogofilter/ChangeLog
index 1abd90143e7f5048fde52a29df946a2845dbd21f..13bc3b21337a5aa31606eec5993c19da5f7fb5ff 100644 (file)
--- a/mail-filter/bogofilter/ChangeLog
+++ b/mail-filter/bogofilter/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-filter/bogofilter
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/ChangeLog,v 1.83 2007/02/28 11:01:55 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/ChangeLog,v 1.84 2007/02/28 11:50:11 tove Exp $
+
+  28 Feb 2007; Torsten Veller <tove@gentoo.org> bogofilter-1.1.5.ebuild:
+  Include fix for USE="berkdb -sqlite"
 
   28 Feb 2007; Roy Marples <uberlord@gentoo.org> bogofilter-1.1.5.ebuild:
   Added ~x86-fbsd keyword. When building against berkdb, include the versioned

diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index ecaec0cc2ec3f48647c561dedfad7871f4dd12f2..c9ffc41674f289fc9ba460cd1b259de256e3a890 100644 (file)
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.1.1-patch.1107.lexer_v3_l 755 RMD160 2ff3ee1f380d56e45e4f1387ad78bef328c770f2 SHA1 4fc5138a59927df8d75e87563c756abfa26c62ad SHA256 7b6710873a76acba298b02772f37ae0fc9dda08d6ee7b5547a2e6e0a3591c719
 MD5 b8a43b91ab58487dd09e5b0b85617dfc files/1.1.1-patch.1107.lexer_v3_l 755
 RMD160 2ff3ee1f380d56e45e4f1387ad78bef328c770f2 files/1.1.1-patch.1107.lexer_v3_l 755
@@ -13,14 +16,14 @@ EBUILD bogofilter-1.1.1-r1.ebuild 2286 RMD160 750d1ea05cd45de5a1583b2f5440c2bc1e
 MD5 0b5b470f7e3fbd7dc1c62a4ceb3081ce bogofilter-1.1.1-r1.ebuild 2286
 RMD160 750d1ea05cd45de5a1583b2f5440c2bc1ec48142 bogofilter-1.1.1-r1.ebuild 2286
 SHA256 059c8db7e156b784a0e15ed98615ed92d50ab28484a21195b29b3ea0a2e5fec9 bogofilter-1.1.1-r1.ebuild 2286
-EBUILD bogofilter-1.1.5.ebuild 2372 RMD160 d2349517f8196d9a847dd88b6ae8031d944a77bb SHA1 e917e0c824f9bae1fb29c92ef260d6ffa17fb50a SHA256 465a02604046616ecfe291f0f1fb92bbfb49d46e56f89137349770d0d0984ac7
-MD5 979c3ebafabc299c7606ad258e0f7e2c bogofilter-1.1.5.ebuild 2372
-RMD160 d2349517f8196d9a847dd88b6ae8031d944a77bb bogofilter-1.1.5.ebuild 2372
-SHA256 465a02604046616ecfe291f0f1fb92bbfb49d46e56f89137349770d0d0984ac7 bogofilter-1.1.5.ebuild 2372
-MISC ChangeLog 18985 RMD160 c7019be28e45984b91ff00961a0607e40983a340 SHA1 9ac70116428b1da9a525f924afd135aa7dde0eb5 SHA256 ef87667f3a34d3866ef7af01e0ac906b97d33cdec6b2693e12adccfc9ebcbdc2
-MD5 77638d4a908c98f0e085f92cfa01b874 ChangeLog 18985
-RMD160 c7019be28e45984b91ff00961a0607e40983a340 ChangeLog 18985
-SHA256 ef87667f3a34d3866ef7af01e0ac906b97d33cdec6b2693e12adccfc9ebcbdc2 ChangeLog 18985
+EBUILD bogofilter-1.1.5.ebuild 2354 RMD160 b9cf2dfd8a6e262fa4feaf83d277f70eb2b85d43 SHA1 15ac4d4f7e404366a013fc02d0f802a19ba926a0 SHA256 c7ce3c087fa585b68e224751e63fc347631a3f66bf883bbc96adb905ea54119f
+MD5 09dd38d5c51ff074befefba68e3349d6 bogofilter-1.1.5.ebuild 2354
+RMD160 b9cf2dfd8a6e262fa4feaf83d277f70eb2b85d43 bogofilter-1.1.5.ebuild 2354
+SHA256 c7ce3c087fa585b68e224751e63fc347631a3f66bf883bbc96adb905ea54119f bogofilter-1.1.5.ebuild 2354
+MISC ChangeLog 19094 RMD160 79f96597d5f8f631197b0458e4fcdc0e1eeb1141 SHA1 9ce7b6f1baa60757519c168ba37ca6d9bcf68994 SHA256 849e495f1d633aa8139a3fcf859397329388f002ba214216e23bf29e00cc3f8d
+MD5 adfb31a46d64291384c117f12ebedb3d ChangeLog 19094
+RMD160 79f96597d5f8f631197b0458e4fcdc0e1eeb1141 ChangeLog 19094
+SHA256 849e495f1d633aa8139a3fcf859397329388f002ba214216e23bf29e00cc3f8d ChangeLog 19094
 MISC metadata.xml 424 RMD160 7780bbf745ba6b51f837cdc076b1b315ba8d33b9 SHA1 0b17aa0a89b5854ee1850da8e222b95015e1afd9 SHA256 ace8b08d5d5b207b9226c509b6d1f9610da16264d08033e28713df61063563d9
 MD5 48bd0f185b30f8151e8da04a025e0373 metadata.xml 424
 RMD160 7780bbf745ba6b51f837cdc076b1b315ba8d33b9 metadata.xml 424
@@ -34,3 +37,10 @@ SHA256 60de5207a6505e04638e479ab398b93193f89a134d006d538d76fb4f9a383dc0 files/di
 MD5 58061ffdd74195a1f2451b506e916113 files/digest-bogofilter-1.1.5 253
 RMD160 39a2af5b40e0f67eeefdf3e8bcb234796a026f0d files/digest-bogofilter-1.1.5 253
 SHA256 490a853ed94bb9fbdedae9a5cdc5f2510eb4e19a73791757cf27296bd1430291 files/digest-bogofilter-1.1.5 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF5Wx6V3J2n04EauwRAhlpAJ9OEwJGicjMOfIwlNexHcZjxnXbRgCgzoeb
+PpnLBHSBCAajPa/HLPn6l/s=
+=+AqS
+-----END PGP SIGNATURE-----

diff --git a/mail-filter/bogofilter/bogofilter-1.1.5.ebuild b/mail-filter/bogofilter/bogofilter-1.1.5.ebuild
index 65c280336b17a16ddc91d00cb8bcbd1d2dec6ab5..2c2b0af95f8496f9aadaa34b85122056ae31f8fe 100644 (file)
--- a/mail-filter/bogofilter/bogofilter-1.1.5.ebuild
+++ b/mail-filter/bogofilter/bogofilter-1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-1.1.5.ebuild,v 1.3 2007/02/28 11:01:55 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-1.1.5.ebuild,v 1.4 2007/02/28 11:50:11 tove Exp $
 
 inherit db-use flag-o-matic
 
@@ -22,20 +22,19 @@ DEPEND="virtual/libiconv
 #      app-arch/pax" # only needed for bf_tar
 
 src_compile() {
-       local myconf="" berkdb=false
+       local myconf="" berkdb=true
        myconf="$(use_with !gsl included-gsl)"
 
        # determine backend: berkdb *is* default
        if use berkdb && use sqlite ; then
                elog "Both useflags berkdb and sqlite are in USE:"
                elog "Using berkdb as database backend."
-               berkdb=true
        elif use sqlite ; then
                myconf="${myconf} --with-database=sqlite"
+               berkdb=false
        elif ! use berkdb ; then
                elog "Neither berkdb nor sqlite are in USE:"
                elog "Using berkdb as database backend."
-               berkdb=true
        fi
 
        # Include the right berkdb headers for FreeBSD