major pruning cause it needed it. Made gnutls-1.2[349] depend on =lzo-1* and gnutls-1.2.9-r1 depend on >=lzo-2 (bug #112357). gnutls-1.2.9-r1 currently masked due to TEXTRELs

(Portage version: 2.1_pre3)

5 files changed, 1 insertions, 40 deletions

diff --git a/net-libs/gnutls/files/digest-gnutls-1.2.3-r1 b/net-libs/gnutls/files/digest-gnutls-1.2.3-r1
deleted file mode 100644
index 5a5d15d2859e..000000000000
--- a/net-libs/gnutls/files/digest-gnutls-1.2.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4986c2bf8ce533d6b5d4dd6f9f1bbdf1 gnutls-1.2.3.tar.bz2 2446437
diff --git a/net-libs/gnutls/files/digest-gnutls-1.2.6 b/net-libs/gnutls/files/digest-gnutls-1.2.6
deleted file mode 100644
index 70a41740619e..000000000000
--- a/net-libs/gnutls/files/digest-gnutls-1.2.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a9aeaf687e40b6b27df51fac9d3315ff gnutls-1.2.6.tar.bz2 2469124
diff --git a/net-libs/gnutls/files/digest-gnutls-1.2.9-r1 b/net-libs/gnutls/files/digest-gnutls-1.2.9-r1
new file mode 100644
index 000000000000..e826ee1b6bb8
--- /dev/null
+++ b/net-libs/gnutls/files/digest-gnutls-1.2.9-r1
@@ -0,0 +1 @@
+MD5 9b14bac9202c91dbc89431726dbf6b90 gnutls-1.2.9.tar.bz2 2720067
diff --git a/net-libs/gnutls/files/gnutls-1.0.17-extra.h.patch b/net-libs/gnutls/files/gnutls-1.0.17-extra.h.patch
deleted file mode 100644
index ea041017cde2..000000000000
--- a/net-libs/gnutls/files/gnutls-1.0.17-extra.h.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- includes/gnutls/extra.h	2004-03-25 04:43:49.000000000 -0500
-+++ includes/gnutls/extra.h.new	2004-07-24 00:31:11.716460832 -0400
-@@ -27,6 +27,10 @@
- 
- #define LIBGNUTLS_EXTRA_VERSION LIBGNUTLS_VERSION
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- /* SRP */
- 
- typedef struct DSTRUCT* gnutls_srp_server_credentials;
-@@ -119,5 +123,9 @@
- int gnutls_srp_base64_decode_alloc( const gnutls_datum *b64_data, 
-    gnutls_datum* result);
- 
-+#ifdef __cplusplus
-+}
-+#endif
-+
- 
- #endif
diff --git a/net-libs/gnutls/files/gnutls-1.2.3-gcc4.patch b/net-libs/gnutls/files/gnutls-1.2.3-gcc4.patch
deleted file mode 100644
index 018415c0a67a..000000000000
--- a/net-libs/gnutls/files/gnutls-1.2.3-gcc4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gnutls-1.2.3/libextra/openpgp/openpgp.h.orig	2005-04-30 13:18:13.000000000 +0200
-+++ gnutls-1.2.3/libextra/openpgp/openpgp.h	2005-04-30 13:18:29.000000000 +0200
-@@ -92,10 +92,12 @@
- 
- #else				/* no opencdk */
- 
-+/*
- typedef void *gnutls_openpgp_key_t;
- typedef void *gnutls_openpgp_privkey_t;
- typedef void *gnutls_openpgp_keyring_t;
- typedef void *gnutls_openpgp_trustdb_t;
-+*/
- 
- #endif /* ENABLE_OPENPGP */
-