Undo last change, enable berkdb by default, require at least one database to be present, bug 528814. Thanks Guillaume Castagnino

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

4 files changed, 37 insertions, 24 deletions

diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index 8f89ca54d9e3..a9e00d8011da 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/spamassassin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.257 2014/11/29 20:41:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.258 2014/11/30 21:24:44 dilfridge Exp $
+
+  30 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  spamassassin-3.3.2-r5.ebuild, spamassassin-3.4.0.ebuild:
+  Undo last change, enable berkdb by default, require at least one database to
+  be present, bug 528814. Thanks Guillaume Castagnino
 
   29 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   spamassassin-3.3.2-r5.ebuild, spamassassin-3.4.0.ebuild:
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 66092dd3c7a3..364480976212 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -13,26 +13,26 @@ AUX spamassassin.service-r1 323 SHA256 960eb0115ac4e70981f9a4350767e001cdabb244f
 AUX spamassassin.service.conf 333 SHA256 b6f942eb15f2476dbd161db92b8dacec43f2a0664b45405f3e4396f23ab8b18d SHA512 d818e0ca5bfa9dadb94f99351a307f41c05bc46b89f55a03b9ba2fba0bd06fada06adf1a3eff949f3a04151f3680b279d78fba08c8f28873d17e4a4aa55edca4 WHIRLPOOL 9b5e5674223f99df7afb48482f12f4fa307677290833dd6d3285cdcb94bea1a632c76e8a99e7e38b556a61c20375389d5a370105d2d8c2d4f1de445340ab429d
 DIST Mail-SpamAssassin-3.3.2.tar.bz2 1006577 SHA256 c7239b4b4ef04ba5e2d5aedb9156850146ed3fa47c88f0a0757f08e22f93a205 SHA512 3baabfacd2f3ac1debc2bbcdc0b2109ad51f6b176b9a6d037e14999c430150f0922469f777e7d35311ab819eb20905b55c00aa58f1c3c8d5f881d173dd441cbd WHIRLPOOL 5751d7285ffd29c041056f15ff6c85f66ecf6b9e806558623716ad8826124e1f92096f0e8b00016158b4a965927bde7e9e5ed48984ee956906175431e8a45ee5
 DIST Mail-SpamAssassin-3.4.0.tar.bz2 1065544 SHA256 553b39bae969b4ba20854c0a0fa1eba2a6aa0f4e103b530e0da4e152cdce4714 SHA512 4a04604a0331a9c23cd10d4fb58e5ca5d3e592bbeffacf0f89b379e5b46118f8b1500d671606a2407115f90fb633a713c8ed557f0db155f4645e263175b0946c WHIRLPOOL 401d61a0ab8bd906b14effb0125aeb3b1a87cdd115484b0787410a03208208e6dfb3c7a440c82ff2334c093555ac7e4eae8b9fc735de5e503f1396a172cec927
-EBUILD spamassassin-3.3.2-r5.ebuild 7181 SHA256 51a74f34a8b4f19afff60f3dded61049dec8de5f5f9d7b16912c8889e7dd4564 SHA512 7ca281999f55bec12423e246d425a8c258cfa80f51d141bf80b0ebc879ad8ca5b54e111afdc5bfc86909424292b2a6b17b743a4a44655e10a621f5fc754bdb15 WHIRLPOOL 260a93d7f01fb7433375c053ff61a8d95ba9f02d710db07e13a69cf89874580b2d8863c608d744950466dc7612689493d42d1249947ffe052dce962181f621b7
-EBUILD spamassassin-3.4.0.ebuild 6743 SHA256 ed6c2d042aef5b15efc158028fffe9db0794ee4b05b6e48d666ccc4127257db5 SHA512 5048d057423b6c6dcd4244faec804abb372c4b5d44595bf4bd1749331bd65525f2f1a9b5c507932beff9a4366406ce2cded6fc9826509ca94fdaff677bcafdc2 WHIRLPOOL a13f3de74dd08bcf73b468805dd738ac11e5a031d437c59c49c233d7a6edb07043a8730fe06bb5e78f4f2abf45d5152b93353dfc2fa91e5e03d7cc1bc75adb31
-MISC ChangeLog 48384 SHA256 1212c9289069397cd138d4587eea37c8f135b6138c417aae80ab9f81bb9f8c86 SHA512 b46d5b86bc62ba8ce1f7adee8f113de5a823de33c0ecd048e78550b7f5ee5a6f36f85a5428bca01ea827bd01360afb7915054bd399bda96d2b3e8c30095a6bd3 WHIRLPOOL 24d42d5e11c3f5fa1177a59dcbe798525c0cda4bfeafd8261e1b24aafa445642edb1acc56bffa13b9f0c1a17b12cd2417c25081e5d7d1bca26141629c9f32903
+EBUILD spamassassin-3.3.2-r5.ebuild 7256 SHA256 c0fe3ae4dfb105f1a569edc4dfd17b2f067469ff8535a3bc51707516565ecb17 SHA512 a5302b95cbeabffa8372cea671718a3829761eeda7a5e4ee07f82987d356993d37efb48cd4389fe0ebd8ea745f119427c0b8fa5ef0e98a7d0498f792f55ef553 WHIRLPOOL a31a700d58922a4edbe14b65ad61d2f1ea5c3939b832ae4cd7e95462af621fce1dc995bdbe3933bf9674dd9675eb6a83b2417170635faa92d507aa73719c4227
+EBUILD spamassassin-3.4.0.ebuild 6818 SHA256 1cb277400a1b5020b5b2a10c0222051031e6e57d7fcc9c6cf9c2af39fbc215d1 SHA512 a2294b3b035200467305b638230e8fb948ae8d1234e95552d169cb1b241c68a9cd5f8d9d5b8b7a21164a6b28666be370d1c78a356781f91b9c74bbda4e2cc615 WHIRLPOOL 60474099d8d491fa73522a5ed6c9067432c0aef9125fc661962c3ba01bde289059ff83c4c54d54bc111a5d5cc8112c94d5e9577ad9db4638cb96d61a3fc17a86
+MISC ChangeLog 48634 SHA256 918f82d1ff21153a7cd459c2f50189223c707d9a7deaf60507b73f2dd7c42255 SHA512 de56854c4319ffeb9a46899edab76a17492ce1d0295d7211048c11c1a9c696bfe68f6dcd3ca4740df09442751c901549a087970d63ab09c751ce714623184aee WHIRLPOOL 0d0c913686b2d7a1d8fb68b29f0a15ddecc96bfa7a5303171f47a1a96c1c708ab9b10cb557bc2b821ccd0986c10bb1cf486a01156e4e15735b1b150d9835146b
 MISC metadata.xml 233 SHA256 2c234ebf47c0de34ea504b0342e8eca756fb7d77a6ac82cadb15fe5ba11e8beb SHA512 26f4aee998e006f276bd381132a5449fe3d8de3fe17610aab068873b1e0273d9f37b7171777e205b8ec3eabb53fcbce1eb4d45db7710fae41674b3fabca2eefa WHIRLPOOL 7992869e2f4237d58b3ea97c8b9fe61e90ec523d3fe81cbe14601841908ccf251d064aa53930ad73b61d5dfb7546995ea41491bfbad1542e18f9c5f9994f9153
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUei9xXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUe4sdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcoxwQALH6OXDpVYxu6QbNJb5twRXK
-mWNlN+lV6ZgrIyM6a0PISDkRG/lby/LHPfXiDKZyncqn1WvT8I6DssJISVBtssfk
-fu0ej8iqQYM+JOfiTJv9hpJ5YWrvVTo++ZQtbobxeuC2nkP1aP51cDdCrosNJxwp
-P0C9ZAFaZjgokVzKx7VLbuImc2j/Hjz5DCysjBLaAY30m918fi/3UtbKWw0r1MGG
-xzY8yd7gn0b4F2blk//IVU6f13T05d8yZgbMQiuP70DEWW7VRDcokCrTiEe04iuA
-WvATEOaQEp0NpSjZfclyjS0EOadBia/SgvulM1hMLgdrmB6uEyeDO2JxZYZvTJBF
-oVA0dNA4iFHhKVoPL4gffxLqlyjxgqshU7juK8lp/hCJyYU5tHhYawFPJvIV6Sst
-bA88u2QG2CzcaJgIHjoZQ17HpT6EYf6dbCInlWuL0JvgpKkhMsoffieF6/CZVsd6
-4xrRJxUFlVAWdDzhGTfmMuM2Af+OP/1Ofj9pr8jgdwyfbjCk1hDLS8+FswQ3xFg7
-NW5tx0b5a5HJSnLejFOVllz4i8PYN5BXcVLalF7CfkMxsFhuAQAuI6p+bwSN963+
-n59/i2AwNL4ji0TqyJg+0UeMkA5/tfykW4fZXAsJVKaV1wiTUiBQYki4zb6Kb4m3
-nIhWdVXTOF6u191gcWuT
-=eCXa
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcA+QQANhqecsNdbiqmMjCU9wZvFgl
+jXefZqIQAUqXDkbliloObn9ypI4wZEaNxVHgFtdBvBhX9qw5sU850eXo8okxrPsr
+SGOT/kAUqTvXvuV2Y85wxIyOHypF9TZiKlptAGCvom56vtB3lt5ejnafxDGs9M71
+W1CUHXPwhHK8Ooao6A7aHVA88uyqTpXn8ddENuD+6Fmw/krrqnvXeO4mJXq4LVEW
+sdpZzdvr7BwupH7FLDqI8xG0BiqqmZoUgkfGjkMdG/UWShnVVHFuFIvs4Dpdno4/
+GqKiLjh7DwZkj/2FlQ8s+rw1QTnS9P8rz6BMdEKGGgfYmQfXfRSWoBZUF2drQBRx
+okoQMNPEKnC8h0TvIv+2DEpyzmAlyhfrp7T++Ypqd6D4/oz3893kVHWPu7kDH93l
+bY2zqaYBznqLuxUFBIHCOxy9SMekUd05LifuTQvE90OxULubjXlSOk0gt6wJefqF
+ftji2M2Q9fncvKr/AqCjro2tlrjUf+K//BztiYk37ou/j9hGmd7HlXfdG8+8G091
+7//AgMXcFlY1fFq838nBmO2dfHjxhwMHYc+zkVQO1ZHnqd1eFyiG7nggbRklFGMA
+MKlab8lFIelto+9X+nmF8hzS24KRnKVdc8kxDjgREmCWZawdMtZelTkY/MNFs19V
+Rdpc0mCoFSZOtCjkpSK0
+=jUrb
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/spamassassin/spamassassin-3.3.2-r5.ebuild b/mail-filter/spamassassin/spamassassin-3.3.2-r5.ebuild
index 285bf5cb955a..16fd1ab7cc67 100644
--- a/mail-filter/spamassassin/spamassassin-3.3.2-r5.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.3.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.3.2-r5.ebuild,v 1.12 2014/11/29 20:41:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.3.2-r5.ebuild,v 1.13 2014/11/30 21:24:44 dilfridge Exp $
 
 EAPI=5
 
@@ -16,7 +16,9 @@ LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 # need keyword request for Mail-SPF ppc ppc64
-IUSE="qmail ssl doc ldap mysql postgres sqlite ipv6"
+IUSE="+berkdb qmail ssl doc ldap mysql postgres sqlite ipv6"
+
+REQUIRED_USE="|| ( berkdb mysql postgres sqlite )"
 
 DEPEND=">=dev-lang/perl-5.8.8-r8
 	virtual/perl-MIME-Base64
@@ -34,11 +36,13 @@ DEPEND=">=dev-lang/perl-5.8.8-r8
 	>=dev-util/re2c-0.12.0
 	dev-perl/Mail-SPF
 	dev-perl/NetAddr-IP
-	virtual/perl-DB_File
 	ssl? (
 		dev-perl/IO-Socket-SSL
 		dev-libs/openssl
 	)
+	berkdb? (
+		virtual/perl-DB_File
+	)
 	ldap? ( dev-perl/perl-ldap )
 	mysql? (
 		dev-perl/DBI
diff --git a/mail-filter/spamassassin/spamassassin-3.4.0.ebuild b/mail-filter/spamassassin/spamassassin-3.4.0.ebuild
index d447b79cda73..da62e1b4c03f 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.0.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.4.0.ebuild,v 1.12 2014/11/29 20:41:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.4.0.ebuild,v 1.13 2014/11/30 21:24:44 dilfridge Exp $
 
 EAPI=5
 
@@ -15,7 +15,9 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="qmail ssl doc ldap mysql postgres sqlite ipv6"
+IUSE="+berkdb qmail ssl doc ldap mysql postgres sqlite ipv6"
+
+REQUIRED_USE="|| ( berkdb mysql postgres sqlite )"
 
 DEPEND=">=dev-lang/perl-5.8.8-r8
 	virtual/perl-MIME-Base64
@@ -36,11 +38,13 @@ DEPEND=">=dev-lang/perl-5.8.8-r8
 	dev-perl/Geo-IP
 	dev-perl/Encode-Detect
 	dev-perl/Net-Patricia
-	virtual/perl-DB_File
 	ssl? (
 		dev-perl/IO-Socket-SSL
 		dev-libs/openssl
 	)
+	berkdb? (
+		virtual/perl-DB_File
+	)
 	ldap? ( dev-perl/perl-ldap )
 	mysql? (
 		dev-perl/DBI