diff options
| author |   Aron Griffis <agriffis@gentoo.org> | 2004-02-17 16:13:49 +0000 |
|---|---|---|
| committer | Aron Griffis <agriffis@gentoo.org> | 2004-02-17 16:13:49 +0000 |
| commit | 94664300aa96283b38faec42e01ef6624f48dd72 (patch) | |
| tree | 5763f0c0d867ed16af57bf85e2052882755528bd | |
| parent | Unmask mozilla 1.6-r1 (whups) (diff) | |
| download | gentoo-2-94664300aa96283b38faec42e01ef6624f48dd72.tar.gz gentoo-2-94664300aa96283b38faec42e01ef6624f48dd72.tar.bz2 gentoo-2-94664300aa96283b38faec42e01ef6624f48dd72.zip | |
According to lanius in bug 21781, Heimdal 0.6 conflicts with app-crypt/kth-krb, whereas this has been a dep in the previous version.
| -rw-r--r-- | app-crypt/heimdal/ChangeLog | 6 | ||||
| -rw-r--r-- | app-crypt/heimdal/heimdal-0.6.ebuild | 15 |
2 files changed, 11 insertions, 10 deletions
diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog index 5072c44bd88b..768ac9d15898 100644 --- a/app-crypt/heimdal/ChangeLog +++ b/app-crypt/heimdal/ChangeLog @@ -1,6 +1,10 @@ # 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.14 2004/02/17 15:54:17 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.15 2004/02/17 16:13:48 agriffis Exp $ + + 17 Feb 2004; Aron Griffis <agriffis@gentoo.org> heimdal-0.6.ebuild: + According to lanius in bug 21781, Heimdal 0.6 conflicts with + app-crypt/kth-krb, whereas this has been a dep in the previous version. 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 diff --git a/app-crypt/heimdal/heimdal-0.6.ebuild b/app-crypt/heimdal/heimdal-0.6.ebuild index 18766e00f117..603fd8fa18c7 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.6 2004/02/17 15:54:17 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.ebuild,v 1.7 2004/02/17 16:13:49 agriffis Exp $ inherit libtool @@ -11,13 +11,13 @@ HOMEPAGE="http://www.pdc.kth.se/heimdal/" SLOT="0" LICENSE="as-is" KEYWORDS="x86 -sparc ppc ~alpha ~ia64" -IUSE="ssl ldap berkdb ipv6 krb4" +IUSE="ssl ldap berkdb ipv6" PROVIDE="virtual/krb5" DEPEND=" - krb4? ( >=app-crypt/kth-krb-1.2.1 ) ssl? ( dev-libs/openssl ) - berkdb? ( sys-libs/db )" + berkdb? ( sys-libs/db ) + !app-crypt/kth-krb" # ldap? ( net-nds/openldap ) # With this enabled, we create a multiple stage # circular dependency with USE="ldap kerberos" @@ -45,7 +45,8 @@ src_compile() { local myconf=" $(use_with ipv6) - $(use_with berkdb berkely-db)" + $(use_with berkdb berkely-db) + --enable-shared" use ssl \ && myconf="--with-openssl=/usr" \ @@ -53,10 +54,6 @@ src_compile() { #use ldap && myconf="${myconf} --with-open-ldap=/usr" - 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 |