summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2009-12-03 20:02:00 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2009-12-03 20:02:00 +0000
commit01a69aba9f6c89c6d990a9549abebf8306082bdc (patch)
tree49cc50a0b33dd1724a4db58ae22c5ac2f23a0b06 /net-nds
parentStable for HPPA (bug #285475). (diff)
downloadgentoo-2-01a69aba9f6c89c6d990a9549abebf8306082bdc.tar.gz
gentoo-2-01a69aba9f6c89c6d990a9549abebf8306082bdc.tar.bz2
gentoo-2-01a69aba9f6c89c6d990a9549abebf8306082bdc.zip
Make cxx NOT defaulted per the profile, due to the circular dependency it brings in with dev-libs/cyrus-sasl. Thanks to Cardoe for pointing out.
(Portage version: 2.2_rc54/cvs/Linux x86_64)
Diffstat (limited to 'net-nds')
-rw-r--r--net-nds/openldap/ChangeLog7
-rw-r--r--net-nds/openldap/openldap-2.4.19-r1.ebuild4
2 files changed, 8 insertions, 3 deletions
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index acc4e2b31657..4b1491127ba9 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-nds/openldap
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.363 2009/12/03 02:47:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.364 2009/12/03 20:02:00 robbat2 Exp $
+
+ 03 Dec 2009; Robin H. Johnson <robbat2@gentoo.org>
+ openldap-2.4.19-r1.ebuild:
+ Make cxx NOT defaulted per the profile, due to the circular dependency it
+ brings in with dev-libs/cyrus-sasl. Thanks to Cardoe for pointing out.
03 Dec 2009; Robin H. Johnson <robbat2@gentoo.org>
openldap-2.4.19-r1.ebuild:
diff --git a/net-nds/openldap/openldap-2.4.19-r1.ebuild b/net-nds/openldap/openldap-2.4.19-r1.ebuild
index eb7a56cf0d1d..45cd1be5c2b5 100644
--- a/net-nds/openldap/openldap-2.4.19-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.19-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.8 2009/12/03 02:47:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.9 2009/12/03 20:02:00 robbat2 Exp $
EAPI="2"
inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
@@ -18,7 +18,7 @@ IUSE_BACKEND="+berkdb"
IUSE_OVERLAY="overlays perl"
IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 syslog selinux"
IUSE_CONTRIB="smbkrb5passwd kerberos"
-IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
+IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
# openssl is needed to generate lanman-passwords required by samba