Relax the datadir sanity check slightly for ease of infra use.

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

10 files changed, 29 insertions, 23 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 70cc5652ff2d..69dd752ce096 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,12 @@
 # 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.467 2014/07/23 15:24:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.468 2014/07/25 18:29:12 robbat2 Exp $
+
+  25 Jul 2014; Robin H. Johnson <robbat2@gentoo.org> 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, openldap-2.4.38-r2.ebuild:
+  Relax the datadir sanity check slightly for ease of infra use.
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> openldap-2.4.38-r2.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/net-nds/openldap/openldap-2.4.19-r1.ebuild b/net-nds/openldap/openldap-2.4.19-r1.ebuild
index dd01447a66e8..fe86b773bcd6 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-2013 Gentoo Foundation
+# 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.17 2013/03/03 09:02:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.19-r1.ebuild,v 1.18 2014/07/25 18:29:12 robbat2 Exp $
 
 EAPI="2"
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs user
@@ -51,7 +51,7 @@ OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
 
 openldap_filecount() {
 	local dir="$1"
-	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG.example' | wc -l
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
 }
 
 openldap_find_versiontags() {
diff --git a/net-nds/openldap/openldap-2.4.23.ebuild b/net-nds/openldap/openldap-2.4.23.ebuild
index c8067317a3c0..809bb3a06d5d 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-2013 Gentoo Foundation
+# 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.17 2013/03/03 09:02:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.23.ebuild,v 1.18 2014/07/25 18:29:12 robbat2 Exp $
 
 EAPI="2"
 WANT_AUTOMAKE=1.9
@@ -52,7 +52,7 @@ OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
 
 openldap_filecount() {
 	local dir="$1"
-	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG.example' | wc -l
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
 }
 
 openldap_find_versiontags() {
diff --git a/net-nds/openldap/openldap-2.4.24.ebuild b/net-nds/openldap/openldap-2.4.24.ebuild
index 76997eebcb4e..51701d924ee8 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-2013 Gentoo Foundation
+# 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.16 2013/03/03 09:02:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.24.ebuild,v 1.17 2014/07/25 18:29:12 robbat2 Exp $
 
 EAPI="2"
 WANT_AUTOMAKE=1.9
@@ -52,7 +52,7 @@ OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
 
 openldap_filecount() {
 	local dir="$1"
-	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG.example' | wc -l
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
 }
 
 openldap_find_versiontags() {
diff --git a/net-nds/openldap/openldap-2.4.28-r1.ebuild b/net-nds/openldap/openldap-2.4.28-r1.ebuild
index 399cb4f4f735..09c70e3f3993 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-2013 Gentoo Foundation
+# 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.16 2013/03/03 09:02:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.28-r1.ebuild,v 1.17 2014/07/25 18:29:12 robbat2 Exp $
 
 EAPI="3"
 
@@ -58,7 +58,7 @@ OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
 
 openldap_filecount() {
 	local dir="$1"
-	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG.example' | wc -l
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
 }
 
 openldap_find_versiontags() {
diff --git a/net-nds/openldap/openldap-2.4.30.ebuild b/net-nds/openldap/openldap-2.4.30.ebuild
index 9b1be9b096a4..59524c81262a 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.12 2014/03/01 22:30:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.30.ebuild,v 1.13 2014/07/25 18:29:12 robbat2 Exp $
 
 EAPI="3"
 
@@ -58,7 +58,7 @@ OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
 
 openldap_filecount() {
 	local dir="$1"
-	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG.example' | wc -l
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
 }
 
 openldap_find_versiontags() {
diff --git a/net-nds/openldap/openldap-2.4.35-r1.ebuild b/net-nds/openldap/openldap-2.4.35-r1.ebuild
index fd89d72466ad..902c210e5788 100644
--- a/net-nds/openldap/openldap-2.4.35-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.35-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.35-r1.ebuild,v 1.12 2014/03/01 22:30:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.35-r1.ebuild,v 1.13 2014/07/25 18:29:12 robbat2 Exp $
 
 EAPI="4"
 
@@ -59,7 +59,7 @@ OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
 
 openldap_filecount() {
 	local dir="$1"
-	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG.example' | wc -l
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
 }
 
 openldap_find_versiontags() {
diff --git a/net-nds/openldap/openldap-2.4.35.ebuild b/net-nds/openldap/openldap-2.4.35.ebuild
index ed926821e26c..9eb8a5090f99 100644
--- a/net-nds/openldap/openldap-2.4.35.ebuild
+++ b/net-nds/openldap/openldap-2.4.35.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.35.ebuild,v 1.13 2014/03/01 22:30:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.35.ebuild,v 1.14 2014/07/25 18:29:12 robbat2 Exp $
 
 EAPI="4"
 
@@ -59,7 +59,7 @@ OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
 
 openldap_filecount() {
 	local dir="$1"
-	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG.example' | wc -l
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
 }
 
 openldap_find_versiontags() {
diff --git a/net-nds/openldap/openldap-2.4.38-r1.ebuild b/net-nds/openldap/openldap-2.4.38-r1.ebuild
index c777cefaf768..4b0ef459b705 100644
--- a/net-nds/openldap/openldap-2.4.38-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.38-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.38-r1.ebuild,v 1.6 2014/05/24 05:03:28 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.38-r1.ebuild,v 1.7 2014/07/25 18:29:12 robbat2 Exp $
 
 EAPI="5"
 
@@ -61,7 +61,7 @@ OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
 
 openldap_filecount() {
 	local dir="$1"
-	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG.example' | wc -l
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
 }
 
 openldap_find_versiontags() {
diff --git a/net-nds/openldap/openldap-2.4.38-r2.ebuild b/net-nds/openldap/openldap-2.4.38-r2.ebuild
index e6ffec97adff..ecc592f42913 100644
--- a/net-nds/openldap/openldap-2.4.38-r2.ebuild
+++ b/net-nds/openldap/openldap-2.4.38-r2.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.38-r2.ebuild,v 1.7 2014/07/23 15:24:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.38-r2.ebuild,v 1.8 2014/07/25 18:29:12 robbat2 Exp $
 
 EAPI="5"
 
@@ -103,7 +103,7 @@ MULTILIB_WRAPPED_HEADERS=(
 
 openldap_filecount() {
 	local dir="$1"
-	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG.example' | wc -l
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
 }
 
 openldap_find_versiontags() {