version bump - still masked due to lzo-2 dependancy

(Portage version: 2.0.51.22-r1)

4 files changed, 93 insertions, 6 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 3d3075826b54..e0a33589a865 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.74 2005/07/10 17:21:25 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.75 2005/07/17 00:23:50 dragonheart Exp $
+
+*gnutls-1.2.5 (17 Jul 2005)
+
+  17 Jul 2005; Daniel Black <dragonheart@gentoo.org> +gnutls-1.2.5.ebuild:
+  version bump - still masked due to lzo-2 dependancy
 
   10 Jul 2005; Lina Pezzella <j4rg0n@gentoo.org> gnutls-1.2.4.ebuild:
   Testing ppc-macos. Bug #98390. Submitted on behalf of Fabian Groffen.
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 5f9a9e3c3b0f..0006e853d154 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,14 +1,16 @@
 MD5 67fa84b1792ca8d5a41d2e510f8f6295 ChangeLog 10632
 MD5 08081d2e15793082b967a6f59be65f4f gnutls-1.0.17.ebuild 2420
-MD5 4afc7479357b55dc6feca54b9b3f3563 gnutls-1.2.3-r1.ebuild 2433
+MD5 0c400a0309e2ab26d5c192bce21b63b7 gnutls-1.2.5.ebuild 1942
 MD5 918a1b851dd53568897b4fc7c503912e metadata.xml 276
+MD5 4afc7479357b55dc6feca54b9b3f3563 gnutls-1.2.3-r1.ebuild 2433
+MD5 3207f14521a169740bf9803a98f728f8 gnutls-1.2.4.ebuild 2587
 MD5 47b18acb61b6c8639d14fde3bbf9c4ba gnutls-1.0.25.ebuild 2215
 MD5 2deed714b9c6f42e6cbb812696cd4458 gnutls-1.2.3.ebuild 2317
-MD5 3207f14521a169740bf9803a98f728f8 gnutls-1.2.4.ebuild 2587
+MD5 29d3e8994448eb3fe1d15c6720621b40 files/gnutls-1.0.17-extra.h.patch 479
 MD5 cfa78b7df28ec06ca09763bd8c908ebc files/digest-gnutls-1.0.17 67
+MD5 5deb0ddb33596df840a663273ddf9c2b files/digest-gnutls-1.2.3-r1 66
 MD5 ee48c699bf5727fa6284864dc62d1c14 files/digest-gnutls-1.0.25 66
-MD5 5deb0ddb33596df840a663273ddf9c2b files/digest-gnutls-1.2.3 66
-MD5 29d3e8994448eb3fe1d15c6720621b40 files/gnutls-1.0.17-extra.h.patch 479
 MD5 29d8c263065fa5908f9b6d9e5ea265b7 files/gnutls-1.2.3-gcc4.patch 417
-MD5 5deb0ddb33596df840a663273ddf9c2b files/digest-gnutls-1.2.3-r1 66
 MD5 0a6c7f63908a38a6e28d34a68accee2a files/digest-gnutls-1.2.4 66
+MD5 5deb0ddb33596df840a663273ddf9c2b files/digest-gnutls-1.2.3 66
+MD5 dcfcf7e6b927a12c18c6c4805bc07490 files/digest-gnutls-1.2.5 66
diff --git a/net-libs/gnutls/files/digest-gnutls-1.2.5 b/net-libs/gnutls/files/digest-gnutls-1.2.5
new file mode 100644
index 000000000000..d932060249f5
--- /dev/null
+++ b/net-libs/gnutls/files/digest-gnutls-1.2.5
@@ -0,0 +1 @@
+MD5 73aa29593327d7e4d561cee5cd39cf6d gnutls-1.2.5.tar.bz2 2466208
diff --git a/net-libs/gnutls/gnutls-1.2.5.ebuild b/net-libs/gnutls/gnutls-1.2.5.ebuild
new file mode 100644
index 000000000000..252c952d762a
--- /dev/null
+++ b/net-libs/gnutls/gnutls-1.2.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.5.ebuild,v 1.1 2005/07/17 00:23:50 dragonheart Exp $
+
+inherit eutils gnuconfig
+
+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.bz2"
+
+IUSE="zlib doc crypt"
+
+LICENSE="LGPL-2.1 GPL-2"
+# GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
+
+# Removed keywords awaiting >=dev-libs/libtasn1-0.2.10 keywords (bug #61944)
+#  ~ia64 ~hppa
+
+RDEPEND=">=dev-libs/libgcrypt-1.2.0
+	>=app-crypt/opencdk-0.5.5
+	zlib? ( >=sys-libs/zlib-1.1 )
+	virtual/libc
+	>=dev-libs/lzo-2.0
+	>=dev-libs/libtasn1-0.2.11
+	dev-libs/libgpg-error"
+
+
+#	crypt? ( >=app-crypt/opencdk-0.5.5 )
+
+DEPEND="${RDEPEND}
+	sys-apps/gawk
+	sys-apps/grep
+	sys-devel/gcc
+	sys-devel/libtool"
+
+
+# gnutls has its own version of these. should maybe avoid using.
+#	libtasn1
+#	opencdk
+
+src_compile() {
+	# Needed for mips and probably others
+	gnuconfig_update
+
+	local myconf=""
+	# use crypt || myconf="${myconf} --disable-extra-pki --disable-openpgp-authentication"
+
+	econf  \
+		`use_with zlib` \
+		--without-included-minilzo \
+		--without-included-libtasn1 \
+		--without-included-opencdk \
+		${myconf} || die
+	emake || die
+}
+
+src_install() {
+	# OSX make doesn't handle -jx with x > 1 correctly here.
+	# Forcing it to be just one process, solves installation
+	# problems that arise here.  Fabian Groffen (2005-07-09)
+	if use ppc-macos; then
+		emake -j1 DESTDIR=${D} install || die
+	else
+		emake DESTDIR=${D} install || die
+	fi
+
+
+	dodoc AUTHORS COPYING COPYING.LIB ChangeLog NEWS \
+		README THANKS doc/TODO
+
+	if use doc ; then
+		dodoc doc/README.autoconf doc/tex/gnutls.ps
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}