diff options
Diffstat (limited to 'dev-libs/grantlee')
-rw-r--r-- | dev-libs/grantlee/Manifest | 5 | ||||
-rw-r--r-- | dev-libs/grantlee/files/grantlee-5.2.0-slot.patch | 67 | ||||
-rw-r--r-- | dev-libs/grantlee/grantlee-5.2.0.ebuild | 60 | ||||
-rw-r--r-- | dev-libs/grantlee/grantlee-5.3.0.ebuild | 2 |
4 files changed, 2 insertions, 132 deletions
diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest index 3794cacba2df..9d25d7497381 100644 --- a/dev-libs/grantlee/Manifest +++ b/dev-libs/grantlee/Manifest @@ -1,8 +1,5 @@ AUX grantlee-0.3.0-nonfatal-warnings.patch 573 BLAKE2B 1e7ca46d955900e24597666e04b7e6eb60ef5c5bc6e77964721bbed93612bd5024a6935f297f0b888c93c78da71472ac0cc03d842dc04c61e3eafcc7d18b92f3 SHA512 903a1ece31f2ddce273188d29078fbd14fab064eb1a1242569a856b716d85e9a3eab99c348d691cc2b41c83a9e446934629dd211dbebed1e74ca8ab1a24d9ea9 -AUX grantlee-5.2.0-slot.patch 2261 BLAKE2B e84c2899e45b0476b1455c7935af2058167f168c9abbf5c324b7bdf7402fe6b272d57cfdca64c61189f4107f436e333ebd2ee5e3f3235f04e46fbc5d80526cf6 SHA512 fbef42f23ce9f44820215112e0b2f7dcf3f0a6bffcb79939c6693471cc35ad53452792efb269be6699b99a0b3d54318d4dd84a5b89d71d51cd2192b479f5ca7c AUX grantlee-5.3.0-slot.patch 2262 BLAKE2B 8a876c6e19f426c3eaa6117672def327b57fada417e94a523e7c91b0d33bcb6c05d26ae0467463544e6f926014efa04fd78d9d9bd50ef84b0e48b8d24efcb37a SHA512 2e9f0bdb3fd493548944fdac879c6854d08ed27c3ef957f6a9d35d10fd0223b1794a01dcede28d639d3846dc5eb6c5bb86a0d82b0612020780e9735f60ba3546 -DIST grantlee-5.2.0.tar.gz 1166467 BLAKE2B 89f66fefe3c5bbd087cdaed0f83a6b9ca2456629465dfd68d32c6f316d6d4533ece09e5a1444833897c70abbeb8258e0ca9faba09388dcbf40245c04f72f5040 SHA512 94b53d103aa775e6d45357d44d5634a5214d12ea7178d251fda30c5a88ddc2682ae44501ee8b7dc475793b84fa0998eb0bc13eea3f2e10ab29b1489db6ea60bd DIST grantlee-5.3.0.tar.gz 1176075 BLAKE2B a3418250845b39c4766dd19a1f423f18ca7393f675d0045477b345e589d5649f1cc332f9c228e9e9317bdf356992e533cfabe62bcfb50c40ffa38be9b5009013 SHA512 8018c92e1001e039243b4a22a790907b53bff21e062c7e3ee63d1e2de4ce7bccc4a7580fc4ec2e61dc2f7131ac336d46f76e2f03a7314c1547b8744842c0a02a -EBUILD grantlee-5.2.0.ebuild 1070 BLAKE2B e1c7e4b33661b07c114de7b0c4b2626d029674202651ca83d8e1dc26fa3cde2234218f9580ce145a1f1b650dcfe4b0bed117a39de352b013c1dd43670bf6bd85 SHA512 1556fb717d94328c13f71e4d75d9834b415468dc067a00287d7250d54525ec9032bdf4fb554bcdc86f7feb53cb1bd2a1ec9b4cbc99ed402edb57355e6067362a -EBUILD grantlee-5.3.0.ebuild 1122 BLAKE2B 3b20e64b6248642743a55dd0924ac24234fd02442647cdc7c42f320dab3295dcfd63fcb040807196cdb00fab078e467637620e1ca39f6aacc31bee43e13379c4 SHA512 620e183e6a7c6d33418dffa0427561e745348dd8639081e74173c60ddec6c6f2927e5a4e773d222add4118bdbff462f05604a77b37dfe9d50ed9360a1af0c278 +EBUILD grantlee-5.3.0.ebuild 1121 BLAKE2B 54e1df4284cf7a89adcebfbd4b7ffac44e05265a70890cc6a1bf1b7e5e45aa3e34314ad45bd5ba5d3e1de2bc66c51a36b44553e0b844d5c15b31339b3a18bf3e SHA512 7097ad80e753ccc9e7c2d289bb76543db5e0f00f9cc4cb6d898a2020bb37ac5824b02838b23baa29daec35ef08dd9e87caf1568cd32468f20c82596ee05be3db MISC metadata.xml 332 BLAKE2B 655bf07600689b25f75cd8889d468ab092a861c8cd88c604a3d0411916ae29ab1508ebd7e296d0df1f037ab9cfad06b146cc2d0fe5d2d4d590d8a36e2de858ed SHA512 5837c62f635103c8ff77caf457916a32600134cd2d9333dc5389f92fa95fba39af867eac73df99fe59cd0c9a16388c6da890f25397986c8406e844aec66bf66b diff --git a/dev-libs/grantlee/files/grantlee-5.2.0-slot.patch b/dev-libs/grantlee/files/grantlee-5.2.0-slot.patch deleted file mode 100644 index 9490df2327ec..000000000000 --- a/dev-libs/grantlee/files/grantlee-5.2.0-slot.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 0bf2a3f667a958b3cc7859cc2fe60ca8a7ccac08 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sat, 30 Nov 2019 11:55:33 +0100 -Subject: [PATCH] Install headers to a custom location to permit slotting - -That was previously necessary with Qt4 version, let's keep it while -Qt6 is around the corner. - -Amended with target_include_directories fix by jospezial. - ---- - templates/lib/CMakeLists.txt | 5 +++-- - textdocument/lib/CMakeLists.txt | 5 +++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt -index 5058481..3ef29a4 100644 ---- a/templates/lib/CMakeLists.txt -+++ b/templates/lib/CMakeLists.txt -@@ -101,6 +101,7 @@ if (Qt5Qml_FOUND) - - target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS}) - target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags) -+ target_include_directories(Grantlee_Templates INTERFACE "$<INSTALL_INTERFACE:include/grantlee5>") - target_link_libraries(Grantlee_Templates - PRIVATE Qt5::Qml - ) -@@ -152,10 +153,10 @@ install(FILES - token.h - util.h - variable.h -- DESTINATION include/grantlee COMPONENT Templates -+ DESTINATION include/grantlee5/grantlee COMPONENT Templates - ) - - install(FILES - grantlee_templates.h -- DESTINATION include COMPONENT Templates -+ DESTINATION include/grantlee5 COMPONENT Templates - ) -diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt -index 2c5a96f..c42d32a 100644 ---- a/textdocument/lib/CMakeLists.txt -+++ b/textdocument/lib/CMakeLists.txt -@@ -34,6 +34,7 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio") - ) - endforeach() - endif() -+target_include_directories(Grantlee_TextDocument INTERFACE "$<INSTALL_INTERFACE:include/grantlee5>") - - target_link_libraries(Grantlee_TextDocument - PUBLIC Qt5::Gui -@@ -59,10 +60,10 @@ install(FILES - texthtmlbuilder.h - mediawikimarkupbuilder.h - ${CMAKE_CURRENT_BINARY_DIR}/grantlee_textdocument_export.h -- DESTINATION include/grantlee COMPONENT TextDocument -+ DESTINATION include/grantlee5/grantlee COMPONENT TextDocument - ) - - install(FILES - grantlee_textdocument.h -- DESTINATION include COMPONENT TextDocument -+ DESTINATION include/grantlee5 COMPONENT TextDocument - ) --- -2.24.0 diff --git a/dev-libs/grantlee/grantlee-5.2.0.ebuild b/dev-libs/grantlee/grantlee-5.2.0.ebuild deleted file mode 100644 index 1a4abea4eeb3..000000000000 --- a/dev-libs/grantlee/grantlee-5.2.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VIRTUALX_REQUIRED="test" -inherit cmake 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 ~loong ~ppc ~ppc64 ~riscv x86" -IUSE="debug doc test" - -BDEPEND=" - doc? ( app-doc/doxygen[dot] ) - test? ( dev-qt/linguist-tools:5 ) -" -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" - -RESTRICT+=" !test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch" - "${FILESDIR}/${P}-slot.patch" -) - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - use doc && cmake_src_compile docs -} - -src_test() { - virtx cmake_src_test -} - -src_install() { - use doc && local HTML_DOCS=("${BUILD_DIR}/apidox/") - - cmake_src_install -} diff --git a/dev-libs/grantlee/grantlee-5.3.0.ebuild b/dev-libs/grantlee/grantlee-5.3.0.ebuild index 3c7e7c10080c..467066d842a0 100644 --- a/dev-libs/grantlee/grantlee-5.3.0.ebuild +++ b/dev-libs/grantlee/grantlee-5.3.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 ~loong ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" IUSE="debug doc test" RESTRICT="!test? ( test )" |