commit:     39a60ca58ef439b835ca2a03479d83f0eb333375
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 19:08:24 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 19:09:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a60ca5

net-nds/openldap: built_with_use -> has_version

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=610448
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 net-nds/openldap/openldap-2.3.43-r3.ebuild | 2 +-
 net-nds/openldap/openldap-2.3.43-r4.ebuild | 2 +-
 net-nds/openldap/openldap-2.4.44-r1.ebuild | 2 +-
 net-nds/openldap/openldap-2.4.44.ebuild    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-nds/openldap/openldap-2.3.43-r3.ebuild 
b/net-nds/openldap/openldap-2.3.43-r3.ebuild
index 7d5c8c0234..dda92d5efd 100644
--- a/net-nds/openldap/openldap-2.3.43-r3.ebuild
+++ b/net-nds/openldap/openldap-2.3.43-r3.ebuild
@@ -180,7 +180,7 @@ pkg_setup() {
                die "Please set ssl useflag"
        fi
 
-       if use minimal && has_version "net-nds/openldap" && built_with_use 
net-nds/openldap minimal ; then
+       if use minimal && has_version 'net-nds/openldap[minimal]' ; then
                einfo
                einfo "Skipping scan for previous datadirs as requested by 
minimal useflag"
                einfo

diff --git a/net-nds/openldap/openldap-2.3.43-r4.ebuild 
b/net-nds/openldap/openldap-2.3.43-r4.ebuild
index e8c1aa5dbf..c4c6745bdf 100644
--- a/net-nds/openldap/openldap-2.3.43-r4.ebuild
+++ b/net-nds/openldap/openldap-2.3.43-r4.ebuild
@@ -180,7 +180,7 @@ pkg_setup() {
                die "Please set ssl useflag"
        fi
 
-       if use minimal && has_version "net-nds/openldap" && built_with_use 
net-nds/openldap minimal ; then
+       if use minimal && has_version 'net-nds/openldap[minimal]' ; then
                einfo
                einfo "Skipping scan for previous datadirs as requested by 
minimal useflag"
                einfo

diff --git a/net-nds/openldap/openldap-2.4.44-r1.ebuild 
b/net-nds/openldap/openldap-2.4.44-r1.ebuild
index aede7c1056..2445bd5958 100644
--- a/net-nds/openldap/openldap-2.4.44-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.44-r1.ebuild
@@ -297,7 +297,7 @@ pkg_setup() {
        # Bug #322787
        if use minimal && ! has_version "net-nds/openldap" ; then
                einfo "No datadir scan needed, openldap not installed"
-       elif use minimal && has_version "net-nds/openldap" && built_with_use 
net-nds/openldap minimal ; then
+       elif use minimal && has_version 'net-nds/openldap[minimal]' ; then
                einfo "Skipping scan for previous datadirs as requested by 
minimal useflag"
        else
                openldap_find_versiontags

diff --git a/net-nds/openldap/openldap-2.4.44.ebuild 
b/net-nds/openldap/openldap-2.4.44.ebuild
index 47400ab6b2..ad16fcf5ec 100644
--- a/net-nds/openldap/openldap-2.4.44.ebuild
+++ b/net-nds/openldap/openldap-2.4.44.ebuild
@@ -296,7 +296,7 @@ pkg_setup() {
        # Bug #322787
        if use minimal && ! has_version "net-nds/openldap" ; then
                einfo "No datadir scan needed, openldap not installed"
-       elif use minimal && has_version "net-nds/openldap" && built_with_use 
net-nds/openldap minimal ; then
+       elif use minimal && has_version 'net-nds/openldap[minimal]' ; then
                einfo "Skipping scan for previous datadirs as requested by 
minimal useflag"
        else
                openldap_find_versiontags

Reply via email to