Fix compilation on gcc3 and use -fPIC for editline.a. This is a proper -fPIC fix so no complaining please! ;-)

3 files changed, 42 insertions, 15 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index bed2d5a81708..5072c44bd88b 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/heimdal
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.13 2003/12/16 01:06:51 weeve Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.14 2004/02/17 15:54:17 agriffis Exp $
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> heimdal-0.6.ebuild:
+  Fix compilation on gcc3 and use -fPIC for editline.a. This is a proper -fPIC
+  fix so no complaining please! ;-)
 
   15 Dec 2003; Jason Wever <weeve@gentoo.org> heimdal-0.4e-r1.ebuild,
   heimdal-0.5.1-r1.ebuild, heimdal-0.5.1.ebuild, heimdal-0.5.ebuild,
diff --git a/app-crypt/heimdal/files/heimdal-0.6-gcc3.patch b/app-crypt/heimdal/files/heimdal-0.6-gcc3.patch
new file mode 100644
index 000000000000..8817d5ebce0a
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-0.6-gcc3.patch
@@ -0,0 +1,13 @@
+--- heimdal-0.6/lib/krb5/verify_krb5_conf.c.gcc3	2004-02-16 21:22:53.000000000 -0500
++++ heimdal-0.6/lib/krb5/verify_krb5_conf.c	2004-02-16 21:23:08.000000000 -0500
+@@ -449,8 +449,8 @@
+ 
+ #if 0
+ struct entry kdcdefaults_entries[] = {
+-    { "kdc_ports, krb5_config_string, mit_entry },
+-    { "v4_mode, krb5_config_string, mit_entry },
++    { "kdc_ports", krb5_config_string, mit_entry },
++    { "v4_mode", krb5_config_string, mit_entry },
+     { NULL }
+ };
+ #endif
diff --git a/app-crypt/heimdal/heimdal-0.6.ebuild b/app-crypt/heimdal/heimdal-0.6.ebuild
index e040a2d2724c..18766e00f117 100644
--- a/app-crypt/heimdal/heimdal-0.6.ebuild
+++ b/app-crypt/heimdal/heimdal-0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.ebuild,v 1.5 2003/12/16 01:06:51 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.ebuild,v 1.6 2004/02/17 15:54:17 agriffis Exp $
 
 inherit libtool
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.pdc.kth.se/heimdal/"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 -sparc ppc"
+KEYWORDS="x86 -sparc ppc ~alpha ~ia64"
 IUSE="ssl ldap berkdb ipv6 krb4"
 PROVIDE="virtual/krb5"
 
@@ -24,10 +24,14 @@ DEPEND="
 	# -- Kain <kain@kain.org> 05 Dec 2002
 
 src_unpack() {
-	unpack ${A}
-
-	cd ${S}/lib/krb5
-	sed -i "s:LIB_crypt = @LIB_crypt@:LIB_crypt = -lssl @LIB_crypt@:g" Makefile.in
+	unpack ${A} || die
+	epatch ${FILESDIR}/heimdal-0.6-gcc3.patch || die
+
+	# Um, I don't think the below is doing anything since automake is
+	# run in src_compile(), but I'll leave it alone since this ebuild
+	# isn't mine... (16 Feb 2004 agriffis)
+	cd ${S}/lib/krb5 || die
+	sed -i "s:LIB_crypt = @LIB_crypt@:LIB_crypt = -lssl @LIB_crypt@:g" Makefile.in || die
 }
 
 src_compile() {
@@ -39,20 +43,26 @@ src_compile() {
 	automake -a || die "configure problem"
 	autoconf || die "configure problem"
 
-	local myconf
+	local myconf="
+		$(use_with ipv6)
+		$(use_with berkdb berkely-db)"
 
-	use ssl && myconf="--with-openssl=/usr" || myconf="--without-openssl"
+	use ssl \
+		&& myconf="--with-openssl=/usr" \
+		|| myconf="--without-openssl"
 
 	#use ldap && myconf="${myconf} --with-open-ldap=/usr"
 
-	use ipv6 || myconf="${myconf} --without-ipv6"
-
-	use berkdb || myconf="${myconf} --without-berkely-db"
-	use krb4 && myconf="${myconf} --with-krb4=/usr/athena --disable-shared" \
+	use krb4 \
+		&& myconf="${myconf} --with-krb4=/usr/athena --disable-shared" \
 		|| myconf="${myconf} --enable-shared"
 
 	econf ${myconf}
 
+	# editline archive is linked into shared objects, needs to be
+	# built with -fPIC (16 Feb 2004 agriffis)
+	sed -i -e '/^CFLAGS\>/s/$/ -fPIC/' lib/editline/Makefile || die
+
 	emake || die
 }