gentoo resync : 14.07.2018

5 files changed, 126 insertions, 0 deletions

diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
new file mode 100644
index 000000000000..a6fb16509c1c
--- /dev/null
+++ b/dev-libs/grantlee/Manifest
@@ -0,0 +1,5 @@
+AUX grantlee-0.3.0-nonfatal-warnings.patch 695 BLAKE2B 74d631feb939a6bac5045d15147c27e9101a824d9518f4d1c0caad03395d96712f66bb2d16581d0e09389e1e15bfaca38c121786614a2f9b5f1b4b5c807f2efe SHA512 1a58a8bc28f4833f0a8562a06e6da4e9e150b3945077223ec4267bbaa5670cedc62d3356e1e61a93f9d60e9e887e99e28c35b13a50d42249a5694cd55c6242de
+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 1053 BLAKE2B cf9a30b467dbf51ab2c486db22bc47d3163475069864ee0c6e94b4147ca4fc503dd4343e4bb389883983c8e7abacc5581b97a7348f5f50475409b764873c6930 SHA512 99c72fcb3721829b0a436a4fc478c6c92150cc906edc5c63b46aa1165e8fd678bfc7065566e5877f4c9a65cacf0161ac3fcffcc8efc367a02fb460e1c883c5c1
+MISC metadata.xml 331 BLAKE2B 6dab7a95213e13aa8367317827224739d146430a1dba20837be5469221ba7e9403ab6edf7e439511fee5082d10d5fd883c3a25c871b4ff4aae7c24399d1f1cf1 SHA512 073a759e22f25e29be31689015b96dd3c8ab4748d59c31fabfc6a7c43cea6ca2a0a0f48ae49b36cc2a835d97fc2ea5a2f2a790a3cf74fb4d16e1e0f5d771b1b6
diff --git a/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch b/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch
new file mode 100644
index 000000000000..a25f52b3c63d
--- /dev/null
+++ b/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch
@@ -0,0 +1,14 @@
+diff -ruN grantlee-0.3.0.orig/CMakeLists.txt grantlee-0.3.0/CMakeLists.txt
+--- grantlee-0.3.0.orig/CMakeLists.txt	2012-11-01 21:14:18.000000000 +0100
++++ grantlee-0.3.0/CMakeLists.txt	2013-03-09 12:25:56.498096399 +0100
+@@ -62,8 +62,8 @@
+   endif()
+ 
+   if (NOT APPLE)
+-    set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")
+-    set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined ${CMAKE_MODULE_LINKER_FLAGS}")
++    set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")
++    set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_MODULE_LINKER_FLAGS}")
+   endif ()
+ 
+   if (NOT MINGW)
diff --git a/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch b/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch
new file mode 100644
index 000000000000..5b0d61d5c1eb
--- /dev/null
+++ b/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch
@@ -0,0 +1,39 @@
+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
new file mode 100644
index 000000000000..553658e457e5
--- /dev/null
+++ b/dev-libs/grantlee/grantlee-5.1.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+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 )
+"
+
+DOCS=( AUTHORS CHANGELOG README.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch"
+	"${FILESDIR}/${PN}-5.1.0-slot.patch"
+)
+
+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/metadata.xml b/dev-libs/grantlee/metadata.xml
new file mode 100644
index 000000000000..060fd39bc3e2
--- /dev/null
+++ b/dev-libs/grantlee/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">steveire/grantlee</remote-id>
+	</upstream>
+</pkgmetadata>