gentoo auto-resync : 16:02:2025 - 00:13:18

5 files changed, 11 insertions, 26 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 7ee6bd304a58..09085286bc5c 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 66fc75e3f0ac..adb8014ed770 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -3,5 +3,5 @@ AUX prosody.initd-r6 1114 BLAKE2B a988b584eb49d21261776fa0a651dc01d3943a5a75c9bf
 AUX prosody.service-r3 439 BLAKE2B abd128f236f2c28f54542388a38aaa3d0e5030510dddc16240273de90c13ddee62d01d26d7c9e1be0635dc59ad9ca5e93a30f2b5fa42106489a95d26a037314a SHA512 b540e5d4389439cdd2886f9ccaf189d20ffcaf29a982a26e4ed296b0c529df95aade88751d22919cb36b27db94530dade754044d50cee2e5244d37983b933517
 AUX prosody.tmpfilesd-r2 39 BLAKE2B 1e004bf2bf1495d219c12bea1973206fae135fb4a5b453c6692f0143413626ec83889bb84b5086a6e507d3b8af14877b3820f3d9560df17e1ca49e2cbee85e0b SHA512 81b855c6bf496f0e6f20c41b8be5538c4edd1fbc6e4f2ca6e9a2d0a06bd5237223a4d42bcbdb75746cb01e46ff0eb36dac6952d9c076c6a72d1bbd733aca07eb
 DIST prosody-0.12.5.tar.gz 617833 BLAKE2B 71f8681e9a976919281be2afe47aa59e8ebd3b7a6e947e85757e18db3110749fa64ae75e3db2a5e55b2116cb213f0caa404fecade2d817623d36ae497f6ed1f6 SHA512 05b15204849ec285c465784ae43e3b748c4a3cda434b53f700121b518af59e14faea22af4b6bbc0d45f3633ddcaf762f00072fd713744a60d2e9ea8b3b10a7ed
-EBUILD prosody-0.12.5.ebuild 5129 BLAKE2B eecc7ea15f4fbf508af9810f3b9dd7ced492c6db715337c56eab2e6f922c489698b46f261ef3447e8a49980d704f1be8462dd300c9585d7f10a601acd546cd99 SHA512 22f401b1be2b869ddfaed1f531528fdc3fbe80bf1639f11a578509eb23165ef651f57554f177d83385dba027517617a98dfa4cd674090932f6b1cdc44a110693
+EBUILD prosody-0.12.5.ebuild 4922 BLAKE2B 057e67574d3c7a95341f83f3b280c1044c28061994795525c2b4351c42e6a3732afd87a326bb24e4ee06567d8f65a8d87223336586d38f14aa5ac455638beaef SHA512 60925d97929fad81b24a228262ca84852f9313921b112143f696d33069061352b684f0364d4feb9416eabdba81ed6f4175b872302e0822152ffb2c4a37f59f32
 MISC metadata.xml 670 BLAKE2B 448bf5ede2b6f09940c51fdff4642e18be22d9c3dac637271c7c8bcfde1b4af0853e2623c55c00efcd8757ef863ac37fdb895606e572911a62a1c9d5f32cc693 SHA512 6177b8e3d2ed1aeeae2f369dc693283a3f811953f71be0e004eea402aa421d89973dbefe79c8fd198e9f9f82e4b345552dc3a2c3597c05927dc1a518cacbaf1d
diff --git a/net-im/prosody/prosody-0.12.5.ebuild b/net-im/prosody/prosody-0.12.5.ebuild
index 4eae36e979c8..563f4aab0dd0 100644
--- a/net-im/prosody/prosody-0.12.5.ebuild
+++ b/net-im/prosody/prosody-0.12.5.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 LUA_COMPAT=( lua5-{1..4} luajit )
 LUA_REQ_USE="deprecated(+)"
 
-inherit lua-single systemd tmpfiles toolchain-funcs
+inherit eapi9-ver lua-single systemd tmpfiles toolchain-funcs
 
 DESCRIPTION="Prosody is a modern XMPP communication server"
 HOMEPAGE="https://prosody.im/"
@@ -103,25 +103,15 @@ src_install() {
 }
 
 pkg_postinst() {
-	local migrate_to_prosody_user="false"
 	tmpfiles_process prosody.conf
 
-	if [[ ${REPLACING_VERSIONS} ]]; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt 0.12.0; then
-				migrate_to_prosody_user="true"
-				break
-			fi
-		done
-	fi
-
-	# Sarting with >=0.12.0, the prosody configuration is now in
+	# Starting with >=0.12.0, the prosody configuration is now in
 	# /etc/prosody and no longer in /etc/jabber.
 	# See if we need to migrate the configuration. Furthermore,
 	# prosody no longer runs under the, shared via net-im/jabber-base,
 	# 'jabber' use, but under its own user.
 	# This increase isolation and hence robustness and security.
-	if ${migrate_to_prosody_user}; then
+	if ver_replacing -lt 0.12.0; then
 		local -A dirs_to_migrate=(
 			[/etc/jabber]=/etc/prosody
 			[/var/log/jabber]=/var/log/prosody
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 8b508ebba3b4..b6a2be24d3e7 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -4,5 +4,5 @@ AUX spectrum2.initd 1333 BLAKE2B ee4530c47e12d29a16d6b17a126878870c9332e2b6b9941
 AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
 AUX spectrum2.tmpfiles-r1 44 BLAKE2B 262e14134a78bc5955fc8ec750ceec94b6fd99fbb65365e28c6dab6f80b0941197899bec6a99d2c5ae21ecaf750013c5c909791c86a609893a4b431597323a59 SHA512 151c93d490f58309fe25bc3ee13ec9987e024c3aec4e58fe399016307f8b78aa7721f3b86bc51373aee7cebe9ab75273f0c48c7c840562ecd2e69d2ce44eba53
 DIST spectrum2-2.2.1.tar.gz 666509 BLAKE2B c946cea46d99bd8126ad8270a8a01140d75ff989cf0cc0e2ff19ac830c01df4ad02a296959077f5a56707d509bafe937515f78adf7361a2e261497f5299dfe7d SHA512 c752f043f337157125da800ec5e5ed41b0f0f2bf8ee91c682a228779754557389469eb58610bef7793a0d68a303260f80a38a1519f61b62ba23e9a2222c6f399
-EBUILD spectrum2-2.2.1.ebuild 2874 BLAKE2B 4133583e6fefc61e0a63b594140e5bfe101e770f1b644af64dc6b712d887527f8c2f1a388501803c7224561292dcd437191f901fa3f167838d9cdb17f535e971 SHA512 b7d69936942513b27a7181d90344271647e91e9c1d9d757457f676f13cc6db30d309e1cea49ceb2d1168aa6869e52c9f72318a9db507a43a4a1bf7d70d12265c
+EBUILD spectrum2-2.2.1.ebuild 2776 BLAKE2B d2ebef3538fd5fa3756ab1daa078c028d35827e6a0193740a0eb4b6025846c85c367615ea1923935f8809d9ef68180bc3b5c3e92c7435a7f74754fac33ac4d73 SHA512 a215a8a7eedb6a1fe13f9ce8e35191f7eba83ff776bb9b91cce9a3dd75faf573b62dda52dfaa8d662a2b3a6d7abbdb937b8adec4584d6ae2125750b653f3f472
 MISC metadata.xml 1114 BLAKE2B 35d457612fa10fe7e6e2007734c54e491b581e86e0376416b3e2177d6c22b478c7b2bb98cb7bf4d7c80d3ab36f2674c18642f2725cc5c8e230df174bf80d1776 SHA512 13de6689c9838edaccc98b038a86d64dd4bc9639c41b383f8cd0d7e081f6a6bd23c597901165e39867dbed6d957a71f71a9011f6c73050d098ee984fb59f994e
diff --git a/net-im/spectrum2/spectrum2-2.2.1.ebuild b/net-im/spectrum2/spectrum2-2.2.1.ebuild
index bfeccf1de360..1f90c0890c70 100644
--- a/net-im/spectrum2/spectrum2-2.2.1.ebuild
+++ b/net-im/spectrum2/spectrum2-2.2.1.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 cmake systemd tmpfiles
+inherit cmake eapi9-ver systemd tmpfiles
 
 DESCRIPTION="An open source instant messaging transport"
 HOMEPAGE="https://www.spectrum.im"
@@ -113,14 +113,9 @@ src_install() {
 pkg_postinst() {
 	tmpfiles_process spectrum2.conf
 
-	if [[ ${REPLACING_VERSIONS} ]]; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt 2.2.0; then
-				ewarn "Starting with Release 2.2.0, the path for spectrum2"
-				ewarn "executable helper files has been changed from '/usr/bin'"
-				ewarn "to '/usr/libexec'. Please update your config files!"
-				break
-			fi
-		done
+	if ver_replacing -lt 2.2.0; then
+		ewarn "Starting with Release 2.2.0, the path for spectrum2"
+		ewarn "executable helper files has been changed from '/usr/bin'"
+		ewarn "to '/usr/libexec'. Please update your config files!"
 	fi
 }