diff options
author | Eray Aslan <eras@gentoo.org> | 2011-03-12 15:46:14 +0000 |
---|---|---|
committer | Eray Aslan <eras@gentoo.org> | 2011-03-12 15:46:14 +0000 |
commit | 27d78604351bbdac94c2e613f55aeb4bea09fbf5 (patch) | |
tree | 8a1403b482dbae4bf8988945c26bcbf081d184bc /app-crypt/mit-krb5 | |
parent | alpha/arm/ia64/sparc stable wrt #353436 (diff) | |
download | gentoo-2-27d78604351bbdac94c2e613f55aeb4bea09fbf5.tar.gz gentoo-2-27d78604351bbdac94c2e613f55aeb4bea09fbf5.tar.bz2 gentoo-2-27d78604351bbdac94c2e613f55aeb4bea09fbf5.zip |
Remove circular dependency with global kerberos and ldap USE flags. ldap -> openldap renamed.
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt/mit-krb5')
-rw-r--r-- | app-crypt/mit-krb5/ChangeLog | 7 | ||||
-rw-r--r-- | app-crypt/mit-krb5/metadata.xml | 1 | ||||
-rw-r--r-- | app-crypt/mit-krb5/mit-krb5-1.9-r1.ebuild | 11 |
3 files changed, 12 insertions, 7 deletions
diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog index d8a6d0f5ae68..a24182631026 100644 --- a/app-crypt/mit-krb5/ChangeLog +++ b/app-crypt/mit-krb5/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-crypt/mit-krb5 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.260 2011/02/14 14:22:28 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.261 2011/03/12 15:46:14 eras Exp $ + + 12 Mar 2011; Eray Aslan <eras@gentoo.org> mit-krb5-1.9-r1.ebuild, + metadata.xml: + Remove circular dependency with global kerberos and ldap USE flags. ldap + -> openldap renamed 14 Feb 2011; Eray Aslan <eras@gentoo.org> -mit-krb5-1.8.3-r2.ebuild: Remove vulnerable version. diff --git a/app-crypt/mit-krb5/metadata.xml b/app-crypt/mit-krb5/metadata.xml index 6057210f4d88..09d4d31de2ce 100644 --- a/app-crypt/mit-krb5/metadata.xml +++ b/app-crypt/mit-krb5/metadata.xml @@ -10,5 +10,6 @@ which depends on kerberos. </flag> <flag name="pkinit">Enable pkinit support for the initial ticket.</flag> + <flag name="openldap">Enable support for ldap as a database backend.</flag> </use> </pkgmetadata> diff --git a/app-crypt/mit-krb5/mit-krb5-1.9-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.9-r1.ebuild index a00dc95cacf9..7487fec1a8bd 100644 --- a/app-crypt/mit-krb5/mit-krb5-1.9-r1.ebuild +++ b/app-crypt/mit-krb5/mit-krb5-1.9-r1.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.9-r1.ebuild,v 1.1 2011/02/08 22:45:14 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.9-r1.ebuild,v 1.2 2011/03/12 15:46:14 eras Exp $ EAPI=2 inherit eutils flag-o-matic versionator MY_P="${P/mit-}" -MY_P="${MY_P/_/-}" P_DIR=$(get_version_component_range 1-2) DESCRIPTION="MIT Kerberos V" HOMEPAGE="http://web.mit.edu/kerberos/www/" @@ -16,12 +15,12 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar" LICENSE="as-is" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="doc ldap +pkinit +threads test xinetd" +IUSE="doc openldap +pkinit +threads test xinetd" RDEPEND="!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 sys-apps/keyutils - ldap? ( net-nds/openldap ) + openldap? ( net-nds/openldap ) xinetd? ( sys-apps/xinetd )" DEPEND="${RDEPEND} doc? ( virtual/latex-base ) @@ -46,7 +45,7 @@ src_prepare() { src_configure() { append-flags "-I/usr/include/et" econf \ - $(use_with ldap) \ + $(use_with openldap ldap) \ $(use_with test tcl /usr) \ $(use_enable pkinit) \ $(use_enable threads thread-support) \ @@ -99,7 +98,7 @@ src_install() { insinto /var/lib/krb5kdc newins "${D}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example - if use ldap ; then + if use openldap ; then insinto /etc/openldap/schema doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema" || die fi |