gentoo resync : 15.12.2019

3 files changed, 54 insertions, 3 deletions

diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index d6fda30f9514..5921163703e6 100644
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -1,6 +1,7 @@
 AUX kadu-4.3-do-not-force-ccache.patch 635 BLAKE2B c1b29e41186a05ee7c34b7f2c349095c9e1a12584defd393a0952a6b6c5015ae401cd0a7b8d4579eabe05e4d771aabaa51fba3ccef49d05cf7c0ff702739f893 SHA512 d17b7a20d78c8446d845bdb80c4a110adb164d0dfaff52f5a67730a3e1d861f65ccb84d67d04cc7088169b6d3d56376c8c43b3c432795a273a0da5517eabd86b
+AUX kadu-4.3-find-x11-with-newer-cmake-modules.patch 2155 BLAKE2B 0709979d6c2e30a40f5e6de7f83c7ae1e991e639d85b30c0b012a736f6c4bf30b0b5f6e6f4f5ffdbf380bbff109709a8b2671a8f0237634c9809856d206e9a87 SHA512 861a5718990df106ec7edc408b29215b2bca0597bf1505fac49cddd3059da6228df82e98da752ce436e174f702d8996d5454ecf4a67fc1e05b6b284d4f341369
 AUX kadu-4.3-fix-plugins-rpath.patch 473 BLAKE2B 8b7c16e7acecb59798a52c514e9f472c13eeda3c005ae84026d13737362435d7381f302a48d87ec15853067bb1e46699803cdc3ba4de54aa1f67f0f4d3d84023 SHA512 af94cb0127abd7ffe6ebd9fea20d17efb835773a6e8194caddd07b736e84e2ee40da51b820ec38e8eb07de6755941b53ded07f9b8aa9a7acd28b612c3259f952
 AUX kadu-4.3-gcc7.patch 266 BLAKE2B 1211251304c10c46df75d3fbc84dff1f560c89a533c8119b80f03d21f8d25def87a32380cb5291d31c3695d706e431fc3fc95c4a35bb8fda9c2c5a0324d257df SHA512 04911ccf7d414a4449634e164ab1c093baa8b05b189a252b8a61bf0f4ad9857e08780620c946524a2d0d4696a6785c0789cbe2ad6f87b2330a093d351df4f982
 DIST kadu-4.3.tar.bz2 8087786 BLAKE2B b63ce2beebb1fd1f64ae8e85430784c6c7d25a071e00342e33d97a2e49b25c02ab131fb30d591acc11a336427118d4dd23e03d89ad07ef066eca09d0463397db SHA512 fb3d16320894bbfbd50e695d61f305710e59bccce84319389a4047626e97da95ded0b35bc5f7e5d8c2ac96594693b14dd8dd8d46eb1863f89d3eec2e51c73cc9
-EBUILD kadu-4.3-r2.ebuild 2591 BLAKE2B 9e859b20e3a792aa10faf4af381b9cc4b9a7ee070db93a0c827191f50cdffe1b5507d882d64ba56bbeec5c96ce73fc9f7aa90941ebb64761b817f1577b4b1cc0 SHA512 1c44d49c19ee9b9e0c0f9ccf5485ba4676c8157441f81fcf088596903ec06fd1f32c11e2c742a401e00000b7f055ac75c37b941ed625e3f3ddd842c4064ddb3d
+EBUILD kadu-4.3-r2.ebuild 2675 BLAKE2B af26625a6ce0c900e20459b26eba97350e50bca82eef5fc1c8c6b8a39da25b16000c36397319618385973bfa866572ce2f189fb160c358c51145ff891c1c305a SHA512 7071c23feea11e397d738320961334d5de7112958838470017c3d6c8209ad572f95de4a8fe4f16b1c2a5c8b9223017651ce75e61260ea8a73ee2c3bf0bcd8632
 MISC metadata.xml 578 BLAKE2B c6454fd583cf3ee9d55963cc482349eb236a46420d956ed7fe199721c81177e4f32c133279a49c71f5a5f64541efdb3ff8933753b3de868562b74a48eb7093c7 SHA512 23b011af6a0bcc235ca6685aeb1ec01cd9ef1e529fb5970860aab059fc1063d39d36446e3b86542ce303becc991e6250d58ec599aeddef6343382956c55a6c89
diff --git a/net-im/kadu/files/kadu-4.3-find-x11-with-newer-cmake-modules.patch b/net-im/kadu/files/kadu-4.3-find-x11-with-newer-cmake-modules.patch
new file mode 100644
index 000000000000..ec44a0be7f55
--- /dev/null
+++ b/net-im/kadu/files/kadu-4.3-find-x11-with-newer-cmake-modules.patch
@@ -0,0 +1,48 @@
+diff -ruN kadu-4.3/kadu-core/CMakeLists.txt my/kadu-core/CMakeLists.txt
+--- kadu-4.3/kadu-core/CMakeLists.txt	2017-01-24 22:36:21.000000000 +0100
++++ my/kadu-core/CMakeLists.txt	2019-11-22 02:05:51.381540018 +0100
+@@ -111,7 +111,7 @@
+ list (APPEND ADDITIONAL_LIBKADU_LIBRARIES ${LibArchive_LIBRARIES})
+ 
+ if (UNIX AND NOT APPLE)
+-	find_package (X11 REQUIRED COMPONENTS X11 Xutil Xfixes)
++	find_package (X11 REQUIRED COMPONENTS Xutil Xfixes)
+ 	if (X11_FOUND AND X11_Xutil_FOUND AND X11_Xfixes_FOUND)
+ 		message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xfixes_LIB}")
+ 	else ()
+diff -ruN kadu-4.3/plugins/idle/CMakeLists.txt my/plugins/idle/CMakeLists.txt
+--- kadu-4.3/plugins/idle/CMakeLists.txt	2017-01-24 22:36:22.000000000 +0100
++++ my/plugins/idle/CMakeLists.txt	2019-11-22 02:06:57.503381610 +0100
+@@ -15,7 +15,7 @@
+ )
+ 
+ if (UNIX AND NOT APPLE)
+-	find_package (X11 REQUIRED COMPONENTS X11 Xutil Xscreensaver)
++	find_package (X11 REQUIRED COMPONENTS Xutil Xscreensaver)
+ 	if (X11_Xscreensaver_FOUND)
+ 		message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xscreensaver_LIB}")
+ 	else ()
+diff -ruN kadu-4.3/plugins/pcspeaker/CMakeLists.txt my/plugins/pcspeaker/CMakeLists.txt
+--- kadu-4.3/plugins/pcspeaker/CMakeLists.txt	2017-01-24 22:36:22.000000000 +0100
++++ my/plugins/pcspeaker/CMakeLists.txt	2019-11-22 02:07:45.315719788 +0100
+@@ -15,7 +15,7 @@
+ set (LIBRARIES "")
+ 
+ if (UNIX AND NOT APPLE)
+-	find_package (X11 REQUIRED COMPONENTS X11)
++	find_package (X11 REQUIRED)
+ 	if (NOT X11_FOUND)
+ 		message (SEND_ERROR "Could NOT find X11")
+ 	endif ()
+diff -ruN kadu-4.3/plugins/screenshot/CMakeLists.txt my/plugins/screenshot/CMakeLists.txt
+--- kadu-4.3/plugins/screenshot/CMakeLists.txt	2017-01-24 22:36:22.000000000 +0100
++++ my/plugins/screenshot/CMakeLists.txt	2019-11-22 02:07:54.323972436 +0100
+@@ -30,7 +30,7 @@
+ 
+ if (UNIX AND NOT APPLE)
+ 	set (PLUGIN_ADDITIONAL_QT_MODULES X11Extras)
+-	find_package (X11 REQUIRED COMPONENTS X11 Xext Xshape)
++	find_package (X11 REQUIRED COMPONENTS Xext Xshape)
+ 	if (X11_Xshape_FOUND)
+ 		message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xext_LIB}")
+ 	else ()
diff --git a/net-im/kadu/kadu-4.3-r2.ebuild b/net-im/kadu/kadu-4.3-r2.ebuild
index 10dd889fae2e..8caf2eac7c4f 100644
--- a/net-im/kadu/kadu-4.3-r2.ebuild
+++ b/net-im/kadu/kadu-4.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -40,6 +40,7 @@ COMMON_DEPEND="
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
 	x11-libs/libX11
+	x11-libs/libXfixes
 	x11-libs/libXext
 	x11-libs/libXScrnSaver
 	gadu? ( >=net-libs/libgadu-1.12.2[threads] )
@@ -50,7 +51,7 @@ COMMON_DEPEND="
 	)
 	spell? ( app-text/enchant )
 	xmpp? (
-		net-dns/libidn
+		net-dns/libidn:*
 		>=net-libs/qxmpp-0.9.3-r1
 		sys-libs/zlib
 	)
@@ -102,6 +103,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.3-do-not-force-ccache.patch"
 	"${FILESDIR}/${PN}-4.3-fix-plugins-rpath.patch"
 	"${FILESDIR}/${PN}-4.3-gcc7.patch"
+	"${FILESDIR}/${PN}-4.3-find-x11-with-newer-cmake-modules.patch"
 )
 
 src_configure() {