[gentoo-commits] repo/gentoo:master commit in: net-print/cups/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     2dedc3d9f5ad07bfbc56b5b4e42564548ab35d2f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 20 12:56:00 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 20 12:58:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dedc3d9

net-print/cups: Drop obsolete IUSE=lprng-compat

net-print/lprng was last-rited more than 2 years ago.

Bug: https://bugs.gentoo.org/467226
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-print/cups/cups-2.3.3_p2.ebuild | 14 +-------------
 net-print/cups/cups-9999.ebuild     | 14 +-------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/net-print/cups/cups-2.3.3_p2.ebuild b/net-print/cups/cups-2.3.3_p2.ebuild
index 67f0a9dd314..20e54bc815d 100644
--- a/net-print/cups/cups-2.3.3_p2.ebuild
+++ b/net-print/cups/cups-2.3.3_p2.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+IUSE="acl dbus debug kerberos pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
 
 REQUIRED_USE="usb? ( threads )"
 # upstream includes an interactive test which is a nono for gentoo
@@ -50,7 +50,6 @@ DEPEND="
 	)
 	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	!lprng-compat? ( !net-print/lprng )
 	pam? ( sys-libs/pam )
 	ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
 	systemd? ( sys-apps/systemd )
@@ -277,17 +276,6 @@ multilib_src_install_all() {
 	# the following are created by the init script
 	rm -r "${ED}"/var/cache/cups || die
 	rm -r "${ED}"/run || die
-
-	# for the special case of running lprng and cups together, bug 467226
-	if use lprng-compat ; then
-		rm -v "${ED}"/usr/bin/{lp*,cancel} || die
-		rm -v "${ED}"/usr/sbin/lp* || die
-		rm -v "${ED}"/usr/share/man/man1/{lp*,cancel*} || die
-		rm -v "${ED}"/usr/share/man/man8/lp* || die
-		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
-		ewarn "Unless you plan to install an exotic server setup, you most likely"
-		ewarn "do not want this. Disable the useflag then and all will be fine."
-	fi
 }
 
 pkg_preinst() {

diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 33d46cf666e..22caf91ef2b 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+IUSE="acl dbus debug kerberos pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
 
 REQUIRED_USE="usb? ( threads )"
 # upstream includes an interactive test which is a nono for gentoo
@@ -50,7 +50,6 @@ DEPEND="
 	)
 	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	!lprng-compat? ( !net-print/lprng )
 	pam? ( sys-libs/pam )
 	ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
 	systemd? ( sys-apps/systemd )
@@ -276,17 +275,6 @@ multilib_src_install_all() {
 	# the following are created by the init script
 	rm -r "${ED}"/var/cache/cups || die
 	rm -r "${ED}"/run || die
-
-	# for the special case of running lprng and cups together, bug 467226
-	if use lprng-compat ; then
-		rm -v "${ED}"/usr/bin/{lp*,cancel} || die
-		rm -v "${ED}"/usr/sbin/lp* || die
-		rm -v "${ED}"/usr/share/man/man1/{lp*,cancel*} || die
-		rm -v "${ED}"/usr/share/man/man8/lp* || die
-		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
-		ewarn "Unless you plan to install an exotic server setup, you most likely"
-		ewarn "do not want this. Disable the useflag then and all will be fine."
-	fi
 }
 
 pkg_preinst() {