- metadata.xml -> GLEP56

- heimdal-1.2.1 added
Package-Manager: portage-2.1.4.4

4 files changed, 195 insertions, 16 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index ad5dec7971ea..383d230158e3 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.121 2008/07/24 21:23:55 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.122 2008/07/31 10:52:13 mueli Exp $
+
+*heimdal-1.2.1 (31 Jul 2008)
+
+  31 Jul 2008; Michael Hammer <mueli@gentoo.org> metadata.xml,
+  +heimdal-1.2.1.ebuild:
+  * fixed metadata.xml -> GLEP 56
+  * added heimdal-1.2.1 to tree - that will be the basis for stabalization
 
 *heimdal-1.0.1 (24 Jul 2008)
 
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index f0e0acce968c..02dada7803b9 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX heimdal-0.7.2-as_needed.patch 853 RMD160 5c03f5008e395e87c48f89fe91828e0d034de7db SHA1 0b4dda9830d36185055b66976436545e3daa926b SHA256 640969f1ebe65bae204d45b076dbd488f62a4fd5cf6d96bdc5373423e71f39e3
 AUX heimdal-kdc-sans_pkinit.patch 500 RMD160 7ed56129127af088d4c10533abf178aa72bf3c8f SHA1 eda1939bf276bfc260981eb7ee770b4adde6070c SHA256 8d7f04189c897706ed8adae6cd81bab9bf5f2eb593d5e630c33eccd017bb8e4c
 AUX heimdal-r23235-kb5-libwind_la.patch 270 RMD160 17784aca21208c3ae29b1e26a45e6394af8d55b5 SHA1 72466a7a8623d759121dbb765cd660b8582ad73c SHA256 0df907bf80298845480a415368bd492eb177fe4e8a11e83d2f1d124e9d889f5b
@@ -8,16 +5,11 @@ AUX heimdal-r23238-kb5_locl_h-wind_h.patch 328 RMD160 0cab54e8605b56ed0168e2f680
 AUX heimdal-system_sqlite.patch 1861 RMD160 fa9cf71fef33b3e434f8d3a5bce5c51f0d3c97e5 SHA1 9255730737444febe78ebc47f246893e3887e880 SHA256 79abe4fae56218066b6827989d22d1e0ea1060c027f3698370d1cf7988b487de
 DIST heimdal-0.7.2-gentoo-patches-0.2.tar.bz2 7500 RMD160 87240de8914b05c552ceb7d2f92e7de68dad21b7 SHA1 f4b33a9816e973bee0fb99b3791e57e019161111 SHA256 cfbec87dcbab67941de5897370fc9e0b3a085292f53cbeb20b8e9d2667109c05
 DIST heimdal-0.7.2.tar.gz 4525734 RMD160 0f028a9d5a6a66e8efc0397e4d8c8adc2183b409 SHA1 a902e6ad7c31d940b588dc0235b348936f0d719d SHA256 28661862ac8cbbd62ddddbda7db760b622b903c88c06f2fbdbf7b97be47eac60
+DIST heimdal-1.2.1.tar.gz 5234882 RMD160 055e858200e53108ac24760516ff9d58e4fee0d2 SHA1 68b013a68bca7d544d29af0f890b9c668ec16936 SHA256 4e32be8d42824f2c58dffa435300e2dd0f0c3bbc6931afcbd450122067f76493
 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.ebuild 4122 RMD160 066e5421047e74a1fdd17e8217a3c07baecbe27f SHA1 e1bf13534537fe5238ee5506904e2575de2b31e5 SHA256 4e3a184defcb4846d3deecb46dce332c860af5f2e8617fceef333191b2437593
 EBUILD heimdal-1.2.1_rc1-r1.ebuild 3899 RMD160 f9640f3fb30dca47fb4dc87c422f76cc83363065 SHA1 35138ce8a9cf7674cc6adf104cbea80d04fc9737 SHA256 71857abcedb0df6779063ffc5bf1c3c5e1e26f9f0e3d5f69aa4475e340361b40
-MISC ChangeLog 20016 RMD160 5dce87ca8bb06a9862ed5e2fbb60560be930aed1 SHA1 1da5f1f397d4ed61fce7d88786b41bd141dcecd6 SHA256 5546abc076685ec7ffdc6f35a4540d0330e46540fa25bb38f7641220af5f387f
-MISC metadata.xml 412 RMD160 3d60983676e92e7371ceec828fdad314a8b0df77 SHA1 c042c5f2791aafcdb1b5dd1e2f6c1f9a8dd91f4e SHA256 b84035cbc2b838e608ebca249d1f7d15725f931840d30ceba099112323fbd517
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiI8vAACgkQoeSe8B0zEfzL/wCgiHBDMEd5EYqiQx+3XxtOduXd
-3T8An0oyKtqGqK2h1G3+/S4NH/X5bdor
-=jzaw
------END PGP SIGNATURE-----
+MISC ChangeLog 20243 RMD160 86a22baa31cea50e17d9d48adf9ab0ac7b671d36 SHA1 88b6e86f1341fae2bf5ee2ecdb4a52711bd636f1 SHA256 ab0d09195ddc73c666711de7d7d204d817fa6e2dc2d9c3b9ee33a5672160a7d9
+MISC metadata.xml 1086 RMD160 a5ee11683dbfe929a061ce2b4f1967ae61b86d5d SHA1 95cc60a2a78fb4cd71e336a9a05b47fdfa7d1715 SHA256 581e15be965c0fe6246010854acabb2fce21a7afdb9c669e46bacd5440514fec
diff --git a/app-crypt/heimdal/heimdal-1.2.1.ebuild b/app-crypt/heimdal/heimdal-1.2.1.ebuild
new file mode 100644
index 000000000000..f71d997d27c0
--- /dev/null
+++ b/app-crypt/heimdal/heimdal-1.2.1.ebuild
@@ -0,0 +1,150 @@
+# 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.ebuild,v 1.1 2008/07/31 10:52:13 mueli Exp $
+
+WANT_AUTOMAKE=latest
+WANT_AUTOCONF=latest
+
+inherit autotools libtool eutils virtualx toolchain-funcs flag-o-matic
+
+EAPI=1
+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/${P}.tar.gz
+	mirror://gentoo/${PATCH_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="afs +berkdb hdb-ldap ipv6 otp pkinit ssl threads X"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	berkdb? ( sys-libs/db )
+	!berkdb? ( sys-libs/gdbm )
+	>=dev-db/sqlite-3.5.7
+	sys-libs/ss
+	sys-libs/com_err
+	afs? ( net-fs/openafs )
+	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
+	!virtual/krb5"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-devel/autoconf-2.62"
+#	>=sys-devel/libtool-2.2"
+
+PROVIDE="virtual/krb5"
+
+GENTOODIR=${WORKDIR}/gentoo
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch "${GENTOODIR}"/patches
+
+	epatch "${FILESDIR}"/${PN}-r23238-kb5_locl_h-wind_h.patch
+	epatch "${FILESDIR}"/${PN}-r23235-kb5-libwind_la.patch
+	epatch "${FILESDIR}"/${PN}-kdc-sans_pkinit.patch
+	epatch "${FILESDIR}"/${PN}-system_sqlite.patch
+	epatch "${FILESDIR}"/${PN}-symlinked-manpages.patch
+	epatch "${FILESDIR}"/${PN}-autoconf-ipv6-backport.patch
+
+	AT_M4DIR="cf" eautoreconf
+
+	elog ""
+	elog "Heimdal is still under development in gentoo and you might"
+	elog "find problems with dependencies to virtual/krb5. Nevertheless"
+	elog "it's still usable. For more information visit:"
+	elog ""
+	elog "    http://bugs.gentoo.org/show_bug.cgi?id=185899"
+	elog ""
+	elog "I can also recommend to use our kerberos overlay at:"
+	elog ""
+	elog "    git://git.overlays.gentoo.org/proj/kerberos.git"
+	elog ""
+}
+
+src_compile() {
+	econf \
+		$(use_with ipv6) \
+		$(use_enable berkdb berkeley-db) \
+		$(use_enable pkinit pk-init) \
+		$(use_with ssl openssl /usr) \
+		$(use_with X x) \
+		$(use_enable threads pthread-support) \
+		$(use_enable otp) \
+		$(use_enable afs afs-support) \
+		$(use_with hdb-ldap openldap /usr) \
+		--disable-osfc2 \
+		--enable-kcm \
+		--enable-shared \
+		--disable-netinfo \
+		--prefix=/usr \
+		--libexecdir=/usr/sbin || die "econf failed"
+
+	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() {
+	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}
+	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}
+	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 hdb-ldap; then
+		insinto /etc/openldap/schema
+		doins "${GENTOODIR}"/configs/krb5-kdc.schema
+	fi
+
+	# default database dir
+	keepdir /var/heimdal
+}
diff --git a/app-crypt/heimdal/metadata.xml b/app-crypt/heimdal/metadata.xml
index e15bf3c46938..364d5ff5b1c3 100644
--- a/app-crypt/heimdal/metadata.xml
+++ b/app-crypt/heimdal/metadata.xml
@@ -4,8 +4,38 @@
 <herd>kerberos</herd>
 <longdescription>Kerberos 5 implementation from KTH</longdescription>
 <use>
-	<flag name='otp'>Enable support for one-time passwords (OTP) in some
-		heimdal apps</flag>
-	<flag name='pkinit'>Enable pkinit support to get the initial ticket</flag>
+	<flag name='ssl'>
+		Enable usage of openssl
+	</flag>
+	<flag name='berkdb'>
+		Berkeley DB is preferred before NDBM, but if you for
+		some reason want to use NDBM instead, you can disable
+		this USE flag.
+	</flag>
+	<flag name='ipv6'>
+		Enable/Disable ipv6 support. No magic here.
+	</flag>
+	<flag name='ldap'>
+		DEPRECATED (because produces circualar dependencies):
+		global USE which enable/disable LDAP as database
+		backend -> see 'hd-ldap'
+	</flag>
+	<flag name='X'>
+		Building X applications
+	</flag>
+	<flag name='threads'>
+		Enable pthread support
+	</flag>
+	<flag name='otp'>
+		Enable support for one-time passwords (OTP) in some
+		heimdal apps
+	</flag>
+	<flag name='pkinit'>
+		Enable pkinit support to get the initial ticket
+	</flag>
+	<flag name='hdb-ldap'>
+		Enable support for LDAP as database backend (not
+		suggested to use)
+	</flag>
 </use>
 </pkgmetadata>