summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-libs/libgadu/Manifest2
-rw-r--r--net-libs/libgsasl/ChangeLog6
-rw-r--r--net-libs/libgsasl/Manifest6
-rw-r--r--net-libs/libgsasl/libgsasl-1.6.0.ebuild12
-rw-r--r--net-libs/libgsasl/metadata.xml3
5 files changed, 20 insertions, 9 deletions
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index 5823fc69209e..4a50250ff824 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -2,7 +2,7 @@ AUX libgadu-1.9.0-memleak.patch 1205 RMD160 2aab98ca3daab357460921baecf909ffd7d5
DIST libgadu-1.10.0.tar.gz 531709 RMD160 ebfbb280f03cdcbb3a35bd4156a5997b112d5171 SHA1 8f3fedddad24779d615c920117e3122e9b8d5774 SHA256 82b6e8230f2a4e11ce0d0b0569aaa533de45ca2955e68245fd73c62188fba302
DIST libgadu-1.9.0.tar.gz 508879 RMD160 28b664dbc04174f0ff3d2615cfa98c9b3ccf8da6 SHA1 8b573ebf4d09962491b9a6e5fa2dd451b820c089 SHA256 12fadc0ea8ff31e5c199e8209bc6409dac2f69d4f4cda4adf6ec3838846af5f9
DIST libgadu-1.9.1.tar.gz 512563 RMD160 e17a7efd1b43a2e6d06a0521e8f27ccf4af5f072 SHA1 ec0a53bdbf6791baa5cd90d3d7ac4e0e7cf4df18 SHA256 669267f9b13879bab79923348158e8f545185b17690d5ecfb161125504a6e493
-EBUILD libgadu-1.10.0-r1.ebuild 1375 RMD160 ab8e74e75d1efbf3e7c813efdc98acd2f5af3cc0 SHA1 c66308414e26cc356cc72253dd8f01be2d2afbe6 SHA256 d7de853860f32874537cba8ca4114373ce7d0699161e8292a5f841abfef50ed0
+EBUILD libgadu-1.10.0-r1.ebuild 1371 RMD160 df219ee49fe70c849b9e26161ec5ea6c076e848c SHA1 f46a7c47579ef2462592705e4f7d16687bfdf7e5 SHA256 026059e45f2b7c07c744a9103405273951f5aae2dffd27fe499bce819b3d9c76
EBUILD libgadu-1.9.0-r1.ebuild 1164 RMD160 3d36c4a2711840a82221d43d85dc1ecee255575f SHA1 9d2a4fbf2ca56ea651dd9a6f8ecc5352d51a6b31 SHA256 a56a9f9055a54a0b853044a21ee863cc952fa624786c8748ac00f3619d958a93
EBUILD libgadu-1.9.1.ebuild 1124 RMD160 679d123d77668dc3d908facdc20cdec81b2716ce SHA1 67a182352744fe808cbfafb4a18090ab7c034b2d SHA256 05374a78f66b812856251ba898d47a0b8d3993a94b2510bbb9b688967c3cb9ed
MISC ChangeLog 7068 RMD160 513428831d0b8f3936e5e5c6e785d0e5a7328aa5 SHA1 50d68c4c1ff1c85973ee88af6051ce351714ca1e SHA256 c1507bdac23e51b7dd6370785aecc87654ca995149c3d0117596872e20341e21
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/Manifest b/net-libs/libgsasl/Manifest
index 49aeae1d1f91..02ddec8bdd76 100644
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -9,6 +9,6 @@ EBUILD libgsasl-0.2.29.ebuild 1083 RMD160 7eca8d5f4dc6affe90f8b96dfaa5ecfd26ddba
EBUILD libgsasl-0.2.4.ebuild 990 RMD160 8b30eaceb59f927caa7c4f0e38dd758119455413 SHA1 f002b3175e95a8d6c76b2652c4710dfe20e47377 SHA256 4322d9a71efaeb81abdc00a01b900f5d97f1b5f19bc1fcdb330ee8a4a8bb42fc
EBUILD libgsasl-1.1.ebuild 1104 RMD160 f024e10b99eb81d6b4036ebb8b10bb966f2a8ebc SHA1 78f7589bc653f52206c11250d72231f6f945ac5c SHA256 58334e950c717e1661318286a7268a3ab88dbb7a61da665bedf63ef6b3d4a2ae
EBUILD libgsasl-1.4.1.ebuild 1113 RMD160 80e2eef63cb705726fbd96dd28847f9137b0cf88 SHA1 6a1c4838678e485cbcf605205cb689955cc898c0 SHA256 27133bf52b3b340dc4392d9fad84e57e2f154e113dfc85f63725f7ed3c09c6e6
-EBUILD libgsasl-1.6.0.ebuild 1112 RMD160 6a9a0051c813ef5413479117fd796cd87a8779f8 SHA1 70d2aa8959a066aca2637093f4848988ba8d8cd4 SHA256 624d907b6a8f8b84c5bfee1f203cfb08853373c4f3109aec8aefb233bbd17845
-MISC ChangeLog 6452 RMD160 b8e3f3e70c3821184e5713b610a9f0831d20b84d SHA1 51e052184f34a62a2df820d1fe6278d81c96bb73 SHA256 47e2e286f8d17f5b3da9cb8041f449552aad5a449b30a01d6f08bdc3920d5c9f
-MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
+EBUILD libgsasl-1.6.0.ebuild 1187 RMD160 6b82ef48aa53538ec341d04c9ba4b42159e435b5 SHA1 d7312c513639693515b7cb9b76f4e20c0693f275 SHA256 4faa93b84303783b9c290fac4e40a3295db90896c2f4ea6197b0e599783bccca
+MISC ChangeLog 6609 RMD160 e98319216d4f0952c00fd363131bfcb12cee5453 SHA1 db6ef24a18bb4d477ea9f12e23c1b73582c6d177 SHA256 14d82933741e33084a19cf216ed0093f6bc55f2b3c103503ff750f65c813b754
+MISC metadata.xml 257 RMD160 809532d8d8edbc45402f5ad65f9f55c3fbd94a56 SHA1 ac01878fb096e07a473eea8eeb3c0ad6317876bc SHA256 8ebd86dc3ffa92b4ae6b49a2944e1b5eed2311bfe3fc304459338fbeab8efed0
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>