Bug #485166: borrow the dev-lang/perl[-build] workaround from the eclass, thanks to dilfridge.

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

8 files changed, 22 insertions, 15 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 36074619bc79..5edccc298659 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.486 2014/11/02 09:23:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.487 2014/11/08 05:09:25 robbat2 Exp $
+
+  08 Nov 2014; Robin H. Johnson <robbat2@gentoo.org> openldap-2.3.43-r3.ebuild,
+  openldap-2.3.43-r4.ebuild, openldap-2.4.19-r1.ebuild, openldap-2.4.23.ebuild,
+  openldap-2.4.24.ebuild, openldap-2.4.28-r1.ebuild, openldap-2.4.30.ebuild,
+  openldap-2.4.35-r1.ebuild, openldap-2.4.35.ebuild, openldap-2.4.38-r1.ebuild:
+  Bug #485166: borrow the dev-lang/perl[-build] workaround from the eclass,
+  thanks to dilfridge.
 
   02 Nov 2014; Sven Vermeulen <swift@gentoo.org> openldap-2.4.38-r2.ebuild,
   openldap-2.4.39.ebuild, openldap-2.4.40-r2.ebuild, openldap-2.4.40.ebuild:
diff --git a/net-nds/openldap/openldap-2.3.43-r3.ebuild b/net-nds/openldap/openldap-2.3.43-r3.ebuild
index d382348cb3dc..8918b82882f4 100644
--- a/net-nds/openldap/openldap-2.3.43-r3.ebuild
+++ b/net-nds/openldap/openldap-2.3.43-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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-r3.ebuild,v 1.3 2014/10/12 06:26:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r3.ebuild,v 1.4 2014/11/08 05:09:25 robbat2 Exp $
 
 EAPI="2"
 
@@ -30,7 +30,7 @@ RDEPEND="sys-libs/ncurses
 	!minimal? (
 		odbc? ( dev-db/unixODBC )
 		slp? ( net-libs/openslp )
-		perl? ( dev-lang/perl[-build] )
+		perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
 		samba? ( dev-libs/openssl )
 		kerberos? ( virtual/krb5 )
 		berkdb? (
diff --git a/net-nds/openldap/openldap-2.3.43-r4.ebuild b/net-nds/openldap/openldap-2.3.43-r4.ebuild
index 5027576434f8..b276f33fb16d 100644
--- a/net-nds/openldap/openldap-2.3.43-r4.ebuild
+++ b/net-nds/openldap/openldap-2.3.43-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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-r4.ebuild,v 1.3 2014/10/12 06:26:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r4.ebuild,v 1.4 2014/11/08 05:09:25 robbat2 Exp $
 
 EAPI="2"
 
@@ -30,7 +30,7 @@ RDEPEND="sys-libs/ncurses
 	!minimal? (
 		odbc? ( dev-db/unixODBC )
 		slp? ( net-libs/openslp )
-		perl? ( dev-lang/perl[-build] )
+		perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
 		samba? ( dev-libs/openssl )
 		kerberos? ( virtual/krb5 )
 		berkdb? (
diff --git a/net-nds/openldap/openldap-2.4.19-r1.ebuild b/net-nds/openldap/openldap-2.4.19-r1.ebuild
index 87fb033792cd..1f45380b29aa 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-2014 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.19 2014/10/12 06:26:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.20 2014/11/08 05:09:25 robbat2 Exp $
 
 EAPI="2"
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs user
@@ -33,7 +33,7 @@ RDEPEND="sys-libs/ncurses
 		odbc? ( !iodbc? ( dev-db/unixODBC )
 			iodbc? ( dev-db/libiodbc ) )
 		slp? ( net-libs/openslp )
-		perl? ( dev-lang/perl[-build] )
+		perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
 		samba? ( dev-libs/openssl )
 		berkdb? ( sys-libs/db )
 		smbkrb5passwd? (
diff --git a/net-nds/openldap/openldap-2.4.23.ebuild b/net-nds/openldap/openldap-2.4.23.ebuild
index e7d8631eed7a..08f6248712ec 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-2014 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.19 2014/10/12 06:26:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.23.ebuild,v 1.20 2014/11/08 05:09:25 robbat2 Exp $
 
 EAPI="2"
 WANT_AUTOMAKE=1.9
@@ -34,7 +34,7 @@ RDEPEND="sys-libs/ncurses
 		odbc? ( !iodbc? ( dev-db/unixODBC )
 			iodbc? ( dev-db/libiodbc ) )
 		slp? ( net-libs/openslp )
-		perl? ( dev-lang/perl[-build] )
+		perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
 		samba? ( dev-libs/openssl )
 		berkdb? ( sys-libs/db )
 		smbkrb5passwd? (
diff --git a/net-nds/openldap/openldap-2.4.24.ebuild b/net-nds/openldap/openldap-2.4.24.ebuild
index b5662c5f3fdf..4c1d6507cc0f 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-2014 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.18 2014/10/12 06:26:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.24.ebuild,v 1.19 2014/11/08 05:09:25 robbat2 Exp $
 
 EAPI="2"
 WANT_AUTOMAKE=1.9
@@ -34,7 +34,7 @@ RDEPEND="sys-libs/ncurses
 		odbc? ( !iodbc? ( dev-db/unixODBC )
 			iodbc? ( dev-db/libiodbc ) )
 		slp? ( net-libs/openslp )
-		perl? ( dev-lang/perl[-build] )
+		perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
 		samba? ( dev-libs/openssl )
 		berkdb? ( sys-libs/db )
 		smbkrb5passwd? (
diff --git a/net-nds/openldap/openldap-2.4.28-r1.ebuild b/net-nds/openldap/openldap-2.4.28-r1.ebuild
index dc10c99e895e..6de792704e2f 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-2014 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.18 2014/10/12 06:26:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.28-r1.ebuild,v 1.19 2014/11/08 05:09:25 robbat2 Exp $
 
 EAPI="3"
 
@@ -39,7 +39,7 @@ RDEPEND="sys-libs/ncurses
 		odbc? ( !iodbc? ( dev-db/unixODBC )
 			iodbc? ( dev-db/libiodbc ) )
 		slp? ( net-libs/openslp )
-		perl? ( dev-lang/perl[-build] )
+		perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
 		samba? ( dev-libs/openssl )
 		berkdb? ( sys-libs/db )
 		smbkrb5passwd? (
diff --git a/net-nds/openldap/openldap-2.4.30.ebuild b/net-nds/openldap/openldap-2.4.30.ebuild
index ab6e883ac3ce..52936188540d 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-2014 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.14 2014/10/12 06:26:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.30.ebuild,v 1.15 2014/11/08 05:09:25 robbat2 Exp $
 
 EAPI="3"
 
@@ -39,7 +39,7 @@ RDEPEND="sys-libs/ncurses
 		odbc? ( !iodbc? ( dev-db/unixODBC )
 			iodbc? ( dev-db/libiodbc ) )
 		slp? ( net-libs/openslp )
-		perl? ( dev-lang/perl[-build] )
+		perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
 		samba? ( dev-libs/openssl )
 		berkdb? ( sys-libs/db )
 		smbkrb5passwd? (