Version bump to block virtual/krb5

6 files changed, 136 insertions, 9 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index cb8933e611b1..4995f2d6698d 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.33 2004/05/06 10:06:53 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.34 2004/05/10 11:15:33 aliz Exp $
+
+*heimdal-0.6.1-r1 (10 May 2004)
+
+  10 May 2004; Daniel Ahlberg <aliz@gentoo.org> heimdal-0.6.1-r1.ebuild:
+  + Fix fPIC issues with libeditline with patch instead of sed.
+  + Block virtual/krb5.
+  + Fix krb5-config.
 
   06 May 2004; Daniel Black <dragonheart@gentoo.org> heimdal-0.6.1.ebuild,
   heimdal-0.6.ebuild:
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 8fddaca11ed7..52b3413c70d7 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,10 +1,15 @@
-MD5 6208fa333a9ffa8845b9845c7f66c72a ChangeLog 4684
+MD5 20f68904a17f44eff1906c28b98a3f1d heimdal-0.6.ebuild 2691
 MD5 1870803f21f81294e8751238c106b435 heimdal-0.6.1.ebuild 2736
+MD5 ab75c9a22a82fcd54ca1cdcb71a3652f heimdal-0.6.1-r1.ebuild 2898
+MD5 b66b3c7b3b140755651b2067c8326142 ChangeLog 4918
 MD5 e5573e25f19694fc8ccaaced2dd576f4 metadata.xml 353
-MD5 ec58d7eca5cf15342d1d4af59780ab6e heimdal-0.6.ebuild 2696
-MD5 12c2f086658ad67e3ddaf1340cb9405a files/01heimdal 125
-MD5 a97dade54c35f0835e9f067d825de8a5 files/digest-heimdal-0.6.1 66
+MD5 ab75c9a22a82fcd54ca1cdcb71a3652f heimdal-0.6.2.ebuild 2898
+MD5 35eed8dc7a9b322e4ed6220ef29cd1bc files/heimdal-0.6-berkdb.patch 542
 MD5 9cf5addf22f494dcf6c5aa9d16a372a8 files/digest-heimdal-0.6 64
-MD5 bdcc2eedb42140afd25307f21aa5bb17 files/heimdal-0.6-gcc3.patch 466
+MD5 a97dade54c35f0835e9f067d825de8a5 files/digest-heimdal-0.6.1-r1 66
+MD5 3d0262aa218e1611500de735d3581e28 files/heimdal-0.6.2-fPIC.patch 352
 MD5 8eb01abfea336bcb2791c23ef05a5b24 files/heimdal-0.6-rxapps.patch 729
-MD5 35eed8dc7a9b322e4ed6220ef29cd1bc files/heimdal-0.6-berkdb.patch 542
+MD5 a97dade54c35f0835e9f067d825de8a5 files/digest-heimdal-0.6.1 66
+MD5 59cbfb44a4bd4c27cf0dd3943b50ae52 files/digest-heimdal-0.6.2 66
+MD5 bdcc2eedb42140afd25307f21aa5bb17 files/heimdal-0.6-gcc3.patch 466
+MD5 12c2f086658ad67e3ddaf1340cb9405a files/01heimdal 125
diff --git a/app-crypt/heimdal/files/digest-heimdal-0.6.1-r1 b/app-crypt/heimdal/files/digest-heimdal-0.6.1-r1
new file mode 100644
index 000000000000..ee6f0f437db7
--- /dev/null
+++ b/app-crypt/heimdal/files/digest-heimdal-0.6.1-r1
@@ -0,0 +1 @@
+MD5 20ef3dade89afc45eac9d8935a1a9cc0 heimdal-0.6.1.tar.gz 3312603
diff --git a/app-crypt/heimdal/files/heimdal-0.6.1-fPIC.patch b/app-crypt/heimdal/files/heimdal-0.6.1-fPIC.patch
new file mode 100644
index 000000000000..ee01e34dcd18
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-0.6.1-fPIC.patch
@@ -0,0 +1,12 @@
+--- lib/editline/Makefile.am	2004-05-10 09:27:21.442490749 +0000
++++ lib/editline/Makefile.am	2004-05-10 09:27:38.876209101 +0000
+@@ -47,6 +47,9 @@
+ 
+ EXTRA_DIST = $(man_MANS)
+ 
++$(libeditline_la_OBJECTS): %.lo: %.c
++	$(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++
+ snprintf.c:
+ 	$(LN_S) $(srcdir)/../roken/snprintf.c .
+ strdup.c:
diff --git a/app-crypt/heimdal/heimdal-0.6.1-r1.ebuild b/app-crypt/heimdal/heimdal-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..ebba35276b24
--- /dev/null
+++ b/app-crypt/heimdal/heimdal-0.6.1-r1.ebuild
@@ -0,0 +1,102 @@
+# 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.1-r1.ebuild,v 1.1 2004/05/10 11:15:33 aliz Exp $
+
+inherit libtool eutils
+
+DESCRIPTION="Kerberos 5 implementation from KTH"
+SRC_URI="ftp://ftp.pdc.kth.se/pub/heimdal/src/${P}.tar.gz"
+HOMEPAGE="http://www.pdc.kth.se/heimdal/"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 sparc ppc alpha ~ia64 amd64 hppa mips"
+IUSE="ssl berkdb ipv6"
+PROVIDE="virtual/krb5"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl )
+	berkdb? ( sys-libs/db )
+	!virtual/krb5"
+	# ldap? ( net-nds/openldap )
+	# With this enabled, we create a multiple stage
+	# circular dependency with USE="ldap kerberos"
+	# -- Kain <kain@kain.org> 05 Dec 2002
+
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	sys-devel/automake
+	sys-devel/gcc
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${PN}-${PV:0:3}-rxapps.patch
+	epatch ${FILESDIR}/${PN}-${PV:0:3}-berkdb.patch
+	epatch ${FILESDIR}/${P}-fPIC.patch
+
+	# 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() {
+
+	elibtoolize
+
+	aclocal -I cf || die "configure problem"
+	autoheader || die "configure problem"
+	automake -a || die "configure problem"
+	autoconf || die "configure problem"
+
+	local myconf="
+		$(use_with ipv6)
+		$(use_with berkdb berkely-db)
+		$(use_with ssl openssl)
+		--enable-shared"
+
+	#use ldap && myconf="${myconf} --with-open-ldap=/usr"
+
+	econf ${myconf} || die "econf failed"
+
+	emake prefix=/usr \
+		sysconfdir=/etc \
+		mandir=/usr/share/man \
+		infodir=/usr/share/info \
+		datadir=/usr/share \
+		localstatedir=/var/lib \
+		includedir=/usr/include/heimdal \
+		|| die
+}
+
+src_install() {
+	make prefix=${D}/usr \
+		sysconfdir=${D}/etc \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		datadir=${D}/usr/share \
+		localstatedir=${D}/var/lib \
+		includedir=${D}/usr/include/heimdal \
+		install || die
+
+	#dodir /etc/env.d
+	#cp ${FILESDIR}/01heimdal ${D}/etc/env.d
+
+	dodoc COPYRIGHT ChangeLog README NEWS PROBLEMS TODO
+
+	# Begin client rename and install
+	for i in {telnetd,ftpd}
+	do
+		mv ${D}/usr/share/man/man8/${i}.8.gz ${D}/usr/share/man/man8/k${i}.8.gz
+		mv ${D}/usr/sbin/${i} ${D}/usr/sbin/k${i}
+	done
+	for i in {rcp,rsh,telnet,ftp,rlogin}
+	do
+		mv ${D}/usr/share/man/man1/${i}.1.gz ${D}/usr/share/man/man1/k${i}.1.gz
+		mv ${D}/usr/bin/${i} ${D}/usr/bin/k${i}
+	done
+}
diff --git a/app-crypt/heimdal/heimdal-0.6.ebuild b/app-crypt/heimdal/heimdal-0.6.ebuild
index 027476d30d9d..ee0b309b377e 100644
--- a/app-crypt/heimdal/heimdal-0.6.ebuild
+++ b/app-crypt/heimdal/heimdal-0.6.ebuild
@@ -1,6 +1,6 @@
 # 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.17 2004/05/06 10:06:53 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.ebuild,v 1.18 2004/05/10 11:15:33 aliz Exp $
 
 inherit libtool eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.pdc.kth.se/heimdal/"
 SLOT="0"
 LICENSE="as-is"
 KEYWORDS="x86 sparc ppc alpha ia64 amd64 hppa mips"
-IUSE="ssl ldap berkdb ipv6"
+IUSE="ssl berkdb ipv6"
 PROVIDE="virtual/krb5"
 
 RDEPEND="ssl? ( dev-libs/openssl )