Version bump.

Package-Manager: portage-13623-svn/cvs/Linux x86_64

11 files changed, 16 insertions, 434 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 2ca3aeadcb45..c92c25baabff 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.197 2009/05/15 22:59:46 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.198 2009/05/19 13:54:09 arfrever Exp $
+
+*gnutls-2.7.11 (19 May 2009)
+
+  19 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -files/gnutls-2.6.0-openpgp-selftest.patch, -gnutls-2.6.4.ebuild,
+  -gnutls-2.6.5.ebuild, -gnutls-2.6.5-r1.ebuild, -gnutls-2.7.8.ebuild,
+  -files/gnutls-2.7.8-lzo.patch, +gnutls-2.7.11.ebuild,
+  -files/CVE-2009-1415.patch, -files/CVE-2009-1416.patch,
+  -files/CVE-2009-1417.patch:
+  Version bump.
 
 *gnutls-2.7.10 (15 May 2009)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 6707ca785b32..3d626e4827bc 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,19 +1,9 @@
-AUX CVE-2009-1415.patch 570 RMD160 6cff2efea8b0eaa3daa0ea85a62604f816cc6c01 SHA1 ce93f7e5b1fd843720030929e583d004fde9d5e8 SHA256 b07b01b8fbbce40a1b541eeecb4e089b7839bda72d256d88c6b89ef26476a1dc
-AUX CVE-2009-1416.patch 393 RMD160 727454d4c7dec0932b551c849a7fb52ffc3b2679 SHA1 4ee981b2ff745dc2368022fba65a2f9b75acfe4d SHA256 ae133003850bd69e02bfc4dbd79f8fccef602a0df4673320d30438e9f74fd896
-AUX CVE-2009-1417.patch 2984 RMD160 5e753e59291d782ec6ccf598cda93f0ed053bafc SHA1 744c77a1881a680483fdfe02a2ef2379e91a886e SHA256 a301edfad1ddc4e7c60b012ea52271a740afd5f510d6a1d3ad47f6c650463327
 AUX gnutls-2.6.0-cxx-configure.in.patch 502 RMD160 fdd7f402f2a9122f8d7db9b165670c42d83abeb8 SHA1 748b7a0f0b689169054970993d7b4a6331f52c33 SHA256 c7a3ff932c467d08b27eee7e8b5bd1ce97b200328fc90478dee5ea3a59b18f71
-AUX gnutls-2.6.0-openpgp-selftest.patch 508 RMD160 dcd254a8078c4ab21662377e4f53176a541292e4 SHA1 f73103e1aa5dcccd4449b42123c00b0e782cac67 SHA256 235e0a1e588548eb52627d9fae528c680aeaf260e6cb87afa86a624f134fbd08
-AUX gnutls-2.7.8-lzo.patch 550 RMD160 7ce3a7a1e3f9d18b8cb7ad7e168333bacd220c7b SHA1 cf9a31512c9159fd5078f5eab867ac7bbee3ae85 SHA256 973e7df790a9286d919a403eb6a22b7d2257f456bdaac34d82f7a2d04e977277
-DIST gnutls-2.6.4.tar.bz2 5115205 RMD160 771fd64026df69d770a0a681141591b21f9be751 SHA1 11dd1e11599906a32b3ff92308f4c4dbaadbad58 SHA256 728a5f9aa4b746d281a442e783caabcdd9df2292a2919ce3330cf75ac4ce0441
-DIST gnutls-2.6.5.tar.bz2 5112923 RMD160 9e484d26c50bda0e26e0788ca5465da1ef620fe3 SHA1 87d0fd82debee0d644f72fcf404ccd7540c6c71a SHA256 e78be636072c0ab748ccf1742c4b41fc7aaff98b43166cfbc8df91c7185501cb
 DIST gnutls-2.6.6.tar.bz2 5116385 RMD160 dc6e717e38741628508208244f07fed8faedb13c SHA1 d1693e611aa7270f14bc500bd56ef529ffcb1703 SHA256 03d85b8b51ca7885740c69b87663963c58fe7c9672da0a43e45732078fabdc9e
 DIST gnutls-2.7.10.tar.bz2 6175641 RMD160 830b7c7e7d602baaefdf30df8f955aa8814da303 SHA1 745757a6d63935aa532cfa7ca93d0dbef47886f0 SHA256 f7ad01c02a86f9d422fe84a64d169428ea44455df8b87b357f44aeb39163216c
-DIST gnutls-2.7.8.tar.bz2 6056746 RMD160 4db24b55863d5a34e582e80394bb444d02154b20 SHA1 d36896478a8156e9da52a0b2b605af43975a2958 SHA256 a3e73660fcae82c2137e576b4e0babd755c9257e5806ce2906e00823b5344c47
-EBUILD gnutls-2.6.4.ebuild 2314 RMD160 65f60de190cb647e3fafb2a64846f8dbe924495e SHA1 f6536d4fcdf131183ec4a99d5aaf49030a3419f3 SHA256 da6d07ff07592051365e59637e77eb4c91b6333f41a7cda0394ae806c097c9c0
-EBUILD gnutls-2.6.5-r1.ebuild 2522 RMD160 12964630f8d47e57164aefff39e58bbcd82e8080 SHA1 17936f4bb8c835547355d029fcbe744f520214b8 SHA256 36ff95ed1f941c84d1c5bd51ff5b84ee7583747bb844761249a94d55e09a23be
-EBUILD gnutls-2.6.5.ebuild 2338 RMD160 7bb73cf8dff83e97bd20302eba1249071a5f6b6e SHA1 3ae9aa8ea83ecf62e63561c48cb573fc5d382e18 SHA256 992153019c80e8e73d837573cfc1a1d623796d5f5bbd8fb461c2f5cf44bc9c18
+DIST gnutls-2.7.11.tar.bz2 6174834 RMD160 5d9bb95a2bd046883adcf5d2b7f2ff0dbe634143 SHA1 1aba54a607451e31ba837adb6378a9a3bd04e5f5 SHA256 6926a4c25e94993cf880800af7ae5270bee487b96918c58d6b6db33be74d5958
 EBUILD gnutls-2.6.6.ebuild 2308 RMD160 61b3ccbbc81ede2805b4343170601af5107596ff SHA1 90c306b4221a31c2423fe96cc1a2dbfce9167293 SHA256 0070991bc9a4408ff8c907be124c3fcddf48e1bb7a08424df3fc587abddfe449
 EBUILD gnutls-2.7.10.ebuild 2224 RMD160 87b3e135cf31b681c31f2ff83152298dad2cb4f6 SHA1 75fd77bf395e7a88c8e0888836c6dd2cf4df683e SHA256 9e2265e0056f71ae2851b6285e12e1a3239fee888f5717740960767840cb5e51
-EBUILD gnutls-2.7.8.ebuild 2268 RMD160 95aa09ba8ea62dbcd81329dde33d7ad1320a0ca6 SHA1 af24184af22ce38c3221266e94bf9c83da2c2555 SHA256 215666d532f3767b121a567177487b5abe023b53c3a56c1f9c5bfeb0113cb027
-MISC ChangeLog 30064 RMD160 7b752f7b16d5096d19f21ddd8c3ada7166e1250f SHA1 e665c51b05712a1fe12bc247cb8578f5c44a4faa SHA256 8d28348cbd01efe5f9bafe5ef1e8875b5d2a601df2a74cb07e7d50c49dde2775
+EBUILD gnutls-2.7.11.ebuild 2224 RMD160 324611a81ed4a2d7dadad3d7804abb6ab8e5a820 SHA1 769fbbbbafa38c92f79d4a816f3755e9588c81ba SHA256 b3751962bc6b4042ec3fb53eb01b36b259d3a91a5dcc13952d0393f2b071149f
+MISC ChangeLog 30467 RMD160 e1bc83085a22592b839663c64ebf59af978a9348 SHA1 63126ac981c4ad6db43b0a8560e3c0c805c35adc SHA256 32ab7812140c9aed78bde23471f1a7a2f0f0c4ec1580f16fbcc4511fb2f17432
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
diff --git a/net-libs/gnutls/files/CVE-2009-1415.patch b/net-libs/gnutls/files/CVE-2009-1415.patch
deleted file mode 100644
index 552775c59bfe..000000000000
--- a/net-libs/gnutls/files/CVE-2009-1415.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- pk-libgcrypt.c-	2009-04-23 10:59:06.000000000 +0200
-+++ pk-libgcrypt.c	2009-04-23 18:32:17.000000000 +0200
-@@ -418,7 +418,7 @@
- 		      const gnutls_datum_t * signature,
- 		      const gnutls_pk_params_st * pk_params)
- {
--  gcry_sexp_t s_sig, s_hash, s_pkey;
-+  gcry_sexp_t s_sig = NULL, s_hash = NULL, s_pkey = NULL;
-   int rc = -1, ret;
-   bigint_t hash;
-   bigint_t tmp[2] = { NULL, NULL };
-@@ -511,6 +511,7 @@
-   gcry_sexp_release (s_sig);
-   gcry_sexp_release (s_hash);
-   gcry_sexp_release (s_pkey);
-+  s_hash = s_pkey = s_sig = NULL;
- 
-   if (rc != 0)
-     {
diff --git a/net-libs/gnutls/files/CVE-2009-1416.patch b/net-libs/gnutls/files/CVE-2009-1416.patch
deleted file mode 100644
index ebc540592820..000000000000
--- a/net-libs/gnutls/files/CVE-2009-1416.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/gnutls_pk.c b/lib/gnutls_pk.c
-index 1015c3a..a08349b 100644
---- a/lib/gnutls_pk.c
-+++ b/lib/gnutls_pk.c
-@@ -529,7 +529,7 @@ _generate_params (int algo, bigint_t * resarr, unsigned int *resarr_len,
-   int ret;
-   unsigned int i;
- 
--  ret = _gnutls_pk_ops.generate (GNUTLS_PK_RSA, bits, &params);
-+  ret = _gnutls_pk_ops.generate (algo, bits, &params);
- 
-   if (ret < 0)
-     {
diff --git a/net-libs/gnutls/files/CVE-2009-1417.patch b/net-libs/gnutls/files/CVE-2009-1417.patch
deleted file mode 100644
index 859c4a632a5c..000000000000
--- a/net-libs/gnutls/files/CVE-2009-1417.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Index: gnutls-2.6.5/includes/gnutls/gnutls.h.in
-===================================================================
---- gnutls-2.6.5.orig/includes/gnutls/gnutls.h.in
-+++ gnutls-2.6.5/includes/gnutls/gnutls.h.in
-@@ -251,7 +251,13 @@ extern "C"
-      */
-     GNUTLS_CERT_SIGNER_NOT_FOUND = 64,
-     GNUTLS_CERT_SIGNER_NOT_CA = 128,
--    GNUTLS_CERT_INSECURE_ALGORITHM = 256
-+    GNUTLS_CERT_INSECURE_ALGORITHM = 256,
-+
-+    /* Time verification.
-+     */
-+    GNUTLS_CERT_NOT_ACTIVATED = 512,
-+    GNUTLS_CERT_EXPIRED = 1024
-+
-   } gnutls_certificate_status_t;
- 
-   typedef enum
-Index: gnutls-2.6.5/includes/gnutls/x509.h
-===================================================================
---- gnutls-2.6.5.orig/includes/gnutls/x509.h
-+++ gnutls-2.6.5/includes/gnutls/x509.h
-@@ -481,7 +481,13 @@ extern "C"
- 
-     /* Allow certificates to be signed using the broken MD5 algorithm.
-      */
--    GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD5 = 32
-+    GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD5 = 32,
-+
-+    /* Disable checking of activation and expiration validity
-+     * periods of certificate chains. Don't set this unless you
-+     * understand the security implications.
-+     */
-+    GNUTLS_VERIFY_DISABLE_TIME_CHECKS = 64
-   } gnutls_certificate_verify_flags;
- 
-   int gnutls_x509_crt_check_issuer (gnutls_x509_crt_t cert,
-Index: gnutls-2.6.5/lib/x509/verify.c
-===================================================================
---- gnutls-2.6.5.orig/lib/x509/verify.c
-+++ gnutls-2.6.5/lib/x509/verify.c
-@@ -493,6 +493,32 @@ _gnutls_x509_verify_certificate (const g
-     }
- #endif
- 
-+  /* Check activation/expiration times
-+   */
-+  if (!(flags & GNUTLS_VERIFY_DISABLE_TIME_CHECKS))
-+    {
-+      time_t t, now = time (0);
-+
-+      for (i = 0; i < clist_size; i++)
-+	{
-+	  t = gnutls_x509_crt_get_activation_time (certificate_list[i]);
-+	  if (t == (time_t) -1 || now < t)
-+	    {
-+	      status |= GNUTLS_CERT_NOT_ACTIVATED;
-+	      status |= GNUTLS_CERT_INVALID;
-+	      return status;
-+	    }
-+
-+	  t = gnutls_x509_crt_get_expiration_time (certificate_list[i]);
-+	  if (t == (time_t) -1 || now > t)
-+	    {
-+	      status |= GNUTLS_CERT_EXPIRED;
-+	      status |= GNUTLS_CERT_INVALID;
-+	      return status;
-+	    }
-+	}
-+    }
-+
-   /* Verify the certificate path (chain)
-    */
-   for (i = clist_size - 1; i > 0; i--)
-Index: gnutls-2.6.5/src/common.c
-===================================================================
---- gnutls-2.6.5.orig/src/common.c
-+++ gnutls-2.6.5/src/common.c
-@@ -427,6 +427,10 @@ print_cert_vrfy (gnutls_session_t sessio
-     {
-       if (status & GNUTLS_CERT_SIGNER_NOT_FOUND)
- 	printf ("- Peer's certificate issuer is unknown\n");
-+      if (status & GNUTLS_CERT_NOT_ACTIVATED)
-+    printf ("- Peer's certificate chain uses not yet valid certificate\n");
-+      if (status & GNUTLS_CERT_EXPIRED)
-+    printf ("- Peer's certificate chain uses expired certificate\n");
-       if (status & GNUTLS_CERT_INVALID)
- 	printf ("- Peer's certificate is NOT trusted\n");
-       else
diff --git a/net-libs/gnutls/files/gnutls-2.6.0-openpgp-selftest.patch b/net-libs/gnutls/files/gnutls-2.6.0-openpgp-selftest.patch
deleted file mode 100644
index 661ca87bfffe..000000000000
--- a/net-libs/gnutls/files/gnutls-2.6.0-openpgp-selftest.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- tests/openpgp/Makefile.am.orig	2009-01-10 11:48:55.000000000 +1100
-+++ tests/openpgp/Makefile.am	2009-01-10 11:49:13.000000000 +1100
-@@ -30,10 +30,7 @@
- 
- AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_builddir)/includes	\
- 	      -I$(top_srcdir)/tests
--LDADD = -L$(top_builddir)/libextra -lgnutls-extra	\
--        -L$(top_builddir)/lib      -lgnutls		\
--	-L$(top_builddir)/tests    -lutils
--
-+LDADD = ../lib/libgnutls.la ../lib/libgnutls-extra.la ../libutils.la
- else
- 
- EXTRA_DIST = $(openpgp_sources)
diff --git a/net-libs/gnutls/files/gnutls-2.7.8-lzo.patch b/net-libs/gnutls/files/gnutls-2.7.8-lzo.patch
deleted file mode 100644
index 5b0d280281f9..000000000000
--- a/net-libs/gnutls/files/gnutls-2.7.8-lzo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=commitdiff;h=e7eeb6c7c94cf838b3b199d4d7ec5aa1b6e1f656
-
---- lib/libgnutls.map
-+++ lib/libgnutls.map
-@@ -582,6 +582,11 @@
-     _gnutls_read_uint24;
-     _gnutls_get_cred;
-     _gnutls_recv_int;
-+    # Internal symbols needed by libgnutls-extra for LZO:
-+    _gnutls_compression_algorithms;
-+    _gnutls_comp_algorithms_size;
-+    _gnutls_lzo1x_decompress_safe;
-+    _gnutls_lzo1x_1_compress;
-     # Internal symbols needed by libgnutls-openssl:
-     _gnutls_pkix1_asn;
-     _gnutls_x509_parse_dn_oid;
diff --git a/net-libs/gnutls/gnutls-2.6.4.ebuild b/net-libs/gnutls/gnutls-2.6.4.ebuild
deleted file mode 100644
index 0b8351cd3818..000000000000
--- a/net-libs/gnutls/gnutls-2.6.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.6.4.ebuild,v 1.6 2009/04/11 14:08:29 armin76 Exp $
-
-EAPI="2"
-inherit eutils libtool autotools
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-
-MINOR_VERSION="${PV#*.}"
-MINOR_VERSION="${MINOR_VERSION%.*}"
-if [[ $((MINOR_VERSION % 2)) == 0 ]] ; then
-	#SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-else
-	SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
-fi
-unset MINOR_VERSION
-
-# 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="bindist +cxx doc guile lzo nls zlib"
-
-RDEPEND="dev-libs/libgpg-error
-	>=dev-libs/libgcrypt-1.4.0
-	>=dev-libs/libtasn1-0.3.4
-	nls? ( virtual/libintl )
-	guile? ( dev-scheme/guile[networking] )
-	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 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_prepare() {
-	for dir in m4 lib/m4 libextra/m4 ; do
-		rm -f ${dir}/lt* ${dir}/libtool.m4
-	done
-	find . -name ltmain.sh -exec rm {} \;
-
-	# the below patch is in 2.7.* as per
-	# https://savannah.gnu.org/support/?106542
-	epatch "${FILESDIR}"/gnutls-2.6.0-cxx-configure.in.patch
-	epatch "${FILESDIR}"/gnutls-2.6.0-openpgp-selftest.patch
-
-	eautoreconf
-
-	elibtoolize # for sane .so versioning on FreeBSD
-}
-
-src_configure() {
-	local myconf
-	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-	econf  \
-		$(use_with zlib) \
-		$(use_enable nls) \
-		$(use_enable guile) \
-		$(use_enable cxx) \
-		$(use_enable doc gtk-doc) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	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
-}
diff --git a/net-libs/gnutls/gnutls-2.6.5-r1.ebuild b/net-libs/gnutls/gnutls-2.6.5-r1.ebuild
deleted file mode 100644
index 874b6dc2417e..000000000000
--- a/net-libs/gnutls/gnutls-2.6.5-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.6.5-r1.ebuild,v 1.3 2009/05/01 10:33:54 dragonheart Exp $
-
-EAPI="2"
-inherit autotools eutils libtool
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-
-MINOR_VERSION="${PV#*.}"
-MINOR_VERSION="${MINOR_VERSION%.*}"
-if [[ $((MINOR_VERSION % 2)) == 0 ]] ; then
-	#SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-else
-	SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
-fi
-unset MINOR_VERSION
-
-# 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="bindist +cxx doc guile lzo nls zlib"
-
-RDEPEND="dev-libs/libgpg-error
-	>=dev-libs/libgcrypt-1.4.0
-	>=dev-libs/libtasn1-0.3.4
-	nls? ( virtual/libintl )
-	guile? ( dev-scheme/guile[networking] )
-	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 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_prepare() {
-	# old libtool compatibility #245544
-	local dir
-	for dir in m4 lib/m4 libextra/m4 ; do
-		rm -f ${dir}/lt* ${dir}/libtool.m4
-	done
-	find . -name ltmain.sh -exec rm {} \;
-
-	# the below patch is in 2.7.* as per
-	# https://savannah.gnu.org/support/?106542
-	epatch "${FILESDIR}"/gnutls-2.6.0-cxx-configure.in.patch
-	epatch "${FILESDIR}"/gnutls-2.6.0-openpgp-selftest.patch
-
-	pushd lib
-	epatch "${FILESDIR}"/CVE-2009-1415.patch
-	epatch "${FILESDIR}"/CVE-2009-1416.patch
-	popd
-	epatch "${FILESDIR}"/CVE-2009-1417.patch
-
-	eautoreconf
-
-	elibtoolize # for sane .so versioning on FreeBSD
-}
-
-src_configure() {
-	local myconf
-	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-	econf  \
-		$(use_enable cxx) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable guile) \
-		$(use_enable nls) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	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
-}
diff --git a/net-libs/gnutls/gnutls-2.6.5.ebuild b/net-libs/gnutls/gnutls-2.6.5.ebuild
deleted file mode 100644
index e8fb96912301..000000000000
--- a/net-libs/gnutls/gnutls-2.6.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.6.5.ebuild,v 1.1 2009/04/12 18:07:52 arfrever Exp $
-
-EAPI="2"
-inherit autotools eutils libtool
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-
-MINOR_VERSION="${PV#*.}"
-MINOR_VERSION="${MINOR_VERSION%.*}"
-if [[ $((MINOR_VERSION % 2)) == 0 ]] ; then
-	#SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-else
-	SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
-fi
-unset MINOR_VERSION
-
-# 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="bindist +cxx doc guile lzo nls zlib"
-
-RDEPEND="dev-libs/libgpg-error
-	>=dev-libs/libgcrypt-1.4.0
-	>=dev-libs/libtasn1-0.3.4
-	nls? ( virtual/libintl )
-	guile? ( dev-scheme/guile[networking] )
-	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 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_prepare() {
-	local dir
-	for dir in m4 lib/m4 libextra/m4 ; do
-		rm -f ${dir}/lt* ${dir}/libtool.m4
-	done
-	find . -name ltmain.sh -exec rm {} \;
-
-	# the below patch is in 2.7.* as per
-	# https://savannah.gnu.org/support/?106542
-	epatch "${FILESDIR}"/gnutls-2.6.0-cxx-configure.in.patch
-	epatch "${FILESDIR}"/gnutls-2.6.0-openpgp-selftest.patch
-
-	eautoreconf
-
-	elibtoolize # for sane .so versioning on FreeBSD
-}
-
-src_configure() {
-	local myconf
-	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-	econf  \
-		$(use_enable cxx) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable guile) \
-		$(use_enable nls) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	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
-}
diff --git a/net-libs/gnutls/gnutls-2.7.8.ebuild b/net-libs/gnutls/gnutls-2.7.11.ebuild
index b0c9c2aa2d97..f2d0e007ae02 100644
--- a/net-libs/gnutls/gnutls-2.7.8.ebuild
+++ b/net-libs/gnutls/gnutls-2.7.11.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.7.8.ebuild,v 1.1 2009/05/04 03:41:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.7.11.ebuild,v 1.1 2009/05/19 13:54:09 arfrever Exp $
 
 EAPI="2"
 
-inherit autotools eutils libtool
+inherit autotools libtool
 
 DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
 HOMEPAGE="http://www.gnutls.org/"
@@ -46,8 +46,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-lzo.patch"
-
 	local dir
 	for dir in m4 lib/m4 libextra/m4 ; do
 		rm -f "${dir}/lt"* "${dir}/libtool.m4"