From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 8209C138239 for ; Tue, 20 Apr 2021 12:59:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AFFFAE082B; Tue, 20 Apr 2021 12:59:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 8E5A2E082B for ; Tue, 20 Apr 2021 12:59:27 +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 25059340E99 for ; Tue, 20 Apr 2021 12:59:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7DC43702 for ; Tue, 20 Apr 2021 12:59:24 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1618923527.2dedc3d9f5ad07bfbc56b5b4e42564548ab35d2f.asturm@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_p2.ebuild net-print/cups/cups-9999.ebuild X-VCS-Directories: net-print/cups/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2dedc3d9f5ad07bfbc56b5b4e42564548ab35d2f X-VCS-Branch: master Date: Tue, 20 Apr 2021 12:59:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ea70e1b1-59f2-417f-b464-50845659efaf X-Archives-Hash: d96a01ba423126866d1fdd933bd438c8 commit: 2dedc3d9f5ad07bfbc56b5b4e42564548ab35d2f Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 20 12:56:00 2021 +0000 Commit: Andreas Sturmlechner gentoo 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 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() {