Fixing gnutls dep #421463

(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, unsigned Manifest commit)

16 files changed, 53 insertions, 45 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index f83d3dbee65e..633dae44c175 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.426 2013/01/14 02:30:20 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.427 2013/01/14 02:46:20 patrick Exp $
+
+  14 Jan 2013; Patrick Lauer <patrick@gentoo.org> openldap-2.3.43-r1.ebuild,
+  openldap-2.3.43-r2.ebuild, openldap-2.4.19-r1.ebuild, openldap-2.4.21.ebuild,
+  openldap-2.4.23.ebuild, openldap-2.4.24.ebuild, openldap-2.4.25-r1.ebuild,
+  openldap-2.4.25.ebuild, openldap-2.4.28-r1.ebuild, openldap-2.4.28.ebuild,
+  openldap-2.4.30.ebuild, openldap-2.4.31-r1.ebuild, openldap-2.4.31.ebuild,
+  openldap-2.4.32.ebuild, openldap-2.4.33-r1.ebuild, openldap-2.4.33.ebuild:
+  Fixing gnutls dep #421463
 
 *openldap-2.3.43-r2 (14 Jan 2013)
 
diff --git a/net-nds/openldap/openldap-2.3.43-r1.ebuild b/net-nds/openldap/openldap-2.3.43-r1.ebuild
index 36f4a82e5b0f..b539f0f78a1f 100644
--- a/net-nds/openldap/openldap-2.3.43-r1.ebuild
+++ b/net-nds/openldap/openldap-2.3.43-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.11 2012/05/13 11:38:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.12 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="2"
 
diff --git a/net-nds/openldap/openldap-2.4.19-r1.ebuild b/net-nds/openldap/openldap-2.4.19-r1.ebuild
index cb907980a9ee..2926f6598a56 100644
--- a/net-nds/openldap/openldap-2.4.19-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.19-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.15 2012/05/13 11:38:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.16 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="2"
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
@@ -27,7 +27,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls ) )
+		gnutls? ( <net-libs/gnutls-3 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.21.ebuild b/net-nds/openldap/openldap-2.4.21.ebuild
index 1ab77c019326..edd21ae525ca 100644
--- a/net-nds/openldap/openldap-2.4.21.ebuild
+++ b/net-nds/openldap/openldap-2.4.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.21.ebuild,v 1.9 2012/07/02 23:12:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.21.ebuild,v 1.10 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="2"
 WANT_AUTOMAKE=1.9
@@ -28,7 +28,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls ) )
+		gnutls? ( <net-libs/gnutls-3 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.23.ebuild b/net-nds/openldap/openldap-2.4.23.ebuild
index 3a064f30c59a..14ab74ceea8f 100644
--- a/net-nds/openldap/openldap-2.4.23.ebuild
+++ b/net-nds/openldap/openldap-2.4.23.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.23.ebuild,v 1.15 2012/07/02 23:12:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.23.ebuild,v 1.16 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="2"
 WANT_AUTOMAKE=1.9
@@ -28,7 +28,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls ) )
+		gnutls? ( <net-libs/gnutls-3 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.24.ebuild b/net-nds/openldap/openldap-2.4.24.ebuild
index eb7ea00f91e2..67a24beee04b 100644
--- a/net-nds/openldap/openldap-2.4.24.ebuild
+++ b/net-nds/openldap/openldap-2.4.24.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.24.ebuild,v 1.14 2012/07/02 23:12:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.24.ebuild,v 1.15 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="2"
 WANT_AUTOMAKE=1.9
@@ -28,7 +28,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls ) )
+		gnutls? ( <net-libs/gnutls-3 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.25-r1.ebuild b/net-nds/openldap/openldap-2.4.25-r1.ebuild
index da6c7ad99cc7..b20bf265a253 100644
--- a/net-nds/openldap/openldap-2.4.25-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.25-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25-r1.ebuild,v 1.9 2012/07/02 23:12:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25-r1.ebuild,v 1.10 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="3"
 WANT_AUTOMAKE=1.9
@@ -28,7 +28,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls ) )
+		gnutls? ( <net-libs/gnutls-3 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.25.ebuild b/net-nds/openldap/openldap-2.4.25.ebuild
index 9414fada16b8..7c5f0476bd6e 100644
--- a/net-nds/openldap/openldap-2.4.25.ebuild
+++ b/net-nds/openldap/openldap-2.4.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25.ebuild,v 1.9 2012/07/02 23:12:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.25.ebuild,v 1.10 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="2"
 WANT_AUTOMAKE=1.9
@@ -28,7 +28,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls ) )
+		gnutls? ( <net-libs/gnutls-3 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.28-r1.ebuild b/net-nds/openldap/openldap-2.4.28-r1.ebuild
index 1d193f912659..191e1b74cb1d 100644
--- a/net-nds/openldap/openldap-2.4.28-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.28-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.28-r1.ebuild,v 1.14 2012/07/02 23:12:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.28-r1.ebuild,v 1.15 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="3"
 
@@ -33,7 +33,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls ) )
+		gnutls? ( <net-libs/gnutls-3 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.28.ebuild b/net-nds/openldap/openldap-2.4.28.ebuild
index d07168cc3359..eb6ed695a01d 100644
--- a/net-nds/openldap/openldap-2.4.28.ebuild
+++ b/net-nds/openldap/openldap-2.4.28.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.28.ebuild,v 1.7 2012/07/02 23:12:32 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.28.ebuild,v 1.8 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="3"
 WANT_AUTOMAKE=1.9
@@ -28,7 +28,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls ) )
+		gnutls? ( <net-libs/gnutls-3 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.30.ebuild b/net-nds/openldap/openldap-2.4.30.ebuild
index 27aba2d85024..5db18a16514a 100644
--- a/net-nds/openldap/openldap-2.4.30.ebuild
+++ b/net-nds/openldap/openldap-2.4.30.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.30.ebuild,v 1.9 2012/10/22 08:25:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.30.ebuild,v 1.10 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="3"
 
@@ -33,7 +33,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) )
+		gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.31-r1.ebuild b/net-nds/openldap/openldap-2.4.31-r1.ebuild
index 4e587b300d9e..194e55a478d5 100644
--- a/net-nds/openldap/openldap-2.4.31-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.31-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.31-r1.ebuild,v 1.2 2012/06/13 11:06:45 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.31-r1.ebuild,v 1.3 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="4"
 
@@ -35,7 +35,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) )
+		gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.31.ebuild b/net-nds/openldap/openldap-2.4.31.ebuild
index 7e3bcff9fecf..3fdca0d92eef 100644
--- a/net-nds/openldap/openldap-2.4.31.ebuild
+++ b/net-nds/openldap/openldap-2.4.31.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.31.ebuild,v 1.2 2012/05/26 00:34:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.31.ebuild,v 1.3 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="4"
 
@@ -35,7 +35,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) )
+		gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.32.ebuild b/net-nds/openldap/openldap-2.4.32.ebuild
index 5f68756743c4..4f09e4a1c0c6 100644
--- a/net-nds/openldap/openldap-2.4.32.ebuild
+++ b/net-nds/openldap/openldap-2.4.32.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.32.ebuild,v 1.1 2012/10/08 20:11:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.32.ebuild,v 1.2 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="4"
 
@@ -35,7 +35,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) )
+		gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )
diff --git a/net-nds/openldap/openldap-2.4.33-r1.ebuild b/net-nds/openldap/openldap-2.4.33-r1.ebuild
index 1b789dc16d86..8dd1c1a4c2c2 100644
--- a/net-nds/openldap/openldap-2.4.33-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.33-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.33-r1.ebuild,v 1.1 2012/12/01 23:04:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.33-r1.ebuild,v 1.2 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="4"
 
@@ -32,7 +32,7 @@ REQUIRED_USE="cxx? ( sasl )"
 # openssl is needed to generate lanman-passwords required by samba
 RDEPEND="icu? ( dev-libs/icu )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) )
+		gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		sys-devel/libtool
diff --git a/net-nds/openldap/openldap-2.4.33.ebuild b/net-nds/openldap/openldap-2.4.33.ebuild
index 63b81a24dacf..c8d8067d7b79 100644
--- a/net-nds/openldap/openldap-2.4.33.ebuild
+++ b/net-nds/openldap/openldap-2.4.33.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.33.ebuild,v 1.1 2012/10/16 19:56:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.33.ebuild,v 1.2 2013/01/14 02:46:20 patrick Exp $
 
 EAPI="4"
 
@@ -35,7 +35,7 @@ RDEPEND="sys-libs/ncurses
 	icu? ( dev-libs/icu )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( !gnutls? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) )
+		gnutls? ( <net-libs/gnutls-3 dev-libs/libgcrypt ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	!minimal? (
 		odbc? ( !iodbc? ( dev-db/unixODBC )