version bump as per bug #236690 thanks to Arfrever

(Portage version: 2.2_rc12/cvs/Linux 2.6.25-gentoo-r7 x86_64)

2 files changed, 6 insertions, 70 deletions

diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 2c6425c06713..5f35bb1db618 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnutls-2.3.11+gcc-4.3.patch 349 RMD160 192c663f741c6a2b6681b3873c199c64996d0000 SHA1 657ed9b73f7cfcbf348b94cff9f1ab9c2f8c7b59 SHA256 30dc6126ffa85a4765ca4724355759932990545c962ef2239fdb692af631e018
-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
+AUX gnutls-2.6.0-cxx-configure.in.patch 451 RMD160 d449a7f5de65a6e8768b93dd30c0891dde66884c SHA1 628bc60599692f9d2753cc93ba4e6998552db3bc SHA256 8cfa6fa3ee545b4cd5845f4fa3b9017cddd22568c00222431136486a1b64f1bb
+DIST gnutls-2.2.5.tar.bz2 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
 DIST gnutls-2.4.1.tar.bz2 4940118 RMD160 4e21a82047add916b8ccce8aa82c36b2c9bcff90 SHA1 7a439542e6344d5ccf11a29431a0600e7fe1c735 SHA256 d91401a6828d7300dc2b1106ff99610479aa35af05d39746cacdab8cdc7be5fd
 DIST gnutls-2.5.4.tar.bz2 5035669 RMD160 ca8a46f2ead196fbf8b0bb85ba26a039bb189e10 SHA1 f73374eed8ff703834979558af1e0cf2d61919b2 SHA256 5309671f0eef1fcb5599d975c544f91b7d8ab19330838e1da0bcd08b152d9ff4
-EBUILD gnutls-2.0.4.ebuild 1436 RMD160 d42ecdcf9259e92457a89b237ed581c19a741494 SHA1 35e2e1c2344ae807987a34a844d54aff29747944 SHA256 cf562ea795bbed27aa91f8c5cf9c6ef65a9b3beb7ceff91005ae49e63e30c70f
+DIST gnutls-2.6.0.tar.bz2 5112845 RMD160 1d92662edd64e93e658fc527f1dfbfc99ab3a1da SHA1 bbd9e5f3a77bfcbef5a769c67d1576e7a6e4bda5 SHA256 9270a3eab9a9371839af79be92d50b8b21e7fbe157ebe915edae8e352f4e9fb5
 EBUILD gnutls-2.2.5.ebuild 2025 RMD160 af9f9b2cec5ebd1b50a48eb9acae55014d01a464 SHA1 5450b5833019cb6bc809d1ab38dbc40651e8d9b4 SHA256 57732a9022e09682530e3e271b836852f0b9de06aa42fc2b0101df72a862091e
 EBUILD gnutls-2.4.1.ebuild 2042 RMD160 37348a20c0a3985f40494fb4db04b110470635a7 SHA1 3274aca625492b0fc34c8ff8d6314d68da74469d SHA256 5748c71e75cd46b8a7a3cd3f9a42453abed4d4c2684d3373388eadda2d4c11b6
-EBUILD gnutls-2.5.4.ebuild 2042 RMD160 0ba1fdc4027ef66e45b1c3ca12f632e1528df991 SHA1 bf031062cfd894b28367ecbf5347dea19259179e SHA256 533961e6c84bae4ab82cf56655aebbdecd96286f7fea44445a741fd89cb9788a
-MISC ChangeLog 24146 RMD160 c56f1ca69dc1b6fa812ab5325b974fd71f31319a SHA1 5faba315fc80059782433426b64d671ffd064765 SHA256 838aab6339a72f37f507b589038f181a98ca7f2a1fdb6454a86650a8e46cf0fe
+EBUILD gnutls-2.5.4.ebuild 2076 RMD160 eab3659e87dcab4aaf919ed4d53842e938911125 SHA1 32969e57d5b3603465d372f2a49e14e9fd50cbf2 SHA256 198f071b5928267e9421343fdc60ba1b08b2565d74aee542564e574971b446dc
+EBUILD gnutls-2.6.0.ebuild 2310 RMD160 d3fe8207079c1e41e8974c7a9fd2e4af19a81d96 SHA1 2bc4f8fa14122f354ce859070bd3ab5fc80d0cff SHA256 31641e51b8de6187fab2b0ab6bc5080b5b7e4bd0c92a55303b9277f5e42fedd6
+MISC ChangeLog 24373 RMD160 8270635c25073efb36c8dacdc51f41d2582b0275 SHA1 c533124cbbf6e4d6f84b1ab1e1196458443aa1d2 SHA256 1f1692ed7cf4351dc1f9cd89d8b40144e445d08ca81d5566178f81597b7a9cd5
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkPxBgACgkQ67wieSYcaxdyqgCfTsFVIaMHJJwGE6XNJByD0IgK
-ifIAoKO24staSD6j9qZnAw00Y3jAjTEw
-=R2Qk
------END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-2.0.4.ebuild b/net-libs/gnutls/gnutls-2.0.4.ebuild
deleted file mode 100644
index e21b736e6d87..000000000000
--- a/net-libs/gnutls/gnutls-2.0.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.0.4.ebuild,v 1.9 2008/01/16 20:52:48 grobian Exp $
-
-inherit libtool
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="http://josefsson.org/gnutls/releases/${P}.tar.bz2"
-
-# GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
-LICENSE="LGPL-2.1 GPL-2"
-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"
-
-RDEPEND="dev-libs/libgpg-error
-	>=dev-libs/libgcrypt-1.2.2
-	>=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 )
-	lzo? ( >=dev-libs/lzo-2 )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	elibtoolize # for sane .so versioning on FreeBSD
-
-	econf  \
-		--without-included-opencdk \
-		$(use_with zlib) \
-		$(use_with lzo) \
-		$(use_enable nls) \
-		$(use_enable guile) \
-		$(use_enable doc gtk-doc) \
-		|| die
-	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
-}