[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/, dev-libs/grantlee/files/

2022-10-25 Thread Andreas Sturmlechner 
commit: c6d0d6e7331c6a2b4a7dcda1a15217502a6f4bcf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Oct 25 18:39:10 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Oct 25 18:39:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6d0d6e7

dev-libs/grantlee: drop 5.2.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-libs/grantlee/Manifest|  1 -
 dev-libs/grantlee/files/grantlee-5.2.0-slot.patch | 67 ---
 dev-libs/grantlee/grantlee-5.2.0.ebuild   | 60 
 3 files changed, 128 deletions(-)

diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index 92adc47c2bf0..6e84d3fdb86d 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -1,2 +1 @@
-DIST grantlee-5.2.0.tar.gz 1166467 BLAKE2B 
89f66fefe3c5bbd087cdaed0f83a6b9ca2456629465dfd68d32c6f316d6d4533ece09e5a1444833897c70abbeb8258e0ca9faba09388dcbf40245c04f72f5040
 SHA512 
94b53d103aa775e6d45357d44d5634a5214d12ea7178d251fda30c5a88ddc2682ae44501ee8b7dc475793b84fa0998eb0bc13eea3f2e10ab29b1489db6ea60bd
 DIST grantlee-5.3.0.tar.gz 1176075 BLAKE2B 
a3418250845b39c4766dd19a1f423f18ca7393f675d0045477b345e589d5649f1cc332f9c228e9e9317bdf356992e533cfabe62bcfb50c40ffa38be9b5009013
 SHA512 
8018c92e1001e039243b4a22a790907b53bff21e062c7e3ee63d1e2de4ce7bccc4a7580fc4ec2e61dc2f7131ac336d46f76e2f03a7314c1547b8744842c0a02a

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..
--- 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 
-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 
"$")
-   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 
"$")
- 
- 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..
--- 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"
-

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/

2022-10-25 Thread Arthur Zamarin 
commit: cb74fff2e5916fda89218d34126281af94f26db1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Oct 25 18:37:20 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Oct 25 18:37:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb74fff2

dev-libs/grantlee: Stabilize 5.3.0 arm64, #873448

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-libs/grantlee/grantlee-5.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 )"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/

2022-10-04 Thread Agostino Sarubbo 
commit: 7e9517d9d8c47a56eb1ed00b989a3a463cfcc2f8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct  4 07:30:44 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct  4 07:30:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e9517d9

dev-libs/grantlee: Stabilize 5.3.0 x86, #873448

Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-libs/grantlee/grantlee-5.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grantlee/grantlee-5.3.0.ebuild 
b/dev-libs/grantlee/grantlee-5.3.0.ebuild
index 54836e3783e4..3c7e7c10080c 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 )"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/

2022-09-30 Thread Sam James 
commit: d742cea47c4eea25042ab33c84b8c447abf3b3e8
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 30 20:38:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 30 20:39:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d742cea4

dev-libs/grantlee: Stabilize 5.3.0 amd64, #873448

Signed-off-by: Sam James  gentoo.org>

 dev-libs/grantlee/grantlee-5.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grantlee/grantlee-5.3.0.ebuild 
b/dev-libs/grantlee/grantlee-5.3.0.ebuild
index d28d8a77daee..54836e3783e4 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 )"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/files/

2022-09-14 Thread Andreas Sturmlechner 
commit: 978e123f0ff2ca606c2b7e44e042e71a1f037f96
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 14 09:26:40 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 14 09:26:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=978e123f

dev-libs/grantlee: Fix grantlee-5.3.0-slot.patch

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-libs/grantlee/files/grantlee-5.3.0-slot.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch 
b/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch
index 896290499dcf..444274b0992c 100644
--- a/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch
+++ b/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch
@@ -43,7 +43,7 @@ index a472267..8134d83 100644
)
endforeach()
  endif()
-+target_include_directories(Grantlee_TextDocument INTERFACE 
"$")
++target_include_directories(Grantlee_TextDocument INTERFACE 
"$")
  
  if (GRANTLEE_BUILD_WITH_QT6)
target_link_libraries(Grantlee_TextDocument

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/files/, dev-libs/grantlee/

2022-09-14 Thread Andreas Sturmlechner 
commit: 120ab70ab993741629984f219f4b2ff7ac04b2f5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 14 09:16:41 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 14 09:18:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=120ab70a

dev-libs/grantlee: add 5.3.0, EAPI-8 bump

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-libs/grantlee/Manifest|  1 +
 dev-libs/grantlee/files/grantlee-5.3.0-slot.patch | 65 +++
 dev-libs/grantlee/grantlee-5.3.0.ebuild   | 61 +
 3 files changed, 127 insertions(+)

diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index d56c4763280d..92adc47c2bf0 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -1 +1,2 @@
 DIST grantlee-5.2.0.tar.gz 1166467 BLAKE2B 
89f66fefe3c5bbd087cdaed0f83a6b9ca2456629465dfd68d32c6f316d6d4533ece09e5a1444833897c70abbeb8258e0ca9faba09388dcbf40245c04f72f5040
 SHA512 
94b53d103aa775e6d45357d44d5634a5214d12ea7178d251fda30c5a88ddc2682ae44501ee8b7dc475793b84fa0998eb0bc13eea3f2e10ab29b1489db6ea60bd
+DIST grantlee-5.3.0.tar.gz 1176075 BLAKE2B 
a3418250845b39c4766dd19a1f423f18ca7393f675d0045477b345e589d5649f1cc332f9c228e9e9317bdf356992e533cfabe62bcfb50c40ffa38be9b5009013
 SHA512 
8018c92e1001e039243b4a22a790907b53bff21e062c7e3ee63d1e2de4ce7bccc4a7580fc4ec2e61dc2f7131ac336d46f76e2f03a7314c1547b8744842c0a02a

diff --git a/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch 
b/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch
new file mode 100644
index ..896290499dcf
--- /dev/null
+++ b/dev-libs/grantlee/files/grantlee-5.3.0-slot.patch
@@ -0,0 +1,65 @@
+From f9dda5f8a81c18c59eabcea515084253c284803a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+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.
+---
+ 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 07a192c..9049bdc 100644
+--- a/templates/lib/CMakeLists.txt
 b/templates/lib/CMakeLists.txt
+@@ -101,6 +101,7 @@ if (Qt5Qml_FOUND OR Qt6Qml_FOUND)
+ 
+   target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS})
+   target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags)
++  target_include_directories(Grantlee_Templates INTERFACE 
"$")
+   if (GRANTLEE_BUILD_WITH_QT6)
+ target_link_libraries(Grantlee_Templates
+   PRIVATE Qt6::Qml
+@@ -164,10 +165,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 a472267..8134d83 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 
"$")
+ 
+ if (GRANTLEE_BUILD_WITH_QT6)
+   target_link_libraries(Grantlee_TextDocument
+@@ -65,10 +66,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.37.3
+

diff --git a/dev-libs/grantlee/grantlee-5.3.0.ebuild 
b/dev-libs/grantlee/grantlee-5.3.0.ebuild
new file mode 100644
index ..d28d8a77daee
--- /dev/null
+++ b/dev-libs/grantlee/grantlee-5.3.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+"
+DEPEND="${RDEPEND}
+   test? ( dev-qt/qttest:5 )
+"
+BDEPEND="
+   doc? ( app-doc/doxygen[dot] )
+   test? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/, dev-libs/grantlee/files/

2020-03-19 Thread Andreas Sturmlechner 
commit: f866a680b3a46e1a5e12856ffcd6457ce45683c5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 19 11:41:52 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 19 11:41:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f866a680

dev-libs/grantlee: Drop 5.1.0

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 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(-)

diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index d0d20f2b038..d56c4763280 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 d049d6c96f8..000
--- 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 67a92c1f869..000
--- 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 5b0d61d5c1e..000
--- 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

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/

2020-03-19 Thread Mart Raudsepp 
commit: 1a81a4c183b6aca0ffafa283682f2cf3f094984d
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Mar 19 11:36:39 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Mar 19 11:36:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a81a4c1

dev-libs/grantlee: arm64 stable (bug #705756)

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-libs/grantlee/grantlee-5.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grantlee/grantlee-5.2.0.ebuild 
b/dev-libs/grantlee/grantlee-5.2.0.ebuild
index 94df8e673a6..677164dc81e 100644
--- a/dev-libs/grantlee/grantlee-5.2.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.2.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 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="debug doc test"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/

2020-01-20 Thread Agostino Sarubbo 
commit: 8d5159716cff156aec438195fd8efb91ce8234b5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jan 20 12:51:04 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jan 20 12:51:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d515971

dev-libs/grantlee: amd64 stable wrt bug #705756

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-libs/grantlee/grantlee-5.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grantlee/grantlee-5.2.0.ebuild 
b/dev-libs/grantlee/grantlee-5.2.0.ebuild
index 5beb9dfdc6b..94df8e673a6 100644
--- a/dev-libs/grantlee/grantlee-5.2.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.2.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 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="debug doc test"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/

2020-01-18 Thread Thomas Deutschmann 
commit: dfcd673db82af1c3b3d8ec48cf624cb763ae712e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Jan 18 23:07:14 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Jan 18 23:15:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfcd673d

dev-libs/grantlee: x86 stable (bug #705756)

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-libs/grantlee/grantlee-5.2.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/grantlee/grantlee-5.2.0.ebuild 
b/dev-libs/grantlee/grantlee-5.2.0.ebuild
index 5f7dff2d6d2..5beb9dfdc6b 100644
--- a/dev-libs/grantlee/grantlee-5.2.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.grantlee.org/${P}.tar.gz;
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="debug doc test"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/, dev-libs/grantlee/files/

2019-12-21 Thread Andreas Sturmlechner 
commit: 57d851ef6924085f05624ff7d34340ea2a94badd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Dec 20 20:23:46 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 21 09:28:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57d851ef

dev-libs/grantlee: 0.5.2 version bump

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-libs/grantlee/Manifest |  1 +
 .../files/grantlee-0.3.0-nonfatal-warnings.patch   |  9 ++-
 dev-libs/grantlee/files/grantlee-5.2.0-slot.patch  | 67 ++
 dev-libs/grantlee/grantlee-5.2.0.ebuild| 60 +++
 4 files changed, 134 insertions(+), 3 deletions(-)

diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index 78e73378a73..d0d20f2b038 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -1 +1,2 @@
 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-0.3.0-nonfatal-warnings.patch 
b/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch
index a25f52b3c63..b35dc46586e 100644
--- a/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch
+++ b/dev-libs/grantlee/files/grantlee-0.3.0-nonfatal-warnings.patch
@@ -1,6 +1,9 @@
-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.0 +0100
-+++ grantlee-0.3.0/CMakeLists.txt  2013-03-09 12:25:56.498096399 +0100
+Do not make linker warnings fatal.
+
+Gentoo-bug: 430968
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
 @@ -62,8 +62,8 @@
endif()
  

diff --git a/dev-libs/grantlee/files/grantlee-5.2.0-slot.patch 
b/dev-libs/grantlee/files/grantlee-5.2.0-slot.patch
new file mode 100644
index 000..9490df2327e
--- /dev/null
+++ b/dev-libs/grantlee/files/grantlee-5.2.0-slot.patch
@@ -0,0 +1,67 @@
+From 0bf2a3f667a958b3cc7859cc2fe60ca8a7ccac08 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+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 
"$")
+   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 
"$")
+ 
+ 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
new file mode 100644
index 000..9d5b5a2b958
--- /dev/null
+++ b/dev-libs/grantlee/grantlee-5.2.0.ebuild
@@ -0,0

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/files/, dev-libs/grantlee/

2019-07-20 Thread Andreas Sturmlechner 
commit: 9172613e8e9a5a480e75c409765524bb3e46f640
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jul 20 16:13:50 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jul 20 16:17:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9172613e

dev-libs/grantlee: EAPI-7 bump, fix build with >=cmake-3.15

Closes: https://bugs.gentoo.org/690226
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch | 24 ++
 dev-libs/grantlee/grantlee-5.1.0.ebuild|  9 
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch 
b/dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch
new file mode 100644
index 000..d049d6c96f8
--- /dev/null
+++ b/dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch
@@ -0,0 +1,24 @@
+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/grantlee-5.1.0.ebuild 
b/dev-libs/grantlee/grantlee-5.1.0.ebuild
index d8de4e45a9f..8bcda9a613c 100644
--- a/dev-libs/grantlee/grantlee-5.1.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.1.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit cmake-utils virtualx
@@ -15,25 +15,26 @@ 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}
-   doc? ( app-doc/doxygen[dot] )
test? ( dev-qt/qttest:5 )
 "
 
 # bug 682258
 RESTRICT="test"
 
-DOCS=( AUTHORS CHANGELOG README.md )
-
 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() {

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/

2019-05-27 Thread Aaron Bauman 
commit: 325eefa64ab6da175600c378fd2cca3c6a1e529a
Author: Aaron Bauman  gentoo  org>
AuthorDate: Tue May 28 04:05:56 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Tue May 28 04:06:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=325eefa6

dev-libs/grantlee: arm64 stable

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"

 dev-libs/grantlee/grantlee-5.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grantlee/grantlee-5.1.0.ebuild 
b/dev-libs/grantlee/grantlee-5.1.0.ebuild
index 59e9f458582..d8de4e45a9f 100644
--- a/dev-libs/grantlee/grantlee-5.1.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.1.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 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="debug doc test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/

2019-04-12 Thread Michael Palimaka 
commit: 1babdc2858e301939ef7e0458b5837ff6d4549cf
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Apr 13 03:10:06 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Apr 13 03:10:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1babdc28

dev-libs/grantlee: restrict tests

Closes: https://bugs.gentoo.org/682258
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Michael Palimaka  gentoo.org>

 dev-libs/grantlee/grantlee-5.1.0.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-libs/grantlee/grantlee-5.1.0.ebuild 
b/dev-libs/grantlee/grantlee-5.1.0.ebuild
index 328ce49c302..59e9f458582 100644
--- a/dev-libs/grantlee/grantlee-5.1.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.1.0.ebuild
@@ -25,6 +25,9 @@ DEPEND="${RDEPEND}
test? ( dev-qt/qttest:5 )
 "
 
+# bug 682258
+RESTRICT="test"
+
 DOCS=( AUTHORS CHANGELOG README.md )
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/files/, dev-libs/grantlee/

2019-02-17 Thread Andreas Sturmlechner 
commit: cb0b10d7fea3b70322551676b92e42fa0b2692b5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 17 13:04:15 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 17 13:04:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb0b10d7

dev-libs/grantlee: Fix build with Qt 5.13

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../grantlee/files/grantlee-5.1.0-qt-5.13.patch| 27 ++
 dev-libs/grantlee/grantlee-5.1.0.ebuild|  5 ++--
 2 files changed, 30 insertions(+), 2 deletions(-)

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
new file mode 100644
index 000..67a92c1f869
--- /dev/null
+++ b/dev-libs/grantlee/files/grantlee-5.1.0-qt-5.13.patch
@@ -0,0 +1,27 @@
+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/grantlee-5.1.0.ebuild 
b/dev-libs/grantlee/grantlee-5.1.0.ebuild
index 21f665921e5..328ce49c302 100644
--- a/dev-libs/grantlee/grantlee-5.1.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,8 @@ DOCS=( AUTHORS CHANGELOG README.md )
 
 PATCHES=(
"${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch"
-   "${FILESDIR}/${PN}-5.1.0-slot.patch"
+   "${FILESDIR}/${P}-slot.patch"
+   "${FILESDIR}/${P}-qt-5.13.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/

2018-09-12 Thread Andreas Sturmlechner 
commit: e26266c6b953ecb5fa780c457bd870fa52aad999
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 12 12:10:24 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 12 12:36:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e26266c6

dev-libs/grantlee: Disable broken test

Closes: https://bugs.gentoo.org/661900
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 dev-libs/grantlee/grantlee-5.1.0.ebuild | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dev-libs/grantlee/grantlee-5.1.0.ebuild 
b/dev-libs/grantlee/grantlee-5.1.0.ebuild
index 553658e457e..21f665921e5 100644
--- a/dev-libs/grantlee/grantlee-5.1.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,6 +32,12 @@ PATCHES=(
"${FILESDIR}/${PN}-5.1.0-slot.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)

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/

2017-07-15 Thread Alexis Ballier 
commit: a5fe67e63e213b52a27afd6b98c8ae6142397283
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Jul 15 09:39:46 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Jul 15 09:39:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5fe67e6

dev-libs/grantlee: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-libs/grantlee/grantlee-5.1.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/grantlee/grantlee-5.1.0.ebuild 
b/dev-libs/grantlee/grantlee-5.1.0.ebuild
index 48075557c13..553658e457e 100644
--- a/dev-libs/grantlee/grantlee-5.1.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.grantlee.org/${P}.tar.gz;
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="debug doc test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/

2017-06-18 Thread Michael Palimaka 
commit: e637ffe6a35141d7c1926eb76a9644eac9a5d1c0
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jun 18 12:06:06 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jun 18 12:08:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e637ffe6

dev-libs/grantlee: update HOMEPAGE

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-libs/grantlee/grantlee-0.4.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/grantlee/grantlee-0.4.0.ebuild 
b/dev-libs/grantlee/grantlee-0.4.0.ebuild
index 3bc74ea5ca6..f92edc2ae62 100644
--- a/dev-libs/grantlee/grantlee-0.4.0.ebuild
+++ b/dev-libs/grantlee/grantlee-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit cmake-utils
 
 DESCRIPTION="C++ string template engine based on the Django template system"
-HOMEPAGE="http://www.gitorious.org/grantlee/pages/Home;
+HOMEPAGE="https://github.com/steveire/grantlee;
 SRC_URI="http://downloads.grantlee.org/${P}.tar.gz;
 
 LICENSE="LGPL-2.1"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/

2016-12-23 Thread Johannes Huber 
commit: 15c5099ca34a7312ed27390358e2bb8e65a28841
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Dec 23 09:36:31 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Dec 23 10:11:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c5099c

dev-libs/grantlee: Drop CMAKE_MIN_VERSION

Covered by cmake utils eclass now.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/grantlee/grantlee-5.1.0.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-libs/grantlee/grantlee-5.1.0.ebuild 
b/dev-libs/grantlee/grantlee-5.1.0.ebuild
index 4cb9699..8d3343e 100644
--- a/dev-libs/grantlee/grantlee-5.1.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.1.0.ebuild
@@ -4,7 +4,6 @@
 
 EAPI=6
 
-CMAKE_MIN_VERSION="3.1"
 VIRTUALX_REQUIRED="test"
 inherit cmake-utils virtualx

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/files/

2016-09-04 Thread Michael Palimaka 
commit: 20771fe04feb054dbb48aaf1c215b9f2ab548026
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Sat Sep  3 15:53:35 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Sep  4 18:51:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20771fe0

dev-libs/grantlee: remove unused patches

 .../files/grantlee-0.1.9-qt-test-optional.patch| 46 --
 dev-libs/grantlee/files/grantlee-slot.patch| 40 ---
 2 files changed, 86 deletions(-)

diff --git a/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch 
b/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch
deleted file mode 100644
index 6af42cb..
--- a/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ab40a1ce4bff38fe6c19931bcdb46cdf754e29ed Mon Sep 17 00:00:00 2001
-From: Johannes Huber 
-Date: Thu, 22 Mar 2012 11:37:57 +0100
-Subject: [PATCH] Search only for qt-test if test build option is enabled.
-
-Build fails on systems were no qt-test is installed and the build option
-for tests is disabled. See downstream bug report
-https://bugs.gentoo.org/show_bug.cgi?id=409131.

- templates/CMakeLists.txt|6 +-
- textdocument/CMakeLists.txt |6 +-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/templates/CMakeLists.txt b/templates/CMakeLists.txt
-index 0594cc3..eec0f12 100644
 a/templates/CMakeLists.txt
-+++ b/templates/CMakeLists.txt
-@@ -1,5 +1,9 @@
- 
--find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest)
-+if (BUILD_TESTS)
-+  find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest)
-+else (BUILD_TESTS)
-+  find_package(Qt4 4.5.0 REQUIRED QtCore QtScript)
-+endif (BUILD_TESTS)
- 
- include(${Grantlee_USE_FILE})
- 
-diff --git a/textdocument/CMakeLists.txt b/textdocument/CMakeLists.txt
-index d456663..8fa2892 100644
 a/textdocument/CMakeLists.txt
-+++ b/textdocument/CMakeLists.txt
-@@ -1,5 +1,9 @@
- 
--find_package(Qt4 4.5.0 REQUIRED QtCore QtGui QtTest)
-+if (BUILD_TESTS)
-+  find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest)
-+else (BUILD_TESTS)
-+find_package(Qt4 4.5.0 REQUIRED QtCore QtScript)
-+endif (BUILD_TESTS)
- 
- include(${QT_USE_FILE})
- 
--- 
-1.7.9.4
-

diff --git a/dev-libs/grantlee/files/grantlee-slot.patch 
b/dev-libs/grantlee/files/grantlee-slot.patch
deleted file mode 100644
index 814fb9d..
--- a/dev-libs/grantlee/files/grantlee-slot.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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 
"$")
- 
- 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 
"$")
- 
- target_link_libraries(Grantlee_TextDocument
-   LINK_PUBLIC Qt5::Gui

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/

2016-07-25 Thread Chí-Thanh Christopher Nguyễn 
commit: 1b23311138c821e44f7548bdab991a1ef2f38e8d
Author: Chí-Thanh Christopher Nguyễn  gentoo  org>
AuthorDate: Mon Jul 25 17:56:17 2016 +
Commit: Chí-Thanh Christopher Nguyễn  gentoo  org>
CommitDate: Mon Jul 25 17:56:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b233111

dev-libs/grantlee: keyword ~ppc

Bug: https://bugs.gentoo.org/show_bug.cgi?id=553426

Package-Manager: portage-2.2.28

 dev-libs/grantlee/grantlee-5.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grantlee/grantlee-5.1.0.ebuild 
b/dev-libs/grantlee/grantlee-5.1.0.ebuild
index e10f4c4..4cb9699 100644
--- a/dev-libs/grantlee/grantlee-5.1.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://downloads.grantlee.org/${P}.tar.gz;
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="debug doc test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/

2016-06-23 Thread Michael Palimaka 
commit: 27ef0d700f5de78ee8d22b670028b0444a92e0ff
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Jun 23 19:39:32 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Jun 23 19:49:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27ef0d70

dev-libs/grantlee: amd64/x86 stable

Package-Manager: portage-2.3.0

 dev-libs/grantlee/grantlee-5.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grantlee/grantlee-5.1.0.ebuild 
b/dev-libs/grantlee/grantlee-5.1.0.ebuild
index c864552..e10f4c4 100644
--- a/dev-libs/grantlee/grantlee-5.1.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://downloads.grantlee.org/${P}.tar.gz;
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="debug doc test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/

2016-06-23 Thread Michael Palimaka 
commit: d48918dfe723b43aa290afec2bb55d9e6903bd68
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Jun 23 19:40:42 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Jun 23 19:49:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d48918df

dev-libs/grantlee: remove old

Package-Manager: portage-2.3.0

 dev-libs/grantlee/Manifest  |  1 -
 dev-libs/grantlee/grantlee-5.0.0.ebuild | 58 -
 2 files changed, 59 deletions(-)

diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index 5d3bcb9..e0f8f09 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -1,3 +1,2 @@
 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/grantlee-5.0.0.ebuild 
b/dev-libs/grantlee/grantlee-5.0.0.ebuild
deleted file mode 100644
index 4b7b7db..000
--- a/dev-libs/grantlee/grantlee-5.0.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 ~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 )
-
-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() {
-   virtx cmake-utils_src_test
-}
-
-src_install() {
-   use doc && HTML_DOCS=("${BUILD_DIR}/apidox/")
-
-   cmake-utils_src_install
-}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/

2016-06-02 Thread Michael Palimaka 
commit: a8ba912f6142fd893ced3ccdaf4c48bdc698e50b
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Jun  2 15:39:18 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Jun  2 15:43:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8ba912f

dev-libs/grantlee: x86 stable

Gentoo-bug: 579366

Package-Manager: portage-2.3.0_rc1

 dev-libs/grantlee/grantlee-5.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grantlee/grantlee-5.0.0.ebuild 
b/dev-libs/grantlee/grantlee-5.0.0.ebuild
index 6060093..4b7b7db 100644
--- a/dev-libs/grantlee/grantlee-5.0.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.grantlee.org/${P}.tar.gz;
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="debug doc test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/files/, dev-libs/grantlee/

2016-04-19 Thread Michael Palimaka 
commit: e34304a5e23ad47f71fbc0dd4ea4c0797104ef87
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Apr 19 21:39:00 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Apr 19 21:39:16 2016 +
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 000..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 000..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)

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/

2016-04-08 Thread Johannes Huber 
commit: 4c53de89ad81e533dddcc95f986a264b93c8835b
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Apr  8 18:36:49 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Apr  8 18:36:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c53de89

dev-libs/grantlee: EAPI 6, update HOMEPAGE

Package-Manager: portage-2.2.28

 dev-libs/grantlee/grantlee-5.0.0.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-libs/grantlee/grantlee-5.0.0.ebuild 
b/dev-libs/grantlee/grantlee-5.0.0.ebuild
index b72ac4e..8813e0f 100644
--- a/dev-libs/grantlee/grantlee-5.0.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.0.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 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;
+HOMEPAGE="https://github.com/steveire/grantlee;
 SRC_URI="http://downloads.grantlee.org/${P}.tar.gz;
 
 LICENSE="LGPL-2.1"
@@ -48,7 +48,7 @@ src_compile() {
 }
 
 src_test() {
-   VIRTUALX_COMMAND="cmake-utils_src_test" virtualmake
+   virtx cmake-utils_src_test
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/

2015-09-27 Thread Jeroen Roovers 
commit: 0d7ba4b0704bc84cc9ef386acdda6988c5c888b5
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Sep 28 03:47:52 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Sep 28 03:47:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d7ba4b0

dev-libs/grantlee: Mark ~ppc64 (bug #553426).

Package-Manager: portage-2.2.20.1
RepoMan-Options: --ignore-arches

 dev-libs/grantlee/grantlee-5.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grantlee/grantlee-5.0.0.ebuild 
b/dev-libs/grantlee/grantlee-5.0.0.ebuild
index 635c7b4..b72ac4e 100644
--- a/dev-libs/grantlee/grantlee-5.0.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.grantlee.org/${P}.tar.gz;
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE="debug doc test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grantlee/

2015-08-16 Thread Mikle Kolyada 
commit: d4b874fc86c75e8590e2b7dcabfadfcbb05645df
Author: Mikle Kolyada zlogene AT gentoo DOT org
AuthorDate: Sun Aug 16 14:37:18 2015 +
Commit: Mikle Kolyada zlogene AT gentoo DOT org
CommitDate: Sun Aug 16 14:37:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4b874fc

dev-libs/grantlee: Add ~x86 keyword wrt bug #553426

Package-Manager: portage-2.2.20.1

 dev-libs/grantlee/grantlee-5.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grantlee/grantlee-5.0.0.ebuild 
b/dev-libs/grantlee/grantlee-5.0.0.ebuild
index 2134e80..635c7b4 100644
--- a/dev-libs/grantlee/grantlee-5.0.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI=http://downloads.grantlee.org/${P}.tar.gz;
 
 LICENSE=LGPL-2.1
 SLOT=5
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 IUSE=debug doc test
 
 RDEPEND=