From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 34B1D1388BF for ; Thu, 14 Jan 2016 02:19:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC7C1E085A; Thu, 14 Jan 2016 02:19:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4D50AE085A for ; Thu, 14 Jan 2016 02:19:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1F91A340AFF for ; Thu, 14 Jan 2016 02:19:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 48A5BE68 for ; Thu, 14 Jan 2016 02:19:51 +0000 (UTC) From: "Victor Ostorga" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Victor Ostorga" Message-ID: <1452737982.79a5feedb39bcb12ec91db11ec6d2ac5e05b1990.vostorga@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/samba/samba-4.2.7-r1.ebuild net-fs/samba/samba-4.3.4.ebuild X-VCS-Directories: net-fs/samba/ X-VCS-Committer: vostorga X-VCS-Committer-Name: Victor Ostorga X-VCS-Revision: 79a5feedb39bcb12ec91db11ec6d2ac5e05b1990 X-VCS-Branch: master Date: Thu, 14 Jan 2016 02:19:51 +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: deda9aa2-3455-4afe-9748-ac3587df80c0 X-Archives-Hash: 2139e6965c48c79a2a6b2db04dfc07bd commit: 79a5feedb39bcb12ec91db11ec6d2ac5e05b1990 Author: Victor Ostorga gentoo org> AuthorDate: Thu Jan 14 02:19:42 2016 +0000 Commit: Victor Ostorga gentoo org> CommitDate: Thu Jan 14 02:19:42 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79a5feed Fixing ldap multilib dependency bug 571634 Package-Manager: portage-2.2.24 net-fs/samba/samba-4.2.7-r1.ebuild | 4 ++-- net-fs/samba/samba-4.3.4.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-fs/samba/samba-4.2.7-r1.ebuild b/net-fs/samba/samba-4.2.7-r1.ebuild index 973d1c1..e3684eb 100644 --- a/net-fs/samba/samba-4.2.7-r1.ebuild +++ b/net-fs/samba/samba-4.2.7-r1.ebuild @@ -63,7 +63,7 @@ CDEPEND="${PYTHON_DEPS} fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) - ldap? ( net-nds/openldap ) + ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] ) !system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) systemd? ( sys-apps/systemd:0= )" @@ -174,7 +174,7 @@ multilib_src_configure() { --without-fam --disable-gnutls --disable-iprint - --without-ldap + $(use_with ldap) --without-pam --without-pam_smbpass --without-quotas diff --git a/net-fs/samba/samba-4.3.4.ebuild b/net-fs/samba/samba-4.3.4.ebuild index d6161bf..e8edaf8 100644 --- a/net-fs/samba/samba-4.3.4.ebuild +++ b/net-fs/samba/samba-4.3.4.ebuild @@ -62,7 +62,7 @@ CDEPEND="${PYTHON_DEPS} fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) - ldap? ( net-nds/openldap ) + ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] ) !system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) systemd? ( sys-apps/systemd:0= )" @@ -173,7 +173,7 @@ multilib_src_configure() { --without-fam --disable-gnutls --disable-iprint - --without-ldap + $(use_with ldap) --without-pam --without-pam_smbpass --without-quotas