| 1 |
commit: cabf47baf53c62600a0e30d3a5ece66833e29936 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Sat Jun 26 00:00:00 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 27 01:03:38 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cabf47ba |
| 7 |
|
| 8 |
net-print/cups: Depend on virtual/libcrypt only with USE="-pam". |
| 9 |
|
| 10 |
Fixes: 48244f2b864c40e301acaaefed40107afe768e09 |
| 11 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
net-print/cups/{cups-2.3.3-r3.ebuild => cups-2.3.3-r4.ebuild} | 2 +- |
| 15 |
net-print/cups/{cups-2.3.3_p2-r1.ebuild => cups-2.3.3_p2-r2.ebuild} | 2 +- |
| 16 |
net-print/cups/cups-9999.ebuild | 2 +- |
| 17 |
3 files changed, 3 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-print/cups/cups-2.3.3-r3.ebuild b/net-print/cups/cups-2.3.3-r4.ebuild |
| 20 |
similarity index 99% |
| 21 |
rename from net-print/cups/cups-2.3.3-r3.ebuild |
| 22 |
rename to net-print/cups/cups-2.3.3-r4.ebuild |
| 23 |
index 655d81e9445..2c0e2bf040b 100644 |
| 24 |
--- a/net-print/cups/cups-2.3.3-r3.ebuild |
| 25 |
+++ b/net-print/cups/cups-2.3.3-r4.ebuild |
| 26 |
@@ -33,7 +33,6 @@ IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd |
| 27 |
CDEPEND=" |
| 28 |
app-text/libpaper |
| 29 |
sys-libs/zlib |
| 30 |
- virtual/libcrypt:= |
| 31 |
acl? ( |
| 32 |
kernel_linux? ( |
| 33 |
sys-apps/acl |
| 34 |
@@ -44,6 +43,7 @@ CDEPEND=" |
| 35 |
kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
| 36 |
!lprng-compat? ( !net-print/lprng ) |
| 37 |
pam? ( sys-libs/pam ) |
| 38 |
+ !pam? ( virtual/libcrypt:= ) |
| 39 |
ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] ) |
| 40 |
systemd? ( sys-apps/systemd ) |
| 41 |
usb? ( virtual/libusb:1 ) |
| 42 |
|
| 43 |
diff --git a/net-print/cups/cups-2.3.3_p2-r1.ebuild b/net-print/cups/cups-2.3.3_p2-r2.ebuild |
| 44 |
similarity index 99% |
| 45 |
rename from net-print/cups/cups-2.3.3_p2-r1.ebuild |
| 46 |
rename to net-print/cups/cups-2.3.3_p2-r2.ebuild |
| 47 |
index 55b7b94fe7a..a5616f1a209 100644 |
| 48 |
--- a/net-print/cups/cups-2.3.3_p2-r1.ebuild |
| 49 |
+++ b/net-print/cups/cups-2.3.3_p2-r2.ebuild |
| 50 |
@@ -41,7 +41,6 @@ BDEPEND=" |
| 51 |
" |
| 52 |
DEPEND=" |
| 53 |
app-text/libpaper |
| 54 |
- virtual/libcrypt:= |
| 55 |
sys-libs/zlib |
| 56 |
acl? ( |
| 57 |
kernel_linux? ( |
| 58 |
@@ -52,6 +51,7 @@ DEPEND=" |
| 59 |
dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) |
| 60 |
kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
| 61 |
pam? ( sys-libs/pam ) |
| 62 |
+ !pam? ( virtual/libcrypt:= ) |
| 63 |
ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] ) |
| 64 |
systemd? ( sys-apps/systemd ) |
| 65 |
usb? ( virtual/libusb:1 ) |
| 66 |
|
| 67 |
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild |
| 68 |
index 900b761fedf..9dfe3c78281 100644 |
| 69 |
--- a/net-print/cups/cups-9999.ebuild |
| 70 |
+++ b/net-print/cups/cups-9999.ebuild |
| 71 |
@@ -42,7 +42,6 @@ BDEPEND=" |
| 72 |
DEPEND=" |
| 73 |
app-text/libpaper |
| 74 |
sys-libs/zlib |
| 75 |
- virtual/libcrypt:= |
| 76 |
acl? ( |
| 77 |
kernel_linux? ( |
| 78 |
sys-apps/acl |
| 79 |
@@ -52,6 +51,7 @@ DEPEND=" |
| 80 |
dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) |
| 81 |
kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
| 82 |
pam? ( sys-libs/pam ) |
| 83 |
+ !pam? ( virtual/libcrypt:= ) |
| 84 |
ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] ) |
| 85 |
systemd? ( sys-apps/systemd ) |
| 86 |
usb? ( virtual/libusb:1 ) |
Archives