From f3e8983f91f3569d36491547506b7bc27b6c61b9 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Thu, 21 Nov 2013 12:08:17 +0100
Subject: [PATCH] detect correct kerberos implementation

Package-Manager: portage-2.2.0_alpha188
RepoMan-Options: --force
---
 net-fs/nfs-utils/ChangeLog                 |  3 +++
 net-fs/nfs-utils/Manifest                  |  4 ++--
 net-fs/nfs-utils/nfs-utils-1.2.8-r2.ebuild | 21 +++++++++++++++++++--
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 38984a83..bc0ca5b0 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.215 2013/04/13 20:02:02 vapier Exp $
 
+  21 Nov 2013; Mario Fetka <mario.fetka@gmail.com> nfs-utils-1.2.8-r2.ebuild:
+  detect correct kerberos implementation
+
   21 Nov 2013; Mario Fetka <mario.fetka@gmail.com> nfs-utils-1.2.8-r2.ebuild:
   use older patch
 
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index fe009cb4..7e99d92e 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -19,6 +19,6 @@ AUX rpc.pipefs.initd 822 SHA256 6503951b3c200ccf3f46396f7b9274f0a565807f7f6e561c
 AUX rpc.statd.initd 818 SHA256 0c7bd35a14da6c0c2577f09ae82a41ddb693a88157eeaf80684616f79be6c304 SHA512 e7c85a5437f65c82bcab6818fa3aa27fdf746ce745b41987d0e59d620b59529b7a8613aad59e831a5b46fee1fe4410d6982a3e76e7834c79675c4c271b0db3b0 WHIRLPOOL b3c6c4147634f3db39f0a50307a7433e0d28f8cf2d89452d90f9db1b56d55c41add68336640a442508ebfc75270dd627154af787b00f603659a5c730ab724340
 AUX rpc.svcgssd.initd 584 SHA256 f1c460d8b0e91e54a551397d755135d05a3728d81de596535bf8bda074455677 SHA512 844e8d41a6a8b632d98585724aca2e9ae596f72c67e17e4e8fb9eb81e6c58eed9e10cf8b2a96896dba8fd1efaa95d846954e712bdf3402a847ae17742dae2157 WHIRLPOOL f1e4a38168c112ce07e40432527a77e17aa80b4a37aeccb8b01a9e655f0437e67e4c12998d62ea7c162319cca956c18edd3cb3c64cfd8e17370782ea30fef677
 DIST nfs-utils-1.2.8.tar.bz2 2747577 SHA256 1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6 SHA512 abe13f37dccb40258ac2f654143e540b9ac8c41ca10fe88f104ebb558334d41c0e31220dbae0122836e43236cac763fbcfc1d5bd708aca3b282152ac3ac7213b WHIRLPOOL 95bc97e572aebae4b99d20b67845e081d75f4126fc74e9f081a6bc1a913796f5370befb5a21c7626668bd430b8671c4732ddfbf319e6a2ef8df8e15f4ef213a1
-EBUILD nfs-utils-1.2.8-r2.ebuild 4137 SHA256 b5232663f27017da52893847e666686a18b216bd2fcbccf6710b453e9205b442 SHA512 40af6c1049e1603e253473211e755932ac22e72f246a7d5ac2f36cbbe9eae5d952ebb83a11a02086042fbffc3c4927f51514cbd198b7e7026258be47a72eb7f2 WHIRLPOOL 0451104cbce08f54e6923819e92942156671d0f05fa13519d7ff946d1a919aa6be02525f4bcef548bc5fecdb253c307d2fa01603a6e3208c927bcc208863d1a5
-MISC ChangeLog 35682 SHA256 274ae6f4a61fb684962b930ffc5ed00ad6953703ca207e6b1b889aa353b830b0 SHA512 cb6856911e0fd5c699a43dc8abd7d2680c4643564293ae022daf9ffcdad2689b2a6f46d657de6870fda4bc05d64e5cc11e52ed7f771b5ad8d6a909b359836b0e WHIRLPOOL f23e9e5adb266a949158e0e190a967de1ceef041cb831da11d85f7f08d4b6696303f608bb97696fba744118a68386cec7e56105748a80bc62be6d50cca376db1
+EBUILD nfs-utils-1.2.8-r2.ebuild 4609 SHA256 1dff97354a8fbc097d27b667dbf33e6743e519a367c3068a6d7f0df4b41263e0 SHA512 4a8eb8bf234ac09f8189b4bf10f4e6331a250876838f99eb718cde79416ff17cb429bcc3193e778123e95bfdaf575a280c5cca963842430f4024957fb6a967b6 WHIRLPOOL 203daea6f3e2dc32c2fa987973187a768d3db99d2a8264cbfc69922a0d32190448d8a20b800bdc4c0538ee7de12d2d5c438a33055fc6375a1de0023f6778172d
+MISC ChangeLog 35802 SHA256 9584525f90adf61c39f2f84163d130d21092b0dbb6470b0b76e02643fb05cc8b SHA512 79870b0b0907bcf917c964b7270da0a38ad834af27d267a93954519391a5e3856ae7b073115558b1cab398109ad9eecd52f6174e891b74db6d99ee91e948a7c6 WHIRLPOOL 19c3fd184375902df46775ad629530ddc5115dc6c735f94ac790ce728c446c1f5ca16e2797339180ee91eaee3dad746ca8efc791fe9f98729a1ba18aa94066a2
 MISC metadata.xml 728 SHA256 654292a2a5f9be2660c579f750c31cb7d2c77de85fb305876c466a672486fbc0 SHA512 289e3ba39ed190f9a8fa5641ab3845503a982e252ea2ff40ce48bcddc66381883e0ffa334446372d0f4e3d97cdbaf5df548db48bc58c6f29479591f659004fa0 WHIRLPOOL f1de0a51ed05327d86442a2503b3a8f7507edde56b1930c7fbae402cdec184122e5047b97f5258af4bb44b32cf9e934a356a32f32e51a76b16614f62dd757c8f
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.8-r2.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.8-r2.ebuild
index b98dd692..f48ec454 100644
--- a/net-fs/nfs-utils/nfs-utils-1.2.8-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.2.8-r2.ebuild
@@ -57,14 +57,30 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
 	epatch "${FILESDIR}"/0001-statd-exit-if-a-statd-is-already-running.patch
 	epatch "${FILESDIR}"/0001-mountd-Fix-is_subdirectory-again.patch
-	epatch "${FILESDIR}"/${PN}-1.2.7-heimdal.patch
+	epatch "${FILESDIR}"/${PN}-1.2.8-heimdal.patch
 	eautoreconf
 }
 
 src_configure() {
 	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
 	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-	econf \
+
+        if has_version app-crypt/heimdal ; then
+		econf \
+		--with-statedir=/var/lib/nfs \
+		--enable-tirpc \
+		--without-gssglue \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable nfsdcld nfsdcltrack) \
+		$(use_enable nfsv4) \
+		$(use_enable nfsv41) \
+		$(use_enable ipv6) \
+		$(use_enable caps) \
+		$(use_enable uuid) \
+		$(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \
+		$(usex nfsv4 "$(use_with kerberos krb5)" "--without-krb5")
+        else
+		econf \
 		--with-statedir=/var/lib/nfs \
 		--enable-tirpc \
 		$(use_with tcpd tcp-wrappers) \
@@ -76,6 +92,7 @@ src_configure() {
 		$(use_enable uuid) \
 		$(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \
 		$(usex nfsv4 "$(use_with kerberos gssglue)" "--without-gssglue")
+        fi
 }
 
 src_compile(){