gentoo resync : 03.11.2017

4 files changed, 42 insertions, 2 deletions

diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index 2565457b2e14..7d6428e9c49b 100644
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -1,9 +1,11 @@
 AUX kadu-2.1-port-to-QtQuick-2.3.patch 5640 SHA256 12276d2b4ea71869b6a454cd9e2fc358f94107822d85399af6a8de51f2207ef1 SHA512 f5923c25861497fac78f29ed70fd5ea444797ecd93cd89d5e87326e76977ac74837975a7c0c948463f7eb0b9db25246c71246710a70aad32e01c378251140505 WHIRLPOOL 62098cfa991030f811f245052dd67d4fdd17722403b61fd18e9ffff33503f06cd6dff2b592f92ae0778adc2d57f32a532a219c287e644de8d1e9d6d7f40ef360
 AUX kadu-2.1-qt5-compilation.patch 542 SHA256 5a18b98d3bc6182e489344157057d60802c52f70f7fa8063254b4b9570df94a2 SHA512 294a2d90145d8765e0ae25482607f326f5fc8a86c589ed686ad37e02a13a5d487c28c5b0fbc3495de690864cc5b120cc5a75297dfc5ff28a4b6e4eaf7eade5d8 WHIRLPOOL db78ee7f4ac1c2eade749d8d6e1e86daf437514288042c111a5caa605f6f14595cae664310cabcf89b3c19d289d2b5c520cc237d65b6ff48efb82bfebeccdd83
+AUX kadu-4.3-do-not-force-ccache.patch 635 SHA256 ea78811a5584741aa4cf17685b3d0fa6bfff47f30f0e6d80c5dd0e9d5cabea33 SHA512 d17b7a20d78c8446d845bdb80c4a110adb164d0dfaff52f5a67730a3e1d861f65ccb84d67d04cc7088169b6d3d56376c8c43b3c432795a273a0da5517eabd86b WHIRLPOOL 89059bf0502665500f555520558eaa829cc8cca0e8b403a846772e54f4c0d4de03e8c23441b810a75b128f4ab5bf2f6ff56b7176fa920e2148cf95cbc1bfd571
+AUX kadu-4.3-fix-plugins-rpath.patch 473 SHA256 9fd28bc5a31204098867b9df53b41c4146ec47db86006b2ed19ea75926f69768 SHA512 af94cb0127abd7ffe6ebd9fea20d17efb835773a6e8194caddd07b736e84e2ee40da51b820ec38e8eb07de6755941b53ded07f9b8aa9a7acd28b612c3259f952 WHIRLPOOL 177d33d7a05d3c9cb339ee7e5f9c7ca1bc2831c7db6a51b0a3f754e41ad89c52d58bca0f2f7e2bbad13a0053529c4def0cb4dcf402f53b09b1b3471c91a8607a
 DIST kadu-2.1.tar.bz2 6013519 SHA256 9f8092756d4a870c1ecb016c0cba2c833e1697b3eb7e9bf51813b1f0a541ffb8 SHA512 3f0e38aefbaf15f357ae8232b1364deb5954a2464895fafa0a324ad99c7d14c6ba7495bed51d628e04c30bbaaf8e49412c70bbbbf01a40f360406c1afba2384a WHIRLPOOL 10b214ca8d1964054918dc0e1b85bf1157d2496e3ad340958302083a0374ac4fb7b6ac96741637f3847ac06dd9c322b0e529f9c204b9ebc6658157f7b7c2b8a2
 DIST kadu-4.3.tar.bz2 8087786 SHA256 ad5d1cbb908c3cd07f2955d343d44b993cd5639427a48a2912441955cfd2bd6e SHA512 fb3d16320894bbfbd50e695d61f305710e59bccce84319389a4047626e97da95ded0b35bc5f7e5d8c2ac96594693b14dd8dd8d46eb1863f89d3eec2e51c73cc9 WHIRLPOOL 606d25ea578f5edbf768ad9f7cce96a11d58b6a97ff85fc1ba9dbf1062e1ac5774c0b9318ff3bb6cc90767f015b68e8df22086c6cc0ecff5b726e94596562214
 EBUILD kadu-2.1-r1.ebuild 2753 SHA256 f732e12862571eb700b4115a19f0521a03e5cb3befbe089599cb4666b3075ba8 SHA512 c419340e5107b22b678d3b61abe921b29a4155df0773a21edcab6e513100e6cbec823d5effa1975066b04df815f3bfffba308df649c555148e3c3ca18390d56e WHIRLPOOL 497352ceba8461b60b8c3b73f002bb31f9a08caa7caa03a11e79e974890a8761087df2f0ca8db466de35841e396857959ac8b571d90344121375cbb4a8f84235
-EBUILD kadu-4.3-r1.ebuild 2332 SHA256 86ccd0e68c71a7be64206b4af85de2105560314274cca2db3088637f0757792c SHA512 15ae7828478c9fa87ce19f3191dd0ab2abf04ca9eb84eb31127978c08fc8827e4ee2816257a7683396a4bbf538402fb6502513f319e600ec8162257bb4544b3e WHIRLPOOL 59e07296e2e753b4088925f339424fdee45b8e0cc6872f3c9359e4d0343343fe936aebc94452e4969e2e1bcd1bcfa9b8f9e16e913ef684f9fc8ea826916f6b9c
+EBUILD kadu-4.3-r1.ebuild 2504 SHA256 0dff01f7cdffa46168daf3c307a0291c57d0a86399254d6491d83c078a16f205 SHA512 d35a15398bc95402668bd0f5dce81ac591c44a5a38f6cda86ad906dc494f2317e476e1ef0f9c30c060387120a656f2c8e299e73d1ad9b5e82c555b01b2a5c2c6 WHIRLPOOL cab6c9f7c179254a9023cfb567435baaf73913cf20d0addf199e893a3d939a6fc3282858eddcb15bee93d53ce74bab7fa435a471c11fd476ebc492a2ccb12f47
 MISC ChangeLog 3711 SHA256 2f9fb50708693fb45af9e42dcc74c5e2e811b67403284b8f5b57ab12aebfe292 SHA512 7438f66ee90178d94360083c8129a2b4a9a8ae2a4475442af680f39ec1bbab2cb53bd6a0ac58ea202a310b2e8cfb59ca9e09bbc8cfdc27f424fbf6f5f3856105 WHIRLPOOL 817f97bb63482bed5bd2fe89a018483d0800a2efbd440c8b582a6898f6c07397456312f384b6430e63ca0ef5cfe50c90c2cefb2c4a6bb10d1669691307f0044c
 MISC ChangeLog-2015 22539 SHA256 795191f9799eab353a11f4c79b0ed3b36f78d23420d00a6c41be3e85f996498e SHA512 2f7059e1dad15b1369132ee926f0132f18a39c316d4eea498a25cf14795643f887d5ff4155abad5f699e6bb9e7a2f983b2b600b772926007fc26ec8f61998336 WHIRLPOOL b19acd3152dd1b46ab7160eb100a89908825f497efedc8eb9981b1c74200a1ea5de43acb294f60621f4b488a10b6628ee524deb737d0d5c31dac156dcc7028c7
 MISC metadata.xml 635 SHA256 ff678e69d2677fcd15b08cc49179b787e61a4af9a71f0baeceeb9ab898175896 SHA512 91bc130c8ea984c22e84a1702216fb78956f9c25a60fadab7c9b2afa04067306ffa8936db29eb138b6f95c41b8b99ac18b26b4747a054bf56eb0af87f8cb0571 WHIRLPOOL 02ff8b88b92480b71079ed41bd5cbc0db0b9523c3e7058aa2eb88404aafa9d7ce5d6c449fdc53f4ed4085699a629fbcef394f5ff0e0578c4acafc8a96fb8dd2d
diff --git a/net-im/kadu/files/kadu-4.3-do-not-force-ccache.patch b/net-im/kadu/files/kadu-4.3-do-not-force-ccache.patch
new file mode 100644
index 000000000000..2511f3c42b99
--- /dev/null
+++ b/net-im/kadu/files/kadu-4.3-do-not-force-ccache.patch
@@ -0,0 +1,17 @@
+diff -ruN kadu-4.3/CMakeLists.txt my/CMakeLists.txt
+--- kadu-4.3/CMakeLists.txt	2017-01-24 22:36:21.000000000 +0100
++++ my/CMakeLists.txt	2017-11-03 03:00:07.005162047 +0100
+@@ -75,13 +75,6 @@
+ 	endif ()
+ endif ()
+ 
+-## CCache is cool stuff to improve compilation time
+-find_program (CCACHE_FOUND ccache)
+-if (CCACHE_FOUND)
+-	set_property (GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+-	set_property (GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+-endif (CCACHE_FOUND)
+-
+ # Look above, DEBUG_ENABLED is always enabled in Debug configuration.
+ # Enable it in all configurations when ENABLE_DEVELOPER_BUILD is on.
+ if (ENABLE_DEVELOPER_BUILD)
diff --git a/net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch b/net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch
new file mode 100644
index 000000000000..bb171af5f41b
--- /dev/null
+++ b/net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch
@@ -0,0 +1,12 @@
+diff -ruN kadu-4.3/cmake/KaduMacros.cmake my/cmake/KaduMacros.cmake
+--- kadu-4.3/cmake/KaduMacros.cmake	2017-01-24 22:36:21.000000000 +0100
++++ my/cmake/KaduMacros.cmake	2017-11-03 03:24:17.827054622 +0100
+@@ -221,7 +221,7 @@
+ 
+ 	if (NOT WIN32)
+ 		set_target_properties (${KADU_PLUGIN_NAME} PROPERTIES
+-			INSTALL_RPATH "${KADU_INSTALL_LIB_DIR}/kadu"
++			INSTALL_RPATH "${KADU_INSTALL_PREFIX}/${KADU_INSTALL_LIB_DIR}/kadu"
+ 			BUILD_WITH_INSTALL_RPATH TRUE
+ 		)
+ 	endif ()
diff --git a/net-im/kadu/kadu-4.3-r1.ebuild b/net-im/kadu/kadu-4.3-r1.ebuild
index b3e45cf121e7..b33c0729b454 100644
--- a/net-im/kadu/kadu-4.3-r1.ebuild
+++ b/net-im/kadu/kadu-4.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit cmake-utils flag-o-matic
+inherit cmake-utils flag-o-matic gnome2-utils
 
 MY_P="${P/_/-}"
 
@@ -100,6 +100,11 @@ tabs
 word_fix
 '
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.3-do-not-force-ccache.patch"
+	"${FILESDIR}/${PN}-4.3-fix-plugins-rpath.patch"
+)
+
 src_configure() {
 	# Filter out dangerous flags
 	filter-flags -fno-rtti
@@ -128,3 +133,7 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}