gentoo resync : 25.08.2018

4 files changed, 72 insertions, 7 deletions

diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index 86f6652df61b..9aa39d81f465 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,7 +1,8 @@
 AUX retroshare-0.6.3-fix-comment.patch 820 BLAKE2B 361dc83fbe46550ca7b9b6f7c5d0a21bf99b958575aa1e50f9492c790a9f46e52402ba47515a3a3e90c14b7d229dc7d13f3397336aa2b7f67c0147aab3dd67ef SHA512 d27e7a655a0848a1e5feb11778df8e3b1a6a1a6fdde09848d78cb4550842e7b9a581491c7040ce1642773db6b0429f67ff3069c6fc6d6938c20d97e91af5c6bb
+AUX retroshare-0.6.4-qt-5.11.patch 2365 BLAKE2B 34745015cae77990a71005a07be39522d292baf504ea609966b839cd945890cfda644766363f74927307d076e6cfca96b5a4be3b992a723b7672b9e9a1c67d71 SHA512 c3f2a4bcd65ffeb57a17761bb045daa20a19d545b746d8bb8d8c0d61c36be9690f3a05103d55e2390b29ec15d978d24461bae9433b1c92d14bfc8aaa8a2896cb
 DIST retroshare-0.6.3.tar.gz 19699359 BLAKE2B 5a7a77b5ab43d44928e08fd1edc3bd6baa8b42f5c1e68fb079d3c60786c1068914a4f7a4b32fe4b683e7b990fac1bd09e5af66a09a3e9b7013e5b51b3c69ae8c SHA512 ee699ddc71aba3d20498d46e8183953b948896709d1469a5d5374b7c9b7955e460326b1ea3fe6f87e7235c5d2d5e8f042161410a0990b2dd2a44b42551fb5757
 DIST retroshare-0.6.4.tar.gz 20018361 BLAKE2B 63a32ee3a22f4df8b9f6cff149be2c9a9cf18ac895456c808885d510b261f683bf57141b8beb4a0206f7e61eb5c88ce505440956ccdf963ad6ad7f7a73679fb3 SHA512 7fcca6479b73cb4d70532fe46bb4cf24332d523b14a198a0e81689d0e00b62ca300d167be5ac282200e97f5fd9dc6b6c3a2c992ab1daa25846db1a404bf616f8
 EBUILD retroshare-0.6.3-r1.ebuild 3946 BLAKE2B e4078aa47a2553aa113eacb37aac1772db81c5560423af5abcebd847925853fc6a69faba386711a38a96aaf9e9b728afffc453c2cdc9232c9289a426ea424096 SHA512 3c24cd55ddab91ead27966d354320460f7789cb91970d8d0e1628c7e232ee46420aeb1a86334625c6d3a2d4fe83e56cdfad47f1706141ae1d58531edf353697f
-EBUILD retroshare-0.6.4.ebuild 3764 BLAKE2B c83c72a6ed62fb842bd615110b2798a1f6b4bb969c528e01361317dadd60c4f16f0f5d97adca5b636a4b685aa058ab0895124859e59314f8a7f674270c0c8442 SHA512 11244e1503df26aa8a0dbc52a16535389c32dd5147efd1f359d2ad249e34b57580d36d68040f9684f17081fab47c6d10231f91910bbe576bb5351a2166a477ae
-EBUILD retroshare-0.6.9999.ebuild 3272 BLAKE2B 6aced4f87258dd105c3661ad2c3a861ec703ee7a6ff98fd575fb17dd94923b069b8ca16c6a6446d6dff69a3f01241ef9e90d768ac9163d103df34130a220087f SHA512 11056a6d98eed45a7716c848ac3eb812bfd7cedeb246a43cd08ff73dd220b5af3be120c91959d716c1e4f64f4eb40914ce628e9f5bb0e5d6e59eebbd36129708
+EBUILD retroshare-0.6.4.ebuild 3785 BLAKE2B 8eb703df2a8624cea038e45876f3526e20bbcaf4a724f756bd024b8a020b50ce6b7bc3100256e6b3a11c8511dae1f3091c111f64d4e9b72cb4b8e62c0ed3b5fd SHA512 f8eab241d4b19ca5539825ca5a748aac8fb1b6fa0008e5f72923a5701edebcf334cc5aa0b882512500c34ef701f6a76d0cd0c3202d786d1a0c9ae0bf7432c6d3
+EBUILD retroshare-0.6.9999.ebuild 3273 BLAKE2B 3a99b1f80024dacc10165cf0329f6f2f1f17021dc5223c436c817622c7d224ee8d9f312493c563c3df9e14d9a54420393751a26f44a35a11cc01f63e9b4568c4 SHA512 a4951090b3c66f0cc2ed67ac59784c9cfb20e0a0af155831386224b8878603551fa03f7f21258c0ed64fcdbb1d61b227165b6879f7474348cf8d1adf663127d9
 MISC metadata.xml 1684 BLAKE2B 8308ce1d3e2a433b79b01dcfdca2ab79b614cc48158fa43c8163e27f4d1d978ea831d54c5408ff3f3c4a3d71b55d0e5d3043058165461389c35e6cf76cac9cb2 SHA512 ba50aff77c086400bb4cdb631be9a634aada2b81832ac2895b74149448da431040604dc88fec9ad5d9e9bce39f2bb5b82565056937e3236124b8a42b1ab2ea6d
diff --git a/net-p2p/retroshare/files/retroshare-0.6.4-qt-5.11.patch b/net-p2p/retroshare/files/retroshare-0.6.4-qt-5.11.patch
new file mode 100644
index 000000000000..892cc89aff9a
--- /dev/null
+++ b/net-p2p/retroshare/files/retroshare-0.6.4-qt-5.11.patch
@@ -0,0 +1,63 @@
+From 428b331d8efede1e2f39f2fc49216c675d081030 Mon Sep 17 00:00:00 2001
+From: sehraf <sehraf42@gmail.com>
+Date: Fri, 25 May 2018 23:12:35 +0200
+Subject: [PATCH] fix for Qt 5.11
+
+Quote from Arch mailing list:
+- there's been a huge header cleanup in Qt modules. Expect build failures for applications that rely on transitive includes instead of declaring all required headers. Those need to be fixed upstream by explicitely adding the missing includes.
+---
+ retroshare-gui/src/gui/Posted/PostedItem.cpp        | 1 +
+ retroshare-gui/src/gui/chat/ChatTabWidget.cpp       | 2 ++
+ retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp | 1 +
+ retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp    | 1 +
+ 4 files changed, 5 insertions(+)
+
+diff --git a/retroshare-gui/src/gui/Posted/PostedItem.cpp b/retroshare-gui/src/gui/Posted/PostedItem.cpp
+index 7d70b3e157..8fc1cc6869 100644
+--- a/retroshare-gui/src/gui/Posted/PostedItem.cpp
++++ b/retroshare-gui/src/gui/Posted/PostedItem.cpp
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include <QDateTime>
++#include <QStyle>
+ 
+ #include "rshare.h"
+ #include "PostedItem.h"
+diff --git a/retroshare-gui/src/gui/chat/ChatTabWidget.cpp b/retroshare-gui/src/gui/chat/ChatTabWidget.cpp
+index a965bbb323..6dd9c27576 100644
+--- a/retroshare-gui/src/gui/chat/ChatTabWidget.cpp
++++ b/retroshare-gui/src/gui/chat/ChatTabWidget.cpp
+@@ -20,6 +20,8 @@
+  *  Boston, MA  02110-1301, USA.

+  ****************************************************************/

+ 

++#include <QTabBar>

++

+ #include "ChatTabWidget.h"

+ #include "ui_ChatTabWidget.h"

+ #include "ChatDialog.h"

+diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
+index d154408b73..72317640c7 100644
+--- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
++++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include <QTimer>
+ #include <QFileInfo>
++#include <QStyle>
+ 
+ #include "rshare.h"
+ #include "GxsChannelPostItem.h"
+diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
+index 97ac9dd75a..e9773aba9c 100644
+--- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
++++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include <QTimer>
+ #include <QFileInfo>
++#include <QStyle>
+ 
+ #include "rshare.h"
+ #include "GxsForumMsgItem.h"
diff --git a/net-p2p/retroshare/retroshare-0.6.4.ebuild b/net-p2p/retroshare/retroshare-0.6.4.ebuild
index 89ef994223cd..68915e3eb57f 100644
--- a/net-p2p/retroshare/retroshare-0.6.4.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils gnome2-utils qmake-utils versionator
+inherit desktop gnome2-utils qmake-utils versionator
 
 DESCRIPTION="P2P private sharing application"
 HOMEPAGE="http://retroshare.net"
@@ -59,7 +59,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/RetroShare-${PV}"
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
 src_prepare() {
+	default
+
 	local dir
 
 	sed -i \
@@ -81,8 +85,6 @@ src_prepare() {
 
 	# Avoid openpgpsdk false dependency on qtgui
 	sed -i '2iQT -= gui' openpgpsdk/src/openpgpsdk.pro || die
-
-	eapply_user
 }
 
 src_configure() {
@@ -142,7 +144,6 @@ pkg_preinst() {
 			break
 		fi
 	done
-	gnome2_icon_savelist
 }
 
 pkg_postinst() {
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
index 0db2373b5c22..a7718e73f904 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 EGIT_REPO_URI="https://github.com/RetroShare/RetroShare.git"
-inherit eutils git-r3 gnome2-utils qmake-utils versionator
+inherit desktop git-r3 gnome2-utils qmake-utils versionator
 
 DESCRIPTION="P2P private sharing application"
 HOMEPAGE="http://retroshare.net"