gentoo Easter resync : 12.04.2020

6 files changed, 2 insertions, 165 deletions

diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index 66503d9cc139..ab8cc1855c46 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -1,10 +1,5 @@
 AUX grantlee-0.3.0-nonfatal-warnings.patch 573 BLAKE2B 1e7ca46d955900e24597666e04b7e6eb60ef5c5bc6e77964721bbed93612bd5024a6935f297f0b888c93c78da71472ac0cc03d842dc04c61e3eafcc7d18b92f3 SHA512 903a1ece31f2ddce273188d29078fbd14fab064eb1a1242569a856b716d85e9a3eab99c348d691cc2b41c83a9e446934629dd211dbebed1e74ca8ab1a24d9ea9
-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
 AUX grantlee-5.2.0-slot.patch 2261 BLAKE2B e84c2899e45b0476b1455c7935af2058167f168c9abbf5c324b7bdf7402fe6b272d57cfdca64c61189f4107f436e333ebd2ee5e3f3235f04e46fbc5d80526cf6 SHA512 fbef42f23ce9f44820215112e0b2f7dcf3f0a6bffcb79939c6693471cc35ad53452792efb269be6699b99a0b3d54318d4dd84a5b89d71d51cd2192b479f5ca7c
-DIST grantlee-5.1.0.tar.gz 1175380 BLAKE2B 6468c0131a334c3ac52b841a64171093a41605686e4ec2af1a60bbb829f652d388fb48e501a0c1f5eef54ff3253c10b0d6ebd5a4439ed2852f8746188011f9e4 SHA512 2b806a0770b9c6d02f207d5b4939ae8cae325de4fa01901320ffef5c8442ef0f1c10dd799966d0bf0d223e6541f93db8568aaf922ea1b334bcb2f85f6373a936
 DIST grantlee-5.2.0.tar.gz 1166467 BLAKE2B 89f66fefe3c5bbd087cdaed0f83a6b9ca2456629465dfd68d32c6f316d6d4533ece09e5a1444833897c70abbeb8258e0ca9faba09388dcbf40245c04f72f5040 SHA512 94b53d103aa775e6d45357d44d5634a5214d12ea7178d251fda30c5a88ddc2682ae44501ee8b7dc475793b84fa0998eb0bc13eea3f2e10ab29b1489db6ea60bd
-EBUILD grantlee-5.1.0.ebuild 1239 BLAKE2B 10392499200868d40b52d9e0779d07885e56bfa8b4b9530393b515db7d04f65418904eb3b1116c367181b011ee56131d8b793f8d625f17816725089f6a9c74c1 SHA512 7261684b88313f1630213aacb14b42c03ddea49e821f22536a063ea86c1c111ed6542724813e788598e9b7ffb2a225f99543fa2a804d00a076d74d2e6b1a7bdb
-EBUILD grantlee-5.2.0.ebuild 1057 BLAKE2B 747e572baaafbc26f1c1556d9771650a8d3a5381538f185faaa2451d6201f2cd1a9bbbe00819f7ed4071ac6628737ffa5d2f8565636629c3823e19c8e147d8ad SHA512 5242371f453d01c1688bf37448c8ab6e176db64551ad386855036a09b6ee0cd86db28504054f0c06c566539c67bd41753e59c365dbef2c1f1835033ee7c3ad63
+EBUILD grantlee-5.2.0.ebuild 1056 BLAKE2B 9f4dbc461f4f82394fd88655a1fe6311fd4ceefe60f136ed5b36e8294dba38d4bbf0a1dc00c711690b95d8c633a1f6fa8d0892783365ac319820a23cc1dbc399 SHA512 dceebeb2ffaf3dbebc3eec89dc8529b43285e638d6f2b87e9f07ea52a84b5389cb49c2d0012ad8d0fe669af05292e7ba31ce3301819ea99fb8b59b02183e9245
 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
deleted file mode 100644
index d049d6c96f81..000000000000
--- a/dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/files/grantlee-5.1.0-qt-5.13.patch b/dev-libs/grantlee/files/grantlee-5.1.0-qt-5.13.patch
deleted file mode 100644
index 67a92c1f869b..000000000000
--- a/dev-libs/grantlee/files/grantlee-5.1.0-qt-5.13.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0cee029ee03ab4906c6d19b57458b5036852b0f8 Mon Sep 17 00:00:00 2001
-From: Michael Pyne <mpyne@kde.org>
-Date: Tue, 18 Dec 2018 17:47:21 -0500
-Subject: [PATCH] Fix build with Qt 5.13 / GCC 8.2.
-
-At this point Grantlee doesn't build for me because QList is an
-incomplete type. I think the compiler is right to complain, so I fix by
-including the appropriate header.
-
-Fixes issue #47.
----
- templates/lib/lexer_p.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/templates/lib/lexer_p.h b/templates/lib/lexer_p.h
-index 275aeea..1ae451a 100644
---- a/templates/lib/lexer_p.h
-+++ b/templates/lib/lexer_p.h
-@@ -24,7 +24,7 @@
- #include "textprocessingmachine_p.h"
- #include "token.h"
- 
--template <typename T> class QList;
-+#include <QList>
- 
- namespace Grantlee
- {
diff --git a/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch b/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch
deleted file mode 100644
index 5b0d61d5c1eb..000000000000
--- a/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Install headers to a custom location to permit slotting with Qt4 version.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1324566..f98d5da 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -100,7 +100,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '6
- set( LIB_INSTALL_DIR lib${LIB_SUFFIX} )
- set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} )
- set( BIN_INSTALL_DIR bin )
--set( INCLUDE_INSTALL_DIR include )
-+set( INCLUDE_INSTALL_DIR include/grantlee5 )
- set( DATA_INSTALL_DIR share/apps )
- 
- # set up RPATH/install_name_dir
-diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt
-index dad2ef8..434d163 100644
---- a/templates/lib/CMakeLists.txt
-+++ b/templates/lib/CMakeLists.txt
-@@ -107,6 +107,7 @@ if (Qt5Script_FOUND)
- 
-   target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS})
-   target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags)
-+  target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
-   target_link_libraries(Grantlee_Templates
-     LINK_PRIVATE Qt5::Script
-   )
-diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt
-index 557d262..d2dbaa1 100644
---- a/textdocument/lib/CMakeLists.txt
-+++ b/textdocument/lib/CMakeLists.txt
-@@ -42,6 +42,7 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio")
-       )
-   endforeach()
- endif()
-+target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
- 
- target_link_libraries(Grantlee_TextDocument
-   LINK_PUBLIC Qt5::Gui
diff --git a/dev-libs/grantlee/grantlee-5.1.0.ebuild b/dev-libs/grantlee/grantlee-5.1.0.ebuild
deleted file mode 100644
index 8bcda9a613cb..000000000000
--- a/dev-libs/grantlee/grantlee-5.1.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VIRTUALX_REQUIRED="test"
-inherit cmake-utils virtualx
-
-DESCRIPTION="C++ string template engine based on the Django template system"
-HOMEPAGE="https://github.com/steveire/grantlee"
-SRC_URI="http://downloads.grantlee.org/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-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}
-	test? ( dev-qt/qttest:5 )
-"
-
-# bug 682258
-RESTRICT="test"
-
-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() {
-	cmake-utils_src_prepare
-	sed -e '/testfilters/d' \
-		-i templates/tests/CMakeLists.txt || die # bug 661900
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	use doc && cmake-utils_src_compile docs
-}
-
-src_test() {
-	virtx cmake-utils_src_test
-}
-
-src_install() {
-	use doc && HTML_DOCS=("${BUILD_DIR}/apidox/")
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/grantlee/grantlee-5.2.0.ebuild b/dev-libs/grantlee/grantlee-5.2.0.ebuild
index 94df8e673a61..677164dc81ea 100644
--- a/dev-libs/grantlee/grantlee-5.2.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.grantlee.org/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="debug doc test"
 
 BDEPEND="