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 5A4E1138F03 for ; Mon, 17 Oct 2016 01:19:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6CBAE0BB1; Mon, 17 Oct 2016 01:19:12 +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 CB860E0BB1 for ; Mon, 17 Oct 2016 01:19:12 +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 1B2E5341027 for ; Mon, 17 Oct 2016 01:19:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B3036300 for ; Mon, 17 Oct 2016 01:19:09 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1476667135.507f46eea831bdde420d9d39698ea521a3b34e8d.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/nss-pam-ldapd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild X-VCS-Directories: sys-auth/nss-pam-ldapd/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: 507f46eea831bdde420d9d39698ea521a3b34e8d X-VCS-Branch: master Date: Mon, 17 Oct 2016 01:19:09 +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: 2dadde3c-c980-4011-9cca-e3fa9c613e33 X-Archives-Hash: 0d533233c530868851f12f40c50700ca commit: 507f46eea831bdde420d9d39698ea521a3b34e8d Author: Matthew Thode gentoo org> AuthorDate: Mon Oct 17 01:18:32 2016 +0000 Commit: Matt Thode gentoo org> CommitDate: Mon Oct 17 01:18:55 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=507f46ee we actually need pam now sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild | 2 +- sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild index 16a99df..71d3091 100644 --- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild +++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild @@ -19,7 +19,7 @@ DEPEND=" net-nds/openldap sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) - pam? ( virtual/pam ) + virtual/pam !sys-auth/nss_ldap !sys-auth/pam_ldap" RDEPEND="${DEPEND}" diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild index f5da094..10b5796 100644 --- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild +++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.7.ebuild @@ -20,7 +20,7 @@ COMMON_DEP=" net-nds/openldap[${MULTILIB_USEDEP}] sasl? ( dev-libs/cyrus-sasl[${MULTILIB_USEDEP}] ) kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) - pam? ( virtual/pam[${MULTILIB_USEDEP}] ) + virtual/pam[${MULTILIB_USEDEP}] utils? ( ${PYTHON_DEPS} ) !sys-auth/nss_ldap !sys-auth/pam_ldap"