gentoo resync : 17.01.2010

4 files changed, 43 insertions, 37 deletions

diff --git a/net-im/qtox/Manifest b/net-im/qtox/Manifest
index 0f790e41bbcd..70cfeddb3efe 100644
--- a/net-im/qtox/Manifest
+++ b/net-im/qtox/Manifest
@@ -1,4 +1,5 @@
+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
-EBUILD qtox-1.16.3.ebuild 1627 BLAKE2B ed3b3a23498ae2e71c55f5ef1c978d1ac177258d2868169f60a5b25732d89d3cdda606b47dd1d57294976bbd1e5590c5822eb6e8f862305c7f844675731a8202 SHA512 1a8767e222923545b83e34d39ed85f30797304db4911da131a42f971e56112d0846e3e602702eefb99e277341cab2fc058a40870ee52f5a8e44e1e2b48076c0a
-EBUILD qtox-9999.ebuild 1544 BLAKE2B cedd6ef7adc8f9b56155f07b351037a48f16d2e61918345124c2adda563f9804edfa922e3420760394dfb6e24173a3ab68660fbbfc76dd61c76b0d1bc697c5cd SHA512 4383c2126579a94787fd8b1f06bc088dcd671df1cc20db1eb56da4b95087f93b668bbd133abfc6871c204888f5c655ed785cb358ff5de55303da5a9efd351505
+EBUILD qtox-1.16.3.ebuild 1515 BLAKE2B 3b4cee9033283fd157334e1105006a489dd5376790da8c989ea3f72908ae37c5da561228f62e249fced224f9c3f425b368a3c43046b81939d03d071b3e2eeaf8 SHA512 068f52867d5ea7d0dc12cf69c08e3f589da3a551ad386c9f8482ec8245e7ba6719f6834e2e251b2b778f57430ab763ff8eb80f8518e1de6375a4ea5287a64026
+EBUILD qtox-9999.ebuild 1354 BLAKE2B da1cd9849a2effe1fa860607adeebc6f30b962a24ddae0840e19f58e66af9660f3296eb3e29b0cca4e169c991a3956f55a94c98c0bfa1263a9b990978c1590c0 SHA512 10c8e794d2ee446552f0a0c8a3e9171cdc4b214dba5b13f4e3f6396a99f252075b778b0f55e8860252c49addcd47314bff916a184db180d14d1bdad8a1c6d43b
 MISC metadata.xml 387 BLAKE2B 16f71b094c5fcef1b3c0b3b7bb6bc962c9d7b332604d0c0d30676992b8ed0586b47d9b51470e41b5cd6c305895072661f8d7939ab90b780c28af460a80f660a5 SHA512 d941cb804aaf0f9d03fa699b0080b03afba798c5146ba21597349e65dc79c9c6a02fc23aec2db19403a19d906db3be55c56e5b8f4337a6871eb19ce3cecfe5cb
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
new file mode 100644
index 000000000000..16805843253a
--- /dev/null
+++ b/net-im/qtox/files/qtox-1.16.3-qt-5.13.patch
@@ -0,0 +1,18 @@
+--- 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.ebuild b/net-im/qtox/qtox-1.16.3.ebuild
index 44236e1bfab8..57aabd1c8f03 100644
--- a/net-im/qtox/qtox-1.16.3.ebuild
+++ b/net-im/qtox/qtox-1.16.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
+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"
@@ -14,10 +14,15 @@ 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:=
@@ -40,13 +45,13 @@ RDEPEND="
 		x11-libs/libXScrnSaver )
 "
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
 	test? ( dev-qt/qttest:5 )
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.13.patch" ) # bug #699152
+
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# bug 628574
 	if ! use test; then
@@ -64,15 +69,5 @@ src_configure() {
 		-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
+	cmake_src_configure
 }
diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild
index 955d7a8edce1..c2f80f279d6f 100644
--- a/net-im/qtox/qtox-9999.ebuild
+++ b/net-im/qtox/qtox-9999.ebuild
@@ -1,21 +1,25 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eutils git-r3 gnome2-utils xdg-utils
+inherit cmake git-r3 xdg
 
 DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5"
 HOMEPAGE="https://github.com/qTox/qTox"
-SRC_URI=""
 EGIT_REPO_URI="https://github.com/qTox/qTox.git"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS=""
 IUSE="notification test X"
+
 RESTRICT="!test? ( test )"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
 RDEPEND="
 	dev-db/sqlcipher
 	dev-libs/libsodium:=
@@ -38,13 +42,11 @@ RDEPEND="
 		x11-libs/libXScrnSaver )
 "
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
 	test? ( dev-qt/qttest:5 )
 "
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# bug 628574
 	if ! use test; then
@@ -61,15 +63,5 @@ src_configure() {
 		-DUSE_FILTERAUDIO=OFF
 	)
 
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	cmake_src_configure
 }