summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2014-12-26 11:06:04 +0000
committerMichael Palimaka <kensington@gentoo.org>2014-12-26 11:06:04 +0000
commitcb231712039bebe010a8b7545162158c30b85f6a (patch)
treee5630ae6711b59055a5cdba9e122000a7de61af6 /dev-libs/grantlee
parentMask dev-libs/grantlee:5 due to masked Qt 5 dependency. (diff)
downloadhistorical-cb231712039bebe010a8b7545162158c30b85f6a.tar.gz
historical-cb231712039bebe010a8b7545162158c30b85f6a.tar.bz2
historical-cb231712039bebe010a8b7545162158c30b85f6a.zip
Version bump.
Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x06B1F38DCA45A1EC!
Diffstat (limited to 'dev-libs/grantlee')
-rw-r--r--dev-libs/grantlee/ChangeLog8
-rw-r--r--dev-libs/grantlee/Manifest31
-rw-r--r--dev-libs/grantlee/files/grantlee-slot.patch40
-rw-r--r--dev-libs/grantlee/grantlee-5.0.0.ebuild58
4 files changed, 122 insertions, 15 deletions
diff --git a/dev-libs/grantlee/ChangeLog b/dev-libs/grantlee/ChangeLog
index 0a6c1fdb63de..da020a202516 100644
--- a/dev-libs/grantlee/ChangeLog
+++ b/dev-libs/grantlee/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/grantlee
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/ChangeLog,v 1.27 2014/02/05 17:16:43 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/ChangeLog,v 1.28 2014/12/26 11:05:56 kensington Exp $
+
+*grantlee-5.0.0 (26 Dec 2014)
+
+ 26 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+ +files/grantlee-slot.patch, +grantlee-5.0.0.ebuild:
+ Version bump.
*grantlee-0.4.0 (05 Feb 2014)
diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index c23d44a3176c..f0feb1a017a1 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -3,27 +3,30 @@ Hash: SHA256
AUX grantlee-0.1.9-qt-test-optional.patch 1428 SHA256 66c75a543a6dc04d85e2d1db6c3d0e0eba5d84c05967188b8bf4cdebcda76913 SHA512 6b7d428fa36ac0b9d1a6e1d6e5edb6e3b5f0344de70c834823436dc3f80744731eaa2528e86c5a4dc964361d9506bdb7c284c212853bc03b96b4048b19798aad WHIRLPOOL 2b1cb3dbbbfbd6cf947f85d3bb8e557736498600ed165cc4646dd453e7e61ec3ca008a38438c2d178e4595d90b233bd27e6b09781709c0de9231f0bd5f419772
AUX grantlee-0.3.0-nonfatal-warnings.patch 695 SHA256 d46ac901997fdbe82cf459711a937fa0eb12a064bff98bfa800098e670c78f89 SHA512 1a58a8bc28f4833f0a8562a06e6da4e9e150b3945077223ec4267bbaa5670cedc62d3356e1e61a93f9d60e9e887e99e28c35b13a50d42249a5694cd55c6242de WHIRLPOOL 2eb6533886010f2745ad5e526b55933a41a2e5c5ca90c83935bb5bafa07a20951bf04191c42d10138365da499138a3c2e1838dcee400df9fcb060094afd3abcc
+AUX grantlee-slot.patch 1841 SHA256 9c3fe3a119c5bdcc350b3d42af6e6a847ccf4a505aa1188fedf37e2ebc3978c2 SHA512 de1a3e8d5e6b9a9a17c0c800a29dfd39a268b83b638464ce0b3ab62b5f64e43992f6c2f626bd7658cac3119b22a685847d68f6cf2d78bc8b2e2f90d09ff35bf8 WHIRLPOOL 005a9a77155fc8cd53caa64ddcde4518892bb0ac54d92154adbe95fcd677cb3664242284ede15003d516a6cf3672e794819ca774f45a99e110f6f7b5147d2066
DIST grantlee-0.3.0.tar.gz 1132163 SHA256 fb7ebcc9beb5f74077a5e2fb4e9893d280dd3346e7f5f58155f0dcc9a2e25f30 SHA512 bde5790c223aa34738b5092c2c1e91715f9d503fc584ad2ec33ee0ab870a4c35aeea63a3a9f429ed55df12d4d538b2903ad10a9fb71dc15fb592693a2b84acae WHIRLPOOL ac284835e447c8baa76eace1154ba9ce42d0f01e63616d515a6b8be36ec6f8eea7f5e42e81bb221b29c604e6fc069c2451488484b16aa7ac4b64abd038f0057f
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
EBUILD grantlee-0.3.0.ebuild 1313 SHA256 bce2cb15c03620073bed0555984ee8aa00acf82f4e9d46833e4686a11fe107b1 SHA512 e2048f7b447d43f2bc6f61d5eb12fd5b65d1ac6c56fef162a41c8d99bae8bb2b1d55c8a02ba0a5abfa3e8943bf0bf9f489294ebd3a125af1f558b951e7076d95 WHIRLPOOL 43b5796070f3fa808eeb32ba17daeea3c88b9b9c390c079ff316ee28081cb09ff849b62657ff33b0f79739e21b69ea1395e0b2c6c009f6df39c2ec4b9c2def24
EBUILD grantlee-0.4.0.ebuild 1155 SHA256 65e648ef106c8d60a96d93555fae947aa072eca3ed10fbe1c35beef3310eb230 SHA512 f5fe198b85bff66c2d07929ed59f6cd8cb0e71a768043b05ab776642d9986437547f7d3e7e40f7c65113cc9cf06d62035185f3ea99ad2a984752fc5bd8500cd1 WHIRLPOOL 68b8fdd42d5bb517c5c92eee730ae7840d0c6acccac709f413e8e6de59faca4e90d45941fd24184107cd5ca1753afd9db6e41909829128190370a30bac63b4f0
-MISC ChangeLog 3739 SHA256 520ef4607140d455e8de92886837f12f338d4754c4392cc0e64b627bccf6c20f SHA512 391824264291a27d329d6d4fa4a20cc99da8bd5fe0cc866c27cd8d829daf8b65215b13ef5743613d73c924970251634d07880bb5ccbf1644c2456058e64c36ee WHIRLPOOL 1d2b11a6d4ecd167c6e6fc600e2b39f5df898170a0b27f5aac2a248c3c52c69a0119debcab4427466b15e120a5aed4bd2effc79693bcd843ecf62e639f2bb259
+EBUILD grantlee-5.0.0.ebuild 1167 SHA256 d733a2c638566655b7a17dae105334f052254ba550a1f7466d84bda73f01f6d2 SHA512 13c56cec2db7b6debf2a89671455ed117215a52f98a1104f6284b12a67f7a6de573a539317cfd103ce4c569ebc86bfcb983beb32f6d03d6e29000f21377ffb3f WHIRLPOOL 573328058ce60cf158b4b262593ddd85b8b24364c3564e75e0381955ead32b3422f0eb84a69bc780d267a3a40c8bf6bb3b22b1a7f966d57372445864b373f993
+MISC ChangeLog 3897 SHA256 02b7331ff373f35035aee9623f8dd0d32b3619671cf2edffe8d4f7181dfd0ad4 SHA512 24f9f8b42500a7ef949a81b0712d1a3e6363449af37c3df82e7dba470deeda7c1f42a16c117f9124c13d9718ff5a6790ccbfddb4533eef3c874ae3ace75adca3 WHIRLPOOL 5155b26efa5148189250ceb7cf5ecad54998c5003eed5af87b5d10ba8da2c4f3cd74dbaaa5f02b267f1905441300b8e5c2a9f234a0839afc0725d81393695ed1
MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQJiBAEBCABMBQJUQUsIRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJUnUElRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7C8kD/9Dkcz9JekfrKfrlB49wrEBs6ecxSqrtwx2YnmRsHryLI0eMFbt+j2Q4Vnb
-LDVm56S43yOvYHcMCiWbA0h+c6OXidZTFtYZ+RP8MC3ztfOqwVE+x7KeXX6LlWnI
-5fIWrJuB5Gf2snAz1TBce3yjzY08TJQoRQLPK65uJHCXLd9wKaB9WTfMHtiIqxdo
-jIqqyCl6MozA4XwmIWPDqox6FabXfHILBxtMxYQueXDgt3i+tcbG/JhY4cjoxRme
-6D7YGQFivc4jfwfy93u/wxH3fRwmQYKgjohUweiwkJAz3JVnZhj2B/AeHnvaUytZ
-9JBljh0j1n4VMj+6k/rB8VeVVDVEEV+zgrtC7GyoxTiBiUUwg0Wze7MO8YbooRTg
-E5f8c5lF7P4amVPTzYQz73q8ys0g/tSRNAzWRofcH9V/4AW45IhWk14E3aMKZgUl
-5ZU8851GkemeZeM+F9O7j/rIdkHaBDk6We57kxyQ3r8hxvY2q//9gLCswRudFXJV
-g9qJXmE5OmFU6l5jqjdHOYdDUI0GQZlV2tlCfVD1xDiqaIU3l0kL3FVO1VFVXgk0
-UKN8Zeb5JkBEEMJ6EfYegaYrrQ4o4WfV+3Xo0rzmAkhb49SRNzsy/Z9DbNByXF46
-61SCa9INZVyCZTemzIcNRf0aOuHXVMU1abhodr/sNCNZ/Ig2jQ==
-=uVbv
+7MnnD/9KtdITyF52nQev5+4wWWZEtsLhB5cVrG0jCI06OTP70WDrA9W5UZAKUoVY
+8SJAnarRfeB8u+EPsyO8yCt6EZnbsEj+UVyC1pFaPmqpVVoe3N47b2QTnu5+K4dr
+TGlHMjkaLduFrg/tHZklDpIFahvTjiIXxAB5LrSsNu5hcEWpV+X8SdHI6jz3lZpe
+39O8dpkoUh0VDlI3J6PcJhJMRKVFAPyabnQkZ9avrpqr2xxEOLF6kmw7vJ8gxUQq
+gZt4CJP/j0I9jWgZqk8lyTHGRwE1o6BVHHHbEc19vEGp9uMGdVDDCulDrsn7bvwF
+JBTpfZ6g8lu0MKSjy2N9W4YTdAWmpz+wNQtDYCEm+BUjYcA4nHu3d9vCzL9qZPPt
+EPriX8ddxzXLvGsWblJF5iki1hObwq77ekMpShKIYrxvRZ34f73TPvAbNnpUGZz1
+Mr1/pp2RmWQ7EUwKQywxTd9V4Kc4oEkQpGlTLaepko5/cQXM1DkjzDZ4DLXpqNnQ
+lHx2AhbhF0xeinuG5yk7LEWpswS8bbNUIyh6lP62/YNo2aFas+shthSZ2p1c4b7J
+gBBTV4FnAxle7k7K4epAJUqr94FLwE4jMn8ls/Px2jNYikqKaDuDu6qodYubIbE4
+39e1iGtcE0bAeB71FS+++FO2k4W8sFkdV0eEo55vtErg4UpGBw==
+=B/Sz
-----END PGP SIGNATURE-----
diff --git a/dev-libs/grantlee/files/grantlee-slot.patch b/dev-libs/grantlee/files/grantlee-slot.patch
new file mode 100644
index 000000000000..814fb9d63b90
--- /dev/null
+++ b/dev-libs/grantlee/files/grantlee-slot.patch
@@ -0,0 +1,40 @@
+Install headers to a custom location to permit slotting with Qt4 version.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 45f8673..7832a3b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -94,7 +94,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${LIB_SUFFIX}/grantlee/${Grantlee_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 789205c..7045449 100644
+--- a/templates/lib/CMakeLists.txt
++++ b/templates/lib/CMakeLists.txt
+@@ -79,6 +79,7 @@ add_library(Grantlee5::Templates ALIAS Grantlee_Templates)
+ generate_export_header(Grantlee_Templates)
+ set_property(TARGET Grantlee_Templates PROPERTY EXPORT_NAME Templates)
+ target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags)
++target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
+
+ if (BUILD_TESTS)
+ set(GRANTLEE_TESTS_EXPORT "GRANTLEE_TEMPLATES_EXPORT")
+diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt
+index 14163db..7c609f9 100644
+--- a/textdocument/lib/CMakeLists.txt
++++ b/textdocument/lib/CMakeLists.txt
+@@ -24,7 +24,7 @@ add_library(Grantlee_TextDocument SHARED
+ generate_export_header(Grantlee_TextDocument)
+ add_library(Grantlee::TextDocument ALIAS Grantlee_TextDocument)
+ set_property(TARGET Grantlee_TextDocument PROPERTY EXPORT_NAME TextDocument)
+-
++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.0.0.ebuild b/dev-libs/grantlee/grantlee-5.0.0.ebuild
new file mode 100644
index 000000000000..3b98dc4b45d2
--- /dev/null
+++ b/dev-libs/grantlee/grantlee-5.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/grantlee-5.0.0.ebuild,v 1.1 2014/12/26 11:05:56 kensington Exp $
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit cmake-utils virtualx
+
+DESCRIPTION="C++ string template engine based on the Django template system"
+HOMEPAGE="http://www.gitorious.org/grantlee/pages/Home"
+SRC_URI="http://downloads.grantlee.org/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64"
+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 )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch"
+ "${FILESDIR}/${PN}-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() {
+ VIRTUALX_COMMAND="cmake-utils_src_test" virtualmake
+}
+
+src_install() {
+ use doc && HTML_DOCS=("${BUILD_DIR}/apidox/")
+
+ cmake-utils_src_install
+}