From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 774BF59CB4 for ; Tue, 19 Apr 2016 21:39:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE24D21C00A; Tue, 19 Apr 2016 21:39:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4838E21C00A for ; Tue, 19 Apr 2016 21:39:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2A0E340B5D for ; Tue, 19 Apr 2016 21:39:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6D4815F for ; Tue, 19 Apr 2016 21:39:25 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1461101956.e34304a5e23ad47f71fbc0dd4ea4c0797104ef87.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/files/, dev-libs/grantlee/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/grantlee/Manifest dev-libs/grantlee/files/grantlee-5.1.0-slot.patch dev-libs/grantlee/grantlee-5.1.0.ebuild X-VCS-Directories: dev-libs/grantlee/ dev-libs/grantlee/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: e34304a5e23ad47f71fbc0dd4ea4c0797104ef87 X-VCS-Branch: master Date: Tue, 19 Apr 2016 21:39:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 332768b8-39dc-4595-99c3-3bec8f0b514e X-Archives-Hash: b2cdacd7a22b913d275511a6e463b0e8 commit: e34304a5e23ad47f71fbc0dd4ea4c0797104ef87 Author: Michael Palimaka gentoo org> AuthorDate: Tue Apr 19 21:39:00 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Tue Apr 19 21:39:16 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e34304a5 dev-libs/grantlee: version bump Package-Manager: portage-2.2.28 dev-libs/grantlee/Manifest | 1 + dev-libs/grantlee/files/grantlee-5.1.0-slot.patch | 39 +++++++++++++++ dev-libs/grantlee/grantlee-5.1.0.ebuild | 59 +++++++++++++++++++++++ 3 files changed, 99 insertions(+) diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest index be3a94f..5d3bcb9 100644 --- a/dev-libs/grantlee/Manifest +++ b/dev-libs/grantlee/Manifest @@ -1,2 +1,3 @@ DIST grantlee-0.4.0.tar.gz 1171445 SHA256 13a2d8121392404bb3be4ed470b211bc098cd98da795ef7bf41517d2fb640d3f SHA512 6ff539eb7aaf366487214b02131d67b9967713c42d20314ff56129e9543516fdf2d129b9c3015f0959c89c6f0ee9ad085af91fed4293bd0613d8e888bc850ca7 WHIRLPOOL ee639a72c6f785559b427a2f13483c256e19dbeb270ff34118a81547ea1f31a69aeaed7c58a2d89952b79d58e3acc88ef44f06cac32739747c7920ef66d621b0 DIST grantlee-5.0.0.tar.gz 1166498 SHA256 eaf22ba92e53b8eb5dd8bca045fe81b734d3445445ed9e0c1af2a0a7c375b161 SHA512 29b73fe4ee1b6e814ca91e4a3732208bada9b64bc8ace506bd8e888927b3fcd1a539e4ec03488901815692bd47424d8176fb2d6766461011e40fb33b221f6be4 WHIRLPOOL 418cb19061990a39c24d6be42c86f7f63a11d4451434dc2616072a4498268a1bc1de0d5de9163d2980420c1cc955e2f700a4722e19ebbeded5f0aa6a7393eb48 +DIST grantlee-5.1.0.tar.gz 1175380 SHA256 ea2e402466c74bb533eee2c7252209ec61cd93a5d236fecd625b4a0eb13a1478 SHA512 2b806a0770b9c6d02f207d5b4939ae8cae325de4fa01901320ffef5c8442ef0f1c10dd799966d0bf0d223e6541f93db8568aaf922ea1b334bcb2f85f6373a936 WHIRLPOOL bbe96918cc28e5ab0112f4d5b6bca33825110997d3b91f009f699620168bc7310fe72e3b04fc5dcb93681196d6f2a02df29163b0dfcb5ab8816cba2755afe3c5 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 0000000..5b0d61d --- /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 "$") + 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 "$") + + 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 0000000..c864552 --- /dev/null +++ b/dev-libs/grantlee/grantlee-5.1.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +CMAKE_MIN_VERSION="3.1" +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 ~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 +}