gentoo auto-resync : 14:04:2025 - 08:45:05

15 files changed, 113 insertions, 259 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index dabaab64559a..3d217073c241 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/dino/Manifest b/net-im/dino/Manifest
index 49c7b6e97d5f..24ebf2841ee3 100644
--- a/net-im/dino/Manifest
+++ b/net-im/dino/Manifest
@@ -1,8 +1,9 @@
 AUX README.gentoo 469 BLAKE2B e7176c3fa41c859f13f93f2805bf317817de1c736b56a55a1cd21340b2195f1192a96c56ae973c347430f3553715e829420ef6e0d91b26835cf06d06b744b9ec SHA512 a800f5ae1f02a1574602c1595f005eeffbd2db6c100bb59f7a4cf9dbb0bea79bb3d1a17cf9559a09f318f4d8189ecfce964e594829228ab16f861b3c966c3f41
+AUX dino-0.4.5-cmake4.patch 311 BLAKE2B 6e6e12a440fdf0374bb8bbea3509229377a2d10936da3536dac62eab607a10065d21797b20c811a6bbb3a2746c6bec7c8b18e6c5b8b1fbd3cf3220081fd49028 SHA512 0a0eb0ffca80bc706225047d40052071a05ea74320c58bf6ce6cd4eda08193e2e70783cc1d4a81d3b66395c4e454263a9bf47ef811121b32a9672c62a3b61ec9
 DIST dino-0.4.4.tar.gz 884259 BLAKE2B 5290543aeaf89f2adf5acf648b6ff4fb7daafc7d4e0b9e948f34a4af81ea49073664aa37d2541753e2f75dbfe492ac82ebdda5fe9ab5749e7b251d6788a36f3a SHA512 d2d5553c60d20e163930c0d8468727109871651f7305bf86940b7efd70a42d11ca85572f4dbea01e67ec8ce48fb0a244acb29b491d5d43bf188653ddc6ecface
 DIST dino-0.4.5.tar.gz 886933 BLAKE2B 19afec6cedf770017ef459ab87dac38f24a4e9c7ca956145e6bd4bc99f35928ae2cc461f98de262beb6e06cd6cbbcd56197835adc8ead57c3f1f29b2c4446771 SHA512 877e218105b4c9b643145d557ebf0e19d9ad989146dcffde047aba46290389babf8814a8bd819788f91e34c11df0c8609c68f9de8fa418c0801c83642ad861c6
 EBUILD dino-0.4.4-r1.ebuild 2017 BLAKE2B c0a71bd5b533855c5af568f8f093cacc0a56e56a1ed23931fed02e1e22f82af2402fdefb8dddf58eff9708178251d5771fc3e9ecd81057761651e4f302655076 SHA512 f85879aed52699b77f89bf69310b8931af8a4cdb8b3ffe4ab672c6befae6275083818f1da9b7119a348b156f61d9d512372ae47bbefbf47e9080a7ca89368a79
-EBUILD dino-0.4.4-r3.ebuild 2115 BLAKE2B 670d246ad7fc4678534eb1cc455517a8d29d5c9399a7a6af11d0730e37ade3b7bf4460d9da240694a55cb593c32b66dba137a3796649bbf3d2d694a5c30aaa75 SHA512 72960af4797615b1695810c074a3e56721a3fafb908c091cbd08995af00d41e937e0f696d530842541256db664335d949afdc894b34ee52b19c11ca979cd33ea
+EBUILD dino-0.4.5-r1.ebuild 2148 BLAKE2B ee7c9017aab3d496adcb2653788c51ecaea1908c1376359e7f05d62479b43e0936de92ccbc7bc2956c4c5f2cf23579061570a754011969496536dd34c09e2ec1 SHA512 36008b28c53bde69ac71de72a12f09615791d8427e327b75294ffb84da8c190fbaadcf8d4686ea93587b1e8d363a53ff0df73ccfa2a5ba58de63f643e58bcaaa
 EBUILD dino-0.4.5.ebuild 2115 BLAKE2B 0d80281fca6181e4d9262b574f5ecc5a6b1da41d9cfec7a8126e6d6a247bc21c3c717f05a0ca191306e411fe6147395a7530a70d5efb8b747a9813c81be2ef7f SHA512 d922009cbbf71385d88b1cdaf713395dd02c6f5e44732325b02b89555e3ae7322cbe449fdc13377d60da6754f200e72e9798441b7dbdf6d132c26763e0bf52fd
-EBUILD dino-9999.ebuild 2115 BLAKE2B 670d246ad7fc4678534eb1cc455517a8d29d5c9399a7a6af11d0730e37ade3b7bf4460d9da240694a55cb593c32b66dba137a3796649bbf3d2d694a5c30aaa75 SHA512 72960af4797615b1695810c074a3e56721a3fafb908c091cbd08995af00d41e937e0f696d530842541256db664335d949afdc894b34ee52b19c11ca979cd33ea
-MISC metadata.xml 629 BLAKE2B 451fa9ab43aa4c0915e87a4b8835b25fba86c846270d3257f7ca8dcde782f5b2d5c8705f828dc3d20e371345af2b5715f86753839f7d0a147ee9b6fb71aeadb4 SHA512 5d16f3cd53aa46fa5028050fd8db9c3bd239ea80a7bf38dbfc0814a0b50efdc34a7aa52bf628439b2db4aa22afbe320514ae22fc7349d508220da23c00663416
+EBUILD dino-9999.ebuild 2041 BLAKE2B a3ac7da0111b7752830d7be7ae5bb2c78955ca623ef4f39bb90f3e81db55c844f97f47fa3a6adac71c70e1f8fd9203dbea5c3dac8454f3f330fb5a1a54cd84ef SHA512 d7c5adf9acdc8bd89b3d23c49803ef8d8a92df016e146cec2061ca625598cbf6126c2bb1d80436e3d1a2e28d7c7c0359cc0510f1167810bd2ccf620829e00b29
+MISC metadata.xml 629 BLAKE2B 2adab2f4ee3194f41d8fdc698d123bb3c9000c5c891ae938f03b95f7e9fe5d9bd0df99da0da327a40664db09f6ed576d7848cc3a31e69c8c9886ef4e85fa9f44 SHA512 321e0d0895a1cf94454a4658fb24fb0692abc13c2cae26d87b5f627af62429de6ae546c06eb49d9d0b8bcc1ae36e0b25a5b2a61b86eeda378380ec92c1a2a1c0
diff --git a/net-im/dino/dino-0.4.4-r3.ebuild b/net-im/dino/dino-0.4.5-r1.ebuild
index aa0695a944b6..d076866eaf1c 100644
--- a/net-im/dino/dino-0.4.4-r3.ebuild
+++ b/net-im/dino/dino-0.4.5-r1.ebuild
@@ -8,20 +8,20 @@ inherit cmake vala xdg readme.gentoo-r1
 DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
 HOMEPAGE="https://dino.im"
 
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+gpg +http +omemo +notification-sound +rtp test"
-RESTRICT="!test? ( test )"
-
 MY_REPO_URI="https://github.com/dino/dino"
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="${MY_REPO_URI}.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm64"
 	SRC_URI="${MY_REPO_URI}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+gpg +http +notification-sound +omemo +rtp test"
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-db/sqlite:3
 	dev-libs/glib:2
@@ -32,14 +32,14 @@ RDEPEND="
 	media-libs/graphene
 	net-libs/glib-networking
 	net-libs/gnutls:=
-	>=net-libs/libnice-0.1.15
+	>=net-libs/libnice-0.1.22-r1
 	net-libs/libsignal-protocol-c
 	net-libs/libsrtp:2=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/pango
 	gpg? ( app-crypt/gpgme:= )
-	http? ( net-libs/libsoup:2.4 )
+	http? ( net-libs/libsoup:3.0 )
 	notification-sound? ( media-libs/libcanberra:0[sound(+)] )
 	omemo? (
 		dev-libs/libgcrypt:=
@@ -48,7 +48,7 @@ RDEPEND="
 	rtp? (
 		media-libs/gst-plugins-base:1.0
 		media-libs/gstreamer:1.0
-		media-libs/webrtc-audio-processing:0
+		media-libs/webrtc-audio-processing:1
 	)
 "
 DEPEND="${RDEPEND}
@@ -60,6 +60,9 @@ BDEPEND="
 	$(vala_depend)
 "
 
+# upstream switched to meson, so no need to try send it there
+PATCHES=( "${FILESDIR}/${P}-cmake4.patch" )
+
 src_configure() {
 	vala_setup
 
@@ -76,9 +79,7 @@ src_configure() {
 		"-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")"
 		"-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")"
 		"-DVALA_EXECUTABLE=${VALAC}"
-		# libsoup-2 for bug #948374
-		# dino -> libnice[upnp] -> gupnp-igd:0 -> gupnp:0 -> libsoup:2.4
-		"-DSOUP_VERSION=2"
+		"-DSOUP_VERSION=3" # fixed bug #948374
 		"-DBUILD_TESTS=$(usex test)"
 	)
 
diff --git a/net-im/dino/dino-9999.ebuild b/net-im/dino/dino-9999.ebuild
index aa0695a944b6..87f2f6b87e59 100644
--- a/net-im/dino/dino-9999.ebuild
+++ b/net-im/dino/dino-9999.ebuild
@@ -8,20 +8,20 @@ inherit cmake vala xdg readme.gentoo-r1
 DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
 HOMEPAGE="https://dino.im"
 
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+gpg +http +omemo +notification-sound +rtp test"
-RESTRICT="!test? ( test )"
-
 MY_REPO_URI="https://github.com/dino/dino"
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="${MY_REPO_URI}.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm64"
 	SRC_URI="${MY_REPO_URI}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+gpg +http +notification-sound +omemo +rtp test"
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-db/sqlite:3
 	dev-libs/glib:2
@@ -32,14 +32,14 @@ RDEPEND="
 	media-libs/graphene
 	net-libs/glib-networking
 	net-libs/gnutls:=
-	>=net-libs/libnice-0.1.15
+	>=net-libs/libnice-0.1.22-r1
 	net-libs/libsignal-protocol-c
 	net-libs/libsrtp:2=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/pango
 	gpg? ( app-crypt/gpgme:= )
-	http? ( net-libs/libsoup:2.4 )
+	http? ( net-libs/libsoup:3.0 )
 	notification-sound? ( media-libs/libcanberra:0[sound(+)] )
 	omemo? (
 		dev-libs/libgcrypt:=
@@ -48,7 +48,7 @@ RDEPEND="
 	rtp? (
 		media-libs/gst-plugins-base:1.0
 		media-libs/gstreamer:1.0
-		media-libs/webrtc-audio-processing:0
+		media-libs/webrtc-audio-processing:1
 	)
 "
 DEPEND="${RDEPEND}
@@ -76,9 +76,7 @@ src_configure() {
 		"-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")"
 		"-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")"
 		"-DVALA_EXECUTABLE=${VALAC}"
-		# libsoup-2 for bug #948374
-		# dino -> libnice[upnp] -> gupnp-igd:0 -> gupnp:0 -> libsoup:2.4
-		"-DSOUP_VERSION=2"
+		"-DSOUP_VERSION=3" # fixed bug #948374
 		"-DBUILD_TESTS=$(usex test)"
 	)
 
diff --git a/net-im/dino/files/dino-0.4.5-cmake4.patch b/net-im/dino/files/dino-0.4.5-cmake4.patch
new file mode 100644
index 000000000000..15ecb0e9467a
--- /dev/null
+++ b/net-im/dino/files/dino-0.4.5-cmake4.patch
@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt	2025-02-24 20:00:00.000000000 +0100
++++ b/CMakeLists.txt	2025-04-13 20:22:18.772585202 +0200
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.3)
++cmake_minimum_required(VERSION 3.5)
+ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+ include(ComputeVersion)
+ if (NOT VERSION_FOUND)
diff --git a/net-im/dino/metadata.xml b/net-im/dino/metadata.xml
index 8798c1dab8d4..4f5967b0d20a 100644
--- a/net-im/dino/metadata.xml
+++ b/net-im/dino/metadata.xml
@@ -9,8 +9,8 @@
 	<use>
 		<flag name="gpg">Enable OpenPGP encryption plugin</flag>
 		<flag name="http">Enable HTTP file upload plugin</flag>
-		<flag name="omemo">Enable OMEMO encryption plugin</flag>
 		<flag name="notification-sound">notification sounds plugin</flag>
+		<flag name="omemo">Enable OMEMO encryption plugin</flag>
 		<flag name="rtp">Enable Audio/Video calls over XMPP using RTP</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 37376104380f..bb7afd082319 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,11 +1,7 @@
 DIST gajim-1.8.4.tar.gz 3710470 BLAKE2B e23eafe707bc482a050fcef44df9e68af552444cce173c506538ebe01557a894dc0ba8b9afe18f195fd0b00b717b1268531a960b1c8b868c22081135d14e3079 SHA512 1a5b028c0e308eb15417c8c11584bc0e8b0218fead5155093ede4bc3961b6bee2b47bc3510f751dc70194634d6ca94d4a675f6891c8f050859fb4729020e52cb
-DIST gajim-1.9.3.tar.gz 3803265 BLAKE2B 44c6985728871b82fd86aa8a5e066123cd10a0f990dffcbdc6099333caec95af4f78eecdf49af062aa5bad293d819ea7e0811e2cd1906eb81630b9fd94f0c3f7 SHA512 d7815ad77afb3ea1e7b1cdf6baa4ed1acaaed857da4a0ca1db57200dc3fc7103e4110ee8b7e2918838f86c9250226a6c8b98be6cd0915ea29eaf5e1a2830688a
-DIST gajim-1.9.5.tar.gz 4723544 BLAKE2B 5975338a366eba36bc6f92af8d41f727d00ae0bdeaa93a62ed8f5e1f0c4f91ae1b3334afa9f71d21b57a3cd51d35b052a29fecba4bdd7bb577611e01c53d98d2 SHA512 00adfffa255ecbd73227967f86be02549403e81801339dbd896c9c48c3717e7f99d7c1d70d3629b2b242e60ddba6037a9877f264af6f8b6b0d7d30666a54e5f5
-DIST gajim-2.0.1.tar.gz 4702535 BLAKE2B 6a05fc9ef77bdf3a4512d3efe109d8fac3f294a0f7c1df8718acf078c56701bd892bfe00b8f772d96fa28fbb76d19949990d4e15bf2a39cd24730854709d1817 SHA512 637189c0e6a8777652ae5a58b028fef9452324db9ed41390ab4df3340730b283e28b094584af9d6e591597d21a5fac7c9ab81a33b8c5db6898af765044c4704a
 DIST gajim-2.0.3.tar.gz 4711551 BLAKE2B 66508788267132901f805cc130cd685005c77e3887833e36e31a895e1e9fb699ac84cf448879796870bf58dc321989b31fee4dff490c804f27fa6eea4848398c SHA512 4efb495edaad0e3d0e4945b2e5ff1334fb6703ebf6fc60c6f81861cda01ab85feef5cf90abd214dac6f79036700b6d6d68ed25fe13af91c1ecb6739e9e8ca1bf
+DIST gajim-2.1.0.tar.gz 4739465 BLAKE2B d03822a51dc36fd15138d376d15967bedb71632a9ca8746bc00b13c10b2719f5174d4d1a931da284de1331a891f8a3cd3001240361e2a618350bdd90f57e096a SHA512 be05385f22ff6b5d8627b93cbe3e278ef4a65b367730a0a834f35075ab230c6257295f34bb407d0d97f2a0aac9813e48e3551f63e40012112de2830b7de5b202
 EBUILD gajim-1.8.4-r1.ebuild 2957 BLAKE2B 81fb0ee481dc27f789d07222f9fbeb04c045ed8bb97cf2d1786f60a59c7891826a57bd961717cb4e2c46019e40b03f552f92f6412cb65ba810d101565a5608d6 SHA512 c4163b55d81b179c454775a94a48916996d216a467107be9fcfd68ab976a4cd87ecb9e80b1713947020b6c63d6f143a65c83cec6936747654347c889ea34aa4c
-EBUILD gajim-1.9.3-r1.ebuild 3216 BLAKE2B 5782fdb6cbdd24b4d8149466417933d8c44484a69dd2db2ab0e9f8b35bd53e25bf852bdd8bb6a36e77e34413c076e63b29d7dd27e146d41ebbb37f261b5c6987 SHA512 f5cc91900e76598620889b1feb8a5701f2ec378744c7997d08ed684604d33af7d1f75b7d9c950d5293eb0ddf000d0bb6a64647ad63f79cd6b6e8a4d36465323d
-EBUILD gajim-1.9.5-r3.ebuild 3170 BLAKE2B 28a9073d7b76f6230614fa0492ac1704af9e584fc435f893e617d47eb10f749e38b1d0a027808c6d8149854ecef46954a8fd1485d09b314057667655df24864b SHA512 3c2d52526ba44a009ea485755d5d892ecd0c905c7632d469a6d13fac3e40ef76d7a603558964bc131a61e119890d2dbcb10b03883739e487fb100b91e2a260f2
-EBUILD gajim-2.0.1.ebuild 3588 BLAKE2B 4a5602866e91cebaf6f0f828fd406e6400d892793503aa396c6742ee131025d8a6f7e38c380a8c3ee72a3de9177490ef6a98edff7d9273a241d6cd4d378e53f7 SHA512 9eb2651f5d5453344982e4c31df270038b0227503fd119413252b623a27699905d81c428e3f1c7798b3a9f47e5584229d8dd4268cadf789d8b313dc0a80c4211
 EBUILD gajim-2.0.3.ebuild 3587 BLAKE2B 1686ce6f738af462d50bd4f1588d2f17d2afac2fa3e6e5bac3bbe82f2e5e199511fffd042f1b00723bfc96f9ff5d3e2fc65c2949ffb5e75b1b879b2561a37c05 SHA512 24571db811a02795b3cd9998ce5c84d11e106e9d163bfc8eb28ff25523a075fc383139aaf6eda12990e2822cbcb8c75ad0eea2414fb58716df95460df5903d48
-MISC metadata.xml 911 BLAKE2B f25f3f37bd56c2f91948d11dbb6aab552f2c341518295b0d6cc47e6bd2638fec528dfd338b91de0f656e1650cceebe08169b46af32e69405cae19b528eb8a795 SHA512 68187b4a12a1ed0ff1da6235bc98489a5fd0d41c7488473de0c4be1cf55fdae13391f2a6c8eae477399bf59e880ee89af62eeb8fc5db03e0012f165a22ca66a9
+EBUILD gajim-2.1.0.ebuild 3588 BLAKE2B 56c9efc97a9cfbd696698900d06f1483f507f3e26e8c549bc093f5ebf43f0f07b3bca0a9f64e2ce87bdee11af31cac0ac19dc7367691c82a505e7dce5b7b45fb SHA512 857793cde23c70307622f2b88194a3948fbb6a39ed55b56b506eff1b085769ddb731b7c83dc46436e34f836cc15d138e108ab9f11a13a69c21e0c608c56fcbf5
+MISC metadata.xml 817 BLAKE2B 9a49c738023d852534956b6c815eb4c9d277dfda71e982063180aae14169b73020ba7c29e10c20e8da75ca571c0e2e6a3c35ede889c3a113170ef2eb68807629 SHA512 300cc95d32d4425af58fa061e63ce0232d17d3eb37967e70cde3ec0c2323e735bd2706a301a70accb5dbfb6b6319a691f5df17e11a5b57864a3e1c6b8d8c6277
diff --git a/net-im/gajim/gajim-1.9.3-r1.ebuild b/net-im/gajim/gajim-1.9.3-r1.ebuild
deleted file mode 100644
index daaa128f23db..000000000000
--- a/net-im/gajim/gajim-1.9.3-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="sqlite,xml(+)"
-DISTUTILS_USE_PEP517=standalone
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="XMPP client written in PyGTK"
-HOMEPAGE="https://gajim.org/"
-SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-# Rekeyword for ~long, ~x86 and ~riscv, when https://bugs.gentoo.org/937582 is fixed.
-# KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
-KEYWORDS="amd64 ~arm64"
-IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo(+)]
-	>=x11-libs/gtk+-3.24.30:3[introspection]
-	x11-libs/gtksourceview:4[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	virtual/pkgconfig
-	>=x11-libs/pango-1.50.0
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/idna[${PYTHON_USEDEP}]
-		<dev-python/nbxmpp-6[${PYTHON_USEDEP}]
-		>=dev-python/nbxmpp-5.0.1[${PYTHON_USEDEP}]
-		dev-python/precis-i18n[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		x11-libs/libXScrnSaver
-		app-crypt/libsecret[crypt,introspection]
-		dev-python/keyring[${PYTHON_USEDEP}]
-		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
-		dev-python/css-parser[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		net-libs/libsoup:3.0[introspection]
-		media-libs/gsound[introspection]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/jaraco-classes[${PYTHON_USEDEP}]
-		dev-python/python-axolotl[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/emoji[${PYTHON_USEDEP}]
-		dev-python/qrcode[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/omemo-dr[${PYTHON_USEDEP}]
-		crypt? (
-			dev-python/pycryptodome[${PYTHON_USEDEP}]
-			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-		geolocation? ( app-misc/geoclue[introspection] )
-		jingle? (
-			net-libs/farstream:0.2[introspection]
-			media-libs/gstreamer:1.0[introspection]
-			media-libs/gst-plugins-base:1.0[introspection]
-			media-libs/gst-plugins-ugly:1.0
-			media-plugins/gst-plugins-gtk
-		)
-		remote? (
-			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-			sys-apps/dbus[X]
-		)
-		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
-		spell? (
-			app-text/gspell[introspection]
-			app-text/hunspell
-		)
-		upnp? ( net-libs/gupnp-igd:0[introspection] )
-	')"
-
-python_compile() {
-	distutils-r1_python_compile
-	./pep517build/build_metadata.py -o dist/metadata
-}
-
-python_install() {
-	distutils-r1_python_install
-	./pep517build/install_metadata.py dist/metadata --prefix="${D}/usr"
-
-	gzip -d "${ED}"/usr/share/man/man1/*.gz || die
-}
-
-pkg_postinst() {
-	ewarn "The chat database format changes when upgrading from 1.8.x to 1.9.x."
-	ewarn "The first time the user starts Gajim, an automatic migration is performed."
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-# Tests are unfortunately regularly broken
-RESTRICT="test"
diff --git a/net-im/gajim/gajim-1.9.5-r3.ebuild b/net-im/gajim/gajim-1.9.5-r3.ebuild
deleted file mode 100644
index b4fce36f79b8..000000000000
--- a/net-im/gajim/gajim-1.9.5-r3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="sqlite,xml(+)"
-DISTUTILS_USE_PEP517=standalone
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="XMPP client written in PyGTK"
-HOMEPAGE="https://gajim.org/"
-SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-# Rekeyword for ~long, ~x86 and ~riscv, when https://bugs.gentoo.org/937582 is fixed.
-# KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
-KEYWORDS="~amd64 ~arm64"
-IUSE="+crypt geolocation jingle remote rst +spell +webp"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo(+)]
-	>=x11-libs/gtk+-3.24.30:3[introspection]
-	x11-libs/gtksourceview:4[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	virtual/pkgconfig
-	>=x11-libs/pango-1.50.0
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/idna[${PYTHON_USEDEP}]
-		<dev-python/nbxmpp-6[${PYTHON_USEDEP}]
-		>=dev-python/nbxmpp-5.0.4[${PYTHON_USEDEP}]
-		dev-python/precis-i18n[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		x11-libs/libXScrnSaver
-		sys-apps/xdg-desktop-portal
-		app-crypt/libsecret[crypt,introspection]
-		dev-python/keyring[${PYTHON_USEDEP}]
-		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
-		dev-python/css-parser[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		net-libs/libsoup:3.0[introspection]
-		media-libs/gsound[introspection]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/jaraco-classes[${PYTHON_USEDEP}]
-		dev-python/python-axolotl[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/emoji[${PYTHON_USEDEP}]
-		dev-python/qrcode[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/omemo-dr[${PYTHON_USEDEP}]
-		crypt? (
-			dev-python/pycryptodome[${PYTHON_USEDEP}]
-			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-		geolocation? ( app-misc/geoclue[introspection] )
-		jingle? (
-			net-libs/farstream:0.2[introspection]
-			media-libs/gstreamer:1.0[introspection]
-			media-libs/gst-plugins-base:1.0[introspection]
-			media-libs/gst-plugins-ugly:1.0
-			media-plugins/gst-plugins-gtk
-		)
-		remote? (
-			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-			sys-apps/dbus[X]
-		)
-		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
-		spell? (
-			app-text/gspell[introspection]
-			app-text/hunspell
-		)
-	')"
-
-python_compile() {
-	./make.py build --dist unix || die
-	distutils-r1_python_compile
-}
-
-python_install() {
-	distutils-r1_python_install
-	./make.py install --dist unix --prefix="${ED}/usr" || die
-
-	gzip -d "${ED}"/usr/share/man/man1/*.gz || die
-}
-
-pkg_postinst() {
-	ewarn "The chat database format changes when upgrading from 1.8.x to 1.9.x."
-	ewarn "The first time the user starts Gajim, an automatic migration is performed."
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-# Tests are unfortunately regularly broken
-RESTRICT="test"
diff --git a/net-im/gajim/gajim-2.0.1.ebuild b/net-im/gajim/gajim-2.1.0.ebuild
index d8b02efa005e..ed9dcede3d75 100644
--- a/net-im/gajim/gajim-2.0.1.ebuild
+++ b/net-im/gajim/gajim-2.1.0.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-python/emoji-2.6.0[${PYTHON_USEDEP}]
 	dev-python/keyring[${PYTHON_USEDEP}]
 	<dev-python/nbxmpp-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/nbxmpp-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/nbxmpp-6.1.0[${PYTHON_USEDEP}]
 	<dev-python/omemo-dr-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/omemo-dr-1.0.0[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
index d92fbc20c5df..d069254fd8a2 100644
--- a/net-im/gajim/metadata.xml
+++ b/net-im/gajim/metadata.xml
@@ -12,7 +12,6 @@
     <flag name="remote">Controling Gajim instance from command line with gajim-remote</flag>
     <flag name="rst">Generating XHTML output from RST code</flag>
     <flag name="spell">Spellchecking of composed messages</flag>
-    <flag name="upnp">Ability to request your router to forward port for file transfer</flag>
     <flag name="voice">Support for video calls, audio calls and voice messages</flag>
     <flag name="webp">Support WebP avatars</flag>
   </use>
diff --git a/net-im/telepathy-logger/Manifest b/net-im/telepathy-logger/Manifest
index 8d3c214ade2a..a8c576ccbf0b 100644
--- a/net-im/telepathy-logger/Manifest
+++ b/net-im/telepathy-logger/Manifest
@@ -1,4 +1,6 @@
 DIST telepathy-logger-0.8.2-py3.patch 15181 BLAKE2B bebd153a519ee6cd4d7e3e04b4516e6fb53b6efea1d0693133ca5807686e115d08998e9e3ad0d6308d01945a0ac1b66010c3e312346dd238c43be1418574e11e SHA512 98cd5f9af7d4781be30b15c58ca6cd3a131b52dbc5cc38eae3423fc3377a02451782838d9f32575a71dd8d6ce7f46657e17f3dee29059a728bb8988d05c716ea
 DIST telepathy-logger-0.8.2.tar.bz2 562670 BLAKE2B 357d717136fe099ee3788bcd004d3eb14e83520c39a8412f4586181e0a1c98ac21be26931759b8f0439ab6f2f9b32aaf6cbf586619ab0fe40ef0f9581b301a29 SHA512 f3eda26133a4c38eeb79b01cbe3b7801a5eb773e8b4e6ce621c47d3ca701025364c6b2b890caea00104f01ba85ae891a6fad82d7a9dc487fd7a980221cede451
+DIST telepathy-logger_0.8.2-4.2.debian.tar.xz 18204 BLAKE2B c533070d03b721bb9b0a945820b24dcff19b09ad5ca032c72fee900039e7a481d096479ebd98b05defbb1998a2a4946c70598fd1f2a3b7852e008ba4cc27f999 SHA512 e4fdc72077568299fff940f2cadf9318718b4f9b73f94e1dddd421f26bb86ec9d88e46c075320ce8718d2a897b2222bb497c6e959fc1e221c70acb8516a16af6
 EBUILD telepathy-logger-0.8.2-r1.ebuild 1423 BLAKE2B e955238b2c4fadef8d7310b9d50f8939a43cfbc8044a9648fe12d97524997377ca619410d6f7efeb01d0fa373e7fee92af2ce30dc71192710d89e069be06cd9a SHA512 5632c9971c93c9847d9c56aa0f2a41848d4c89931a31f08beeb4cd6be900d46878e5f58d8eb3e288f0c88aa226c94707fd89f220be2632a0228435b7e919617f
+EBUILD telepathy-logger-0.8.2_p4.ebuild 1723 BLAKE2B c859b10f83ec5a12149f0383df6e14a6dd4e9884976847ff013f5fd6e4ae2812a1ff71f0aa590cd30a6e172fbe49e4e0931f4bbb5286a5e7a82f0acfbc3fc3c9 SHA512 010816c8afb1d51e660c5997e35d4ac5e966f17784fb5f4b70d116d334f93c95bbedf0220d28c12b78c56a91b0915efabfc4f20c8601ffb9d5acbb0e88befefd
 MISC metadata.xml 367 BLAKE2B a53fd690e0e872c8bc146380ff11be2b1f8acd75fcc141118abc5d83b04db705671c934dc11b14f93c603f8aa830f6ef2795ef15e23c0d929bbddeb2b4c27bda SHA512 49a8ba5073386bcdb09772f7d737baa68df4b50287d22e1670dc528ef9abb556d793e2b827b7e133aaae27eb73b9d7c841fa8b9ea1848b1717915890f5a2f1f4
diff --git a/net-im/telepathy-logger/telepathy-logger-0.8.2_p4.ebuild b/net-im/telepathy-logger/telepathy-logger-0.8.2_p4.ebuild
new file mode 100644
index 000000000000..94002b954684
--- /dev/null
+++ b/net-im/telepathy-logger/telepathy-logger-0.8.2_p4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2 python-any-r1 virtualx
+
+DESCRIPTION="Daemon that centralizes the communication logging within the Telepathy framework"
+HOMEPAGE="https://telepathy.freedesktop.org/components/telepathy-logger/"
+# FIXME: Debian upstream uses 4.x for the latest patches, hopefully they
+# will release _p5 to fix this in the near future
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P/_p*}.tar.bz2
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.2.debian.tar.xz"
+S="${WORKDIR}/${P/_p*}"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux"
+IUSE="+introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=sys-apps/dbus-1.1
+	>=dev-libs/dbus-glib-0.82
+	>=net-libs/telepathy-glib-0.19.2[introspection?]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-db/sqlite:3
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+	>=dev-build/gtk-doc-am-1.10
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Debian patches
+	for p in $(<"${WORKDIR}"/debian/patches/series) ; do
+		eapply -p1 "${WORKDIR}/debian/patches/${p}"
+	done
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-debug needed due to https://bugs.freedesktop.org/show_bug.cgi?id=83390
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--enable-debug \
+		--enable-public-extensions \
+		--disable-coding-style-checks \
+		--disable-Werror \
+		--disable-static
+}
+
+src_test() {
+	virtx emake -j1 check
+}
diff --git a/net-im/telepathy-mission-control/Manifest b/net-im/telepathy-mission-control/Manifest
index 093390f0aeab..05c4134313a4 100644
--- a/net-im/telepathy-mission-control/Manifest
+++ b/net-im/telepathy-mission-control/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-mission-control-5.16.6.tar.gz 1127785 BLAKE2B 82055a86d102292dec44ddeadd99458b1cf083f5d74be09326cfae41d627f1792468a180b5cb9f5bb5712989198cc46116f39e41343ca35b3bac101e3db6003a SHA512 56d62bc7270d2d62a490361f3ef3bc39384fde05ee5d69cb7e20db4f41665bd99d05b4cd2b5992b84dbfee5400684503e44c5b8c63cfa101e0cfe6a85b005e5e
-EBUILD telepathy-mission-control-5.16.6.ebuild 1050 BLAKE2B c74728672982154175a3b4e35d7f5f8edba3da36073e46c9d6501f7d6f0f5cbac809ab88bf2a62878448c0935c157fc192e17d862452608f4e2ebab00b03b087 SHA512 a66f19a1fa9d76d84d5f10d936f1687d725b9451c3ee0cca4cbb29fa244adf9d026028e1d733b0cb58331e5b4fa1e7fe1248d03e450bd5361d63eb411e62050a
+EBUILD telepathy-mission-control-5.16.6.ebuild 1050 BLAKE2B 21a56ff5acf606415ce9dbeb8b3a6944856a886f8d656eff01b7c6ee81fb4b8e16eccce35234d180dbb14a0ef0f7f491c7756fcff8dd1777069f783140a868eb SHA512 c2039d4a66abd2af3054199a6ebb1897a6043480c1388546f23a1509c9acc56f9c2a9a12e3769b28bf41b993bcb6fe5c47504ac1c0ed653fe49c0373f77b90ff
 MISC metadata.xml 752 BLAKE2B e60fd6afedeea01e269f621ee13aa92eae2700a95113cffe72e303979734f1a90279cc96e1fb243681d6a1c39df59d2d9e1010a63435581491c02bd4ac9f4bce SHA512 250844a7d6bd144d159377373c9679d10bcb11aef569da107de538dcc045ff1864186318a56e4cadc0b10b90ca8a587da1fb0d2073628bffffbcb5d645a18a8c
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
index 0a2fdfd92369..a1d891d8d95d 100644
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.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=7
+EAPI=8
 PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit gnome2 python-any-r1