From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-926214-garchives=archives.gentoo.org@lists.gentoo.org>
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 EC9FF139085
for <garchives@archives.gentoo.org>; Tue, 24 Jan 2017 21:00:44 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 03F3421C09E;
Tue, 24 Jan 2017 21:00:44 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 CFDC421C09E
for <gentoo-commits@lists.gentoo.org>; Tue, 24 Jan 2017 21:00:43 +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 8A49034167D
for <gentoo-commits@lists.gentoo.org>; Tue, 24 Jan 2017 21:00:42 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E0BB2E1A
for <gentoo-commits@lists.gentoo.org>; Tue, 24 Jan 2017 21:00:40 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" <polynomial-c@gentoo.org>
Message-ID: <1485291636.7ad932cf204b2a7ccf65b6be853f23c4450eb732.polynomial-c@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.5.4.ebuild net-fs/samba/samba-4.6.0_rc1.ebuild
X-VCS-Directories: net-fs/samba/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: 7ad932cf204b2a7ccf65b6be853f23c4450eb732
X-VCS-Branch: master
Date: Tue, 24 Jan 2017 21:00:40 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 709d1152-40b7-46a8-9045-eb6bfe16bea2
X-Archives-Hash: 0155c64f17e7baa23c2754d364e88039
commit: 7ad932cf204b2a7ccf65b6be853f23c4450eb732
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 21:00:12 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 21:00:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad932cf
net-fs/samba: Always use bundled heimdal if no system-krb was enabled.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-fs/samba/samba-4.5.4.ebuild | 3 +--
net-fs/samba/samba-4.6.0_rc1.ebuild | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/net-fs/samba/samba-4.5.4.ebuild b/net-fs/samba/samba-4.5.4.ebuild
index e0a0e03..3a493e2 100644
--- a/net-fs/samba/samba-4.5.4.ebuild
+++ b/net-fs/samba/samba-4.5.4.ebuild
@@ -132,9 +132,8 @@ multilib_src_configure() {
# when specifying libs for samba build you must append NONE to the end to
# stop it automatically including things
local bundled_libs="NONE"
- if use addc && ! use system-heimdal ; then
+ if ! use system-heimdal && ! use system-mitkrb5 ; then
bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
- #bundled_libs="heimdal,NONE"
fi
local myconf=()
diff --git a/net-fs/samba/samba-4.6.0_rc1.ebuild b/net-fs/samba/samba-4.6.0_rc1.ebuild
index 093f6f7..56a673c 100644
--- a/net-fs/samba/samba-4.6.0_rc1.ebuild
+++ b/net-fs/samba/samba-4.6.0_rc1.ebuild
@@ -133,9 +133,8 @@ multilib_src_configure() {
# when specifying libs for samba build you must append NONE to the end to
# stop it automatically including things
local bundled_libs="NONE"
- if use addc && ! use system-heimdal ; then
+ if ! use system-heimdal && ! use system-mitkrb5 ; then
bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
- #bundled_libs="heimdal,NONE"
fi
local myconf=()