From e841501a3efe2f58c69bf8e0fc0792fc00e94368 Mon Sep 17 00:00:00 2001
From: Alastair Tse <liquidx@gentoo.org>
Date: Sat, 6 Sep 2003 11:28:01 +0000
Subject: fixes lzo and tasn1 support. made openpgp/crypt support optional

---
 net-libs/gnutls/ChangeLog            |  6 +++++-
 net-libs/gnutls/Manifest             |  4 ++--
 net-libs/gnutls/gnutls-0.8.10.ebuild | 20 +++++++++++++-------
 3 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'net-libs/gnutls')

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 469e598ae4a0..9824fe87f18d 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.1 2003/09/02 22:19:58 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.2 2003/09/06 11:27:55 liquidx Exp $
+
+  06 Sep 2003; Alastair Tse <liquidx@gentoo.org> gnutls-0.8.10.ebuild:
+  put opencdk dep behind crypt USE flag and removed optional lzo support. also
+  changed build to use included libtasn1 instead of dev-libs/libtasn1
 
 *gnutls-0.8.10 (02 Sep 2003)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 3ee9124f94a1..329f1bc5b572 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,4 +1,4 @@
-MD5 113609f0ee266efa2027ea367b8d56b2 ChangeLog 393
-MD5 ea46c92d3c571b24f3a5ac77510e1280 gnutls-0.8.10.ebuild 1024
+MD5 887894b4b81e221ecf029d212c9175d8 ChangeLog 614
+MD5 f3b8da716d4f9e6b7a8d93df2b29e689 gnutls-0.8.10.ebuild 1208
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 MD5 b2ae83a3180a66ab61bdf08669f27399 files/digest-gnutls-0.8.10 66
diff --git a/net-libs/gnutls/gnutls-0.8.10.ebuild b/net-libs/gnutls/gnutls-0.8.10.ebuild
index d5476a36659e..79e9e4dc0718 100644
--- a/net-libs/gnutls/gnutls-0.8.10.ebuild
+++ b/net-libs/gnutls/gnutls-0.8.10.ebuild
@@ -1,21 +1,23 @@
 # Copyright 2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-0.8.10.ebuild,v 1.1 2003/09/02 22:19:58 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-0.8.10.ebuild,v 1.2 2003/09/06 11:27:55 liquidx Exp $
 
 DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
 HOMEPAGE="http://www.gnutls.org/"
 SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/${P}.tar.gz"
 
-IUSE="zlib doc lzo"
+IUSE="zlib doc crypt"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86"
 
 DEPEND=">=dev-libs/libgcrypt-1.1.12
-	<app-crypt/opencdk-0.5.0
-	>=dev-libs/libtasn1-0.2
-	zlib? ( >=sys-libs/zlib-1.1 )
-	lzo? ( >=dev-libs/lzo-1.08 )"
+	crypt? ( <app-crypt/opencdk-0.5.0 )
+	zlib? ( >=sys-libs/zlib-1.1 )"
+
+# gnutls has its own version of these. so let us use those instead.
+#	>=dev-libs/libtasn1-0.1
+#   >=dev-libs/lzo-1.0	
 
 src_unpack() {
 	unpack ${A}
@@ -24,7 +26,11 @@ src_unpack() {
 }
 
 src_compile() {
-	econf  `use_with zlib` || die
+	econf  \
+		`use_with zlib` \
+		`use_enable crypt openpgp-authentication` \
+		--with-included-minilzo \
+		--with-included-libtasn1 || die
 	emake || die
 }
 
-- 
cgit v1.2.3-65-gdbad