diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2014-11-30 21:24:44 +0000 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2014-11-30 21:24:44 +0000 |
commit | 091c2c9610a55dc75740c254cae320f3cf89af72 (patch) | |
tree | 76e764c420dc0c007e9d035036ed0048dc485562 /mail-filter | |
parent | Version bump, bug 519964 (diff) | |
download | gentoo-2-091c2c9610a55dc75740c254cae320f3cf89af72.tar.gz gentoo-2-091c2c9610a55dc75740c254cae320f3cf89af72.tar.bz2 gentoo-2-091c2c9610a55dc75740c254cae320f3cf89af72.zip |
Undo last change, enable berkdb by default, require at least one database to be present, bug 528814. Thanks Guillaume Castagnino
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Diffstat (limited to 'mail-filter')
-rw-r--r-- | mail-filter/spamassassin/ChangeLog | 7 | ||||
-rw-r--r-- | mail-filter/spamassassin/spamassassin-3.3.2-r5.ebuild | 10 | ||||
-rw-r--r-- | mail-filter/spamassassin/spamassassin-3.4.0.ebuild | 10 |
3 files changed, 20 insertions, 7 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/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 |