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)

14 files changed, 32 insertions, 359 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index d61f696e648a..b51b07c339c3 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-libs/gnutls
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.83 2005/11/27 15:55:07 vanquirius Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.84 2006/01/03 12:04:01 dragonheart Exp $
+
+*gnutls-1.2.9-r1 (03 Jan 2006)
+
+  03 Jan 2006; Daniel Black <dragonheart@gentoo.org>
+  -files/gnutls-1.0.17-extra.h.patch, -files/gnutls-1.2.3-gcc4.patch,
+  -gnutls-1.0.17.ebuild, -gnutls-1.0.25.ebuild, gnutls-1.2.3.ebuild,
+  -gnutls-1.2.3-r1.ebuild, gnutls-1.2.4.ebuild, -gnutls-1.2.6.ebuild,
+  gnutls-1.2.9.ebuild, +gnutls-1.2.9-r1.ebuild:
+  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
 
   27 Nov 2005; Marcelo Goes <vanquirius@gentoo.org> gnutls-1.0.17.ebuild,
   gnutls-1.0.25.ebuild, gnutls-1.2.3.ebuild, gnutls-1.2.3-r1.ebuild,
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 5dd17bd22bea..0d6a06ff5ec2 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,28 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ec244239c8abfa5bb101fe8820a4aab0 ChangeLog 11924
-MD5 cfa78b7df28ec06ca09763bd8c908ebc files/digest-gnutls-1.0.17 67
-MD5 ee48c699bf5727fa6284864dc62d1c14 files/digest-gnutls-1.0.25 66
 MD5 5deb0ddb33596df840a663273ddf9c2b files/digest-gnutls-1.2.3 66
-MD5 5deb0ddb33596df840a663273ddf9c2b files/digest-gnutls-1.2.3-r1 66
 MD5 0a6c7f63908a38a6e28d34a68accee2a files/digest-gnutls-1.2.4 66
-MD5 26cd0c7e5a105e72808024e198a3ce35 files/digest-gnutls-1.2.6 66
 MD5 077c38845fca7036f125850ae6bb0ab3 files/digest-gnutls-1.2.9 66
-MD5 29d3e8994448eb3fe1d15c6720621b40 files/gnutls-1.0.17-extra.h.patch 479
-MD5 29d8c263065fa5908f9b6d9e5ea265b7 files/gnutls-1.2.3-gcc4.patch 417
-MD5 bba2cac2f09f512d2ebe6f7d1dbb3966 gnutls-1.0.17.ebuild 2399
-MD5 32d3deb75aaf5cda01979493fe6871c9 gnutls-1.0.25.ebuild 2203
-MD5 8d2ff70baadcd4bf5fdb0d126cb14b9f gnutls-1.2.3-r1.ebuild 2412
-MD5 479068c2ae339ebc1b076f3e57958974 gnutls-1.2.3.ebuild 2306
-MD5 ed668eb3fc05284f48b594faefe2e2fb gnutls-1.2.4.ebuild 2569
-MD5 774f9e17045b92014fa11fea08b330d2 gnutls-1.2.6.ebuild 1960
-MD5 cafb0a85f1f8bf8a89ce260cc6102e6d gnutls-1.2.9.ebuild 1960
+MD5 077c38845fca7036f125850ae6bb0ab3 files/digest-gnutls-1.2.9-r1 66
+MD5 8c08f3f35aaf512a5e8c8f367d88f871 gnutls-1.2.3.ebuild 2304
+MD5 251e9413e2bf8d8dd59ab8ce1c7fc058 gnutls-1.2.4.ebuild 2567
+MD5 0bd2e08e72e751a52acbe33bd5f927d3 gnutls-1.2.9-r1.ebuild 1958
+MD5 57cdac6d48d20c74e8330ebea16c9d4b gnutls-1.2.9.ebuild 1958
 MD5 918a1b851dd53568897b4fc7c503912e metadata.xml 276
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDs9YY2+ySkm8kpY0RApoBAKC7dMJjcqvjhqtMS1crzK45WWZk1wCfeBef
-M6D2mdVUUJAwraioOzopH+4=
-=Vhy8
------END PGP SIGNATURE-----
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 */
- 
diff --git a/net-libs/gnutls/gnutls-1.0.17.ebuild b/net-libs/gnutls/gnutls-1.0.17.ebuild
deleted file mode 100644
index 024faf2ae1fd..000000000000
--- a/net-libs/gnutls/gnutls-1.0.17.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.0.17.ebuild,v 1.21 2005/11/27 15:55:07 vanquirius Exp $
-
-inherit eutils gnuconfig
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/${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 mips ppc ppc64 sparc x86"
-IUSE="zlib doc crypt"
-
-RDEPEND=">=dev-libs/libgcrypt-1.1.94
-	crypt? ( >=app-crypt/opencdk-0.5.5 )
-	zlib? ( >=sys-libs/zlib-1.1 )
-	virtual/libc
-	dev-libs/libgpg-error"
-
-# Need masking on ~amd64 ~sparc ~ppc ~mips ~alpha
-#	>=dev-libs/libtasn1-0.2
-#	>=dev-libs/lzo-1.0"
-
-DEPEND="${RDEPEND}
-	sys-apps/gawk
-	sys-apps/grep
-	sys-devel/gcc
-	sys-devel/libtool"
-
-
-# gnutls has its own version of these. should maybe avoid using.
-#	libtasn1
-#	opencdk
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/includes/gnutls; epatch ${FILESDIR}/${P}-extra.h.patch
-}
-
-src_compile() {
-	# Needed for mips and probablly others
-	gnuconfig_update
-
-	#   I think this vvv gets ignored if not present
-	local myconf="--without-included-libtasn1 --without-included-opencdk"
-
-
-	use crypt || myconf="${myconf} --disable-extra-pki --disable-openpgp-authentication"
-
-	econf  \
-		`use_with zlib` \
-		--with-included-lzo \
-		--with-included-libtasn1 \
-		${myconf} || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die
-
-	# make compatibility symlinks - 0.8.x
-	#dosym /usr/lib/libgnutls.so.10 /usr/lib/libgnutls.so.7
-
-	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
-}
-
-pkg_postinst() {
-	ewarn "An API has changed in gnutls. This is why the library has gone from "
-	ewarn "libgnutls.so.10 to libgnutls.so.11."
-	ewarn
-	ewarn "What is required is a revdep-rebuild."
-	ewarn "To show you what is needed to rebuild"
-	ewarn "revdep-rebuild --soname libgnutls.so.10 -- -p"
-	ewarn ""
-	ewarn "Then do:"
-	ewarn "revdep-rebuild --soname libgnutls.so.10"
-	einfo ""
-	einfo "Afterward just try:"
-	einfo "revdep-rebuild -- -p"
-	einfo "to see if there are any other packages broken."
-	einfo "To rebuild these:"
-	einfo "revdep-rebuild"
-
-}
diff --git a/net-libs/gnutls/gnutls-1.0.25.ebuild b/net-libs/gnutls/gnutls-1.0.25.ebuild
deleted file mode 100644
index 89760966e9a0..000000000000
--- a/net-libs/gnutls/gnutls-1.0.25.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.0.25.ebuild,v 1.11 2005/11/27 15:55:07 vanquirius Exp $
-
-inherit eutils gnuconfig
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/${P}.tar.gz"
-
-IUSE="zlib doc crypt"
-LICENSE="LGPL-2.1 GPL-2"
-# GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-
-# Removed keywords awaiting >=dev-libs/libtasn1-0.2.10 keywords (bug #61944)
-# ~ia64
-
-RDEPEND=">=dev-libs/libgcrypt-1.1.94
-	crypt? ( >=app-crypt/opencdk-0.5.5 )
-	zlib? ( >=sys-libs/zlib-1.1 )
-	virtual/libc
-	>=dev-libs/lzo-1.0
-	>=dev-libs/libtasn1-0.2.10
-	dev-libs/libgpg-error"
-
-DEPEND="${RDEPEND}
-	sys-apps/gawk
-	sys-apps/grep
-	sys-devel/gcc
-	sys-devel/libtool"
-
-
-# gnutls has its own version of these. should maybe avoid using. Done by DEPEND/configure options
-#	libtasn1
-#	opencdk
-
-src_compile() {
-	# Needed for mips and probably others
-	gnuconfig_update
-
-	local myconf=""
-	use crypt || myconf="${myconf} --disable-extra-pki --disable-openpgp-authentication"
-
-	econf  \
-		`use_with zlib` \
-		--without-included-minilzo \
-		--without-included-libtasn1 \
-		--without-included-opencdk \
-		${myconf} || 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
-}
-
-pkg_postinst() {
-	ewarn "An API has changed in gnutls. This is why the library has gone from "
-	ewarn "libgnutls.so.10 to libgnutls.so.11."
-	ewarn
-	ewarn "What is required is a revdep-rebuild."
-	ewarn "To show you what is needed to rebuild"
-	ewarn "revdep-rebuild --soname libgnutls.so.10 -- -p"
-	ewarn ""
-	ewarn "Then do:"
-	ewarn "revdep-rebuild --soname libgnutls.so.10"
-	einfo ""
-	einfo "Afterward just try:"
-	einfo "revdep-rebuild -- -p"
-	einfo "to see if there are any other packages broken."
-	einfo "To rebuild these:"
-	einfo "revdep-rebuild"
-
-}
diff --git a/net-libs/gnutls/gnutls-1.2.3-r1.ebuild b/net-libs/gnutls/gnutls-1.2.3-r1.ebuild
deleted file mode 100644
index 94044d665ed9..000000000000
--- a/net-libs/gnutls/gnutls-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.3-r1.ebuild,v 1.4 2005/12/29 12:26:33 vapier Exp $
-
-inherit eutils gnuconfig
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/${P}.tar.bz2"
-
-IUSE="zlib doc crypt"
-
-LICENSE="LGPL-2.1 GPL-2"
-# GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-
-# Removed keywords awaiting >=dev-libs/libtasn1-0.2.10 keywords (bug #61944)
-#  ~ia64 ~hppa
-
-RDEPEND=">=dev-libs/libgcrypt-1.2.0
-	>=app-crypt/opencdk-0.5.5
-	zlib? ( >=sys-libs/zlib-1.1 )
-	virtual/libc
-	>=dev-libs/lzo-1.0
-	>=dev-libs/libtasn1-0.2.11
-	dev-libs/libgpg-error"
-
-
-#	crypt? ( >=app-crypt/opencdk-0.5.5 )
-
-DEPEND="${RDEPEND}
-	sys-apps/gawk
-	sys-apps/grep
-	sys-devel/gcc
-	sys-devel/libtool"
-
-
-# gnutls has its own version of these. should maybe avoid using.
-#	libtasn1
-#	opencdk
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# Fix building with gcc4.
-	epatch ${FILESDIR}/${P}-gcc4.patch
-}
-
-src_compile() {
-	# Needed for mips and probably others
-	gnuconfig_update
-
-	local myconf=""
-	# use crypt || myconf="${myconf} --disable-extra-pki --disable-openpgp-authentication"
-
-	econf  \
-		`use_with zlib` \
-		--without-included-minilzo \
-		--without-included-libtasn1 \
-		--without-included-opencdk \
-		${myconf} || die
-	emake || die
-
-	# gtk-doc removed - bug #80906
-	# 		`use_enable doc gtk-doc`
-}
-
-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
-}
-
-pkg_postinst() {
-	ewarn "An API has changed in gnutls. This is why the library has gone from "
-	ewarn "libgnutls.so.11 (or 10) to libgnutls.so.12."
-	ewarn
-	ewarn "What is required is a revdep-rebuild."
-	ewarn "To show you what is needed to rebuild"
-	ewarn 'revdep-rebuild --soname-regexp libgnutls.so.1[0-1] -- -p'
-	ewarn ""
-	ewarn "Then do:"
-	ewarn 'revdep-rebuild --soname-regexp libgnutls.so.1[0-1]'
-	einfo ""
-	einfo "Afterward just try:"
-	einfo "revdep-rebuild -- -p"
-	einfo "to see if there are any other packages broken."
-	einfo "To rebuild these:"
-	einfo "revdep-rebuild"
-
-}
diff --git a/net-libs/gnutls/gnutls-1.2.3.ebuild b/net-libs/gnutls/gnutls-1.2.3.ebuild
index a1f9fcdd40d6..f44a299015d9 100644
--- a/net-libs/gnutls/gnutls-1.2.3.ebuild
+++ b/net-libs/gnutls/gnutls-1.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.3.ebuild,v 1.13 2005/12/29 12:26:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.3.ebuild,v 1.14 2006/01/03 12:04:01 dragonheart Exp $
 
 inherit eutils gnuconfig
 
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/libgcrypt-1.2.0
 	>=app-crypt/opencdk-0.5.5
 	zlib? ( >=sys-libs/zlib-1.1 )
 	virtual/libc
-	>=dev-libs/lzo-1.0
+	=dev-libs/lzo-1*
 	>=dev-libs/libtasn1-0.2.11
 	dev-libs/libgpg-error"
 
diff --git a/net-libs/gnutls/gnutls-1.2.4.ebuild b/net-libs/gnutls/gnutls-1.2.4.ebuild
index 74e106d1cf10..76154ee0520a 100644
--- a/net-libs/gnutls/gnutls-1.2.4.ebuild
+++ b/net-libs/gnutls/gnutls-1.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.4.ebuild,v 1.10 2005/12/29 12:26:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.4.ebuild,v 1.11 2006/01/03 12:04:01 dragonheart Exp $
 
 inherit eutils gnuconfig
 
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/libgcrypt-1.2.0
 	>=app-crypt/opencdk-0.5.5
 	zlib? ( >=sys-libs/zlib-1.1 )
 	virtual/libc
-	>=dev-libs/lzo-1.0
+	=dev-libs/lzo-1*
 	>=dev-libs/libtasn1-0.2.11
 	dev-libs/libgpg-error"
 
diff --git a/net-libs/gnutls/gnutls-1.2.6.ebuild b/net-libs/gnutls/gnutls-1.2.9-r1.ebuild
index b15b6bfddbd6..fab6f799d637 100644
--- a/net-libs/gnutls/gnutls-1.2.6.ebuild
+++ b/net-libs/gnutls/gnutls-1.2.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.6.ebuild,v 1.5 2005/12/29 12:26:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.9-r1.ebuild,v 1.1 2006/01/03 12:04:01 dragonheart Exp $
 
 inherit eutils gnuconfig
 
@@ -19,11 +19,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh
 # Removed keywords awaiting >=dev-libs/libtasn1-0.2.10 keywords (bug #61944)
 #  ~ia64 ~hppa
 
-RDEPEND=">=dev-libs/libgcrypt-1.2.0
+RDEPEND=">=dev-libs/libgcrypt-1.2.2
 	>=app-crypt/opencdk-0.5.5
 	zlib? ( >=sys-libs/zlib-1.1 )
 	virtual/libc
-	>=dev-libs/lzo-1.0
+	>=dev-libs/lzo-2
 	>=dev-libs/libtasn1-0.2.11
 	dev-libs/libgpg-error"
 
diff --git a/net-libs/gnutls/gnutls-1.2.9.ebuild b/net-libs/gnutls/gnutls-1.2.9.ebuild
index 3cdaa86629bf..95c710d894a3 100644
--- a/net-libs/gnutls/gnutls-1.2.9.ebuild
+++ b/net-libs/gnutls/gnutls-1.2.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.9.ebuild,v 1.4 2005/12/29 12:26:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.9.ebuild,v 1.5 2006/01/03 12:04:01 dragonheart Exp $
 
 inherit eutils gnuconfig
 
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/libgcrypt-1.2.2
 	>=app-crypt/opencdk-0.5.5
 	zlib? ( >=sys-libs/zlib-1.1 )
 	virtual/libc
-	>=dev-libs/lzo-1.0
+	=dev-libs/lzo-1*
 	>=dev-libs/libtasn1-0.2.11
 	dev-libs/libgpg-error"