Version bump. Dropped m68k bug 324097. Dropped s390 and sh bug 355253.

Double blocker to mit-krb5 bug 296610. Better support for sys-libs/db bug
333341. Added confd options bug 339340.

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

12 files changed, 312 insertions, 3 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index 96b7e4e94ed8..927fcc3b7b84 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-crypt/heimdal
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.166 2010/09/05 15:57:07 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.167 2011/02/16 22:14:12 eras Exp $
+
+*heimdal-1.4.1_pre20110216 (16 Feb 2011)
+
+  16 Feb 2011; Eray Aslan <eras@gentoo.org>
+  +heimdal-1.4.1_pre20110216.ebuild, +files/heimdal-kadmind.confd,
+  +files/heimdal-kadmind.initd-r1, +files/heimdal-kcm.confd,
+  +files/heimdal-kcm.initd-r1, +files/heimdal-kdc.confd,
+  +files/heimdal-kdc.initd-r1, +files/heimdal-kpasswdd.confd,
+  +files/heimdal-kpasswdd.initd-r1, +files/heimdal_link_order.patch:
+  Version bump. Dropped m68k bug #324097. Dropped s390 and sh bug #355253.
+  Double blocker to mit-krb5 bug #296610. Better support for sys-libs/db bug
+  #333341. Added confd options bug #339340.
 
   05 Sep 2010; Raúl Porcel <armin76@gentoo.org> heimdal-1.3.3-r1.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #330447
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index fee370c9e25a..35167424a615 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,14 +1,25 @@
+AUX heimdal-kadmind.confd 151 RMD160 25ae05e118d61a06871d4b7cea4caf3bf8b28cc1 SHA1 4187aa7ec5ddbc79f25d30d65c1f0d6dd2ab0992 SHA256 892f9650d4eb631eb1ea435dc8d3defd3805e6d1f2fa59a698d424c44915d644
 AUX heimdal-kadmind.initd 579 RMD160 d6cae14cfabe5b0170664b882fd8691870181f61 SHA1 b2c58d80917ae63eeb8eb120be076db0b673f6c5 SHA256 1f1e6a086d3f07620f0656bac67d1b3bbe0d8c9cca66dc3c5a01afd7fdbc0549
+AUX heimdal-kadmind.initd-r1 553 RMD160 aaa2e4a8918254f1f663089ef2f63161cebefb0b SHA1 fdda38fda6ad81e3dfe31aa20b8948a57d940ae5 SHA256 cb598a34926c9152072f77027da0106684245e6c53cb931233de32a2c8011a79
+AUX heimdal-kcm.confd 130 RMD160 fc5a12a774be8c96222680de239726d743dba70d SHA1 da9ad21d25ad649318eb39c0d4bde2317e90d62c SHA256 04d90973441ef7b274986152fd78ca6b145fe022fe630d39bfa165cd25b63890
 AUX heimdal-kcm.initd 563 RMD160 6aac9c3ffe9717e48838a1f977b02928d3ab0741 SHA1 22411837ca5931887911df44ee043e4752b26bb7 SHA256 a904c990b3560a4caca3de1ef9a306095f1347be7b404092343ddc059f7852aa
+AUX heimdal-kcm.initd-r1 579 RMD160 64af60100b9a50e74bebdd9c65a33549df3e1fc6 SHA1 2058c2d914fdb58d28ccbff36f208812a61a463b SHA256 77740430c294da3f3f18f186aeb2ba5560c5b8fd944de02603668ce385d99f3b
+AUX heimdal-kdc.confd 130 RMD160 e6d6aab2bf405d839c506fcd97d91ed585d5c250 SHA1 e255a3bbb9c175515a0e690061d9a34feaf194d7 SHA256 c96bedd8c989378cc427da77862353a879bdbfdfd9c9e4b7b3ed1fa09f3d2f93
 AUX heimdal-kdc.initd 554 RMD160 52fb746a619222cf2d965754098fcbe7bc8e8b62 SHA1 af71df7d5a63937b306136e9adfcc5394d7230d0 SHA256 17744329217d998a380f2be47e6f4c10b39c2437db678c49704636fd4ad507f1
+AUX heimdal-kdc.initd-r1 551 RMD160 a8ecb46492f807e8abce133044c37c2881379d81 SHA1 263c103c62611dd5f2cf03d83c361cd102929e12 SHA256 f41052b3ac113c97933d3c83003aa5eec2de1a6baf3f739150e30a26ccac26b8
+AUX heimdal-kpasswdd.confd 148 RMD160 f31d3484987bf5651484f94cfdab7246a837211d SHA1 ac4a7ad909f8c060a88213b3674ad3ccf0c3f771 SHA256 ee533af2cb109038108649bf3f44988fbb63d5a7fd2bacfd9842140790116003
 AUX heimdal-kpasswdd.initd 596 RMD160 ec7ad3d3171f2b29047b1b780237bc379e66eb1a SHA1 46462b4f4ac4156e87de0111ef7cce7d233a3673 SHA256 88cbff8de40337d12acec1d8dc04ee8d219647ec4072a9c9e95f1e56925c8861
+AUX heimdal-kpasswdd.initd-r1 575 RMD160 1f4a7c22a1594cbc280b7f8a85aafac335044412 SHA1 699c3e7834cf405f6d0a175b801cf45112669322 SHA256 97b4e84bcd991e9d52694a91568476e7bd4e94837bc1c8ec6a13cc2d23f74f04
 AUX heimdal_db5.patch 923 RMD160 e7e74d67b2b8789b006ea0dae5695a49386f86f3 SHA1 66106a8c39db0c61a90f0e847417a107cd91931e SHA256 5dac2109683705b2ade8962abfd88f1d989a371b811bc17176c5b360a67bcbe3
 AUX heimdal_disable-check-iprop.patch 577 RMD160 ce3733c555c5c13f320bb9a11b5911ab43f7da85 SHA1 a5ab37be218e03e57cf637a5f45ba630bcb45bcf SHA256 b2ab6f335b5a756856a5df635df82488f9dcdb3ed02a7114f90b4a34911f9721
+AUX heimdal_link_order.patch 1164 RMD160 5aaed57c15dd24e3f51e9fb10c2020bbec88d811 SHA1 5080b5d7d350da5c34e77ef11b990e59b2af4709 SHA256 794560047c549a996d03140ebcbd0476646f4a8e9e36d0cfe6cbaddba611e754
 AUX heimdal_openssl-1.patch 4623 RMD160 1450ee6db0dc8f4603ad3db7f093f4e9021f34f7 SHA1 f0c03e0afe2daff84eec888c2025568628210358 SHA256 359c6201937e91ad9f78cbac07a7e74e467582400de16049eba0fbb30aad1a86
 AUX heimdal_testsuite.patch 11928 RMD160 4e5f3277b07b8c0dd08d8518e381d9d21c296332 SHA1 e9e35a7306f4c59d05a0934b41a192faaa638a6b SHA256 0edb8be49749b27c37d8a19d7129f52dde26a17cc029d541042e568b39fe1db3
 AUX heimdal_testsuite_extra.patch 2352 RMD160 1f2dd032c995d672d376821060ea10684720c5ad SHA1 5537e1d96bc5509c987a2ea75df8dc3d3a5a1cb8 SHA256 301a27f3b36e00ca289d35c3554c4f03f1688e5e16a883b15a3d75180f9c8052
 AUX krb5.conf 424 RMD160 80a0159824b8a44698d97d911c701bb05f2f0688 SHA1 7602cc72576d144429cae5cf568feb25a5906ab7 SHA256 3acbae7a561b0a76c90ab53f41d5ffb5b811a39049c5ed15b1e7a34e8c889c6e
 DIST heimdal-1.3.3.tar.gz 5744155 RMD160 ce97ac415e7c27912ba148b81c46e756dc54ba3e SHA1 a385d959e3edd144aee79e9df585e44347342049 SHA256 8c8d2b272529c87ae9800825e2f266821b696ae6b56837edf0d19e17fc2a8630
+DIST heimdal-1.4.1_pre20110216.tar.bz2 10322710 RMD160 2ab82fa99d13dc91f8c28377b02ed40dd98d5ae5 SHA1 2fd61808398c956f152b809e50dc1d56781280f7 SHA256 e733e248479c36b1b9f7ce4e1cbc925efa05c514d40b44395e56932761e18cfc
 EBUILD heimdal-1.3.3-r1.ebuild 3136 RMD160 a77f4854f9cd988bad15a587af8fae3fc6e8de6a SHA1 7c5afecbdfcd43c8691fc4af0c7e33e0b5239ac5 SHA256 6984607ec24083cef23e8af14922516997d214885abccc32b42b0c9a2044b989
-MISC ChangeLog 27014 RMD160 e07d43bb54655c340b774481b7942d8075d61c10 SHA1 963d6df84dcf8a25533771605b3afa1744712c75 SHA256 0cb76d53221268b548be6ab8ac842cd99fa553ad9ec4d3164f11133f819468ce
+EBUILD heimdal-1.4.1_pre20110216.ebuild 3467 RMD160 ad25d1069eadc0a114168535fbd631187f8b9275 SHA1 ce181aeba8302f30ed0ce2f90c484938698813b5 SHA256 d8902ee409cfe500905b76105c9e5ef47a5d66c0f3cb8289897321ca7f1b2b2b
+MISC ChangeLog 27610 RMD160 30039c15459c875e60b4cde076de416752f55f3b SHA1 831b9aae3ad7b66c120b059c4681ab8faecc8d1b SHA256 b3898ce8ed151105bc6ce8cec8aaf5277c29915ab3f9b07fba0118ae9b29aa5d
 MISC metadata.xml 469 RMD160 2dc8ebb842bdde2d766a1d35335d97581686cccc SHA1 f87ee646d52dc65e1c232b5ca15f7cfeef213304 SHA256 8d648750dfc00c8726d98166f672d9d35396cdad6f1ebed89e0ee4a29045abad
diff --git a/app-crypt/heimdal/files/heimdal-kadmind.confd b/app-crypt/heimdal/files/heimdal-kadmind.confd
new file mode 100644
index 000000000000..5d75504a1402
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kadmind.confd
@@ -0,0 +1,5 @@
+# /etc/conf.d/heimdal-kadmind
+
+# Options to pass to the kadmind daemon.  Please see man 8 kadmind for details.
+#
+# OPTIONS="--keytab=/etc/krb5.keytab"
diff --git a/app-crypt/heimdal/files/heimdal-kadmind.initd-r1 b/app-crypt/heimdal/files/heimdal-kadmind.initd-r1
new file mode 100644
index 000000000000..798d94fe641a
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kadmind.initd-r1
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kadmind.initd-r1,v 1.1 2011/02/16 22:14:12 eras Exp $
+
+depend() {
+	need net
+	use heimdal-kdc
+	after logger
+}
+
+start() {
+	ebegin "Starting Heimdal kadmind"
+		/usr/sbin/kadmind "${OPTIONS}" &
+		echo $! > /var/run/heimdal-kadmind.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Heimdal kadmind"
+	start-stop-daemon --stop --quiet --exec \
+		/usr/sbin/kadmind
+	eend $?
+}
diff --git a/app-crypt/heimdal/files/heimdal-kcm.confd b/app-crypt/heimdal/files/heimdal-kcm.confd
new file mode 100644
index 000000000000..8c156aa9b677
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kcm.confd
@@ -0,0 +1,5 @@
+# /etc/conf.d/heimdal-kcm
+
+# Options to pass to the kcm daemon.  Please see man 8 kcm for details
+#
+# OPTIONS="-c /etc/krb5.conf"
diff --git a/app-crypt/heimdal/files/heimdal-kcm.initd-r1 b/app-crypt/heimdal/files/heimdal-kcm.initd-r1
new file mode 100644
index 000000000000..1146abd5371a
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kcm.initd-r1
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kcm.initd-r1,v 1.1 2011/02/16 22:14:12 eras Exp $
+
+depend() {
+	after heimdal-kdc
+}
+
+OPTIONS="${OPTIONS} --detach"
+
+start() {
+	ebegin "Starting Heimdal KCM..."
+	start-stop-daemon --start --pidfile /var/run/kcm.pid --exec /usr/sbin/kcm -- ${OPTIONS# }
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Heimdal KCM..."
+	start-stop-daemon --stop --pidfile /var/run/kcm.pid --retry SIGKILL/5
+	eend $?
+}
diff --git a/app-crypt/heimdal/files/heimdal-kdc.confd b/app-crypt/heimdal/files/heimdal-kdc.confd
new file mode 100644
index 000000000000..d33f663feccd
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kdc.confd
@@ -0,0 +1,5 @@
+# /etc/conf.d/heimdal-kdc
+
+# Options to pass to the kdc daemon.  Please see man 8 kdc for details
+#
+# OPTIONS="-c /etc/krb5.conf"
diff --git a/app-crypt/heimdal/files/heimdal-kdc.initd-r1 b/app-crypt/heimdal/files/heimdal-kdc.initd-r1
new file mode 100644
index 000000000000..be425c4126c3
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kdc.initd-r1
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kdc.initd-r1,v 1.1 2011/02/16 22:14:12 eras Exp $
+
+depend() {
+	need net
+	after logger
+}
+
+OPTIONS="${OPTIONS} --detach"
+
+start() {
+	ebegin "Starting Heimdal kdc"
+	start-stop-daemon --start --quiet --exec \
+		/usr/sbin/kdc -- ${OPTIONS# }
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Heimdal kdc"
+	start-stop-daemon --stop --quiet --exec \
+		/usr/sbin/kdc
+	eend $?
+}
diff --git a/app-crypt/heimdal/files/heimdal-kpasswdd.confd b/app-crypt/heimdal/files/heimdal-kpasswdd.confd
new file mode 100644
index 000000000000..7a3e808a9715
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kpasswdd.confd
@@ -0,0 +1,5 @@
+# /etc/conf.d/heimdal-kpasswdd
+
+# Options to pass to the kpasswdd daemon.  Please see man 8 kpasswdd for details.
+#
+# OPTIONS="-k /etc/krb5.keytab"
diff --git a/app-crypt/heimdal/files/heimdal-kpasswdd.initd-r1 b/app-crypt/heimdal/files/heimdal-kpasswdd.initd-r1
new file mode 100644
index 000000000000..2f3afa2d310a
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kpasswdd.initd-r1
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kpasswdd.initd-r1,v 1.1 2011/02/16 22:14:12 eras Exp $
+
+depend() {
+	need net
+	use heimdal-kdc
+	after logger
+}
+
+start() {
+	ebegin "Starting Heimdal kpasswdd"
+	start-stop-daemon --background --start --quiet --exec \
+		/usr/sbin/kpasswdd -- "${OPTIONS}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Heimdal kpasswdd"
+	start-stop-daemon --stop --quiet --exec \
+		/usr/sbin/kpasswdd
+	eend $?
+}
diff --git a/app-crypt/heimdal/files/heimdal_link_order.patch b/app-crypt/heimdal/files/heimdal_link_order.patch
new file mode 100644
index 000000000000..fdf6a0af9bc9
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_link_order.patch
@@ -0,0 +1,41 @@
+--- kadmin/Makefile.am.orig	2010-11-25 12:39:31.000000000 +0000
++++ kadmin/Makefile.am	2011-02-14 21:37:29.000000000 +0000
+@@ -64,10 +64,10 @@
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
+ 	$(LIB_hcrypto) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+-	$(LIB_roken) \
+ 	$(DBLIB)
+ 
+ kadmind_LDADD = $(top_builddir)/lib/kadm5/libkadm5srv.la \
++	$(LIB_roken) \
+ 	../lib/gssapi/libgssapi.la \
+ 	$(LDADD_common) \
+ 	$(LIB_pidfile) \
+@@ -78,12 +78,14 @@
+ 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
+ 	$(top_builddir)/lib/sl/libsl.la \
+ 	$(LIB_readline) \
++	$(LIB_roken) \
+ 	$(LDADD_common) \
+ 	$(LIB_dlopen)
+ 
+ add_random_users_LDADD = \
+ 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
++	$(LIB_roken) \
+ 	$(LDADD_common) \
+ 	$(LIB_dlopen)
+ 
+--- tests/plugin/check-pac.in.orig	2010-11-25 12:39:31.000000000 +0000
++++ tests/plugin/check-pac.in	2011-02-16 13:24:50.000000000 +0000
+@@ -62,7 +62,8 @@
+ test_apreq="${TESTS_ENVIRONMENT} ../../lib/krb5/test_ap-req"
+ 
+ KRB5_CONFIG="${objdir}/krb5.conf"
+-export KRB5_CONFIG
++LD_PRELOAD="../../lib/roken/.libs/libroken.so"
++export KRB5_CONFIG LD_PRELOAD
+ 
+ rm -f ${keytabfile}
+ rm -f current-db*
diff --git a/app-crypt/heimdal/heimdal-1.4.1_pre20110216.ebuild b/app-crypt/heimdal/heimdal-1.4.1_pre20110216.ebuild
new file mode 100644
index 000000000000..f5d31cae617d
--- /dev/null
+++ b/app-crypt/heimdal/heimdal-1.4.1_pre20110216.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.4.1_pre20110216.ebuild,v 1.1 2011/02/16 22:14:12 eras Exp $
+
+EAPI=2
+VIRTUALX_REQUIRED="manual"
+
+inherit libtool virtualx eutils toolchain-funcs db-use autotools
+
+MY_P="${P}"
+DESCRIPTION="Kerberos 5 implementation from KTH"
+HOMEPAGE="http://www.h5l.org/"
+SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl threads test X"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	berkdb? ( sys-libs/db )
+	!berkdb? ( sys-libs/gdbm )
+	caps? ( sys-libs/libcap-ng )
+	>=dev-db/sqlite-3.5.7
+	>=sys-libs/e2fsprogs-libs-1.41.11
+	afs? ( net-fs/openafs )
+	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
+	!!app-crypt/mit-krb5"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-devel/autoconf-2.62
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
+
+PROVIDE="virtual/krb5"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}/heimdal_db5.patch"
+	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
+	epatch "${FILESDIR}/heimdal_link_order.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-kcm \
+		--disable-osfc2 \
+		--enable-shared \
+		--with-libintl=/usr \
+		--with-readline=/usr \
+		--with-sqlite3=/usr \
+		--libexecdir=/usr/sbin \
+		$(use_enable afs afs-support) \
+		$(use_enable otp) \
+		$(use_enable pkinit kx509) \
+		$(use_enable pkinit pk-init) \
+		$(use_enable threads pthread-support) \
+		$(use_with berkdb berkeley-db) \
+		$(use_with berkdb berkeley-db-include=$(db_includedir)) \
+		$(use_with caps capng) \
+		$(use_with hdb-ldap openldap /usr) \
+		$(use_with ipv6) \
+		$(use_with ssl openssl /usr) \
+		$(use_with X x)
+}
+
+src_compile() {
+	emake -j1 || die "emake failed"
+}
+
+src_test() {
+	einfo "Disabled check-iprop which is known to fail.  Other tests should work."
+	default_src_test
+}
+
+src_install() {
+	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc ChangeLog README NEWS TODO
+
+	# Begin client rename and install
+	for i in {telnetd,ftpd,rshd,popper}
+	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,pagsh,kf}
+	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
+
+	newinitd "${FILESDIR}"/heimdal-kdc.initd-r1 heimdal-kdc
+	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r1 heimdal-kadmind
+	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r1 heimdal-kpasswdd
+	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
+
+	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
+	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
+	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
+	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
+
+	insinto /etc
+	newins "${FILESDIR}"/krb5.conf krb5.conf.example
+
+	if use hdb-ldap; then
+		insinto /etc/openldap/schema
+		doins "${S}/lib/hdb/hdb.schema"
+	fi
+
+	# default database dir
+	keepdir /var/heimdal
+}
+
+pkg_preinst() {
+
+	if has_version "=${CATEGORY}/${PN}-1.3.2*" ; then
+		if use hdb-ldap ; then
+			ewarn "Schema name changed to hdb.schema to follow upstream."
+			ewarn "Please check your slapd conf file to make sure"
+			ewarn "that the correct schema file is included."
+		fi
+	fi
+}