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

5 files changed, 38 insertions, 30 deletions

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>