gentoo resync : 20.03.2022

4 files changed, 93 insertions, 97 deletions

diff --git a/net-im/qtox/Manifest b/net-im/qtox/Manifest
index e7ca6a0002b8..954c0865a3b7 100644
--- a/net-im/qtox/Manifest
+++ b/net-im/qtox/Manifest
@@ -1,9 +1,8 @@
-AUX qtox-1.16.3-qt-5.13.patch 672 BLAKE2B 49bde1355f9042dcb60dde2863435bf32110d87d4954191425a50e67ff3ae2ea4b226a16639137a31267d5a97568b45249d1fbb22d2c2d21c5d5db64059322e9 SHA512 eb716cbd6b33c9a07f197a11dce31d875d32a1dfeb499bf2445e77b508cfb3a658a3e9ad1e6724b942e730a67d3784fe250682e151c87d93b83aa4ae0320cda1
-DIST qTox-1.16.3.tar.gz 4256757 BLAKE2B 70103e2d912da86dab63424586c642a73614b4a408a53634b146d1e401d5b328a2b8c81c472a94e0e8804d774f693c1250e7263b263e80abef5e111372f29232 SHA512 a857266ffcf32b1963e3a4428501299ce19f3c087087583115dc01e41934fc31d52ea54d781fa93ec7e21f6e3303b4e22383ecaaa7f1f1dbf32d740db73aca4c
 DIST qTox-1.17.3.tar.gz 4765213 BLAKE2B 3bffa351da01b436edc9c80c481845f6c6399c930ac1601e1676b7dec22ccfbf37c082c3a30ab71e2295c96bb427b36a718f960ffc75e700d5c29605f7bf0ac0 SHA512 e7534e40aed06aaeba57a201b7315ae2bd361f80971969b95b00fea0a6cbe106c2ea337485c47b350c07a9e3b74947c8b2feb206899292c29621e057b630ca56
 DIST qTox-1.17.4.tar.gz 4778657 BLAKE2B 5edcb6b6f997eeb4a332c23477d4c5021085cf8c62be596b0eb4771963f450bc96de6c2dc30ec3cfc98577f20bf618e8fc2478fc34af8a8810fc538a5ccc787b SHA512 00dd2b4492e6dbf90b038bd1e5263ba96c969fb5d879b5680401ad090ffe6aaa70ff487f2e88f93c573f2e1a7e6ca50a75dfe7b51fc56fc4d08cac076bfd75d0
-EBUILD qtox-1.16.3-r1.ebuild 1564 BLAKE2B 03facbc9f537853e2d2d9c265835630ae74a83574c7e76acfeed51ba9d22ce16edfbfc4cb5c1b5ed9d70a14401e78b5e0104341c4bd46a5c2583151cc90d6227 SHA512 5f6d88631c0d46c0c2484512b5ec768e15d41f804e260e524b58b40a85f195f2d26970cb25afc5c95d41c00152d1816b059a90101402b008c7cad080b8faa5bf
+DIST qTox-1.17.6.tar.gz 4777590 BLAKE2B d67ea8c1d5c478a791fd8594866130874c036f22ec9fd991e0f6c81fb7919824bba8e13675b0ffaf613188215a4fce6d07545476ab5565922b3989519aedd91f SHA512 840dfbca2cb1a3db4b5ab27cb408e183b152fcd87c0cb915ee58245e7c311b8682605e73497248072a5a48b239058b101a85235ed169d19606dc7bf61865f208
 EBUILD qtox-1.17.3.ebuild 1777 BLAKE2B 662bf5e9a1b535dcd25f1032bfb2257316cc41e484c0ff92a4f60b2f440bb8488969a5b532f2e529ac36daeb28a729e2be8dc5862a0980ef81e317934a99dbe5 SHA512 456680cca3cf840351814d20a69615a225c0db6592b51290a362ef3a6316e9d5243b66bdec78fafa02564c18057fa57c62ce65e3183cefcbe987f51c2c601ebf
 EBUILD qtox-1.17.4.ebuild 1905 BLAKE2B f9e9b9e89b78a9b5e75030c517216dc713a31fd022f0b9c2bde6f14380c423d8db78ac63495b19fdb536cf52b46c369fb1dbcecee1ab37c0c26c4128653c0dbd SHA512 a8309f88cb917f3cd6f845540a5f3979c11ce6ae018e8d4aad160befdd4fe59207e045594962655efb61f7314873dbbd25352f7349ee195fea7a71d861401904
+EBUILD qtox-1.17.6.ebuild 1905 BLAKE2B f9e9b9e89b78a9b5e75030c517216dc713a31fd022f0b9c2bde6f14380c423d8db78ac63495b19fdb536cf52b46c369fb1dbcecee1ab37c0c26c4128653c0dbd SHA512 a8309f88cb917f3cd6f845540a5f3979c11ce6ae018e8d4aad160befdd4fe59207e045594962655efb61f7314873dbbd25352f7349ee195fea7a71d861401904
 EBUILD qtox-9999.ebuild 1971 BLAKE2B 99e1d6e2c0b950acd10d5dac741a20ef04baa7d739df6e7df230fbbc12d3ac12c75a81ca9730744c3c97a6517d76d079beda0494ce7bbcb4340d876c43246726 SHA512 6b243eb5730f2a678ff5966848840f426d50cf0ecb5fd70e56e43e952d77a4ba3a46311b18c28ef8eb287679710c4f76f33aae8f655f1b1362ecd45cbc1aced2
 MISC metadata.xml 672 BLAKE2B 0f28ef27d2fab6333632a78210eb699d6655041aa04a208c27fb527f9f541038f9ed07fa9250302f55eccc1df0c45774dc358c141f7e8aef3abcba9ae58512ae SHA512 333f2df5182e424dae5de93cfd65a3ad267ef2eec55ab023efc79443390822723d737b392e9cea9a5adffa048a74b225b846df1578010ffc19709040881b0136
diff --git a/net-im/qtox/files/qtox-1.16.3-qt-5.13.patch b/net-im/qtox/files/qtox-1.16.3-qt-5.13.patch
deleted file mode 100644
index 16805843253a..000000000000
--- a/net-im/qtox/files/qtox-1.16.3-qt-5.13.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt	2020-01-15 22:17:59.921502029 +0100
-+++ b/CMakeLists.txt	2020-01-15 22:19:55.834885195 +0100
-@@ -48,7 +48,6 @@
- set(RCC_OPTIONS -compress 9 -threshold 0)
- 
- # Use C++11.
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
- 
-@@ -56,7 +55,6 @@
- set(POSITION_INDEPENDENT_CODE True)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-overflow")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-aliasing")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
- 
- if (NOT WIN32)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all")
diff --git a/net-im/qtox/qtox-1.16.3-r1.ebuild b/net-im/qtox/qtox-1.16.3-r1.ebuild
deleted file mode 100644
index d29e70e3f7b1..000000000000
--- a/net-im/qtox/qtox-1.16.3-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="qTox-${PV}"
-inherit cmake xdg
-
-DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5"
-HOMEPAGE="https://github.com/qTox/qTox"
-SRC_URI="https://github.com/qTox/qTox/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="notification test X"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-db/sqlcipher
-	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/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/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 )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.13.patch" ) # bug #699152
-
-src_prepare() {
-	cmake_src_prepare
-
-	# bug 628574
-	if ! use test; then
-		sed -i CMakeLists.txt -e "/include(Testing)/d" || die
-		sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/d" || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_STATUSNOTIFIER=$(usex notification)
-		-DENABLE_GTK_SYSTRAY=$(usex notification)
-		-DPLATFORM_EXTENSIONS=$(usex X)
-		-DUSE_FILTERAUDIO=OFF
-		-DGIT_DESCRIBE="${PV}"
-	)
-
-	cmake_src_configure
-}
diff --git a/net-im/qtox/qtox-1.17.6.ebuild b/net-im/qtox/qtox-1.17.6.ebuild
new file mode 100644
index 000000000000..825ce6aa14d1
--- /dev/null
+++ b/net-im/qtox/qtox-1.17.6.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/qTox/qTox.git"
+else
+	MY_P="qTox-${PV}"
+	SRC_URI="https://github.com/qTox/qTox/releases/download/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/qTox"
+fi
+
+DESCRIPTION="Instant messaging client using the encrypted p2p Tox protocol"
+HOMEPAGE="https://qtox.github.io/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="notification +spellcheck test X"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-db/sqlcipher
+	dev-libs/libsodium:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[gif,jpeg,png,X(-)]
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-gfx/qrencode:=
+	media-libs/libexif
+	media-libs/openal
+	media-video/ffmpeg:=[webp,v4l]
+	>=net-libs/tox-0.2.13:=[av]
+	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
+
+	# bug 628574
+	if ! use test; then
+		sed -i CMakeLists.txt -e "/include(Testing)/d" || die
+		sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/d" || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPLATFORM_EXTENSIONS=$(usex X)
+		-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)"
+}