gentoo auto-resync : 23:02:2025 - 19:24:09

3 files changed, 22 insertions, 32 deletions

diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 9f719a956473..dee6dde9c89d 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -8,9 +8,9 @@ DIST cups-2.4.6-source.tar.gz 8135135 BLAKE2B 4e61112ddaa46f20b1cfcb8f523dd07ba7
 DIST cups-2.4.7-source.tar.gz 8134809 BLAKE2B d81de62cff37c576ef8fb125b97568c2d86602cec6151d7030552fad421d7bc77a5df1e860d5ac5a241e739cc0d1fe5fcac44b8451ad2fc4dc675cf74fd41382 SHA512 914b574ff6d85de9f3471528b52d4a436c484c441f47651846e1bdfa00aec26774efd416ff466216d2bccf468f8a797b1e0d666b5c82abc87e77550ce8b00d39
 EBUILD cups-2.4.10-r1.ebuild 9749 BLAKE2B 499d7f555ac2576e558837a5ee94814473dfd0c8c4a49e060c681d49f309619b165406a4056fbf570015de664787efe82af390d9c131032d9d808fb3b4c3c451 SHA512 43c32e946c07d8a668b79aab11d0fe6df31ac3db4ebc65e605db115893ecf1871e01606804b97a7f352c7b3608b3e4bb8c7dd60de043bd66aa86ee9f917fc5d8
 EBUILD cups-2.4.10.ebuild 9639 BLAKE2B b0dfae3c38aa0196891318f4c87bf96c4a14700d52240270176db7c0ef251afc396f118c826bd35c52fa127ce10a4ac6f7fbc2bec9cce8c256f9670a4089d48e SHA512 29df0de683db650619afeef406f26ce96ec853433e06837e10f04781732b25562e63d21500111a3428084c9f071cbab70bcd071be6e87a2214395532b58068c8
-EBUILD cups-2.4.11.ebuild 9631 BLAKE2B 4e42d905a60bd55059121a33f9e0f675498c690a05c0f923aa4d0f09358869f599e39cce47d31f60ee2f95e338dd702b35600d8b583e636179e7544f81d51115 SHA512 fc2b84d3fce534ca827c1391922ad74d5f044b09f0443ed69584968536246bbd1a7a5e8b4949da59384d14df50b04fd37c355ec4144032b0450458cba25d2fcc
+EBUILD cups-2.4.11.ebuild 9569 BLAKE2B 2fa1fa9f806597836ae46d0f871a48bccc8bcd56908e5ceadd4bb3c8ca1b779705c4a3dbced4204a9b1e1de852011f4c69ba42548ef1e4e8ddbe74572d149ff3 SHA512 618421f4b5ffbe939a7f5832143a83099901089cc15cd491aec36b9ba9ce04017fe18e1812a00374cfab1ead466c7ba611dffe979362a991d699af9fd9f56212
 EBUILD cups-2.4.6.ebuild 9546 BLAKE2B d7706335f4b5f7d2c83067f3451a6ec8c2c19798fabc36e9a13b8ae307ae96b65f700cb8cd08cac1f93b4c834b60c43f39fe1184651360e53041b8642e06e38c SHA512 17737077831162beb5681b33c511405d5fe8fef0c90227847169695f64a3e38e8513f1b076d9f86a34c4c75796c42b2aacd589feb32ab4e2cbc590ee78ce4b54
 EBUILD cups-2.4.7-r1.ebuild 9461 BLAKE2B 025635024f9a3fe9ce89130296106d1d18668eb5614be97b3d4ca7dfdc55a2e73dc4b067c576c67015cc97641dc7a76b06f1a3e37c3ee6936357b2a752711627 SHA512 da1ccc462abcc582eeff2fbd8eeb0d9f6cf8b6dd62848c0079937ae409e1385719b23452ebdb200a96505ecc0bb4b117d13d7ce6075f98c25bd6154d8fd4dae7
 EBUILD cups-2.4.7-r2.ebuild 9632 BLAKE2B b51e3873d139f01e68bbaf666e92e25ef621feb366ee7a4295648f24c29f5210fb4289b9675645a16d0f80d3624421accf06436fb197bd02d7deea95e3214f52 SHA512 ef9b5079b1e0cb0f2a8cab0f361981e1c87d087c189032b870e7272bc3530677fb53e0b6e0a8adfebcc8f48c267dbe3ec73c5690faae8cc75332ca84fcd6a236
-EBUILD cups-9999.ebuild 9639 BLAKE2B b0dfae3c38aa0196891318f4c87bf96c4a14700d52240270176db7c0ef251afc396f118c826bd35c52fa127ce10a4ac6f7fbc2bec9cce8c256f9670a4089d48e SHA512 29df0de683db650619afeef406f26ce96ec853433e06837e10f04781732b25562e63d21500111a3428084c9f071cbab70bcd071be6e87a2214395532b58068c8
+EBUILD cups-9999.ebuild 9577 BLAKE2B 78791330136a929252ec851bd26d7fe21605c878263d251608e5f0a365ce0bf4c7cd314d42ae6735d01d7a6cf0b014abef915b1441f4c1cd022bc40a99e2d1b5 SHA512 7652adb23fb8cc6bdf00fbe8fa38d343a5208120ddf14cdf1e4c77e5edfaf3e01dc5198423664aaa5dba4397bbc12fb08e5274edfe6df948f9d4e9055b9ef846
 MISC metadata.xml 527 BLAKE2B 04a32175e666165226eaa97785a6b9e4b779644e352c503a4653870631f28089dddbaaa3db3143f09a1d97c7f57952e4d760d64005eafacb379c23035fe9ad19 SHA512 136c81a99b501ffcedfd71f4425ba556292b79abc0ac819d336d2c845401775955b8cd72e6194f02f4c48d0cd26bc93ee7c94c7438228b49410daca80a159523
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