From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CBC64139694 for ; Thu, 23 Feb 2017 19:09:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24217E0C9F; Thu, 23 Feb 2017 19:09:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7170E0C9F for ; Thu, 23 Feb 2017 19:09:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 564823413C3 for ; Thu, 23 Feb 2017 19:09:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E5E1C521D for ; Thu, 23 Feb 2017 19:09:12 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1487876945.39a60ca58ef439b835ca2a03479d83f0eb333375.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-nds/openldap/openldap-2.3.43-r3.ebuild net-nds/openldap/openldap-2.3.43-r4.ebuild net-nds/openldap/openldap-2.4.44-r1.ebuild net-nds/openldap/openldap-2.4.44.ebuild X-VCS-Directories: net-nds/openldap/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 39a60ca58ef439b835ca2a03479d83f0eb333375 X-VCS-Branch: master Date: Thu, 23 Feb 2017 19:09:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 36af4330-e04c-4f8b-b30d-a65170fcab15 X-Archives-Hash: 3bbe605ce6c9f787c8151444b1a4d4d4 commit: 39a60ca58ef439b835ca2a03479d83f0eb333375 Author: Robin H. Johnson gentoo org> AuthorDate: Thu Feb 23 19:08:24 2017 +0000 Commit: Robin H. Johnson gentoo 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 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