robbat2 14/11/01 00:29:02 Modified: openldap-2.4.40-r2.ebuild ChangeLog Log: Bug #527140: avoid double-dep against bdb. (Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.3 net-nds/openldap/openldap-2.4.40-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.40-r2.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.40-r2.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.40-r2.ebuild?r1=1.2&r2=1.3 Index: openldap-2.4.40-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.40-r2.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openldap-2.4.40-r2.ebuild 30 Oct 2014 02:22:07 -0000 1.2 +++ openldap-2.4.40-r2.ebuild 1 Nov 2014 00:29:02 -0000 1.3 @@ -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="${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 @@ 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 1.485 net-nds/openldap/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/ChangeLog?rev=1.485&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/ChangeLog?rev=1.485&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/ChangeLog?r1=1.484&r2=1.485 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v retrieving revision 1.484 retrieving revision 1.485 diff -u -r1.484 -r1.485 --- ChangeLog 30 Oct 2014 02:22:07 -0000 1.484 +++ ChangeLog 1 Nov 2014 00:29:02 -0000 1.485 @@ -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 <[email protected]> openldap-2.4.40-r2.ebuild: + Bug #527140: avoid double-dep against bdb. 30 Oct 2014; Patrick Lauer <[email protected]> metadata.xml, openldap-2.4.40-r2.ebuild, openldap-2.4.40.ebuild:
