gentoo resync : 25.10.2021

9 files changed, 95 insertions, 30 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 8a0f804b832f..f65fde9c13c5 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/dino/Manifest b/net-im/dino/Manifest
index 74c55ebea3fc..8dc9ecdd9621 100644
--- a/net-im/dino/Manifest
+++ b/net-im/dino/Manifest
@@ -1,6 +1,7 @@
+AUX README.gentoo 469 BLAKE2B e7176c3fa41c859f13f93f2805bf317817de1c736b56a55a1cd21340b2195f1192a96c56ae973c347430f3553715e829420ef6e0d91b26835cf06d06b744b9ec SHA512 a800f5ae1f02a1574602c1595f005eeffbd2db6c100bb59f7a4cf9dbb0bea79bb3d1a17cf9559a09f318f4d8189ecfce964e594829228ab16f861b3c966c3f41
 DIST dino-0.2.1.tar.gz 514504 BLAKE2B 42fae18bb7cda276c1eadeefdea130069f9929dfde62855f00ab6b88912fe9db3374315f40ff8f53350cf38e45fe61b0fd6256ef390cdbed6a65a3f2d79ac80a SHA512 b71497ec115945eadf7d33bb973f68465a20284aa75f37f1ae25fc30c1c423ce28cb10f7e9123c47f82e77e97170b8fa72c75389dacc3a2aa3d487a9c9610d49
 DIST dino-0.2.2.tar.gz 514648 BLAKE2B 54110f3767b5d1d3d4bffc82b767d3c92114c55449ad10705ed10b8815ecc9c337016348886acc3df21d5f27be5d93bbe3c203173167146ff9859bd03f0be7a6 SHA512 6c973b0b88e2c8aecbab694b456762973c5f60217bbf6bc81f4d81226fe8124596bddfe7c190f35307ec3ad6376858ce8f686c74aaebec133124377d8a9e4898
 EBUILD dino-0.2.1.ebuild 1648 BLAKE2B a060d33c0d9b8ea88a6fedadb7ce4964bfb0c51f7a79fcce46f8f2bb77b32b48f41eca7113f7ccbe5e58d57bd262cc89930b41c0c597c6e5bd12550bb91747b4 SHA512 6f9ba82b543c598ce897917e7d12126d87d9dd1925748dfe55ac61f891dab216ebb5c1efd6fbdf02741be85d16f210e4f90888972bd75342ff3ac99eda72e8e0
 EBUILD dino-0.2.2.ebuild 1650 BLAKE2B 0062e108a6c191c1049ce076e81d09d0860b743b08f9a33a168936492c2901d15f21862a699693d9cf4fd856cd6540a5611fa07ef48db4af906373bedc27e68c SHA512 62fd08158864ab5e8b624b0ec45c340f7a319ae3cf6952c5411b6b7db9eb37a5cab6e508b137a2e881eadd5f6905458282cc8c8ada3e413aacf6e146cbd96ecb
-EBUILD dino-9999.ebuild 1697 BLAKE2B a129d51469bb007a1c023ef216ebe6076bce93cd24ae24e541fc14654151662db336bc3a22b0efa2e6d7991123a395d4d5ee58c4df4fbb00f9d768580874f2e1 SHA512 8d01a975b53058c4df68ccff058d24f47b6f072d6f98c06cc4fb4764abc7bc2f9b4143eb4472149fe1908220f7e61f964b7e24fd51e04f7b32014b331da979f9
+EBUILD dino-9999.ebuild 1893 BLAKE2B 6794dee249c9a0a011b7c59774f58effc051bad877d3c3d2a6558b217ab8a57cb42487df28b6c633d0e4084ce1207cd3b5dd33cdcf945840b28c8566df8ba9f7 SHA512 80313d092f8427a9917a42b00ada083a759e21b72f801e5a461b9f0c389e0edca400c9ccb86a3d4b4c2c4b8b6977f3c81af0e66939895131fbc2427f6325db59
 MISC metadata.xml 642 BLAKE2B 31f8929e6bbcc03672e487d70a37b3796ced84e17cfdfb7d55026aa97c8a001d6f666ec5de4894ff5648c3b8bcbe856866986baffaff5305636cc1fce2c201a1 SHA512 db7adb8b4a47f7129b01783605983e87d93b3bfc6f7add5256bdd72d88090923730c56697ad95a0e19071ed96d85e1f16acf44e3aa6ab5cbbcc19684bf9dc895
diff --git a/net-im/dino/dino-9999.ebuild b/net-im/dino/dino-9999.ebuild
index 408e90c29689..29103bf879ef 100644
--- a/net-im/dino/dino-9999.ebuild
+++ b/net-im/dino/dino-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 VALA_MIN_API_VERSION="0.34"
-inherit cmake vala xdg
+inherit cmake vala xdg readme.gentoo-r1
 
 DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
 HOMEPAGE="https://dino.im"
@@ -49,6 +49,8 @@ RDEPEND="
 DEPEND="
 	$(vala_depend)
 	${RDEPEND}
+	media-libs/gst-plugins-base
+	media-libs/gstreamer
 	sys-devel/gettext
 "
 
@@ -79,3 +81,13 @@ src_configure() {
 src_test() {
 	"${BUILD_DIR}"/xmpp-vala-test || die
 }
+
+src_install() {
+	cmake_src_install
+	readme.gentoo_create_doc
+}
+
+src_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/net-im/dino/files/README.gentoo b/net-im/dino/files/README.gentoo
new file mode 100644
index 000000000000..b51e4391562e
--- /dev/null
+++ b/net-im/dino/files/README.gentoo
@@ -0,0 +1,23 @@
+To enable video calls, install the following packages.
+
+Transport level security:
+- gst-plugins-srtp
+- gst-plugins-dtls
+
+Peer to peer connection reliability:
+- gst-plugins-libnice
+
+Video output into a window:
+- gst-plugins-gtk
+
+At least one codec is needed in common with the other end of the call, as they
+are negotiated when the call begins.
+
+Video codecs:
+- gst-plugins-x264
+- gst-plugins-vpx
+
+Audio codecs:
+- gst-plugins-good
+- gst-plugins-speex
+- gst-plugins-opus
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index f52125bbd991..b91e1cc21849 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -4,5 +4,5 @@ DIST gajim-1.3.2.tar.gz 9538320 BLAKE2B 9af561d4316a34480d073dcbf95fbc04ffd30bb4
 DIST gajim-1.3.3.tar.gz 9886175 BLAKE2B 27c4163a5762e8fa72524f91d846439b5bd54aff8ec0c4f8ffe4061295540d986b71fc333a2d65110e87821efc5a96ce0dc8a519236c5d71df9a722c65851296 SHA512 b1b6ed1eeb9ce01c26240a0a0c1ff3991ac305787e2ed49ecf7ed9cc75789da2d0ec1c3a1fda6dc67fe440fa7aa143af9be1a837acfc94255d7027f63f55ced2
 EBUILD gajim-1.3.1_p2.ebuild 2393 BLAKE2B 29e9137608241890d52a59ce27beec4f38f9789e66627c7d03d8646614149adeaaa1ea728a59b6ee62f3fe3b6b9eacc63f186b779abd29d6dc1687dedf373837 SHA512 809c01bfb5cd847ebdfa087877695be7d644ace122e546df1e47c1b2b848a02029dd42fd2735ec00b575f4822d4c8a755836afabfd0e8109e88854dd4b72c747
 EBUILD gajim-1.3.2.ebuild 2680 BLAKE2B 7c42ef6db2251790a159475c9ad6235f2329c700316cee4487b008546467bac85ab1efc206bfe5cfa93ec0fca63bba0b88337905a6c6dc0cb2dca69c78452eb5 SHA512 e5a9fef65f8415d8510888a2d4bac393115cb969d246f23eb0504891979f5e53e305e11d7456121fc89c240d80ae10323eb00595800d4b4708e15c016d8ff78a
-EBUILD gajim-1.3.3.ebuild 2529 BLAKE2B bd059956e73f69d101248040b2da5e1b33d0f53d45797a259a5526e48f855998954d628d0e91e4283b78e6e5548e98ed28ce944c1fbc0c64fd476910a695e463 SHA512 8168fe18f19b3c74232b993f05ab709e3cc03a171f9acc577a7a5fbeefe64704008dc916de30355acec5af0ff674707ded7338dc77ba3bff22ff7c73ff11e70e
+EBUILD gajim-1.3.3-r1.ebuild 2529 BLAKE2B e1b6d1fccc9b627cdf0f9f1b47d38aa02913946fbf1040404987ca14f08eda8c2f87e5de157cdf35ab884fa400cd690ecd1d77359b336401e4ad2eca75b690c4 SHA512 37bc9c6f9ff258bc3fb2381b36312803f3caf99f7cb68b8459ca0aa19100b1290d3725abca66134147714c57bf808bd3d1dc96ec10139e11c7afd4bd0bf08df0
 MISC metadata.xml 867 BLAKE2B b7dcc46c99a2c04f9382cd7eeb34b416a422baae8e8123369bb9809c89204413cc9a93c51979fd50f542aed29caff5e6bb18e3ea3a077814f89826972d778837 SHA512 e56580db1a6734f1e219eeb61176ba60e5c85895e0cf7699643f82c928d7f083d519cf3d490b0750b0cbe875cf1428e67e35961ad006c38f62829f04090af134
diff --git a/net-im/gajim/gajim-1.3.3.ebuild b/net-im/gajim/gajim-1.3.3-r1.ebuild
index 66d76d4a1c83..92c1b423ac5c 100644
--- a/net-im/gajim/gajim-1.3.3.ebuild
+++ b/net-im/gajim/gajim-1.3.3-r1.ebuild
@@ -36,7 +36,7 @@ RDEPEND="${COMMON_DEPEND}
 		dev-python/pycurl[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/python-nbxmpp-2.0.2[${PYTHON_USEDEP}]
+		>=dev-python/python-nbxmpp-2.0.4[${PYTHON_USEDEP}]
 		x11-libs/libXScrnSaver
 		app-crypt/libsecret[crypt,introspection]
 		dev-python/keyring[${PYTHON_USEDEP}]
diff --git a/net-im/qtox/Manifest b/net-im/qtox/Manifest
index cb19c07528d0..369e542e2c3c 100644
--- a/net-im/qtox/Manifest
+++ b/net-im/qtox/Manifest
@@ -3,5 +3,5 @@ DIST qTox-1.16.3.tar.gz 4256757 BLAKE2B 70103e2d912da86dab63424586c642a73614b4a4
 DIST qTox-1.17.3.tar.gz 4765213 BLAKE2B 3bffa351da01b436edc9c80c481845f6c6399c930ac1601e1676b7dec22ccfbf37c082c3a30ab71e2295c96bb427b36a718f960ffc75e700d5c29605f7bf0ac0 SHA512 e7534e40aed06aaeba57a201b7315ae2bd361f80971969b95b00fea0a6cbe106c2ea337485c47b350c07a9e3b74947c8b2feb206899292c29621e057b630ca56
 EBUILD qtox-1.16.3-r1.ebuild 1564 BLAKE2B 03facbc9f537853e2d2d9c265835630ae74a83574c7e76acfeed51ba9d22ce16edfbfc4cb5c1b5ed9d70a14401e78b5e0104341c4bd46a5c2583151cc90d6227 SHA512 5f6d88631c0d46c0c2484512b5ec768e15d41f804e260e524b58b40a85f195f2d26970cb25afc5c95d41c00152d1816b059a90101402b008c7cad080b8faa5bf
 EBUILD qtox-1.17.3.ebuild 1679 BLAKE2B ebc3f96bb6f843021474883d35d9b54d53626be4f2b4684f6bd999d6ef510d31cd7e63adf96246c1d46fa1096bb46627dfd42f4cadbaa2720112a9833f7dfab9 SHA512 873d7b7bb11ce46ad83d2565b5a4c52cc305e372587c525b8dad859b48025b397ef421325071ecacb43caa3a67812097463b61de129f400bd95486e78a25b3d8
-EBUILD qtox-9999.ebuild 1403 BLAKE2B 9042194f22e893186a212b47be588ffcde8cd1925126a6fd81f4906e3ff576162f5fbe9400013d781e51295d04139a1f513f2243b3c679c3bdf5ff7bfa66efe6 SHA512 5f7efa140c41dc4a4e8431361744e54820e290b17ba38037c3635824dd0f59b36718e8ad070f95da3fe6a96fe037d54824b9f06f5a84254da845060ee7c339cd
-MISC metadata.xml 397 BLAKE2B 61044113697c61c671f85287c97750d20b2ce8667538a25821be8168a698ee2cb2a2637cd2e76d70c1ad86aba30679deffa798f959fe4e920d12b818a1a4ecde SHA512 bb08d7fb50976f36a83671f0f86201527624df1682a371f022a3d7818d5c8a4e9b636b2967064fa5881f2bda7c5b366e555a6342fe093e759e021b2e62ecd894
+EBUILD qtox-9999.ebuild 1906 BLAKE2B 3b89d9ff6d85407c3259a61f1c95feeea81e2318c6e5043fab060199c69f0e41952652cd80f234d0527c3365fb79977d01775b3c08862f6b705282c02944cb2f SHA512 57f284a0ea372daafd9af746fa9db1118edab004c569864cc61c18cc859a21396510a214819c8ee30ba19bdb2632fdf246f75efe93e9908df3b59c2563014496
+MISC metadata.xml 672 BLAKE2B 0f28ef27d2fab6333632a78210eb699d6655041aa04a208c27fb527f9f541038f9ed07fa9250302f55eccc1df0c45774dc358c141f7e8aef3abcba9ae58512ae SHA512 333f2df5182e424dae5de93cfd65a3ad267ef2eec55ab023efc79443390822723d737b392e9cea9a5adffa048a74b225b846df1578010ffc19709040881b0136
diff --git a/net-im/qtox/metadata.xml b/net-im/qtox/metadata.xml
index d8975efcd0c2..51bdfe56b855 100644
--- a/net-im/qtox/metadata.xml
+++ b/net-im/qtox/metadata.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>chiitoo@gentoo.org</email>
+		<name>Jimi Huotari</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="notification">Use snorenotify for desktop notifications</flag>
-		<flag name="spellcheck">Enable spell cheching support</flag>
+		<flag name="spellcheck">Enable spell checking support</flag>
+		<flag name="X">Enable auto-away support</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">qTox/qTox</remote-id>
diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild
index 8e6526263d3a..f3d034bc3f34 100644
--- a/net-im/qtox/qtox-9999.ebuild
+++ b/net-im/qtox/qtox-9999.ebuild
@@ -1,18 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake git-r3 xdg
+inherit cmake xdg
 
-DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5"
-HOMEPAGE="https://github.com/qTox/qTox"
-EGIT_REPO_URI="https://github.com/qTox/qTox.git"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/qTox/qTox.git"
+else
+	SRC_URI="https://github.com/qTox/qTox/releases/download/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Instant messaging client using the encrypted p2p Tox protocol"
+HOMEPAGE="https://qtox.github.io/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS=""
-IUSE="notification test X"
+IUSE="notification +spellcheck test X"
 
 RESTRICT="!test? ( test )"
 
@@ -25,29 +31,33 @@ RDEPEND="
 	dev-libs/libsodium:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
-	|| (
-		dev-qt/qtgui:5[gif,jpeg,png,X(-)]
-		dev-qt/qtgui:5[gif,jpeg,png,xcb(-)]
-	)
+	dev-qt/qtgui:5[gif,jpeg,png,X(-)]
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
-	dev-qt/qtsql:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	media-gfx/qrencode:=
-	media-libs/libexif:=
+	media-libs/libexif
 	media-libs/openal
-	>=media-video/ffmpeg-2.6.3:=[webp,v4l]
-	net-libs/tox:0/0.2[av]
-	notification? ( x11-libs/gtk+:2 )
-	X? ( x11-libs/libX11
-		x11-libs/libXScrnSaver )
+	media-video/ffmpeg:=[webp,v4l]
+	net-libs/tox:=[av]
+	net-libs/toxext
+	net-libs/tox_extension_messages
+	notification? ( x11-libs/snorenotify )
+	spellcheck? ( kde-frameworks/sonnet:5 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+	)
 "
 DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
+	X? ( x11-base/xorg-proto )
 "
 
+DOCS=( CHANGELOG.md README.md doc/user_manual_en.md )
+
 src_prepare() {
 	cmake_src_prepare
 
@@ -60,11 +70,22 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DENABLE_STATUSNOTIFIER=$(usex notification)
-		-DENABLE_GTK_SYSTRAY=$(usex notification)
 		-DPLATFORM_EXTENSIONS=$(usex X)
-		-DUSE_FILTERAUDIO=OFF
+		-DUPDATE_CHECK=OFF
+		-DUSE_CCACHE=OFF
+		-DSPELL_CHECK=$(usex spellcheck)
+		-DSVGZ_ICON=ON
+		-DASAN=OFF
+		-DDESKTOP_NOTIFICATIONS=$(usex notification)
+		-DSTRICT_OPTIONS=OFF
 	)
 
+	[[ ${PV} != 9999 ]] && mycmakeargs+=( -DGIT_DESCRIBE=${PV} )
+
 	cmake_src_configure
 }
+
+src_test() {
+	# The excluded tests require network access.
+	cmake_src_test -E "test_(bsu|core)"
+}