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

Package-Manager: portage-2.1.4.4

5 files changed, 101 insertions, 16 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/Manifest b/net-libs/gnutls/Manifest
index 8b5fbccae5dc..0533ce62449e 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnutls-2.3.11+gcc-4.3.patch 349 RMD160 192c663f741c6a2b6681b3873c199c64996d0000 SHA1 657ed9b73f7cfcbf348b94cff9f1ab9c2f8c7b59 SHA256 30dc6126ffa85a4765ca4724355759932990545c962ef2239fdb692af631e018
+AUX gnutls-2.3.15-qa_gnutls_session_is_psk.patch 394 RMD160 99e4e2077b09bb85f5af8084ab1423161fa7a89b SHA1 2529eca0a983af63ac588e8371094f70fbbc258f SHA256 cbd9ce3568ad99afc3e5293e05b277acefee6e977ea9f6676e3d3692a43266bd
 DIST gnutls-2.0.4.tar.bz2 4911330 RMD160 e7fa86f5f9a78da73575507025cde8be6cdc0be6 SHA1 52e17e749a0ad35c54ef204d43ceecda9e5b70d7 SHA256 af07625c701f4d3b2e44b6cb1f9fcf55f8b45942abdf88cfa61a95ca30d6f91f
 DIST gnutls-2.2.5.tar.bz2 4920322 RMD160 dd48a780849fc81c0a688116984eab8f41ea8ebf SHA1 7620d092c790f0a5ac5486c3563786ca8777083d SHA256 cf2689bd5b5f095e27f7a1aa2246212ef9322c0707aeb104238e9eb0f925ae57
 DIST gnutls-2.3.11.tar.bz2 4958034 RMD160 010d7d770abb3327b5d83e6639193197472f06e8 SHA1 f3ddf4ba9df7709f60acfde98ef0ec6842a481b8 SHA256 b874af4ba925e0544709d6712a32d70d4a63f7be3bb1158800591e36d2e85853
+DIST gnutls-2.3.15.tar.bz2 4939069 RMD160 738b95cb4c87ed255ed3cd968fd63c3401af0115 SHA1 9166bdbe1d93bb1d1f1d388e3e492cc462e8c443 SHA256 c6d3dc9f58e01d1612317da6712edd51abf6aecbea655eaffd1c3a3cce15048f
 EBUILD gnutls-2.0.4.ebuild 1436 RMD160 d42ecdcf9259e92457a89b237ed581c19a741494 SHA1 35e2e1c2344ae807987a34a844d54aff29747944 SHA256 cf562ea795bbed27aa91f8c5cf9c6ef65a9b3beb7ceff91005ae49e63e30c70f
 EBUILD gnutls-2.2.5.ebuild 2043 RMD160 2c4f68d97694f8781c45a324db6371c99d2d36a4 SHA1 c23daf33e445aa16ba74e09df0427ad5b98b5eb8 SHA256 0c83127f5c5ff30148c8f0ac86195459cbceae8b068b1e68fd5af93940450f9c
-EBUILD gnutls-2.3.11.ebuild 2101 RMD160 2efe3a5248b245e03b72a786e2967ef09a5a228b SHA1 d659ffd2edb0f56661fb8d5ac8c92a4f660b955f SHA256 f5a1090a2dcd3bbe7fb929411de1de0fb06df51e2b4287b6e249037122dccf14
-MISC ChangeLog 22656 RMD160 7f714229b2f90b0b4ec0b6c934804f4210e8aa2f SHA1 050f4d5dee25b4b80402b79086ecfeffa4d590d5 SHA256 7490a4fa436cfa775ca7a01347b1b594a91f51f70e2b7b5fc65db63fc372810b
+EBUILD gnutls-2.3.11.ebuild 2045 RMD160 15b14da7e36a2317981760c3556ce0727fdd0b8f SHA1 96deed931e361f673625a790512fd935e3521913 SHA256 45ccb0545cd7190f45ca98ffd633695dcba45cc503508afc949556f49040f0b6
+EBUILD gnutls-2.3.15.ebuild 2111 RMD160 e2251e344c9f09d3b7418e82b2f51cd26dab1e5b SHA1 7b9869d6caf2ad104926c1e61f52719a9ef8d9df SHA256 2d6426c770601d1f93ad1f430177c9164a45561e6838ee62a370280b7d241a7e
+MISC ChangeLog 22993 RMD160 c141457c80fb2c96447e8e2aa5bb8446a9f9bc08 SHA1 a0034f6b2aa4eab81c874261f6c195fd1acf8d63 SHA256 32dcec3d1b5f0043b4cf76cba1e1257d7c61478c7ef24ef60bc39dc8d7b97a47
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhCvhkACgkQAiZjviIA2Xi6wgCfeloG4BAK7Q3yC150nEmD6EyG
-5l0AoK7SuTTHJfAr/rbUqrTH3j3m+3Tn
-=p3y9
------END PGP SIGNATURE-----
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
+}