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 663F0138359 for ; Wed, 4 Nov 2020 14:02:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F610E090E; Wed, 4 Nov 2020 14:02:29 +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-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 730A6E0933 for ; Wed, 4 Nov 2020 14:02:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 15A52340E62 for ; Wed, 4 Nov 2020 14:02:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 527993A1 for ; Wed, 4 Nov 2020 14:02:26 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1604498443.2d11a6e55328d3e4fafcf20f949f38d651a83810.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/sudo/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/sudo/sudo-1.9.3_p1.ebuild X-VCS-Directories: app-admin/sudo/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 2d11a6e55328d3e4fafcf20f949f38d651a83810 X-VCS-Branch: master Date: Wed, 4 Nov 2020 14:02:26 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4acae71a-ac14-4b17-967f-afdf422229f2 X-Archives-Hash: 27b6c473100c121435843ae674a8be67 commit: 2d11a6e55328d3e4fafcf20f949f38d651a83810 Author: Mike Gilbert gentoo org> AuthorDate: Wed Nov 4 14:00:43 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Wed Nov 4 14:00:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d11a6e5 app-admin/sudo: fix REQUIRED_USE Consolidate duplicate assignments. Simplify pam/skey conflict. Signed-off-by: Mike Gilbert gentoo.org> app-admin/sudo/sudo-1.9.3_p1.ebuild | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app-admin/sudo/sudo-1.9.3_p1.ebuild b/app-admin/sudo/sudo-1.9.3_p1.ebuild index fba1a9ec786..dfa040469e3 100644 --- a/app-admin/sudo/sudo-1.9.3_p1.ebuild +++ b/app-admin/sudo/sudo-1.9.3_p1.ebuild @@ -68,12 +68,10 @@ BDEPEND=" S="${WORKDIR}/${MY_P}" REQUIRED_USE=" - pam? ( !skey ) - skey? ( !pam ) + ?? ( pam skey ) + ?? ( gcrypt ssl ) " -REQUIRED_USE="?? ( gcrypt ssl )" - MAKEOPTS+=" SAMPLES=" src_prepare() {