From f866a680b3a46e1a5e12856ffcd6457ce45683c5 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Thu, 19 Mar 2020 12:41:52 +0100 Subject: dev-libs/grantlee: Drop 5.1.0 Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andreas Sturmlechner --- dev-libs/grantlee/Manifest | 1 - dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch | 24 -------- .../grantlee/files/grantlee-5.1.0-qt-5.13.patch | 27 --------- dev-libs/grantlee/files/grantlee-5.1.0-slot.patch | 39 ------------- dev-libs/grantlee/grantlee-5.1.0.ebuild | 68 ---------------------- 5 files changed, 159 deletions(-) delete mode 100644 dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch delete mode 100644 dev-libs/grantlee/files/grantlee-5.1.0-qt-5.13.patch delete mode 100644 dev-libs/grantlee/files/grantlee-5.1.0-slot.patch delete mode 100644 dev-libs/grantlee/grantlee-5.1.0.ebuild (limited to 'dev-libs/grantlee') diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest index d0d20f2b0388..d56c4763280d 100644 --- a/dev-libs/grantlee/Manifest +++ b/dev-libs/grantlee/Manifest @@ -1,2 +1 @@ -DIST grantlee-5.1.0.tar.gz 1175380 BLAKE2B 6468c0131a334c3ac52b841a64171093a41605686e4ec2af1a60bbb829f652d388fb48e501a0c1f5eef54ff3253c10b0d6ebd5a4439ed2852f8746188011f9e4 SHA512 2b806a0770b9c6d02f207d5b4939ae8cae325de4fa01901320ffef5c8442ef0f1c10dd799966d0bf0d223e6541f93db8568aaf922ea1b334bcb2f85f6373a936 DIST grantlee-5.2.0.tar.gz 1166467 BLAKE2B 89f66fefe3c5bbd087cdaed0f83a6b9ca2456629465dfd68d32c6f316d6d4533ece09e5a1444833897c70abbeb8258e0ca9faba09388dcbf40245c04f72f5040 SHA512 94b53d103aa775e6d45357d44d5634a5214d12ea7178d251fda30c5a88ddc2682ae44501ee8b7dc475793b84fa0998eb0bc13eea3f2e10ab29b1489db6ea60bd 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 -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 -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 class QList; -+#include - - 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 "$") - 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 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 -} -- cgit v1.2.3-65-gdbad