From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1297110-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 B899F139335 for <garchives@archives.gentoo.org>; Sun, 27 Jun 2021 02:08:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C945E086C; Sun, 27 Jun 2021 02:08:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 06DAEE086C for <gentoo-commits@lists.gentoo.org>; Sun, 27 Jun 2021 02:08:33 +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 51A7133C1EB for <gentoo-commits@lists.gentoo.org>; Sun, 27 Jun 2021 02:08:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BAF4C7B2 for <gentoo-commits@lists.gentoo.org>; Sun, 27 Jun 2021 02:08:29 +0000 (UTC) From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org> Message-ID: <1624755818.cabf47baf53c62600a0e30d3a5ece66833e29936.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cups/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/cups/cups-2.3.3-r3.ebuild net-print/cups/cups-2.3.3-r4.ebuild net-print/cups/cups-2.3.3_p2-r1.ebuild net-print/cups/cups-2.3.3_p2-r2.ebuild net-print/cups/cups-9999.ebuild X-VCS-Directories: net-print/cups/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: cabf47baf53c62600a0e30d3a5ece66833e29936 X-VCS-Branch: master Date: Sun, 27 Jun 2021 02:08:29 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4ac62d12-c3de-498b-9e40-1b2656062644 X-Archives-Hash: 414974f67a88dc1e242642d5d41f03c1 commit: cabf47baf53c62600a0e30d3a5ece66833e29936 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> AuthorDate: Sat Jun 26 00:00:00 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jun 27 01:03:38 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cabf47ba net-print/cups: Depend on virtual/libcrypt only with USE="-pam". Fixes: 48244f2b864c40e301acaaefed40107afe768e09 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> Signed-off-by: Sam James <sam <AT> gentoo.org> net-print/cups/{cups-2.3.3-r3.ebuild => cups-2.3.3-r4.ebuild} | 2 +- net-print/cups/{cups-2.3.3_p2-r1.ebuild => cups-2.3.3_p2-r2.ebuild} | 2 +- net-print/cups/cups-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-print/cups/cups-2.3.3-r3.ebuild b/net-print/cups/cups-2.3.3-r4.ebuild similarity index 99% rename from net-print/cups/cups-2.3.3-r3.ebuild rename to net-print/cups/cups-2.3.3-r4.ebuild index 655d81e9445..2c0e2bf040b 100644 --- a/net-print/cups/cups-2.3.3-r3.ebuild +++ b/net-print/cups/cups-2.3.3-r4.ebuild @@ -33,7 +33,6 @@ IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd CDEPEND=" app-text/libpaper sys-libs/zlib - virtual/libcrypt:= acl? ( kernel_linux? ( sys-apps/acl @@ -44,6 +43,7 @@ CDEPEND=" kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) !lprng-compat? ( !net-print/lprng ) pam? ( sys-libs/pam ) + !pam? ( virtual/libcrypt:= ) ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) diff --git a/net-print/cups/cups-2.3.3_p2-r1.ebuild b/net-print/cups/cups-2.3.3_p2-r2.ebuild similarity index 99% rename from net-print/cups/cups-2.3.3_p2-r1.ebuild rename to net-print/cups/cups-2.3.3_p2-r2.ebuild index 55b7b94fe7a..a5616f1a209 100644 --- a/net-print/cups/cups-2.3.3_p2-r1.ebuild +++ b/net-print/cups/cups-2.3.3_p2-r2.ebuild @@ -41,7 +41,6 @@ BDEPEND=" " DEPEND=" app-text/libpaper - virtual/libcrypt:= sys-libs/zlib acl? ( kernel_linux? ( @@ -52,6 +51,7 @@ DEPEND=" dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) pam? ( sys-libs/pam ) + !pam? ( virtual/libcrypt:= ) ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 900b761fedf..9dfe3c78281 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -42,7 +42,6 @@ BDEPEND=" DEPEND=" app-text/libpaper sys-libs/zlib - virtual/libcrypt:= acl? ( kernel_linux? ( sys-apps/acl @@ -52,6 +51,7 @@ DEPEND=" dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) pam? ( sys-libs/pam ) + !pam? ( virtual/libcrypt:= ) ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 )