Ensure kerberos builds properly with as-needed

(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)

3 files changed, 50 insertions, 8 deletions

diff --git a/net-libs/c-client/ChangeLog b/net-libs/c-client/ChangeLog
index 06f6afc33374..5610ae897512 100644
--- a/net-libs/c-client/ChangeLog
+++ b/net-libs/c-client/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/c-client
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.92 2012/10/08 18:45:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.93 2012/10/08 23:39:18 robbat2 Exp $
+
+  08 Oct 2012; Robin H. Johnson <robbat2@gentoo.org>
+  +files/c-client-2007f-ldflags.patch, c-client-2007f-r3.ebuild:
+  Ensure kerberos builds properly with as-needed
 
   08 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> c-client-2007f-r3.ebuild:
   Whitespace.
diff --git a/net-libs/c-client/c-client-2007f-r3.ebuild b/net-libs/c-client/c-client-2007f-r3.ebuild
index 8168783059cc..47032c9c9008 100644
--- a/net-libs/c-client/c-client-2007f-r3.ebuild
+++ b/net-libs/c-client/c-client-2007f-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2007f-r3.ebuild,v 1.2 2012/10/08 18:45:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2007f-r3.ebuild,v 1.3 2012/10/08 23:39:18 robbat2 Exp $
 
 EAPI=4
 
@@ -61,7 +61,7 @@ src_prepare() {
 	sed -e '/read.*exit/d' -i Makefile || die
 
 	# Respect LDFLAGS
-	epatch "${FILESDIR}"/${PN}-2007e-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-2007f-ldflags.patch
 	sed -e "s/CC=cc/CC=$(tc-getCC)/" \
 		-e "s/ARRC=ar/ARRC=$(tc-getAR)/" \
 		-e "s/RANLIB=ranlib/RANLIB=$(tc-getRANLIB)/" \
@@ -73,19 +73,23 @@ src_prepare() {
 src_compile() {
 	local mymake ipver ssltype target passwdtype
 	ipver='IP=4'
-	use ipv6 && ipver="IP=6"
+	use ipv6 && ipver="IP=6" && touch ip6
 	use ssl && ssltype="unix" || ssltype="none"
 	if use kernel_linux ; then
 		use pam && target=lnp passwdtype=pam || target=lnx passwdtype=std
 	elif use kernel_FreeBSD ; then
 		target=bsf passwdtype=pam
 	fi
-	use kerberos && mymake="EXTRAAUTHENTICATORS=gss"
-	touch ip6 # IPv6 by default now
+	use kerberos \
+		&& mymake="EXTRAAUTHENTICATORS=gss" \
+		&& EXTRALIBS="-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \
 	# no parallel builds supported!
 	emake -j1 SSLTYPE=${ssltype} $target \
-		IP=6 PASSWDTYPE=${passwdtype} ${mymake} \
-		EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="${LDFLAGS}"
+		PASSWDTYPE=${passwdtype} ${ipver} ${mymake} \
+		EXTRACFLAGS="${CFLAGS}" \
+		EXTRALDFLAGS="${LDFLAGS}" \
+		EXTRALIBS="${EXTRALIBS}" \
+		GSSDIR=/usr
 }
 
 src_install() {
@@ -118,3 +122,4 @@ src_install() {
 		dodoc docs/draft/*
 	fi
 }
+
diff --git a/net-libs/c-client/files/c-client-2007f-ldflags.patch b/net-libs/c-client/files/c-client-2007f-ldflags.patch
new file mode 100644
index 000000000000..5c143b79bc7e
--- /dev/null
+++ b/net-libs/c-client/files/c-client-2007f-ldflags.patch
@@ -0,0 +1,33 @@
+--- src/osdep/unix/Makefile~	2011-06-07 16:04:29.000000000 +0300
++++ src/osdep/unix/Makefile	2011-06-07 15:55:31.000000000 +0300
+@@ -954,23 +954,24 @@
+ 
+ # Once-only environment setup
+ 
+-once:	onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) osdep.c
++once:	ssl$(SSLTYPE) onceenv ckp$(PASSWDTYPE) osdep.c
+ 
+ onceenv:
+ 	@echo Once-only environment setup...
+ 	echo $(CC) > CCTYPE
+-	echo $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
+-	echo -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
++	echo `$(CAT) CFLAGS` $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
++	echo `$(CAT) OSCFLAGS` -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
+ 	 -DMD5ENABLE=\"$(MD5PWD)\" -DMAILSPOOL=\"$(MAILSPOOL)\" \
+ 	 -DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
+ 	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
+ 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" \
+ 	 -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \
+ 	 -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
+-	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
++	echo $(EXTRALIBS) `$(CAT) LDFLAGS` > LIBS
++	echo $(EXTRALDFLAGS) `$(CAT) LDFLAGS` -lcrypt $(BASELDFLAGS) > LDFLAGS
+ 	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
+-	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
+-	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
++	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` $(EXTRALDFLAGS) `$(CAT) OSFLAGS` -shared \
++	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" `$(CAT) LIBS` $(BASELDFLAGS) \
+ 	 >> ARCHIVE
+ 	echo $(OS) > OSTYPE
+ 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy