From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1841D1582EF for ; Sat, 22 Feb 2025 09:39:27 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id DA30B34324D for ; Sat, 22 Feb 2025 09:39:26 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 0D30A110484; Sat, 22 Feb 2025 09:38:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id EF20D110483 for ; Sat, 22 Feb 2025 09:38:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 945C4343229 for ; Sat, 22 Feb 2025 09:38:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31DE327D5 for ; Sat, 22 Feb 2025 09:38:48 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1740217099.7dcfe0e62eff4099d8d00ec749a6eb3796305172.ulm@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.4.11.ebuild net-print/cups/cups-9999.ebuild X-VCS-Directories: net-print/cups/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 7dcfe0e62eff4099d8d00ec749a6eb3796305172 X-VCS-Branch: master Date: Sat, 22 Feb 2025 09:38:48 +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: f5af7ee0-d208-42e2-9a8a-3904e9880c91 X-Archives-Hash: 0fce42bde52fb13d6f186ffc124c9a8c commit: 7dcfe0e62eff4099d8d00ec749a6eb3796305172 Author: Ulrich Müller gentoo org> AuthorDate: Fri Feb 14 14:11:51 2025 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sat Feb 22 09:38:19 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dcfe0e6 net-print/cups: Port to ver_replacing Signed-off-by: Ulrich Müller gentoo.org> net-print/cups/cups-2.4.11.ebuild | 25 ++++++++++--------------- net-print/cups/cups-9999.ebuild | 25 ++++++++++--------------- 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/net-print/cups/cups-2.4.11.ebuild b/net-print/cups/cups-2.4.11.ebuild index 63e2c8ed09da..8c93c81f496e 100644 --- a/net-print/cups/cups-2.4.11.ebuild +++ b/net-print/cups/cups-2.4.11.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools linux-info xdg multilib-minimal optfeature pam toolchain-funcs +inherit autotools eapi9-ver linux-info xdg multilib-minimal optfeature pam toolchain-funcs MY_PV="${PV/_beta/b}" MY_PV="${MY_PV/_rc/rc}" @@ -297,23 +297,18 @@ multilib_src_install_all() { pkg_postinst() { xdg_pkg_postinst - local v - - for v in ${REPLACING_VERSIONS}; do - if ! ver_test ${v} -ge 2.2.2-r2 ; then - ewarn "The cupsd init script switched to using pidfiles. Shutting down" - ewarn "cupsd will fail the next time. To fix this, please run once as root" - ewarn " killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start" - break - fi - done - for v in ${REPLACING_VERSIONS}; do + if ver_replacing -lt 2.2.2-r2 ; then + ewarn "The cupsd init script switched to using pidfiles. Shutting down" + ewarn "cupsd will fail the next time. To fix this, please run once as root" + ewarn " killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start" + fi + + if [[ -n ${REPLACING_VERSIONS} ]]; then elog elog "For information about installing a printer and general cups setup" elog "take a look at: https://wiki.gentoo.org/wiki/Printing" - break - done + fi optfeature_header "CUPS may need installing the following for certain features to work:" use zeroconf && optfeature "local hostname resolution using a hostname.local naming scheme" sys-auth/nss-mdns diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 4e72b3e88b7a..31c2ee4826f0 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools linux-info xdg multilib-minimal optfeature pam toolchain-funcs +inherit autotools eapi9-ver linux-info xdg multilib-minimal optfeature pam toolchain-funcs MY_PV="${PV/_beta/b}" MY_PV="${MY_PV/_rc/rc}" @@ -297,23 +297,18 @@ multilib_src_install_all() { pkg_postinst() { xdg_pkg_postinst - local v - - for v in ${REPLACING_VERSIONS}; do - if ! ver_test ${v} -ge 2.2.2-r2 ; then - ewarn "The cupsd init script switched to using pidfiles. Shutting down" - ewarn "cupsd will fail the next time. To fix this, please run once as root" - ewarn " killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start" - break - fi - done - for v in ${REPLACING_VERSIONS}; do + if ver_replacing -lt 2.2.2-r2 ; then + ewarn "The cupsd init script switched to using pidfiles. Shutting down" + ewarn "cupsd will fail the next time. To fix this, please run once as root" + ewarn " killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start" + fi + + if [[ -n ${REPLACING_VERSIONS} ]]; then elog elog "For information about installing a printer and general cups setup" elog "take a look at: https://wiki.gentoo.org/wiki/Printing" - break - done + fi optfeature_header "CUPS may need installing the following for certain features to work:" use zeroconf && optfeature "local hostname resolution using a hostname.local naming scheme" sys-auth/nss-mdns