| 1 |
robbat2 14/11/01 00:29:02 |
| 2 |
|
| 3 |
Modified: openldap-2.4.40-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Bug #527140: avoid double-dep against bdb. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 net-nds/openldap/openldap-2.4.40-r2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.40-r2.ebuild?rev=1.3&view=markup |
| 13 |
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 |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/openldap-2.4.40-r2.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: openldap-2.4.40-r2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.40-r2.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- openldap-2.4.40-r2.ebuild 30 Oct 2014 02:22:07 -0000 1.2 |
| 23 |
+++ openldap-2.4.40-r2.ebuild 1 Nov 2014 00:29:02 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI="5" |
| 31 |
|
| 32 |
@@ -30,12 +30,13 @@ |
| 33 |
IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" |
| 34 |
|
| 35 |
REQUIRED_USE="cxx? ( sasl )" |
| 36 |
-# This is only actually applicable if linking against db-6 |
| 37 |
|
| 38 |
# always list newer first |
| 39 |
# Do not add any AGPL-3 BDB here! |
| 40 |
# See bug 525110, comment 15. |
| 41 |
BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4' |
| 42 |
+BDB_PKGS='' |
| 43 |
+for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done |
| 44 |
|
| 45 |
# openssl is needed to generate lanman-passwords required by samba |
| 46 |
RDEPEND="icu? ( dev-libs/icu:= ) |
| 47 |
@@ -53,8 +54,8 @@ |
| 48 |
perl? ( dev-lang/perl[-build(-)] ) |
| 49 |
samba? ( dev-libs/openssl ) |
| 50 |
berkdb? ( |
| 51 |
- >=sys-libs/db-4.4 |
| 52 |
- <sys-libs/db-6 |
| 53 |
+ <sys-libs/db-6.0:= |
| 54 |
+ || ( ${BDB_PKGS} ) |
| 55 |
) |
| 56 |
smbkrb5passwd? ( |
| 57 |
dev-libs/openssl |
| 58 |
|
| 59 |
|
| 60 |
|
| 61 |
1.485 net-nds/openldap/ChangeLog |
| 62 |
|
| 63 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/ChangeLog?rev=1.485&view=markup |
| 64 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/ChangeLog?rev=1.485&content-type=text/plain |
| 65 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/openldap/ChangeLog?r1=1.484&r2=1.485 |
| 66 |
|
| 67 |
Index: ChangeLog |
| 68 |
=================================================================== |
| 69 |
RCS file: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v |
| 70 |
retrieving revision 1.484 |
| 71 |
retrieving revision 1.485 |
| 72 |
diff -u -r1.484 -r1.485 |
| 73 |
--- ChangeLog 30 Oct 2014 02:22:07 -0000 1.484 |
| 74 |
+++ ChangeLog 1 Nov 2014 00:29:02 -0000 1.485 |
| 75 |
@@ -1,6 +1,9 @@ |
| 76 |
# ChangeLog for net-nds/openldap |
| 77 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 78 |
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.484 2014/10/30 02:22:07 patrick Exp $ |
| 79 |
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.485 2014/11/01 00:29:02 robbat2 Exp $ |
| 80 |
+ |
| 81 |
+ 01 Nov 2014; Robin H. Johnson <robbat2@g.o> openldap-2.4.40-r2.ebuild: |
| 82 |
+ Bug #527140: avoid double-dep against bdb. |
| 83 |
|
| 84 |
30 Oct 2014; Patrick Lauer <patrick@g.o> metadata.xml, |
| 85 |
openldap-2.4.40-r2.ebuild, openldap-2.4.40.ebuild: |
Archives