commit: 224ac572445499be78cf3ad2dbbc791568d1458f
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 8 23:37:55 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Feb 8 23:38:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=224ac572
net-nds/openldap: allow override of BDB slot during build.
Package-Manager: portage-2.3.2
net-nds/openldap/openldap-2.4.40-r2.ebuild | 3 ++-
net-nds/openldap/openldap-2.4.40-r4.ebuild | 3 ++-
net-nds/openldap/openldap-2.4.42-r1.ebuild | 3 ++-
net-nds/openldap/openldap-2.4.42.ebuild | 3 ++-
net-nds/openldap/openldap-2.4.43-r1.ebuild | 3 ++-
net-nds/openldap/openldap-2.4.43.ebuild | 3 ++-
net-nds/openldap/openldap-2.4.44-r1.ebuild | 3 ++-
net-nds/openldap/openldap-2.4.44.ebuild | 3 ++-
8 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/net-nds/openldap/openldap-2.4.40-r2.ebuild
b/net-nds/openldap/openldap-2.4.40-r2.ebuild
index ee565280fe..2b1bd80466 100644
--- a/net-nds/openldap/openldap-2.4.40-r2.ebuild
+++ b/net-nds/openldap/openldap-2.4.40-r2.ebuild
@@ -34,7 +34,8 @@ REQUIRED_USE="cxx? ( sasl )"
# always list newer first
# Do not add any AGPL-3 BDB here!
# See bug 525110, comment 15.
-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'
+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a
slot during build.
+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
BDB_PKGS=''
for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
diff --git a/net-nds/openldap/openldap-2.4.40-r4.ebuild
b/net-nds/openldap/openldap-2.4.40-r4.ebuild
index 7db8c17d09..f0cf71b4cb 100644
--- a/net-nds/openldap/openldap-2.4.40-r4.ebuild
+++ b/net-nds/openldap/openldap-2.4.40-r4.ebuild
@@ -34,7 +34,8 @@ REQUIRED_USE="cxx? ( sasl )"
# always list newer first
# Do not add any AGPL-3 BDB here!
# See bug 525110, comment 15.
-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'
+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a
slot during build.
+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
BDB_PKGS=''
for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
diff --git a/net-nds/openldap/openldap-2.4.42-r1.ebuild
b/net-nds/openldap/openldap-2.4.42-r1.ebuild
index 22b73afd2e..2b8a56f637 100644
--- a/net-nds/openldap/openldap-2.4.42-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.42-r1.ebuild
@@ -35,7 +35,8 @@ REQUIRED_USE="cxx? ( sasl )
# always list newer first
# Do not add any AGPL-3 BDB here!
# See bug 525110, comment 15.
-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'
+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a
slot during build.
+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
BDB_PKGS=''
for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
diff --git a/net-nds/openldap/openldap-2.4.42.ebuild
b/net-nds/openldap/openldap-2.4.42.ebuild
index 19ad134306..e3e20faa16 100644
--- a/net-nds/openldap/openldap-2.4.42.ebuild
+++ b/net-nds/openldap/openldap-2.4.42.ebuild
@@ -34,7 +34,8 @@ REQUIRED_USE="cxx? ( sasl )"
# always list newer first
# Do not add any AGPL-3 BDB here!
# See bug 525110, comment 15.
-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'
+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a
slot during build.
+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
BDB_PKGS=''
for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
diff --git a/net-nds/openldap/openldap-2.4.43-r1.ebuild
b/net-nds/openldap/openldap-2.4.43-r1.ebuild
index 165b543fcf..c10ab6232b 100644
--- a/net-nds/openldap/openldap-2.4.43-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.43-r1.ebuild
@@ -35,7 +35,8 @@ REQUIRED_USE="cxx? ( sasl )
# always list newer first
# Do not add any AGPL-3 BDB here!
# See bug 525110, comment 15.
-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'
+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a
slot during build.
+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
BDB_PKGS=''
for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
diff --git a/net-nds/openldap/openldap-2.4.43.ebuild
b/net-nds/openldap/openldap-2.4.43.ebuild
index baeab80882..d16b8b3c75 100644
--- a/net-nds/openldap/openldap-2.4.43.ebuild
+++ b/net-nds/openldap/openldap-2.4.43.ebuild
@@ -35,7 +35,8 @@ REQUIRED_USE="cxx? ( sasl )
# always list newer first
# Do not add any AGPL-3 BDB here!
# See bug 525110, comment 15.
-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'
+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a
slot during build.
+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
BDB_PKGS=''
for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
diff --git a/net-nds/openldap/openldap-2.4.44-r1.ebuild
b/net-nds/openldap/openldap-2.4.44-r1.ebuild
index 7e7c7a09df..b4cce18283 100644
--- a/net-nds/openldap/openldap-2.4.44-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.44-r1.ebuild
@@ -36,7 +36,8 @@ REQUIRED_USE="cxx? ( sasl )
# always list newer first
# Do not add any AGPL-3 BDB here!
# See bug 525110, comment 15.
-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'
+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a
slot during build.
+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
BDB_PKGS=''
for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
diff --git a/net-nds/openldap/openldap-2.4.44.ebuild
b/net-nds/openldap/openldap-2.4.44.ebuild
index 0b553596b3..560b602b6a 100644
--- a/net-nds/openldap/openldap-2.4.44.ebuild
+++ b/net-nds/openldap/openldap-2.4.44.ebuild
@@ -35,7 +35,8 @@ REQUIRED_USE="cxx? ( sasl )
# always list newer first
# Do not add any AGPL-3 BDB here!
# See bug 525110, comment 15.
-BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4'
+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a
slot during build.
+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
BDB_PKGS=''
for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
