From 39a60ca58ef439b835ca2a03479d83f0eb333375 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Thu, 23 Feb 2017 11:08:24 -0800 Subject: [PATCH] net-nds/openldap: built_with_use -> has_version Fixes: https://bugs.gentoo.org/show_bug.cgi?id=610448 Signed-off-by: Robin H. Johnson --- 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 7d5c8c023456..dda92d5efdd5 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 e8c1aa5dbf58..c4c6745bdfc5 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 aede7c1056b0..2445bd5958f2 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 47400ab6b259..ad16fcf5ec27 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 -- 2.26.2