| 1 |
commit: 2dedc3d9f5ad07bfbc56b5b4e42564548ab35d2f |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 20 12:56:00 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 20 12:58:47 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dedc3d9 |
| 7 |
|
| 8 |
net-print/cups: Drop obsolete IUSE=lprng-compat |
| 9 |
|
| 10 |
net-print/lprng was last-rited more than 2 years ago. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/467226 |
| 13 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
net-print/cups/cups-2.3.3_p2.ebuild | 14 +------------- |
| 17 |
net-print/cups/cups-9999.ebuild | 14 +------------- |
| 18 |
2 files changed, 2 insertions(+), 26 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-print/cups/cups-2.3.3_p2.ebuild b/net-print/cups/cups-2.3.3_p2.ebuild |
| 21 |
index 67f0a9dd314..20e54bc815d 100644 |
| 22 |
--- a/net-print/cups/cups-2.3.3_p2.ebuild |
| 23 |
+++ b/net-print/cups/cups-2.3.3_p2.ebuild |
| 24 |
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups" |
| 25 |
|
| 26 |
LICENSE="Apache-2.0" |
| 27 |
SLOT="0" |
| 28 |
-IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" |
| 29 |
+IUSE="acl dbus debug kerberos pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" |
| 30 |
|
| 31 |
REQUIRED_USE="usb? ( threads )" |
| 32 |
# upstream includes an interactive test which is a nono for gentoo |
| 33 |
@@ -50,7 +50,6 @@ DEPEND=" |
| 34 |
) |
| 35 |
dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) |
| 36 |
kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
| 37 |
- !lprng-compat? ( !net-print/lprng ) |
| 38 |
pam? ( sys-libs/pam ) |
| 39 |
ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] ) |
| 40 |
systemd? ( sys-apps/systemd ) |
| 41 |
@@ -277,17 +276,6 @@ multilib_src_install_all() { |
| 42 |
# the following are created by the init script |
| 43 |
rm -r "${ED}"/var/cache/cups || die |
| 44 |
rm -r "${ED}"/run || die |
| 45 |
- |
| 46 |
- # for the special case of running lprng and cups together, bug 467226 |
| 47 |
- if use lprng-compat ; then |
| 48 |
- rm -v "${ED}"/usr/bin/{lp*,cancel} || die |
| 49 |
- rm -v "${ED}"/usr/sbin/lp* || die |
| 50 |
- rm -v "${ED}"/usr/share/man/man1/{lp*,cancel*} || die |
| 51 |
- rm -v "${ED}"/usr/share/man/man8/lp* || die |
| 52 |
- ewarn "Not installing lp... binaries, since the lprng-compat useflag is set." |
| 53 |
- ewarn "Unless you plan to install an exotic server setup, you most likely" |
| 54 |
- ewarn "do not want this. Disable the useflag then and all will be fine." |
| 55 |
- fi |
| 56 |
} |
| 57 |
|
| 58 |
pkg_preinst() { |
| 59 |
|
| 60 |
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild |
| 61 |
index 33d46cf666e..22caf91ef2b 100644 |
| 62 |
--- a/net-print/cups/cups-9999.ebuild |
| 63 |
+++ b/net-print/cups/cups-9999.ebuild |
| 64 |
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups" |
| 65 |
|
| 66 |
LICENSE="Apache-2.0" |
| 67 |
SLOT="0" |
| 68 |
-IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" |
| 69 |
+IUSE="acl dbus debug kerberos pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" |
| 70 |
|
| 71 |
REQUIRED_USE="usb? ( threads )" |
| 72 |
# upstream includes an interactive test which is a nono for gentoo |
| 73 |
@@ -50,7 +50,6 @@ DEPEND=" |
| 74 |
) |
| 75 |
dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) |
| 76 |
kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
| 77 |
- !lprng-compat? ( !net-print/lprng ) |
| 78 |
pam? ( sys-libs/pam ) |
| 79 |
ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] ) |
| 80 |
systemd? ( sys-apps/systemd ) |
| 81 |
@@ -276,17 +275,6 @@ multilib_src_install_all() { |
| 82 |
# the following are created by the init script |
| 83 |
rm -r "${ED}"/var/cache/cups || die |
| 84 |
rm -r "${ED}"/run || die |
| 85 |
- |
| 86 |
- # for the special case of running lprng and cups together, bug 467226 |
| 87 |
- if use lprng-compat ; then |
| 88 |
- rm -v "${ED}"/usr/bin/{lp*,cancel} || die |
| 89 |
- rm -v "${ED}"/usr/sbin/lp* || die |
| 90 |
- rm -v "${ED}"/usr/share/man/man1/{lp*,cancel*} || die |
| 91 |
- rm -v "${ED}"/usr/share/man/man8/lp* || die |
| 92 |
- ewarn "Not installing lp... binaries, since the lprng-compat useflag is set." |
| 93 |
- ewarn "Unless you plan to install an exotic server setup, you most likely" |
| 94 |
- ewarn "do not want this. Disable the useflag then and all will be fine." |
| 95 |
- fi |
| 96 |
} |
| 97 |
|
| 98 |
pkg_preinst() { |
Archives