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 | c9809336e54b08712a347331d927e2fba7b85264 (patch) | |
| tree | 466bc96f8b601754be96e5fd4fbf5a2954ee82e0 /app-crypt/heimdal | |
| parent | Unmask mozilla 1.6-r1 (whups) (diff) | |
| download | historical-c9809336e54b08712a347331d927e2fba7b85264.tar.gz historical-c9809336e54b08712a347331d927e2fba7b85264.tar.bz2 historical-c9809336e54b08712a347331d927e2fba7b85264.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.
Diffstat (limited to 'app-crypt/heimdal')
| -rw-r--r-- | app-crypt/heimdal/ChangeLog | 6 | ||||
| -rw-r--r-- | app-crypt/heimdal/Manifest | 4 | ||||
| -rw-r--r-- | app-crypt/heimdal/heimdal-0.6.ebuild | 15 |
3 files changed, 13 insertions, 12 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/Manifest b/app-crypt/heimdal/Manifest index 374775e2f512..c8f49782bbe0 100644 --- a/app-crypt/heimdal/Manifest +++ b/app-crypt/heimdal/Manifest @@ -1,9 +1,9 @@ -MD5 5e98559f38de4b60bff2d7ebaab8ddd6 ChangeLog 2349 +MD5 2115433c9b8d34d7a32099d16e66890f ChangeLog 2557 MD5 b9859ed28f031f9396b8c12f53675aa2 heimdal-0.4e-r1.ebuild 1157 MD5 68098215e98ebbd33fd94dd593e58abb heimdal-0.5.1-r1.ebuild 2237 MD5 659291b8fd615a03020309fc26754187 heimdal-0.5.1.ebuild 1314 MD5 05d2acfd024f5372f94c5bb5bbf0afc4 heimdal-0.5.ebuild 1304 -MD5 60ae864fc3f7f000ee04335f45453e6d heimdal-0.6.ebuild 2594 +MD5 08ca977d7f45443498b28817f83b3dfe heimdal-0.6.ebuild 2470 MD5 12c2f086658ad67e3ddaf1340cb9405a files/01heimdal 125 MD5 4b0bf925049fd324edb977fa85fb907f files/digest-heimdal-0.4e-r1 65 MD5 9938c171c490847ed838372b75d29d0c files/digest-heimdal-0.5 64 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 |