4 files changed, 94 insertions, 20 deletions
diff --git a/net-im/qtox/Manifest b/net-im/qtox/Manifest
index dde3f5703c67..cb70ee5f9ffb 100644
--- a/net-im/qtox/Manifest
+++ b/net-im/qtox/Manifest
@@ -1,6 +1,8 @@
+DIST qTox-1.16.3.tar.gz 4256757 BLAKE2B 70103e2d912da86dab63424586c642a73614b4a408a53634b146d1e401d5b328a2b8c81c472a94e0e8804d774f693c1250e7263b263e80abef5e111372f29232 SHA512 a857266ffcf32b1963e3a4428501299ce19f3c087087583115dc01e41934fc31d52ea54d781fa93ec7e21f6e3303b4e22383ecaaa7f1f1dbf32d740db73aca4c
 DIST qtox-1.11.0.tar.lz 2860849 BLAKE2B eedb0720c57afd8a99e48452af67162977df0c4cb889891b082345b0b2d37539cef39d5be16b0e9ce0615561b6628c908e5d3007b96c23026859dc4d42261223 SHA512 3117b5ec9d88f58023f6c2f5e7c37c547ab920588d385e3abe062fb22ad79c49a9b6eb9ca31c6d56f9d03cfea55ef56ddc7e2e53bd43629825ea7b460b31f505
 DIST qtox-1.8.1.tar.gz 3594727 BLAKE2B a1d4191551b082cef21ee211eebf7288aa805bb2401e9c7a48359273fd6520c67eaf826f985843fd01ca0bd4312fab9da1169cbd8b7b61916e282dde06f9dee5 SHA512 9ba32ce43f2d335fe9e07bcca651e0e18ae2f3247e52364918148e400e51f6e2364d1596c7c882674c190bf5438e69cd13e77512eeeec7cba212195e9559a5ae
 EBUILD qtox-1.11.0.ebuild 1620 BLAKE2B 246d85e8d731d87bebae67ee154fd52a9c48a38abfbea788044bd1b7cfdb64fb7c70df216fd475e140dc30cfa33660e610c0d0d2dfe7ae1a1c8a57a9eb7c8263 SHA512 78eb94640ee216cbc111671e89e4bb3cb647cba0da35da55e4f6c5027a9cb32678efa23fe4c92c53e114be1d823428741b8387632f23fa96fe7478c485532420
+EBUILD qtox-1.16.3.ebuild 1581 BLAKE2B 29b96265e0675dde9acf9fcad20b0ab36f5450d9f1a2e4525ac470cd7a845c3c9eb5cfab3d4501745b3e58495d9bfa1b79abfd4eb262215101c5238d7f07439b SHA512 e189f0188ff4201f3d78b014a2c1242e8dddc3c805dec5fe38aaffa65cb2d8e3e3adec0c529333f48032ec97481bde0a8a14934b03907372181e079d51283e0c
 EBUILD qtox-1.8.1.ebuild 1645 BLAKE2B 46e40eea2eb11c6424ad3165d6adb6ac4c66d1ffc2fda29ccf811538cd6cecc43708bd59a07c884f9e2f8d921e5e990d3f14fc0b6051f46f60ee2c3e0a135803 SHA512 77f53452e5de2599f96828de62a42b5827aa716e204ecb907ca882b86851cb8c9152d9855555d25e7913662ab313193ae7cf9c1fd32425e3a2d52554e9c163a2
-EBUILD qtox-9999.ebuild 1531 BLAKE2B 728c7c62de2e5dcb68fff989f2b2d96f88df944e26318fc843cfd95efa2701d0e126a0c1880e56eb33d49d7bd0222b3cb8eaf2727c47081c0dac067ea3cc2576 SHA512 5d5d82ef5220545ae9f4be28a68fbfdf463b566280d1e5217ce475244c878b29e15bcaea9e2cec95759118da1e0a620c9d13f80c3bea1a7ba5f914ab95c6a85e
-MISC metadata.xml 382 BLAKE2B da6ba1556fdfe321ff206c5aae1389b6acbafbc50e546e94e67e6e32c33a09f637a8fcc48af5c98771ecce65a628ee24523db18dc9c4b142de46d151fd1d324e SHA512 285be9118fcc760301cad9bab6f5bc61b70498f262278e92c95f35eb48098aaa35e0f72ab693343394df8cb6c51673861a72402d9ca15978b52fc98e1ae7c87c
+EBUILD qtox-9999.ebuild 1498 BLAKE2B 046649895dcc7f10234d75e5ad9325dfb32035f2a6b2b523f686e06b5997051f00987b3035a6a38a4821d495ae32be6daacd0b9f278fc9b36469dae94e6a3911 SHA512 38af4bca3fb5ef242dcfae483d4b71ed007338b0c05f410fa7b990103a91e5a248a59a5fd03fd80f5e13e91a5d1f83674e1417340c1c109f619607390fe608a4
+MISC metadata.xml 387 BLAKE2B 16f71b094c5fcef1b3c0b3b7bb6bc962c9d7b332604d0c0d30676992b8ed0586b47d9b51470e41b5cd6c305895072661f8d7939ab90b780c28af460a80f660a5 SHA512 d941cb804aaf0f9d03fa699b0080b03afba798c5146ba21597349e65dc79c9c6a02fc23aec2db19403a19d906db3be55c56e5b8f4337a6871eb19ce3cecfe5cb
diff --git a/net-im/qtox/metadata.xml b/net-im/qtox/metadata.xml
index 1ce2420d23bb..aa2232cb4665 100644
--- a/net-im/qtox/metadata.xml
+++ b/net-im/qtox/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
-		<flag name="gtk">Adds support for GTK and Status Notifier tray backends</flag>
+		<flag name="notification">Adds support for GTK Status Notifier tray backends</flag>
 		<flag name="X">Adds support for X11</flag>
 	</use>
 	<upstream>
diff --git a/net-im/qtox/qtox-1.16.3.ebuild b/net-im/qtox/qtox-1.16.3.ebuild
new file mode 100644
index 000000000000..4bd474cc1f42
--- /dev/null
+++ b/net-im/qtox/qtox-1.16.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+MY_P="qTox-${PV}"
+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"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="
+	dev-db/sqlcipher
+	dev-libs/libsodium:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	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/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}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	test? ( dev-qt/qttest:5 )
+"
+
+src_prepare() {
+	cmake-utils_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-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild
index c635dfc405d4..3ad3165b1bc9 100644
--- a/net-im/qtox/qtox-9999.ebuild
+++ b/net-im/qtox/qtox-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,11 +13,11 @@ EGIT_REPO_URI="https://github.com/qTox/qTox.git"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS=""
-IUSE="gtk test X"
+IUSE="notification test X"
 
 RDEPEND="
 	dev-db/sqlcipher
-	dev-libs/libsodium
+	dev-libs/libsodium:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5[gif,jpeg,png,xcb]
@@ -27,17 +27,11 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	media-gfx/qrencode
-	media-libs/libexif
+	media-gfx/qrencode:=
 	media-libs/openal
-	>=media-video/ffmpeg-2.6.3[webp,v4l]
-	gtk? (	dev-libs/atk
-			dev-libs/glib:2
-			x11-libs/gdk-pixbuf[X]
-			x11-libs/gtk+:2
-			x11-libs/cairo[X]
-			x11-libs/pango[X] )
-	net-libs/tox:0/0.1[av]
+	>=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 )
 "
@@ -52,15 +46,17 @@ src_prepare() {
 
 	# bug 628574
 	if ! use test; then
-		sed -i CMakeLists.txt -e "/include(Testing)/s/^/#/" || die
-		sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/s/^/#/" || die
+		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 gtk)
-		-DENABLE_GTK_SYSTRAY=$(usex gtk)
+		-DENABLE_STATUSNOTIFIER=$(usex notification)
+		-DENABLE_GTK_SYSTRAY=$(usex notification)
+		-DPLATFORM_EXTENSIONS=$(usex X)
+		-DUSE_FILTERAUDIO=OFF
 	)
 
 	cmake-utils_src_configure