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@gentoo.org>

diff --git a/net-nds/openldap/openldap-2.3.43-r3.ebuild b/net-nds/openldap/openldap-2.3.43-r3.ebuild
index 7d5c8c02345685c4454cea6d7978378755bc0c73..dda92d5efdd5cbf53b9d9ea85025a7d19cc795b1 100644 (file)
--- 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 e8c1aa5dbf58d643f4a0b32cc9f15a946098860f..c4c6745bdfc5bea5b96a3344b9ff8414b260d7d9 100644 (file)
--- 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 aede7c1056b0b46e2ed1ffd60e87fdfcb90155a0..2445bd5958f23eaa438514d2f69096b80593aa3a 100644 (file)
--- 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 47400ab6b2596067e9867fb8fae6c44cdc487907..ad16fcf5ec27e795caa65dfd76b49c6449153664 100644 (file)
--- 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