gentoo resync : 02.08.2019

3 files changed, 31 insertions, 5 deletions

diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index 1a1b61479aff..8149bbe8e8e4 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -1,6 +1,7 @@
 AUX grantlee-0.3.0-nonfatal-warnings.patch 695 BLAKE2B 74d631feb939a6bac5045d15147c27e9101a824d9518f4d1c0caad03395d96712f66bb2d16581d0e09389e1e15bfaca38c121786614a2f9b5f1b4b5c807f2efe SHA512 1a58a8bc28f4833f0a8562a06e6da4e9e150b3945077223ec4267bbaa5670cedc62d3356e1e61a93f9d60e9e887e99e28c35b13a50d42249a5694cd55c6242de
+AUX grantlee-5.1.0-cxx11.patch 670 BLAKE2B 05cc62e9f343ed680583fd2a163910958c8aa96c48375611bf01b9f865ee3d519a961e1a33815cb82460b8915f6502ddb351c4cb3a9db11849ded590d33f28df SHA512 fe1186c9769243e8c670fd8fa7706a94addf17b29358365027c2f4ab6a8839b448118a333a9efdcaf111f818a507210b78ce72bb27e230f4df3fea5e320fd2e6
 AUX grantlee-5.1.0-qt-5.13.patch 778 BLAKE2B 01c0c1fb6a3a9830134cc0d1bc19ead874d526a452dfb08ef0d4f298d979ee40ca70742ab8d6ad823982d80ff19bb695aa8e4b66ff90500f4f470d7eaf83554f SHA512 03b0168b886ec7a394bdd06acb98908dd002b0e9fb8763f71fee3f022fd1726c09da895154eb4022ea6e114b6f7c1b37f90f35ff77521e6f8272371961ff54c9
 AUX grantlee-5.1.0-slot.patch 1616 BLAKE2B b395e361dee3120f7cc0bfef36c5fc0ec2b7a3c8ea714fdb21a93a34cd309407d07488c926f6a67d921a5767d06c05b620d24fce7c253aaea93bb2ca20aa92e1 SHA512 62ec0d0e510fc7aaecfb2eaf9e52b395070833732aa840ff8fc4b4bb94b6716fe59765a7413263c2a6edb073cc379141955a99860c0fcf592d6f5227493482e1
 DIST grantlee-5.1.0.tar.gz 1175380 BLAKE2B 6468c0131a334c3ac52b841a64171093a41605686e4ec2af1a60bbb829f652d388fb48e501a0c1f5eef54ff3253c10b0d6ebd5a4439ed2852f8746188011f9e4 SHA512 2b806a0770b9c6d02f207d5b4939ae8cae325de4fa01901320ffef5c8442ef0f1c10dd799966d0bf0d223e6541f93db8568aaf922ea1b334bcb2f85f6373a936
-EBUILD grantlee-5.1.0.ebuild 1233 BLAKE2B 73032b4f39b8ac3514b5740155e1b6fafcf11fc86bd3d7bff29f57acb292b02721aec25a2d3cf43a908fce5101e899363c26d49927992c21c48b90fc89f359d9 SHA512 e8285340ef1a54323e9eeace82841b64ad3323d8580eb98c76bd151c4c706308d2e77e9a9aa5b5a71501170379b1f36a82c155f4562567ab0d7364d71ec1b2ab
+EBUILD grantlee-5.1.0.ebuild 1239 BLAKE2B 10392499200868d40b52d9e0779d07885e56bfa8b4b9530393b515db7d04f65418904eb3b1116c367181b011ee56131d8b793f8d625f17816725089f6a9c74c1 SHA512 7261684b88313f1630213aacb14b42c03ddea49e821f22536a063ea86c1c111ed6542724813e788598e9b7ffb2a225f99543fa2a804d00a076d74d2e6b1a7bdb
 MISC metadata.xml 331 BLAKE2B 6dab7a95213e13aa8367317827224739d146430a1dba20837be5469221ba7e9403ab6edf7e439511fee5082d10d5fd883c3a25c871b4ff4aae7c24399d1f1cf1 SHA512 073a759e22f25e29be31689015b96dd3c8ab4748d59c31fabfc6a7c43cea6ca2a0a0f48ae49b36cc2a835d97fc2ea5a2f2a790a3cf74fb4d16e1e0f5d771b1b6
diff --git a/dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch b/dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch
new file mode 100644
index 000000000000..d049d6c96f81
--- /dev/null
+++ b/dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch
@@ -0,0 +1,24 @@
+From 3a5fc7662da3261be6496611900c095844e56ab1 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sat, 20 Jul 2019 17:35:30 +0200
+Subject: [PATCH] Fix compile with newer Qt/cmake combination
+
+Without this i get huge errors about Qt needing C++11 support
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6d51110..0859788 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,9 @@ endif()
+ 
+ project(Grantlee)
+ 
++set (CMAKE_CXX_STANDARD 11)
++set (CMAKE_CXX_EXTENSIONS OFF)
++
+ # Workaround for http://public.kitware.com/Bug/view.php?id=12301
+ if (MINGW)
+   if(NOT CMAKE_BUILD_TYPE)
diff --git a/dev-libs/grantlee/grantlee-5.1.0.ebuild b/dev-libs/grantlee/grantlee-5.1.0.ebuild
index d8de4e45a9f6..8bcda9a613cb 100644
--- a/dev-libs/grantlee/grantlee-5.1.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.1.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit cmake-utils virtualx
@@ -15,25 +15,26 @@ SLOT="5"
 KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="debug doc test"
 
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+"
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtscript:5
 "
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
 	test? ( dev-qt/qttest:5 )
 "
 
 # bug 682258
 RESTRICT="test"
 
-DOCS=( AUTHORS CHANGELOG README.md )
-
 PATCHES=(
 	"${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch"
 	"${FILESDIR}/${P}-slot.patch"
 	"${FILESDIR}/${P}-qt-5.13.patch"
+	"${FILESDIR}/${P}-cxx11.patch"
 )
 
 src_prepare() {