version bump thanks to bug #227385. opencdk notlonger supported as per bug #227381.

(Portage version: 2.1.4.4)

4 files changed, 96 insertions, 4 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 4b0c1b522c5c..568ed89cdc36 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.156 2008/06/01 15:19:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.157 2008/06/19 09:11:03 dragonheart Exp $
+
+*gnutls-2.3.15 (19 Jun 2008)
+
+  19 Jun 2008; Daniel Black <dragonheart@gentoo.org>
+  +files/gnutls-2.3.15-qa_gnutls_session_is_psk.patch, gnutls-2.3.11.ebuild,
+  +gnutls-2.3.15.ebuild:
+  version bump thanks to bug #227385. opencdk notlonger supported as per bug
+  #227381. Thanks to Arfrever Frehtes Taifersar Arahesis and Franz Metz
 
   01 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
   +files/gnutls-2.3.11+gcc-4.3.patch, gnutls-2.3.11.ebuild:
diff --git a/net-libs/gnutls/files/gnutls-2.3.15-qa_gnutls_session_is_psk.patch b/net-libs/gnutls/files/gnutls-2.3.15-qa_gnutls_session_is_psk.patch
new file mode 100644
index 000000000000..c8977c6f3bd5
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.3.15-qa_gnutls_session_is_psk.patch
@@ -0,0 +1,10 @@
+--- ./lib/gnutls_state.h.orig	2008-06-19 18:54:50.000000000 +1000
++++ ./lib/gnutls_state.h	2008-06-19 18:55:57.000000000 +1000
+@@ -58,6 +58,7 @@
+ 
+ int _gnutls_session_is_resumable (gnutls_session_t session);
+ int _gnutls_session_is_export (gnutls_session_t session);
++int _gnutls_session_is_psk (gnutls_session_t session);
+ 
+ int _gnutls_openpgp_send_fingerprint (gnutls_session_t session);
+ 
diff --git a/net-libs/gnutls/gnutls-2.3.11.ebuild b/net-libs/gnutls/gnutls-2.3.11.ebuild
index bf3365989d20..9101260b1878 100644
--- a/net-libs/gnutls/gnutls-2.3.11.ebuild
+++ b/net-libs/gnutls/gnutls-2.3.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.3.11.ebuild,v 1.2 2008/06/01 15:19:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.3.11.ebuild,v 1.3 2008/06/19 09:11:03 dragonheart Exp $
 
 inherit libtool autotools eutils
 
@@ -18,7 +18,6 @@ IUSE="zlib lzo doc nls guile bindist"
 RDEPEND="dev-libs/libgpg-error
 	>=dev-libs/libgcrypt-1.2.4
 	>=dev-libs/libtasn1-0.3.4
-	>=app-crypt/opencdk-0.6.4
 	nls? ( virtual/libintl )
 	guile? ( dev-scheme/guile )
 	zlib? ( >=sys-libs/zlib-1.1 )
@@ -54,7 +53,6 @@ src_compile() {
 	local myconf
 	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
 	econf  \
-		--without-included-opencdk \
 		$(use_with zlib) \
 		$(use_enable nls) \
 		$(use_enable guile) \
diff --git a/net-libs/gnutls/gnutls-2.3.15.ebuild b/net-libs/gnutls/gnutls-2.3.15.ebuild
new file mode 100644
index 000000000000..40aadba7579d
--- /dev/null
+++ b/net-libs/gnutls/gnutls-2.3.15.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.3.15.ebuild,v 1.1 2008/06/19 09:11:03 dragonheart Exp $
+
+inherit libtool autotools eutils
+
+DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="http://www.gnu.org/software/gnutls/releases/${P}.tar.bz2"
+#SRC_URI="mirror://gnu/gnutls/${P}.tar.bz2"
+
+# GPL-3 for the gnutls-extras library and LGPL for the gnutls library.
+LICENSE="LGPL-2.1 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="zlib lzo doc nls guile bindist"
+
+RDEPEND="dev-libs/libgpg-error
+	>=dev-libs/libgcrypt-1.2.4
+	>=dev-libs/libtasn1-0.3.4
+	nls? ( virtual/libintl )
+	guile? ( dev-scheme/guile )
+	zlib? ( >=sys-libs/zlib-1.1 )
+	!bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	if use guile && ! built_with_use dev-scheme/guile networking; then
+		eerror "You are trying to compile ${PN} package with USE=\"guile\""
+		eerror "while dev-scheme/guile does not have USE=\"networking\""
+		die
+	fi
+	if use lzo && use bindist; then
+		ewarn "lzo support was disabled for binary distribution of gnutls"
+		ewarn "due to licensing issues. See Bug 202381 for details."
+		epause 5
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-2.3.11+gcc-4.3.patch
+	epatch "${FILESDIR}"/${P}-qa_gnutls_session_is_psk.patch
+
+	elibtoolize # for sane .so versioning on FreeBSD
+}
+
+src_compile() {
+	local myconf
+	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
+	econf  \
+		$(use_with zlib) \
+		$(use_enable nls) \
+		$(use_enable guile) \
+		$(use_enable doc gtk-doc) \
+		${myconf}
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS 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
+}