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 )