Fixed configuration options thanks to the keen eye of Jiri Denemark <jirka@ics.muni.cz> in bug #47911

4 files changed, 36 insertions, 21 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index ae88762cd700..cb8933e611b1 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,11 @@
 # 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.32 2004/04/25 22:00:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.33 2004/05/06 10:06:53 dragonheart Exp $
+
+  06 May 2004; Daniel Black <dragonheart@gentoo.org> heimdal-0.6.1.ebuild,
+  heimdal-0.6.ebuild:
+  Fixed configuration options thanks to the keen eye of Jiri Denemark
+  <jirka@ics.muni.cz> in bug #47911
 
   25 Apr 2004; Aron Griffis <agriffis@gentoo.org> heimdal-0.6.1.ebuild,
   heimdal-0.6.ebuild:
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 12c6e447570a..8fddaca11ed7 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,10 +1,10 @@
-MD5 3da15b55f45b424f9b2ff9ae85098843 heimdal-0.6.ebuild 2600
-MD5 5cc58b2510c1e4af8e0a9221f7efe125 heimdal-0.6.1.ebuild 2636
-MD5 14e31d6bb10be906227a2d518b04551c ChangeLog 4477
+MD5 6208fa333a9ffa8845b9845c7f66c72a ChangeLog 4684
+MD5 1870803f21f81294e8751238c106b435 heimdal-0.6.1.ebuild 2736
 MD5 e5573e25f19694fc8ccaaced2dd576f4 metadata.xml 353
-MD5 35eed8dc7a9b322e4ed6220ef29cd1bc files/heimdal-0.6-berkdb.patch 542
-MD5 9cf5addf22f494dcf6c5aa9d16a372a8 files/digest-heimdal-0.6 64
-MD5 8eb01abfea336bcb2791c23ef05a5b24 files/heimdal-0.6-rxapps.patch 729
+MD5 ec58d7eca5cf15342d1d4af59780ab6e heimdal-0.6.ebuild 2696
+MD5 12c2f086658ad67e3ddaf1340cb9405a files/01heimdal 125
 MD5 a97dade54c35f0835e9f067d825de8a5 files/digest-heimdal-0.6.1 66
+MD5 9cf5addf22f494dcf6c5aa9d16a372a8 files/digest-heimdal-0.6 64
 MD5 bdcc2eedb42140afd25307f21aa5bb17 files/heimdal-0.6-gcc3.patch 466
-MD5 12c2f086658ad67e3ddaf1340cb9405a files/01heimdal 125
+MD5 8eb01abfea336bcb2791c23ef05a5b24 files/heimdal-0.6-rxapps.patch 729
+MD5 35eed8dc7a9b322e4ed6220ef29cd1bc files/heimdal-0.6-berkdb.patch 542
diff --git a/app-crypt/heimdal/heimdal-0.6.1.ebuild b/app-crypt/heimdal/heimdal-0.6.1.ebuild
index 1ec8477e6604..ef2a99f6a422 100644
--- a/app-crypt/heimdal/heimdal-0.6.1.ebuild
+++ b/app-crypt/heimdal/heimdal-0.6.1.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.1.ebuild,v 1.9 2004/04/25 22:00:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.1.ebuild,v 1.10 2004/05/06 10:06:53 dragonheart Exp $
 
 inherit libtool eutils
 
@@ -14,16 +14,22 @@ KEYWORDS="x86 sparc ppc alpha ~ia64 amd64 hppa mips"
 IUSE="ssl ldap berkdb ipv6"
 PROVIDE="virtual/krb5"
 
-DEPEND="
+RDEPEND="
 	ssl? ( dev-libs/openssl )
 	berkdb? ( sys-libs/db )
-	!app-crypt/kth-krb
-	sys-devel/autoconf"
+	!app-crypt/kth-krb"
 	# 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}
 
@@ -54,8 +60,8 @@ src_compile() {
 		--enable-shared"
 
 	use ssl \
-		&& myconf="--with-openssl=/usr" \
-		|| myconf="--without-openssl"
+		&& myconf="${myconf} --with-openssl=/usr" \
+		|| myconf="${myconf} --without-openssl"
 
 	#use ldap && myconf="${myconf} --with-open-ldap=/usr"
 
diff --git a/app-crypt/heimdal/heimdal-0.6.ebuild b/app-crypt/heimdal/heimdal-0.6.ebuild
index 8cd104cd9030..027476d30d9d 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.16 2004/04/25 22:00:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.ebuild,v 1.17 2004/05/06 10:06:53 dragonheart Exp $
 
 inherit libtool eutils
 
@@ -14,16 +14,20 @@ KEYWORDS="x86 sparc ppc alpha ia64 amd64 hppa mips"
 IUSE="ssl ldap berkdb ipv6"
 PROVIDE="virtual/krb5"
 
-DEPEND="
-	ssl? ( dev-libs/openssl )
+RDEPEND="ssl? ( dev-libs/openssl )
 	berkdb? ( sys-libs/db )
-	!app-crypt/kth-krb
-	sys-devel/autoconf"
+	!app-crypt/kth-krb"
 	# 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}
 
@@ -54,8 +58,8 @@ src_compile() {
 		--enable-shared"
 
 	use ssl \
-		&& myconf="--with-openssl=/usr" \
-		|| myconf="--without-openssl"
+		&& myconf="${myconf} --with-openssl=/usr" \
+		|| myconf="${myconf} --without-openssl"
 
 	#use ldap && myconf="${myconf} --with-open-ldap=/usr"