Remove circular dependency with global kerberos and ldap USE flags. ldap -> openldap renamed.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 15 insertions, 10 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/Manifest b/app-crypt/mit-krb5/Manifest
index 8d8e47cb4ced..e556bab0a29a 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -10,6 +10,6 @@ AUX mit-krb5kdc.initd 656 RMD160 8c4c508273f9d715ac0e0a8d9c54e36f63526b9b SHA1 6
 DIST krb5-1.8.3-signed.tar 11642880 RMD160 bdf3a505e4b2447af0c9080b441918d665dcdd9c SHA1 69696f63b6c2b0e3238156b19eed68cecd661c6b SHA256 2c5988ddd8b409134cd0e77e9ce8f762605ce8d8fb0aa22f6500f53381567019
 DIST krb5-1.9-signed.tar 11888640 RMD160 bb067cb2fde9cb2a7ea04140683b9bc4a616bd38 SHA1 a7ad1b4ed37bff4b9087f6c4561b2b222208d779 SHA256 c30e012226f04943411dbb28d303d1a488955af74eb7d1ab50d6f4f21a6e1d06
 EBUILD mit-krb5-1.8.3-r3.ebuild 2901 RMD160 8937da2dec127ec9c15929a905a8ec63ef75302b SHA1 b846e7870ce5c16fd913d8dd1d41e9da7744009a SHA256 feb25a021dd40804bdfe235be91c68c6ab6a902469418e87f3165ed7dde48490
-EBUILD mit-krb5-1.9-r1.ebuild 2903 RMD160 f228ee314b141b83e268a19399c62e19515c6df1 SHA1 aecdded4051e75e17c751e19b9dc233412e74809 SHA256 41591f3a4e3b807cb06c3082848635a2e204cee0cf31229cd8e5207014d9d9b9
-MISC ChangeLog 41613 RMD160 f7114e38e059772bc8e3286e292f21222d26df23 SHA1 8b0272f79fb9068434da4d9bfd0839b83ae7eb52 SHA256 5b7df0010edadd0b3b5b45b48fb8b27fde76af8e112ddb10fa561701ae1d6b88
-MISC metadata.xml 513 RMD160 1fdd6ccb4acec66644c9e542df12aa75a586a6fe SHA1 83d50a7790fa92668019c39b9153b6ee96e1d90f SHA256 77b1100b25aed0652738c7d5885fe98feb47c783a242221938afd44a235720c9
+EBUILD mit-krb5-1.9-r1.ebuild 2905 RMD160 463d5c53fcb850c4bd3af0bef1547ff0e5251801 SHA1 25a3080ddfcd025a45ca216e839a507fb40884bf SHA256 d9069426269240a0dc1880d714bce7f4610d23aa15dc83cbcf6a63b734f80b94
+MISC ChangeLog 41795 RMD160 d2587ccb97897da5e4c8919978b9e4e0194cbacc SHA1 14b5593c78cbd27f260b00c12e199e244eef1ce6 SHA256 a8974d01f09b019a5e419ce24f1198b4c9b85d442a4f37a9613e7a685e1c0cb5
+MISC metadata.xml 591 RMD160 45010246f34606c6aa0efcd2cd39cc003f2cfd2a SHA1 61026f0f64b6ff475699db6e3926070207703446 SHA256 83b41fa0aa310b86e9b396c67342c5470df3fbc3e97c0190d9bef168f9c2171d
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