gentoo resync : 25.10.2021

3 files changed, 55 insertions, 26 deletions

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)"
+}