diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2014-11-01 00:29:02 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2014-11-01 00:29:02 +0000 |
| commit | 61415d9fbf4eeb9d2a6d2005f32cf53848470379 (patch) | |
| tree | b4d6ead7eb863c177f81f8bf9fc58b3b5259e076 /net-nds | |
| parent | Stable for HPPA (bug #523164). (diff) | |
| download | gentoo-2-61415d9fbf4eeb9d2a6d2005f32cf53848470379.tar.gz gentoo-2-61415d9fbf4eeb9d2a6d2005f32cf53848470379.tar.bz2 gentoo-2-61415d9fbf4eeb9d2a6d2005f32cf53848470379.zip | |
Bug #527140: avoid double-dep against bdb.
(Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'net-nds')
| -rw-r--r-- | net-nds/openldap/ChangeLog | 5 | ||||
| -rw-r--r-- | net-nds/openldap/openldap-2.4.40-r2.ebuild | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog index 067e6012d479..3f36c54e2c8d 100644 --- a/net-nds/openldap/ChangeLog +++ b/net-nds/openldap/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-nds/openldap # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.484 2014/10/30 02:22:07 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.485 2014/11/01 00:29:02 robbat2 Exp $ + + 01 Nov 2014; Robin H. Johnson <robbat2@gentoo.org> openldap-2.4.40-r2.ebuild: + Bug #527140: avoid double-dep against bdb. 30 Oct 2014; Patrick Lauer <patrick@gentoo.org> metadata.xml, openldap-2.4.40-r2.ebuild, openldap-2.4.40.ebuild: diff --git a/net-nds/openldap/openldap-2.4.40-r2.ebuild b/net-nds/openldap/openldap-2.4.40-r2.ebuild index f2aeab7b77de..52cface6a820 100644 --- a/net-nds/openldap/openldap-2.4.40-r2.ebuild +++ b/net-nds/openldap/openldap-2.4.40-r2.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/net-nds/openldap/openldap-2.4.40-r2.ebuild,v 1.2 2014/10/30 02:22:07 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.40-r2.ebuild,v 1.3 2014/11/01 00:29:02 robbat2 Exp $ EAPI="5" @@ -30,12 +30,13 @@ IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" REQUIRED_USE="cxx? ( sasl )" -# This is only actually applicable if linking against db-6 # always list newer first # Do not add any AGPL-3 BDB here! # See bug 525110, comment 15. BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4' +BDB_PKGS='' +for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done # openssl is needed to generate lanman-passwords required by samba RDEPEND="icu? ( dev-libs/icu:= ) @@ -53,8 +54,8 @@ RDEPEND="icu? ( dev-libs/icu:= ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( - >=sys-libs/db-4.4 - <sys-libs/db-6 + <sys-libs/db-6.0:= + || ( ${BDB_PKGS} ) ) smbkrb5passwd? ( dev-libs/openssl |