summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2011-03-15 19:05:30 +0000
committerJeroen Roovers <jer@gentoo.org>2011-03-15 19:05:30 +0000
commit18bcc783ceda53d6734ef103861f3898cfc088d1 (patch)
treecf6f33d243a30a597f2c1ed3aa017b573d4ec91d
parentFix gnutls automagic, bug #358619. Bump EAPI (diff)
downloadgentoo-2-18bcc783ceda53d6734ef103861f3898cfc088d1.tar.gz
gentoo-2-18bcc783ceda53d6734ef103861f3898cfc088d1.tar.bz2
gentoo-2-18bcc783ceda53d6734ef103861f3898cfc088d1.zip
Optionally depend on dev-libs/libgcrypt by Marcin Mirosław (bug #358693).
(Portage version: 2.2.0_alpha27/cvs/Linux i686)
-rw-r--r--net-libs/libgsasl/ChangeLog6
-rw-r--r--net-libs/libgsasl/libgsasl-1.6.0.ebuild12
-rw-r--r--net-libs/libgsasl/metadata.xml3
3 files changed, 16 insertions, 5 deletions
diff --git a/net-libs/libgsasl/ChangeLog b/net-libs/libgsasl/ChangeLog
index 7d9f95da7122..156fadb4266f 100644
--- a/net-libs/libgsasl/ChangeLog
+++ b/net-libs/libgsasl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/libgsasl
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/ChangeLog,v 1.53 2011/01/20 18:09:23 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/ChangeLog,v 1.54 2011/03/15 19:05:30 jer Exp $
+
+ 15 Mar 2011; Jeroen Roovers <jer@gentoo.org> libgsasl-1.6.0.ebuild,
+ metadata.xml:
+ Optionally depend on dev-libs/libgcrypt by Marcin Mirosław (bug #358693).
20 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> libgsasl-1.4.1.ebuild:
ppc64 stable wrt #339505
diff --git a/net-libs/libgsasl/libgsasl-1.6.0.ebuild b/net-libs/libgsasl/libgsasl-1.6.0.ebuild
index 2f878bf2d1b4..d47320460280 100644
--- a/net-libs/libgsasl/libgsasl-1.6.0.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.6.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/libgsasl-1.6.0.ebuild,v 1.1 2011/01/09 17:32:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/libgsasl-1.6.0.ebuild,v 1.2 2011/03/15 19:05:30 jer Exp $
DESCRIPTION="The GNU SASL library"
HOMEPAGE="http://www.gnu.org/software/gsasl/"
@@ -11,16 +11,20 @@ SLOT="0"
# optional external libraries.
# * ntlm - libntlm ( http://josefsson.org/libntlm/ )
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="idn kerberos nls"
-DEPEND="nls? ( >=sys-devel/gettext-0.16.1 )
+IUSE="idn gcrypt kerberos nls"
+DEPEND="
+ gcrypt? ( dev-libs/libgcrypt )
+ idn? ( net-dns/libidn )
kerberos? ( virtual/krb5 )
- idn? ( net-dns/libidn )"
+ nls? ( >=sys-devel/gettext-0.16.1 )
+"
RDEPEND="${DEPEND}
!net-misc/gsasl"
src_compile() {
econf \
$(use_enable kerberos gssapi) \
+ $(use_with gcrypt libgcrypt) \
$(use_enable kerberos kerberos_v5) \
$(use_with idn stringprep) \
$(use_enable nls) \
diff --git a/net-libs/libgsasl/metadata.xml b/net-libs/libgsasl/metadata.xml
index 940fde8f70ce..469ce3f3dfa1 100644
--- a/net-libs/libgsasl/metadata.xml
+++ b/net-libs/libgsasl/metadata.xml
@@ -2,4 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>net-mail</herd>
+<use>
+<flag name='gcrypt'>Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto</flag>
+</use>
</pkgmetadata>