added otp use and removed cracklib dependency

Package-Manager: portage-2.1.4.4

3 files changed, 153 insertions, 2 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index fb0e00a9ca5c..54182ad9b5fe 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.119 2008/06/11 07:27:46 mueli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.120 2008/06/14 16:59:32 mueli Exp $
+
+*heimdal-1.2.1_rc1-r1 (14 Jun 2008)
+
+  14 Jun 2008; Michael Hammer <mueli@gentoo.org>
+  +heimdal-1.2.1_rc1-r1.ebuild:
+  Removed the cracklib dependency as it is not needed. Added otp use flag. See
+  #185899, thx to mastamind@users.sourceforge.net
 
 *heimdal-1.2.1_rc1 (11 Jun 2008)
 
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index d67ff6434e96..6ae50e37ff9b 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -8,6 +8,7 @@ DIST heimdal-0.7.2.tar.gz 4525734 RMD160 0f028a9d5a6a66e8efc0397e4d8c8adc2183b40
 DIST heimdal-1.2.1rc1.tar.gz 5234689 RMD160 70e693e60c32edd33034b780808f715a77fa33e9 SHA1 20d3cb4a647c03e08d8e07f6911fccfaf260f6d3 SHA256 6a420676a8b8f141df5b89176665ca176de6ab776abca3f21898d4f6bb5b8ff2
 DIST heimdal-gentoo-patches-0.2.tar.bz2 5215 RMD160 f6b87d3caf8f156fdcf7c61542ea612cdcd42d9a SHA1 2282ea687e2cc215bf77a61b9badfb4a347b2792 SHA256 c4074b06760e28ac9a9bd5f1bc54dd86f1c104463384ca2f79918029995bb45a
 EBUILD heimdal-0.7.2-r3.ebuild 3545 RMD160 ab053bc40e0cc7692e7bc902798891afc0ddb4f7 SHA1 4b627bb6e3ce87a20c666c5cbf57c5a831ff6323 SHA256 108737e78593d09d97b9661e1f182e02b2911d5289d9b484d87f4869c30f56a1
+EBUILD heimdal-1.2.1_rc1-r1.ebuild 3896 RMD160 dba2c7043885c88827088d45080be8fe6f3d7495 SHA1 f00a2409fb31af486268be736358af29222292a7 SHA256 2e3dc4f37a5c153f6e77f30a5869be21ba3081994052548175492e1b05a4777e
 EBUILD heimdal-1.2.1_rc1.ebuild 3889 RMD160 5b28bbce3a336fa041ddeaa121446017ab0457ce SHA1 bb5da1f16914ac89a6d197c5de847edb8b0bf975 SHA256 ac05d0aace342b6d885ff6afd7948d6847130dc44b159243b7b7e87d51691388
-MISC ChangeLog 19599 RMD160 2e27b14bcb4be4ea1c2312410b6edd99933f27b8 SHA1 f69fe5fcbef53ed233ece9eeba63963acbfc93ac SHA256 55ca54aded26cb1304d0806d5940e0bfdc1adaeaf41dd9beb2f2a7b14e04c85e
+MISC ChangeLog 19847 RMD160 c023e31fbc7781f8cbb766c0b27ec9fe8e7300ff SHA1 8b9429a3bbea03a1599ae3b7f750a714109b595c SHA256 4e7120716176a31f8aa7a80be85d9e3075bc7758c02d4c3b5411036d2aa2e3cf
 MISC metadata.xml 231 RMD160 1be9e973a8223227be2a819d21b20400ec0c2eeb SHA1 9ef61083af843eed7a918f2d91f3aef87b925e50 SHA256 a8adb0e7f6a178f4af8bfabe77a247ef7d6ad2216eb1e15d02e2954143c48d0a
diff --git a/app-crypt/heimdal/heimdal-1.2.1_rc1-r1.ebuild b/app-crypt/heimdal/heimdal-1.2.1_rc1-r1.ebuild
new file mode 100644
index 000000000000..3143896073ea
--- /dev/null
+++ b/app-crypt/heimdal/heimdal-1.2.1_rc1-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.2.1_rc1-r1.ebuild,v 1.1 2008/06/14 16:59:32 mueli Exp $
+
+WANT_AUTOMAKE=latest
+WANT_AUTOCONF=latest
+
+inherit autotools libtool eutils virtualx toolchain-funcs flag-o-matic
+
+PATCHVER=0.2
+PATCH_P=${PN}-gentoo-patches-${PATCHVER}
+
+DESCRIPTION="Kerberos 5 implementation from KTH"
+HOMEPAGE="http://www.h5l.org/"
+SRC_URI="http://www.h5l.org/dist/src/snapshots/${P/_rc/rc}.tar.gz
+	mirror://gentoo/${PATCH_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="berkdb ipv6 ssl threads X pkinit otp" # ldap ldap-shared <- circular dependency
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	berkdb? ( sys-libs/db )
+	>=dev-db/sqlite-3.5.7
+	sys-libs/ss
+	sys-libs/com_err
+	!virtual/krb5"
+# Sry for that - still have no cute solution to break circular dependency
+# I also want to point at http://www.h5l.org/manual/heimdal-1-1-branch/info/heimdal.html#Using-LDAP-to-store-the-database
+# I agree that it's not advicable to use LDAP as backend for kerberos
+#	ldap? ( >=net-nds/openldap-2.3.0 )
+#	ldap-shared? ( >=net-nds/openldap-2.3.0 )
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-devel/autoconf-2.62"
+#	>=sys-devel/libtool-2.2"
+PROVIDE="virtual/krb5"
+
+GENTOODIR=${WORKDIR}/gentoo
+S=${WORKDIR}/${P/_rc/rc}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch "${GENTOODIR}"/patches
+
+	epatch "${FILESDIR}"/heimdal-r23238-kb5_locl_h-wind_h.patch
+	epatch "${FILESDIR}"/heimdal-r23235-kb5-libwind_la.patch
+	epatch "${FILESDIR}"/heimdal-kdc-sans_pkinit.patch
+	epatch "${FILESDIR}"/heimdal-system_sqlite.patch
+
+	AT_M4DIR="cf" eautoreconf
+}
+
+src_compile() {
+	local myconf=""
+
+#	if use ldap || use ldap-shared ; then
+#		myconf="${myconf} --with-openldap=/usr"
+#	fi
+
+	econf \
+		$(use_with ipv6) \
+		$(use_enable berkdb berkeley-db) \
+		$(use_enable pkinit pk-init) \
+		$(use_with ssl openssl) \
+		$(use_with X x) \
+		$(use_enable threads pthread-support) \
+		$(use_enable otp) \
+		--enable-kcm \
+		--enable-shared \
+		--enable-netinfo \
+		--prefix=/usr \
+		--libexecdir=/usr/sbin \
+		${myconf} || die "econf failed"
+#		$(use_enable ldap-shared hdb-openldap-module) \
+
+
+	local ltversion=`libtool --version |grep 'GNU libtool' |sed -e's/^.*(GNU libtool) \([0-9]\+\.[0-9]\+\(\.[0-9]\+\)\+\) .*$/\1/'`
+	local ltmajor=`echo $ltversion |sed -e's/^\([0-9]\+\)\..*$/\1/'`
+	local ltminor=`echo $ltversion |sed -e's/^[0-9]\+\.\([0-9]\+\)\..*$/\1/'`
+	if [ $ltmajor -lt 2 ] || ( [ $ltmajor -eq 2 ] && [ $ltminor -lt 2 ] ); then
+		ewarn "Using old libtool with a quick hack."
+		sed -i -e's/ECHO=/echo=/' libtool
+	fi
+
+	emake || die "emake failed"
+
+}
+
+src_test() {
+	addpredict /proc/fs/openafs/afs_ioctl
+	addpredict /proc/fs/nnpfs/afs_ioctl
+
+	if use X ; then
+		KRB5_CONFIG="${S}"/krb5.conf Xmake check || die
+	else
+		KRB5_CONFIG="${S}"/krb5.conf make check || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc ChangeLog README NEWS TODO
+
+	# Begin client rename and install
+	for i in {telnetd,ftpd,rshd}
+	do
+		mv "${D}"/usr/share/man/man8/{,k}${i}.8
+		mv "${D}"/usr/sbin/{,k}${i}
+	done
+
+	for i in {rcp,rsh,telnet,ftp,su,login}
+	do
+		mv "${D}"/usr/share/man/man1/{,k}${i}.1
+		mv "${D}"/usr/bin/{,k}${i}
+	done
+
+	mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
+	mv "${D}"/usr/share/man/man5/{,k}login.access.5
+
+	doinitd "${GENTOODIR}"/configs/heimdal-kdc
+	doinitd "${GENTOODIR}"/configs/heimdal-kadmind
+	doinitd "${GENTOODIR}"/configs/heimdal-kpasswdd
+	doinitd "${GENTOODIR}"/configs/heimdal-kcm
+
+	insinto /etc
+	newins "${GENTOODIR}"/configs/krb5.conf krb5.conf.example
+
+	sed -i "s:/lib:/$(get_libdir):" "${D}"/etc/krb5.conf.example || die "sed failed"
+
+#	if use ldap; then
+#		insinto /etc/openldap/schema
+#		doins "${GENTOODIR}"/configs/krb5-kdc.schema
+#	fi
+
+	# default database dir
+	keepdir /var/heimdal
+}