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 CB9681582EF for ; Sat, 15 Feb 2025 15:53:03 +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 B5942343078 for ; Sat, 15 Feb 2025 15:53:03 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 0EB76110471; Sat, 15 Feb 2025 15:53:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 04B0F110471 for ; Sat, 15 Feb 2025 15:52:59 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BACBA343078 for ; Sat, 15 Feb 2025 15:52:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 295902713 for ; Sat, 15 Feb 2025 15:52:58 +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: <1739634690.89a21688f18310325f63a36ed373dfe0eccffe4b.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/prosody/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/prosody/prosody-0.12.5.ebuild X-VCS-Directories: net-im/prosody/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 89a21688f18310325f63a36ed373dfe0eccffe4b X-VCS-Branch: master Date: Sat, 15 Feb 2025 15:52:58 +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: 03821dcd-42b7-4c94-9559-6ca10ecfead6 X-Archives-Hash: c5921f8c2039ae3ca834efb317252d08 commit: 89a21688f18310325f63a36ed373dfe0eccffe4b Author: Ulrich Müller gentoo org> AuthorDate: Fri Feb 14 14:11:41 2025 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sat Feb 15 15:51:30 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89a21688 net-im/prosody: Port to ver_replacing Signed-off-by: Ulrich Müller gentoo.org> net-im/prosody/prosody-0.12.5.ebuild | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) 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