[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/

2023-11-19 Thread Andreas Sturmlechner
commit: b75c79ba74b11c5565d81c5cb75deb54738c6c2e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 18 17:01:52 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 18 17:02:14 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b75c79ba

kde-frameworks/extra-cmake-modules: Disable PyQt5-based tests by patch

... replacing sed.

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

 .../extra-cmake-modules-5..ebuild  | 12 ++
 ...les-5.112.0-disable-tests-requiring-PyQt5.patch | 27 ++
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git 
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5..ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5..ebuild
index 0b9a1e6e94..68a04bec3e 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5..ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5..ebuild
@@ -16,6 +16,7 @@ IUSE="doc test"
 
 RESTRICT="!test? ( test )"
 
+RDEPEND="app-arch/libarchive[bzip2]"
 BDEPEND="
doc? (
${PYTHON_DEPS}
@@ -27,14 +28,12 @@ BDEPEND="
>=dev-qt/qtcore-${QTMIN}:5
)
 "
-RDEPEND="
-   app-arch/libarchive[bzip2]
-"
 
 PATCHES=(
"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
"${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch"
"${FILESDIR}/${PN}-5.93.0-disable-qmlplugindump.patch"
+   "${FILESDIR}/${PN}-5.112.0-disable-tests-requiring-PyQt5.patch" # bug 
680256
 )
 
 python_check_deps() {
@@ -45,13 +44,6 @@ pkg_setup() {
use doc && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-   cmake_src_prepare
-   # Requires PyQt5, bug #680256
-   sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT 
SIP_Qt5Core_Mod_FILE/TRUE/" \
-   tests/CMakeLists.txt || die "failed to disable 
GenerateSipBindings tests"
-}
-
 src_configure() {
local mycmakeargs=(
-DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch
new file mode 100644
index 00..17d6044805
--- /dev/null
+++ 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch
@@ -0,0 +1,27 @@
+From 35d209b5662e468aa2f613ffdb9b91bc2e7f7e26 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sat, 18 Nov 2023 17:58:36 +0100
+Subject: [PATCH] Disable tests requiring PyQt5
+
+Gentoo-bug: https://bugs.gentoo.org/680256
+Signed-off-by: Andreas Sturmlechner 
+---
+ tests/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 1415bb91..09d998e4 100644
+--- a/tests/CMakeLists.txt
 b/tests/CMakeLists.txt
+@@ -79,7 +79,7 @@ find_file(SIP_Qt5Core_Mod_FILE
+ PATH_SUFFIXES share/sip/PyQt5/QtCore
+ )
+ 
+-if(NOT SIP_Qt5Core_Mod_FILE)
++if(TRUE)
+ message(STATUS "WARNING: skipping tests that require PyQt")
+ else()
+   find_package(PythonModuleGeneration)
+-- 
+2.42.1
+



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2023-11-12 Thread Andreas Sturmlechner
commit: 015071567eb0a7b52418645b90e13003f451e03d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 12 10:07:51 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 12 10:07:51 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=01507156

kde-frameworks/extra-cmake-modules: add kde-invent upstream metadata

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

 kde-frameworks/extra-cmake-modules/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-frameworks/extra-cmake-modules/metadata.xml 
b/kde-frameworks/extra-cmake-modules/metadata.xml
index 007a8286d3..465dd12c5a 100644
--- a/kde-frameworks/extra-cmake-modules/metadata.xml
+++ b/kde-frameworks/extra-cmake-modules/metadata.xml
@@ -7,6 +7,7 @@


https://bugs.kde.org/
+   frameworks/extra-cmake-modules






[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2023-08-15 Thread Andreas Sturmlechner
commit: 2c776442dc296c284419a9a8d5f76ad5426e2a0b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug  9 21:26:27 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug 15 14:31:16 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2c776442

kde-frameworks/extra-cmake-modules: enable py3.12

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

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.109.0.ebuild | 2 +-
 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5..ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.109.0.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.109.0.ebuild
index b703a6659e..08a4d2f25a 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.109.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.109.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 QTMIN=5.15.9
 inherit cmake frameworks.kde.org python-any-r1
 

diff --git 
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5..ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5..ebuild
index be313fc7fa..0b9a1e6e94 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5..ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5..ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 QTMIN=5.15.9
 inherit cmake frameworks.kde.org python-any-r1
 



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2022-08-11 Thread Sam James
commit: 1b2cb69cd6decd771b37ae3fd50cb5301f8496e2
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 11 10:18:48 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 11 10:18:48 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1b2cb69c

kde-frameworks/extra-cmake-modules: fix PythonAnyMismatchedDepHasVersionCheck

has_version was checking DEPEND, not BDEPEND, so change to python_has_version 
for
better defaults (defaults to BDEPEND) but also nicer output.

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

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.97.0.ebuild | 2 +-
 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.97.0.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.97.0.ebuild
index f33ade5f2c..eec8444546 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.97.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.97.0.ebuild
@@ -38,7 +38,7 @@ PATCHES=(
 )
 
 python_check_deps() {
-   has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+   python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 26eefb7f2b..4f4521c8c2 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -38,7 +38,7 @@ PATCHES=(
 )
 
 python_check_deps() {
-   has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+   python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2022-07-03 Thread Andreas Sturmlechner
commit: 6d668bbd25ddc858b2209a1adadcbcc10f617196
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul  3 09:48:29 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul  3 09:48:29 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6d668bbd

kde-frameworks/extra-cmake-modules: python3_11

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

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild | 2 +-
 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild
index 802171031d..d249cbab55 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 QTMIN=5.15.4
 inherit cmake kde.org python-any-r1
 

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 69281f8a3f..5c1c6c34cd 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 QTMIN=5.15.4
 inherit cmake kde.org python-any-r1
 



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/

2022-04-10 Thread Andreas Sturmlechner
commit: d414d8d43ee77e45f545fabbf71aaba21cfb2f7a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 10 21:26:37 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 10 21:26:49 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d414d8d4

kde-frameworks/extra-cmake-modules: Fix cmake code in patch

skip-ecm_add_test-early.patch broke cmake.

Bug: https://bugs.gentoo.org/837608
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...ake-modules-5.93.0-skip-ecm_add_test-early.patch | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
index f9eef60072..84e192919c 100644
--- 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
+++ 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
@@ -1,4 +1,4 @@
-From 9b53dd107af153b88658ffa246de728a8a6fbd9d Mon Sep 17 00:00:00 2001
+From 36e435f059ee44da78e6900fded348709ea865df Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner 
 Date: Sat, 11 Jul 2020 23:04:16 +0200
 Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt::Test is not
@@ -7,8 +7,8 @@ Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if 
Qt::Test is not
 Signed-off-by: Andreas Sturmlechner 
 ---
  modules/ECMAddTests.cmake| 9 +
- tests/ECMAddTests/CMakeLists.txt | 4 
- 2 files changed, 13 insertions(+)
+ tests/ECMAddTests/CMakeLists.txt | 5 +
+ 2 files changed, 14 insertions(+)
 
 diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake
 index 58c78d05..994ed1e4 100644
@@ -38,20 +38,21 @@ index 58c78d05..994ed1e4 100644
  ecm_add_test(${_test_source}
NAME_PREFIX ${ARG_NAME_PREFIX}
 diff --git a/tests/ECMAddTests/CMakeLists.txt 
b/tests/ECMAddTests/CMakeLists.txt
-index aa7e73a1..5fbc1cc7 100644
+index aa7e73a1..f9fb10cb 100644
 --- a/tests/ECMAddTests/CMakeLists.txt
 +++ b/tests/ECMAddTests/CMakeLists.txt
-@@ -2,6 +2,10 @@ if (QT_MAJOR_VERSION EQUAL "6")
- set(QT_VERSION_OPT "-DBUILD_WITH_QT6=ON")
- else()
+@@ -4,6 +4,11 @@ else()
  set(QT_VERSION_OPT "-DBUILD_WITH_QT6=OFF")
-+
+ endif()
+ 
 +if(NOT TARGET Qt::Test)
 +message(STATUS "WARNING: skipping tests that require Qt::Test")
 +return()
- endif()
- 
++endif()
++
  macro(add_check NAME)
+ string(REPLACE "." "/" dir "${NAME}")
+ string(REGEX REPLACE "[^.]*\\." "" proj "${NAME}")
 -- 
 2.35.1
 



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/

2022-03-29 Thread Andreas Sturmlechner
commit: 5f2b69f3ffb3011e3c77506e98d6363379274ac6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 29 10:47:29 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 29 10:47:29 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5f2b69f3

kde-frameworks/extra-cmake-modules: Rebase skip-ecm_add_test-early.patch

Reported-by: Duncan <1i5t5.duncan  cox.net>
Closes: https://bugs.gentoo.org/836348
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../extra-cmake-modules-.ebuild|  2 +-
 ...e-modules-5.93.0-skip-ecm_add_test-early.patch} | 39 --
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index df4d73770a..d692244ad8 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 
 PATCHES=(
"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
-   "${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
+   "${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch"
"${FILESDIR}/${PN}-5.93.0-disable-qmlplugindump.patch"
 )
 

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
similarity index 61%
rename from 
kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch
rename to 
kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
index 72541d73e7..f9eef60072 100644
--- 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch
+++ 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
@@ -1,35 +1,36 @@
-From ad3aec71ed7f8820e69fe55489368a19d0735ab5 Mon Sep 17 00:00:00 2001
+From 9b53dd107af153b88658ffa246de728a8a6fbd9d Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner 
 Date: Sat, 11 Jul 2020 23:04:16 +0200
-Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt5::Test is 
not available
+Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt::Test is not
+ available
 
 Signed-off-by: Andreas Sturmlechner 
 ---
  modules/ECMAddTests.cmake| 9 +
- tests/ECMAddTests/CMakeLists.txt | 5 +
- 2 files changed, 14 insertions(+)
+ tests/ECMAddTests/CMakeLists.txt | 4 
+ 2 files changed, 13 insertions(+)
 
 diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake
-index 4bc7fb8..12825aa 100644
+index 58c78d05..994ed1e4 100644
 --- a/modules/ECMAddTests.cmake
 +++ b/modules/ECMAddTests.cmake
-@@ -81,6 +81,10 @@ function(ecm_add_test)
+@@ -84,6 +84,10 @@ function(ecm_add_test)
  message(FATAL_ERROR "ecm_add_test() called with multiple source files but 
without setting \"TEST_NAME\"")
endif()
  
-+  if(NOT TARGET Qt5::Test)
++  if(NOT TARGET Qt::Test)
 +return()
 +  endif()
 +
set(_testname ${ARG_NAME_PREFIX}${_targetname})
set(gui_args)
if(ARG_GUI)
-@@ -122,6 +126,11 @@ function(ecm_add_tests)
+@@ -127,6 +131,11 @@ function(ecm_add_tests)
endif()
set(test_names)
set(target_names)
 +
-+  if(NOT TARGET Qt5::Test)
++  if(NOT TARGET Qt::Test)
 +return()
 +  endif()
 +
@@ -37,18 +38,20 @@ index 4bc7fb8..12825aa 100644
  ecm_add_test(${_test_source}
NAME_PREFIX ${ARG_NAME_PREFIX}
 diff --git a/tests/ECMAddTests/CMakeLists.txt 
b/tests/ECMAddTests/CMakeLists.txt
-index e77b33f..4e191fe 100644
+index aa7e73a1..5fbc1cc7 100644
 --- a/tests/ECMAddTests/CMakeLists.txt
 +++ b/tests/ECMAddTests/CMakeLists.txt
-@@ -1,3 +1,8 @@
-+if(NOT TARGET Qt5::Test)
-+message(STATUS "WARNING: skipping tests that require Qt5::Test")
-+return()
-+endif()
+@@ -2,6 +2,10 @@ if (QT_MAJOR_VERSION EQUAL "6")
+ set(QT_VERSION_OPT "-DBUILD_WITH_QT6=ON")
+ else()
+ set(QT_VERSION_OPT "-DBUILD_WITH_QT6=OFF")
 +
++if(NOT TARGET Qt::Test)
++message(STATUS "WARNING: skipping tests that require Qt::Test")
++return()
+ endif()
+ 
  macro(add_check NAME)
- string(REPLACE "." "/" dir "${NAME}")
- string(REGEX REPLACE "[^.]*\\." "" proj "${NAME}")
 -- 
-2.27.0
+2.35.1
 



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/

2022-03-25 Thread Andreas Sturmlechner
commit: f6fdd254c3fa5a2c94fa4cfe713d13bd0447eb3b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar 25 19:29:50 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar 25 19:29:50 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f6fdd254

kde-frameworks/extra-cmake-modules: Rebase disable-qmlplugindump.patch

Closes: https://bugs.gentoo.org/835995
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../extra-cmake-modules/extra-cmake-modules-.ebuild|  2 +-
 ...extra-cmake-modules-5.93.0-disable-qmlplugindump.patch} | 14 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 2d5e795709..df4d73770a 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 PATCHES=(
"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
"${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
-   "${FILESDIR}/${PN}-5.91.0-disable-qmlplugindump.patch"
+   "${FILESDIR}/${PN}-5.93.0-disable-qmlplugindump.patch"
 )
 
 python_check_deps() {

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch
similarity index 90%
rename from 
kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch
rename to 
kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch
index fbec9a441e..0683bd3eff 100644
--- 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch
+++ 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch
@@ -1,4 +1,4 @@
-From 76ee984d5094990c2bd79c71b84ba9f82b3bf3da Mon Sep 17 00:00:00 2001
+From 1c79ef2189dc156bbe0f182411bcc136f140a21d Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner 
 Date: Sun, 8 Dec 2019 15:01:33 +0100
 Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
@@ -13,7 +13,7 @@ BUG: 387753
  1 file changed, 27 insertions(+), 18 deletions(-)
 
 diff --git a/modules/ECMFindQmlModule.cmake.in 
b/modules/ECMFindQmlModule.cmake.in
-index 6c054bf0..1c17c981 100644
+index 0ee5665e..d6e1f14c 100644
 --- a/modules/ECMFindQmlModule.cmake.in
 +++ b/modules/ECMFindQmlModule.cmake.in
 @@ -7,27 +7,36 @@
@@ -21,8 +21,8 @@ index 6c054bf0..1c17c981 100644
  include("${ECM_MODULE_DIR}/QtVersionOption.cmake")
  
 -if (QT_MAJOR_VERSION EQUAL "5")
--include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
--query_qmake(qt_binaries_dir QT_HOST_BINS)
+-include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
+-ecm_query_qt(qt_binaries_dir QT_HOST_BINS)
 -find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS 
${qt_binaries_dir})
 -elseif (QT_MAJOR_VERSION EQUAL "6")
 -find_package(Qt6 COMPONENTS QmlTools REQUIRED)
@@ -47,8 +47,8 @@ index 6c054bf0..1c17c981 100644
 -set(@GENMODULE@_FOUND FALSE)
 +
 +if (QT_MAJOR_VERSION EQUAL "5")
-+include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
-+query_qmake(qt_binaries_dir QT_HOST_BINS)
++include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
++ecm_query_qt(qt_binaries_dir QT_HOST_BINS)
 +find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS 
${qt_binaries_dir})
 +elseif (QT_MAJOR_VERSION EQUAL "6")
 +find_package(Qt6 COMPONENTS QmlTools REQUIRED)
@@ -72,5 +72,5 @@ index 6c054bf0..1c17c981 100644
  
  find_package_handle_standard_args(@GENMODULE@
 -- 
-2.34.1
+2.35.1
 



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/

2022-01-27 Thread Andreas Sturmlechner
commit: ae99e91c16a6004cb9ddc18b3eb457da50dee243
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jan 27 19:04:26 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jan 27 19:04:26 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae99e91c

kde-frameworks/extra-cmake-modules: Rebase disable-qmlplugindump.patch

Reported-by: Duncan <1i5t5.duncan  cox.net>
Closes: https://bugs.gentoo.org/831769
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../extra-cmake-modules/extra-cmake-modules-.ebuild  |  2 +-
 ...tra-cmake-modules-5.91.0-disable-qmlplugindump.patch} | 16 
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index a45565a633..2d5e795709 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 PATCHES=(
"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
"${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
-   "${FILESDIR}/${PN}-5.90.0-disable-qmlplugindump.patch"
+   "${FILESDIR}/${PN}-5.91.0-disable-qmlplugindump.patch"
 )
 
 python_check_deps() {

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch
similarity index 86%
rename from 
kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch
rename to 
kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch
index db46d3e861..fbec9a441e 100644
--- 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch
+++ 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch
@@ -1,4 +1,4 @@
-From 763df79a4b468acd401f8adb5b245245a63d2934 Mon Sep 17 00:00:00 2001
+From 76ee984d5094990c2bd79c71b84ba9f82b3bf3da Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner 
 Date: Sun, 8 Dec 2019 15:01:33 +0100
 Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
@@ -9,13 +9,13 @@ See also: https://phabricator.kde.org/D25812
 Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744135
 BUG: 387753
 ---
- modules/ECMFindQMLModule.cmake.in | 45 ++-
+ modules/ECMFindQmlModule.cmake.in | 45 ++-
  1 file changed, 27 insertions(+), 18 deletions(-)
 
-diff --git a/modules/ECMFindQMLModule.cmake.in 
b/modules/ECMFindQMLModule.cmake.in
-index 7cd737b..9847825 100644
 a/modules/ECMFindQMLModule.cmake.in
-+++ b/modules/ECMFindQMLModule.cmake.in
+diff --git a/modules/ECMFindQmlModule.cmake.in 
b/modules/ECMFindQmlModule.cmake.in
+index 6c054bf0..1c17c981 100644
+--- a/modules/ECMFindQmlModule.cmake.in
 b/modules/ECMFindQmlModule.cmake.in
 @@ -7,27 +7,36 @@
  include(FindPackageHandleStandardArgs)
  include("${ECM_MODULE_DIR}/QtVersionOption.cmake")
@@ -25,7 +25,7 @@ index 7cd737b..9847825 100644
 -query_qmake(qt_binaries_dir QT_HOST_BINS)
 -find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS 
${qt_binaries_dir})
 -elseif (QT_MAJOR_VERSION EQUAL "6")
--find_package(Qt6QmlTools REQUIRED)
+-find_package(Qt6 COMPONENTS QmlTools REQUIRED)
 -get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
 -endif()
 -
@@ -51,7 +51,7 @@ index 7cd737b..9847825 100644
 +query_qmake(qt_binaries_dir QT_HOST_BINS)
 +find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS 
${qt_binaries_dir})
 +elseif (QT_MAJOR_VERSION EQUAL "6")
-+find_package(Qt6QmlTools REQUIRED)
++find_package(Qt6 COMPONENTS QmlTools REQUIRED)
 +get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
 +endif()
 +



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/

2021-12-29 Thread Andreas Sturmlechner
commit: 571c1bce1bdb97b0b08f7cae47c63d0666870ddf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec 29 19:13:30 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec 29 19:13:30 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=571c1bce

kde-frameworks/extra-cmake-modules: Rebase disable-qmlplugindump.patch

Broken by upstream commit bc0692797aba5dd7f6d588bb75d3fc60512a9bd5

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

 .../extra-cmake-modules-.ebuild|  2 +-
 ...make-modules-5.90.0-disable-qmlplugindump.patch | 76 ++
 2 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index a612724875..00deddf483 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 PATCHES=(
"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
"${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
-   "${FILESDIR}/${PN}-5.88.0-disable-qmlplugindump.patch"
+   "${FILESDIR}/${PN}-5.90.0-disable-qmlplugindump.patch"
 )
 
 python_check_deps() {

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch
new file mode 100644
index 00..db46d3e861
--- /dev/null
+++ 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch
@@ -0,0 +1,76 @@
+From 763df79a4b468acd401f8adb5b245245a63d2934 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 8 Dec 2019 15:01:33 +0100
+Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
+ avoid sandbox violations
+
+See also: https://phabricator.kde.org/D25812
+
+Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744135
+BUG: 387753
+---
+ modules/ECMFindQMLModule.cmake.in | 45 ++-
+ 1 file changed, 27 insertions(+), 18 deletions(-)
+
+diff --git a/modules/ECMFindQMLModule.cmake.in 
b/modules/ECMFindQMLModule.cmake.in
+index 7cd737b..9847825 100644
+--- a/modules/ECMFindQMLModule.cmake.in
 b/modules/ECMFindQMLModule.cmake.in
+@@ -7,27 +7,36 @@
+ include(FindPackageHandleStandardArgs)
+ include("${ECM_MODULE_DIR}/QtVersionOption.cmake")
+ 
+-if (QT_MAJOR_VERSION EQUAL "5")
+-include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+-query_qmake(qt_binaries_dir QT_HOST_BINS)
+-find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS 
${qt_binaries_dir})
+-elseif (QT_MAJOR_VERSION EQUAL "6")
+-find_package(Qt6QmlTools REQUIRED)
+-get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
+-endif()
+-
+-if(NOT QMLPLUGINDUMP_PROGRAM)
+-message(WARNING "Could not find qmlplugindump. It is necessary to look up 
qml module dependencies.")
+-endif()
++option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may 
segfault in some sandboxed environments" OFF)
+ 
+-execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" 
"@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE 
RESULT_VARIABLE ExitCode TIMEOUT 30)
+-
+-if(ExitCode EQUAL 0)
++if(ECM_DISABLE_QMLPLUGINDUMP)
++message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency 
is available as >= @VERSION@.")
+ set(@GENMODULE@_FOUND TRUE)
+-set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
++set(@GENMODULE@_VERSION @VERSION@)
+ else()
+-message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
+-set(@GENMODULE@_FOUND FALSE)
++
++if (QT_MAJOR_VERSION EQUAL "5")
++include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
++query_qmake(qt_binaries_dir QT_HOST_BINS)
++find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS 
${qt_binaries_dir})
++elseif (QT_MAJOR_VERSION EQUAL "6")
++find_package(Qt6QmlTools REQUIRED)
++get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
++endif()
++
++if(NOT QMLPLUGINDUMP_PROGRAM)
++message(WARNING "Could not find qmlplugindump. It is necessary to 
look up qml module dependencies.")
++endif()
++
++execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" 
"@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE 
RESULT_VARIABLE ExitCode TIMEOUT 30)
++
++if(ExitCode EQUAL 0)
++set(@GENMODULE@_FOUND TRUE)
++set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
++else()
++message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
++set(@GENMODULE@_FOUND FALSE)
++endif()
+ endif()
+ 
+ find_package_handle_standard_args(@GENMODULE@
+-- 
+2.34.1
+



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/

2021-12-29 Thread Andreas Sturmlechner
commit: bfa83df373f42f71c3ed584b9f06021652690c0b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec 29 19:15:23 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec 29 19:15:23 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bfa83df3

kde-frameworks/extra-cmake-modules: Drop obsolete patches

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

 ...make-modules-5.74.0-disable-qmlplugindump.patch | 65 --
 ...make-modules-5.88.0-disable-qmlplugindump.patch | 65 --
 2 files changed, 130 deletions(-)

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch
deleted file mode 100644
index 08fcf32338..00
--- 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 8d30a7dd4517130bf1f6904b0969aaa78e44e16b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Sun, 8 Dec 2019 15:01:33 +0100
-Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
- avoid sandbox violations
-
-Back story: https://bugzilla.gnome.org/show_bug.cgi?id=744135
-BUG: 387753

- modules/ECMFindQMLModule.cmake.in | 35 +++
- 1 file changed, 22 insertions(+), 13 deletions(-)
-
-diff --git a/modules/ECMFindQMLModule.cmake.in 
b/modules/ECMFindQMLModule.cmake.in
-index 8109ab8..1edc01d 100644
 a/modules/ECMFindQMLModule.cmake.in
-+++ b/modules/ECMFindQMLModule.cmake.in
-@@ -26,23 +26,32 @@
- #=
- 
- include(FindPackageHandleStandardArgs)
--include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
- 
--query_qmake(qt_binaries_dir QT_INSTALL_BINS)
-+option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may 
segfault in some sandboxed environments" OFF)
- 
--find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS 
${qt_binaries_dir})
--if(NOT QMLPLUGINDUMP_PROGRAM)
--message(WARNING "Could not find qmlplugindump. It is necessary to look up 
qml module dependencies.")
--endif()
--
--execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" 
"@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE 
RESULT_VARIABLE ExitCode TIMEOUT 30)
--
--if(ExitCode EQUAL 0)
-+if(ECM_DISABLE_QMLPLUGINDUMP)
-+message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency 
is available as >= @VERSION@.")
- set(@GENMODULE@_FOUND TRUE)
--set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
-+set(@GENMODULE@_VERSION @VERSION@)
- else()
--message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
--set(@GENMODULE@_FOUND FALSE)
-+include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
-+
-+query_qmake(qt_binaries_dir QT_INSTALL_BINS)
-+
-+find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS 
${qt_binaries_dir})
-+if(NOT QMLPLUGINDUMP_PROGRAM)
-+message(WARNING "Could not find qmlplugindump. It is necessary to 
look up qml module dependencies.")
-+endif()
-+
-+execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" 
"@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE 
RESULT_VARIABLE ExitCode)
-+
-+if(ExitCode EQUAL 0)
-+set(@GENMODULE@_FOUND TRUE)
-+set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
-+else()
-+message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
-+set(@GENMODULE@_FOUND FALSE)
-+endif()
- endif()
- 
- find_package_handle_standard_args(@GENMODULE@
--- 
-2.24.0
-

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch
deleted file mode 100644
index f2c8368898..00
--- 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 8bcda9bc1d12e2e8ea54dc8d957e415f9d5469a0 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Sun, 8 Dec 2019 15:01:33 +0100
-Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
- avoid sandbox violations
-
-Back-story: https://bugzilla.gnome.org/show_bug.cgi?id=744135
-BUG: 387753

- modules/ECMFindQMLModule.cmake.in | 35 +++
- 1 file changed, 22 insertions(+), 13 deletions(-)
-
-diff --git a/modules/ECMFindQMLModule.cmake.in 
b/modules/ECMFindQMLModule.cmake.in
-index 4234b702..d9817fe8 100644
 a/modules/ECMFindQMLModule.cmake.in
-+++ b/modules/ECMFindQMLModule.cmake.in
-@@ -5,23 +5,32 @@
- #=
- 
- include(FindPackageHandleStandardArgs)

[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/

2021-10-05 Thread Andreas Sturmlechner
commit: c24905bfe4ba7433673e214f6555fb8348ec3724
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Oct  5 15:22:17 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Oct  5 15:24:36 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c24905bf

kde-frameworks/extra-cmake-modules: Rebase disable-qmlplugindump.patch

Closes: https://bugs.gentoo.org/816309
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../extra-cmake-modules-.ebuild|  2 +-
 ...make-modules-5.88.0-disable-qmlplugindump.patch | 65 ++
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 142667eb9f..a612724875 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 PATCHES=(
"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
"${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
-   "${FILESDIR}/${PN}-5.74.0-disable-qmlplugindump.patch"
+   "${FILESDIR}/${PN}-5.88.0-disable-qmlplugindump.patch"
 )
 
 python_check_deps() {

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch
new file mode 100644
index 00..f2c8368898
--- /dev/null
+++ 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch
@@ -0,0 +1,65 @@
+From 8bcda9bc1d12e2e8ea54dc8d957e415f9d5469a0 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 8 Dec 2019 15:01:33 +0100
+Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
+ avoid sandbox violations
+
+Back-story: https://bugzilla.gnome.org/show_bug.cgi?id=744135
+BUG: 387753
+---
+ modules/ECMFindQMLModule.cmake.in | 35 +++
+ 1 file changed, 22 insertions(+), 13 deletions(-)
+
+diff --git a/modules/ECMFindQMLModule.cmake.in 
b/modules/ECMFindQMLModule.cmake.in
+index 4234b702..d9817fe8 100644
+--- a/modules/ECMFindQMLModule.cmake.in
 b/modules/ECMFindQMLModule.cmake.in
+@@ -5,23 +5,32 @@
+ #=
+ 
+ include(FindPackageHandleStandardArgs)
+-include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+ 
+-query_qmake(qt_binaries_dir QT_HOST_BINS)
++option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may 
segfault in some sandboxed environments" OFF)
+ 
+-find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS 
${qt_binaries_dir})
+-if(NOT QMLPLUGINDUMP_PROGRAM)
+-message(WARNING "Could not find qmlplugindump. It is necessary to look up 
qml module dependencies.")
+-endif()
+-
+-execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" 
"@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE 
RESULT_VARIABLE ExitCode TIMEOUT 30)
+-
+-if(ExitCode EQUAL 0)
++if(ECM_DISABLE_QMLPLUGINDUMP)
++message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency 
is available as >= @VERSION@.")
+ set(@GENMODULE@_FOUND TRUE)
+-set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
++set(@GENMODULE@_VERSION @VERSION@)
+ else()
+-message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
+-set(@GENMODULE@_FOUND FALSE)
++include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
++
++query_qmake(qt_binaries_dir QT_HOST_BINS)
++
++find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS 
${qt_binaries_dir})
++if(NOT QMLPLUGINDUMP_PROGRAM)
++message(WARNING "Could not find qmlplugindump. It is necessary to 
look up qml module dependencies.")
++endif()
++
++execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" 
"@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE 
RESULT_VARIABLE ExitCode)
++
++if(ExitCode EQUAL 0)
++set(@GENMODULE@_FOUND TRUE)
++set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
++else()
++message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
++set(@GENMODULE@_FOUND FALSE)
++endif()
+ endif()
+ 
+ find_package_handle_standard_args(@GENMODULE@
+-- 
+2.33.0
+



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2021-06-14 Thread Andreas Sturmlechner
commit: 56a722bf72556ad8d764b222ac07629c06f5ac34
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 14 08:00:10 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jun 14 08:00:10 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=56a722bf

kde-frameworks/extra-cmake-modules: python3_10

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

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 2467bf44b6..24430fd568 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 QTMIN=5.15.2
 inherit cmake kde.org python-any-r1
 



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2021-01-13 Thread Andreas Sturmlechner
commit: e39e28cf5b2634c6a25073e6eada82f40fb55e59
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan 13 23:17:47 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 13 23:27:37 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e39e28cf

kde-frameworks/extra-cmake-modules: KDEFetchTranslations test broken

It can't work on release tarballs, even local clone only works if .git/config
url is pointed at the full invent.kde.org url instead of kde: alias.
Not worth "fixing".

See also: 
https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/36

Closes: https://bugs.gentoo.org/764953
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index adbc00f237..1fe6e8609f 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -67,10 +67,11 @@ src_configure() {
 src_test() {
# ECMToolchainAndroidTest passes but then breaks src_install
# ECMPoQmToolsTest is broken, bug #627806
+   # KDEFetchTranslations can not possibly succeed in releases, bug #764953
# possible race condition with multiple jobs, bug #701854
local myctestargs=(
-j1
-   -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
+   -E 
"(ECMToolchainAndroidTest|ECMPoQmToolsTest|KDEFetchTranslations)"
)
 
cmake_src_test



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/

2020-08-30 Thread Andreas Sturmlechner
commit: 1d40d9cea3c030184fa2d9de40dd5b253f380a56
Author: Jimi Huotari  gentoo  org>
AuthorDate: Sat Aug 29 21:39:08 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug 30 08:45:24 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1d40d9ce

kde-frameworks/extra-cmake-modules: Refactor qmlplugindump patch

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Jimi Huotari  gentoo.org>
Closes: https://github.com/gentoo/kde/pull/891
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild  | 2 +-
 ...ump.patch => extra-cmake-modules-5.74.0-disable-qmlplugindump.patch} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 0425b6f07a..86cdadf3ee 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -33,8 +33,8 @@ RESTRICT+=" !test? ( test )"
 
 PATCHES=(
"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
-   "${FILESDIR}/${PN}-5.65.0-disable-qmlplugindump.patch"
"${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
+   "${FILESDIR}/${PN}-5.74.0-disable-qmlplugindump.patch"
 )
 
 python_check_deps() {

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch
similarity index 98%
rename from 
kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch
rename to 
kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch
index 2cbfba7d5e..08fcf32338 100644
--- 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch
+++ 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch
@@ -28,7 +28,7 @@ index 8109ab8..1edc01d 100644
 -message(WARNING "Could not find qmlplugindump. It is necessary to look up 
qml module dependencies.")
 -endif()
 -
--execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" 
"@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE 
RESULT_VARIABLE ExitCode)
+-execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" 
"@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE 
RESULT_VARIABLE ExitCode TIMEOUT 30)
 -
 -if(ExitCode EQUAL 0)
 +if(ECM_DISABLE_QMLPLUGINDUMP)



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/

2020-07-12 Thread Andreas Sturmlechner
commit: 1b0294df9849933ffb3b0b22586677a71ebb0487
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jul 11 21:44:16 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul 12 22:51:50 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1b0294df

kde-frameworks/extra-cmake-modules: Skip ecm_add_test w/o Qt5::Test

Bug: https://bugs.gentoo.org/651978
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../extra-cmake-modules-.ebuild|  1 +
 ...ke-modules-5.72.0-skip-ecm_add_test-early.patch | 54 ++
 2 files changed, 55 insertions(+)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 7f5092846c..0425b6f07a 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -34,6 +34,7 @@ RESTRICT+=" !test? ( test )"
 PATCHES=(
"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
"${FILESDIR}/${PN}-5.65.0-disable-qmlplugindump.patch"
+   "${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
 )
 
 python_check_deps() {

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch
new file mode 100644
index 00..72541d73e7
--- /dev/null
+++ 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch
@@ -0,0 +1,54 @@
+From ad3aec71ed7f8820e69fe55489368a19d0735ab5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sat, 11 Jul 2020 23:04:16 +0200
+Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt5::Test is 
not available
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ modules/ECMAddTests.cmake| 9 +
+ tests/ECMAddTests/CMakeLists.txt | 5 +
+ 2 files changed, 14 insertions(+)
+
+diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake
+index 4bc7fb8..12825aa 100644
+--- a/modules/ECMAddTests.cmake
 b/modules/ECMAddTests.cmake
+@@ -81,6 +81,10 @@ function(ecm_add_test)
+ message(FATAL_ERROR "ecm_add_test() called with multiple source files but 
without setting \"TEST_NAME\"")
+   endif()
+ 
++  if(NOT TARGET Qt5::Test)
++return()
++  endif()
++
+   set(_testname ${ARG_NAME_PREFIX}${_targetname})
+   set(gui_args)
+   if(ARG_GUI)
+@@ -122,6 +126,11 @@ function(ecm_add_tests)
+   endif()
+   set(test_names)
+   set(target_names)
++
++  if(NOT TARGET Qt5::Test)
++return()
++  endif()
++
+   foreach(_test_source ${ARG_UNPARSED_ARGUMENTS})
+ ecm_add_test(${_test_source}
+   NAME_PREFIX ${ARG_NAME_PREFIX}
+diff --git a/tests/ECMAddTests/CMakeLists.txt 
b/tests/ECMAddTests/CMakeLists.txt
+index e77b33f..4e191fe 100644
+--- a/tests/ECMAddTests/CMakeLists.txt
 b/tests/ECMAddTests/CMakeLists.txt
+@@ -1,3 +1,8 @@
++if(NOT TARGET Qt5::Test)
++message(STATUS "WARNING: skipping tests that require Qt5::Test")
++return()
++endif()
++
+ macro(add_check NAME)
+ string(REPLACE "." "/" dir "${NAME}")
+ string(REGEX REPLACE "[^.]*\\." "" proj "${NAME}")
+-- 
+2.27.0
+



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/ki18n/, ...

2020-05-26 Thread Andreas Sturmlechner
commit: 7f8ae6ced2b31d03431e4aade46b8924678d6ec6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 26 11:59:52 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 26 11:59:52 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f8ae6ce

kde-frameworks: python3_9

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

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 2 +-
 kde-frameworks/kfilemetadata/kfilemetadata-.ebuild | 2 +-
 kde-frameworks/ki18n/ki18n-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 95e50a23e8..9e8b879b93 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 QTMIN=5.14.1
 inherit cmake kde.org python-any-r1
 

diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-.ebuild 
b/kde-frameworks/kfilemetadata/kfilemetadata-.ebuild
index 17b25f99ab..ce97caf96f 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PVCUT=$(ver_cut 1-2)
 QTMIN=5.14.1
 inherit ecm kde.org python-any-r1

diff --git a/kde-frameworks/ki18n/ki18n-.ebuild 
b/kde-frameworks/ki18n/ki18n-.ebuild
index 2f3d112f39..72d0643c24 100644
--- a/kde-frameworks/ki18n/ki18n-.ebuild
+++ b/kde-frameworks/ki18n/ki18n-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 QTMIN=5.14.1
 inherit ecm kde.org python-single-r1
 



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2020-02-12 Thread Andreas Sturmlechner
commit: 3e6c2ae418a0cdd5f57a8f147e12b7ce89baa893
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Feb 11 14:54:53 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Feb 12 23:10:48 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3e6c2ae4

kde-frameworks/extra-cmake-modules: Don't run tests in parallel

Reported-by: Paolo Pedroni  iol.it>
Closes: https://bugs.gentoo.org/701854
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index bb9758aa5c..3b4c614cc5 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -66,7 +66,9 @@ src_configure() {
 src_test() {
# ECMToolchainAndroidTest passes but then breaks src_install
# ECMPoQmToolsTest is broken, bug #627806
+   # possible race condition with multiple jobs, bug #701854
local myctestargs=(
+   -j1
-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
)
 



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2019-12-15 Thread Andreas Sturmlechner
commit: b5c03cc131a0b6cd7e974261db7e28dba0df5c2e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec  9 12:49:45 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 15 13:23:24 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b5c03cc1

kde-frameworks/extra-cmake-modules: Add ECM_DISABLE_QMLPLUGINDUMP

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

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 9958906cd1..c2ec7f0ec3 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -31,7 +31,10 @@ RDEPEND="
 
 RESTRICT+=" !test? ( test )"
 
-PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
+   "${FILESDIR}/${PN}-5.65.0-disable-qmlplugindump.patch"
+)
 
 python_check_deps() {
has_version "dev-python/sphinx[${PYTHON_USEDEP}]"



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/

2019-12-09 Thread Andreas Sturmlechner
commit: f5b2cf80ea9696a5efbc2064cd432670670af486
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec  9 12:49:45 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec  9 14:50:24 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f5b2cf80

kde-frameworks/extra-cmake-modules: Add ECM_DISABLE_QMLPLUGINDUMP

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

 .../extra-cmake-modules-5.65.0.ebuild  |  5 +-
 ...make-modules-5.65.0-disable-qmlplugindump.patch | 65 ++
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git 
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.65.0.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.65.0.ebuild
index e152de53fc..e070207366 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.65.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.65.0.ebuild
@@ -31,7 +31,10 @@ RDEPEND="
 
 RESTRICT+=" !test? ( test )"
 
-PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
+   "${FILESDIR}/${PN}-5.65.0-disable-qmlplugindump.patch"
+)
 
 python_check_deps() {
has_version "dev-python/sphinx[${PYTHON_USEDEP}]"

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch
new file mode 100644
index 00..2cbfba7d5e
--- /dev/null
+++ 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch
@@ -0,0 +1,65 @@
+From 8d30a7dd4517130bf1f6904b0969aaa78e44e16b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 8 Dec 2019 15:01:33 +0100
+Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
+ avoid sandbox violations
+
+Back story: https://bugzilla.gnome.org/show_bug.cgi?id=744135
+BUG: 387753
+---
+ modules/ECMFindQMLModule.cmake.in | 35 +++
+ 1 file changed, 22 insertions(+), 13 deletions(-)
+
+diff --git a/modules/ECMFindQMLModule.cmake.in 
b/modules/ECMFindQMLModule.cmake.in
+index 8109ab8..1edc01d 100644
+--- a/modules/ECMFindQMLModule.cmake.in
 b/modules/ECMFindQMLModule.cmake.in
+@@ -26,23 +26,32 @@
+ #=
+ 
+ include(FindPackageHandleStandardArgs)
+-include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+ 
+-query_qmake(qt_binaries_dir QT_INSTALL_BINS)
++option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may 
segfault in some sandboxed environments" OFF)
+ 
+-find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS 
${qt_binaries_dir})
+-if(NOT QMLPLUGINDUMP_PROGRAM)
+-message(WARNING "Could not find qmlplugindump. It is necessary to look up 
qml module dependencies.")
+-endif()
+-
+-execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" 
"@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE 
RESULT_VARIABLE ExitCode)
+-
+-if(ExitCode EQUAL 0)
++if(ECM_DISABLE_QMLPLUGINDUMP)
++message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency 
is available as >= @VERSION@.")
+ set(@GENMODULE@_FOUND TRUE)
+-set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
++set(@GENMODULE@_VERSION @VERSION@)
+ else()
+-message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
+-set(@GENMODULE@_FOUND FALSE)
++include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
++
++query_qmake(qt_binaries_dir QT_INSTALL_BINS)
++
++find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS 
${qt_binaries_dir})
++if(NOT QMLPLUGINDUMP_PROGRAM)
++message(WARNING "Could not find qmlplugindump. It is necessary to 
look up qml module dependencies.")
++endif()
++
++execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" 
"@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE 
RESULT_VARIABLE ExitCode)
++
++if(ExitCode EQUAL 0)
++set(@GENMODULE@_FOUND TRUE)
++set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
++else()
++message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
++set(@GENMODULE@_FOUND FALSE)
++endif()
+ endif()
+ 
+ find_package_handle_standard_args(@GENMODULE@
+-- 
+2.24.0
+



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2019-11-29 Thread Andreas Sturmlechner
commit: 207917d9b6538b6bd63ea1e893cbee35fe1060cc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 26 21:00:40 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov 29 18:33:33 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=207917d9

kde-frameworks/extra-cmake-modules: Mark for ALLARCHES stabilization

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

 kde-frameworks/extra-cmake-modules/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-frameworks/extra-cmake-modules/metadata.xml 
b/kde-frameworks/extra-cmake-modules/metadata.xml
index 2fdbf33d96..ce744e04ea 100644
--- a/kde-frameworks/extra-cmake-modules/metadata.xml
+++ b/kde-frameworks/extra-cmake-modules/metadata.xml
@@ -5,4 +5,5 @@
k...@gentoo.org
Gentoo KDE Project

+   
 



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/kfilemetadata/

2019-11-20 Thread Andreas Sturmlechner
commit: 77d6bfb7e403630d075342a4a445d061a1d403f4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 20 22:40:36 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 20 22:40:36 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=77d6bfb7

kde-frameworks: python3_8 where possible

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

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 2 +-
 kde-frameworks/kfilemetadata/kfilemetadata-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 600af42aa3..9958906cd1 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 QTMIN=5.12.3
 inherit cmake-utils kde.org python-any-r1
 

diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-.ebuild 
b/kde-frameworks/kfilemetadata/kfilemetadata-.ebuild
index 3a23565500..9ca651a76a 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PVCUT=$(ver_cut 1-2)
 QTMIN=5.12.3
 inherit ecm kde.org python-any-r1



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2019-11-10 Thread Andreas Sturmlechner
commit: 439ce7213e5a7340a2da411e80fa55b135f1e31c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Nov 11 07:29:25 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 11 07:30:27 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=439ce721

kde-frameworks/extra-cmake-modules: Add BUILD_TESTING cmakearg

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

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 31de4526a7..600af42aa3 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -50,10 +50,11 @@ src_prepare() {
 
 src_configure() {
local mycmakeargs=(
+   -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
-DBUILD_QTHELP_DOCS=$(usex doc)
-DBUILD_HTML_DOCS=$(usex doc)
-DBUILD_MAN_DOCS=$(usex doc)
-   -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
+   -DBUILD_TESTING=$(usex test)
)
 
cmake-utils_src_configure



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2019-10-17 Thread Andreas Sturmlechner
commit: a4e11e5e2a0785e33999cc03ffd2bc8b037eff6f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct 17 18:07:08 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct 17 18:07:08 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a4e11e5e

kde-frameworks/extra-cmake-modules: Drop python2_7

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

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 5cfdab0f5d..14fce598df 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils kde.org python-any-r1
 
 DESCRIPTION="Extra modules and scripts for CMake"



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2019-10-16 Thread Andreas Sturmlechner
commit: 08117c7ec3a9f2d10b5df646e8d782f4e581fdba
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Oct 16 12:26:22 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct 16 12:26:22 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=08117c7e

kde-frameworks/extra-cmake-modules: Port away from kde5.eclass

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

 .../extra-cmake-modules-.ebuild   | 19 +++
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index bd0f45ebea..5cfdab0f5d 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -4,12 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-ECM_KDEINSTALLDIRS="false"
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_QTHELP="false"
-KDE_TEST="false"
-inherit kde5 python-any-r1
+inherit cmake-utils kde.org python-any-r1
 
 DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git;
@@ -22,11 +17,11 @@ BDEPEND="
doc? (
${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-   $(add_qt_dep qthelp)
+   dev-qt/qthelp:5
)
test? (
-   $(add_qt_dep qtcore)
-   $(add_qt_dep linguist-tools)
+   dev-qt/linguist-tools:5
+   dev-qt/qtcore:5
)
 "
 RDEPEND="
@@ -44,7 +39,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-   kde5_src_prepare
+   cmake-utils_src_prepare
# Requires PyQt5, bug #680256
sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT 
SIP_Qt5Core_Mod_FILE/TRUE/" \
tests/CMakeLists.txt || die "failed to disable 
GenerateSipBindings tests"
@@ -58,7 +53,7 @@ src_configure() {
-DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
)
 
-   kde5_src_configure
+   cmake-utils_src_configure
 }
 
 src_test() {
@@ -68,5 +63,5 @@ src_test() {
-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
)
 
-   kde5_src_test
+   cmake-utils_src_test
 }



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2019-10-11 Thread Andreas Sturmlechner
commit: 8fece55a26a600a4b44ca24f36caa59274678dcf
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Oct 11 15:35:55 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Oct 11 17:56:30 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8fece55a

kde-frameworks: Remove *-fbsd KEYWORDS

Signed-off-by: Michał Górny  gentoo.org>

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.63.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.63.0.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.63.0.ebuild
index 17e8faa62a..65262ecc72 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.63.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.63.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git;
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="doc test"
 
 BDEPEND="



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2019-03-17 Thread Andreas Sturmlechner
commit: 2fac7f150f085937633f1e89eba81c4fb13341ec
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 17 22:09:06 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 17 22:44:40 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2fac7f15

kde-frameworks/extra-cmake-modules: Fix unused CMake variable warning

Closes: https://bugs.gentoo.org/680256
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../extra-cmake-modules/extra-cmake-modules-.ebuild   | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index b7be0b53d6..f24d2f6bc4 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -43,6 +43,13 @@ pkg_setup() {
use doc && python-any-r1_pkg_setup
 }
 
+src_prepare() {
+   kde5_src_prepare
+   # Requires PyQt5, bug #680256
+   sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT 
SIP_Qt5Core_Mod_FILE/TRUE/" \
+   tests/CMakeLists.txt || die "failed to disable 
GenerateSipBindings tests"
+}
+
 src_configure() {
local mycmakeargs=(
-DBUILD_QTHELP_DOCS=$(usex doc)
@@ -50,7 +57,6 @@ src_configure() {
-DBUILD_MAN_DOCS=$(usex doc)
-DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
)
-   use test && mycmakeargs+=( 
-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON )
 
kde5_src_configure
 }



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/

2019-02-10 Thread Andreas Sturmlechner
commit: d67d29299a7347b02b43ccefa5a3884aaf7b7989
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb  9 16:01:42 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb  9 16:01:42 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d67d2929

kde-frameworks/extra-cmake-modules: Drop obsolete patch

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

 .../extra-cmake-modules-5.55.0-clazy-1.5.patch | 41 --
 1 file changed, 41 deletions(-)

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch
deleted file mode 100644
index 0ac07a60ee..00
--- 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ba3341c83b186e021337761e5fd689614fe14177 Mon Sep 17 00:00:00 2001
-From: Elvis Angelaccio 
-Date: Sat, 2 Feb 2019 18:46:27 +0100
-Subject: Fix ENABLE_CLAZY option with clazy >= 1.5
-
-Summary:
-clazy 1.5 renamed its plugin from from `ClangLazy.so` to
-`ClazyPlugin.so` and from `clang-lazy` to `clazy`.
-
-Reviewers: apol, smartins
-
-Subscribers: kde-frameworks-devel, kde-buildsystem
-
-Tags: #frameworks, #build_system
-
-Differential Revision: https://phabricator.kde.org/D18680

- kde-modules/KDECMakeSettings.cmake | 7 ++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/kde-modules/KDECMakeSettings.cmake 
b/kde-modules/KDECMakeSettings.cmake
-index 3f7f5a8..17d79a0 100644
 a/kde-modules/KDECMakeSettings.cmake
-+++ b/kde-modules/KDECMakeSettings.cmake
-@@ -293,7 +293,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- option(ENABLE_CLAZY "Enable Clazy warnings" OFF)
- 
- if(ENABLE_CLAZY)
--set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang 
-load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin 
-Xclang clang-lazy")
-+find_library(CLAZY_v1_5_FOUND 
ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX})
-+if(CLAZY_v1_5_FOUND) # clazy >= 1.5
-+set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang 
-load -Xclang ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin 
-Xclang clazy")
-+else() # clazy < 1.5
-+set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang 
-load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin 
-Xclang clang-lazy")
-+endif()
- endif()
- endif()
- 
--- 
-cgit v1.1
-



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/

2019-02-05 Thread Andreas Sturmlechner
commit: ea4a2e9336ed805197c758c9d991ac85bcbe7547
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Feb  6 00:06:58 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Feb  6 00:06:58 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ea4a2e93

kde-frameworks/extra-cmake-modules: Fix detection of >=clazy-1.5

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

 .../extra-cmake-modules-5.55.0.ebuild  |  5 ++-
 .../extra-cmake-modules-5.55.0-clazy-1.5.patch | 41 ++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git 
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.55.0.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.55.0.ebuild
index 3a8e3d7b38..91fdffe863 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.55.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.55.0.ebuild
@@ -33,7 +33,10 @@ RDEPEND="
app-arch/libarchive[bzip2]
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
+   "${FILESDIR}/${P}-clazy-1.5.patch"
+)
 
 python_check_deps() {
has_version "dev-python/sphinx[${PYTHON_USEDEP}]"

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch
new file mode 100644
index 00..0ac07a60ee
--- /dev/null
+++ 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch
@@ -0,0 +1,41 @@
+From ba3341c83b186e021337761e5fd689614fe14177 Mon Sep 17 00:00:00 2001
+From: Elvis Angelaccio 
+Date: Sat, 2 Feb 2019 18:46:27 +0100
+Subject: Fix ENABLE_CLAZY option with clazy >= 1.5
+
+Summary:
+clazy 1.5 renamed its plugin from from `ClangLazy.so` to
+`ClazyPlugin.so` and from `clang-lazy` to `clazy`.
+
+Reviewers: apol, smartins
+
+Subscribers: kde-frameworks-devel, kde-buildsystem
+
+Tags: #frameworks, #build_system
+
+Differential Revision: https://phabricator.kde.org/D18680
+---
+ kde-modules/KDECMakeSettings.cmake | 7 ++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/kde-modules/KDECMakeSettings.cmake 
b/kde-modules/KDECMakeSettings.cmake
+index 3f7f5a8..17d79a0 100644
+--- a/kde-modules/KDECMakeSettings.cmake
 b/kde-modules/KDECMakeSettings.cmake
+@@ -293,7 +293,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ option(ENABLE_CLAZY "Enable Clazy warnings" OFF)
+ 
+ if(ENABLE_CLAZY)
+-set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang 
-load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin 
-Xclang clang-lazy")
++find_library(CLAZY_v1_5_FOUND 
ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX})
++if(CLAZY_v1_5_FOUND) # clazy >= 1.5
++set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang 
-load -Xclang ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin 
-Xclang clazy")
++else() # clazy < 1.5
++set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang 
-load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin 
-Xclang clang-lazy")
++endif()
+ endif()
+ endif()
+ 
+-- 
+cgit v1.1
+



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2019-01-05 Thread Andreas Sturmlechner
commit: eb85b3adadeba8cf98d311d93c996998c364a1f6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan  5 22:45:08 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan  5 22:45:08 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=eb85b3ad

kde-frameworks/extra-cmake-modules: Add missing USE=doc DEPEND

Reported-by: Nick Bowler  draconx.ca>
Bug: https://bugs.gentoo.org/674532
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 642ffd4e77..936c681e56 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,6 +22,7 @@ DEPEND="
doc? (
${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+   $(add_qt_dep qthelp)
)
test? (
$(add_qt_dep qtcore)



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2018-09-30 Thread Andreas Sturmlechner
commit: 58d515c619833259d54104e8ca115fef8d249342
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep 30 08:15:10 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 30 08:44:45 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=58d515c6

kde-frameworks/extra-cmake-modules: Bind BUILD_QTHELP_DOCS to USE=doc

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

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index c9fe16132a..642ffd4e77 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -44,9 +44,10 @@ pkg_setup() {
 
 src_configure() {
local mycmakeargs=(
-   -DBUILD_HTML_DOCS="$(usex doc)"
-   -DBUILD_MAN_DOCS="$(usex doc)"
-   -DDOC_INSTALL_DIR="/usr/share/doc/${PF}"
+   -DBUILD_QTHELP_DOCS=$(usex doc)
+   -DBUILD_HTML_DOCS=$(usex doc)
+   -DBUILD_MAN_DOCS=$(usex doc)
+   -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
)
use test && mycmakeargs+=( 
-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON )
 



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2018-09-30 Thread Andreas Sturmlechner
commit: 638728ffdf33cd47e3583c5967accb775b87bd89
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep 29 21:05:28 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 30 08:43:36 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=638728ff

kde-frameworks/extra-cmake-modules: Fix src_configure

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

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 8ca8a79e63..c9fe16132a 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+ECM_KDEINSTALLDIRS="false"
 KDE_AUTODEPS="false"
 KDE_DEBUG="false"
 KDE_QTHELP="false"
@@ -49,7 +50,7 @@ src_configure() {
)
use test && mycmakeargs+=( 
-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON )
 
-   cmake-utils_src_configure
+   kde5_src_configure
 }
 
 src_test() {



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/

2018-08-19 Thread Michael Palimaka
commit: d02ce6c1b55141859d389596b079200ad6e9e400
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Aug 19 14:00:12 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Aug 19 14:00:25 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d02ce6c1

kde-frameworks/extra-cmake-modules: avoid build failure with GCC8 and ld.gold

Bug: https://bugs.gentoo.org/663512
Package-Manager: Portage-2.3.44, Repoman-2.3.10

 .../extra-cmake-modules-.ebuild   |  2 ++
 ...extra-cmake-modules-5.49.0-no-fatal-warnings.patch | 19 +++
 2 files changed, 21 insertions(+)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index e25c18f8b4..8ca8a79e63 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -31,6 +31,8 @@ RDEPEND="
app-arch/libarchive[bzip2]
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" )
+
 python_check_deps() {
has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
 }

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch
new file mode 100644
index 00..f71d19d5fc
--- /dev/null
+++ 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch
@@ -0,0 +1,19 @@
+Avoid triggering a build failure with GCC8 and ld.gold producing warnings.
+
+Bug: https://bugs.gentoo.org/663512
+
+diff --git a/kde-modules/KDECompilerSettings.cmake 
b/kde-modules/KDECompilerSettings.cmake
+index 44358fb..0270aa5 100644
+--- a/kde-modules/KDECompilerSettings.cmake
 b/kde-modules/KDECompilerSettings.cmake
+@@ -344,8 +344,8 @@ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT APPLE) OR
+ (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT APPLE) OR
+ (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32))
+ # Linker warnings should be treated as errors
+-set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings 
${CMAKE_SHARED_LINKER_FLAGS}")
+-set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings 
${CMAKE_MODULE_LINKER_FLAGS}")
++#set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings 
${CMAKE_SHARED_LINKER_FLAGS}")
++#set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings 
${CMAKE_MODULE_LINKER_FLAGS}")
+ 
+ # Do not allow undefined symbols, even in non-symbolic shared libraries
+ set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined 
${CMAKE_SHARED_LINKER_FLAGS}")



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2018-08-16 Thread Andreas Sturmlechner
commit: e3ea6fddfe4bfb9d621b4a9855060d1b1a0f9e80
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 16 20:42:08 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug 16 20:42:08 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e3ea6fdd

kde-frameworks/extra-cmake-modules: python3_7

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index ec9a6c83b1..e25c18f8b4 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 KDE_AUTODEPS="false"
 KDE_DEBUG="false"
 KDE_QTHELP="false"



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/kconfig/, ...

2018-07-14 Thread Andreas Sturmlechner
commit: 6b9f8a6b15843242d8d5a7a80fbf6961eff19078
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jul 14 12:51:16 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jul 14 12:51:16 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6b9f8a6b

kde-frameworks: Drop KDE Frameworks 5.48

Moved to Gentoo ebuild repository.

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 kde-frameworks/attica/attica-5.48.0.ebuild | 16 -
 kde-frameworks/baloo/baloo-5.48.0.ebuild   | 34 -
 kde-frameworks/bluez-qt/bluez-qt-5.48.0.ebuild | 34 -
 .../breeze-icons-rcc-5.48.0.ebuild | 42 ---
 .../breeze-icons/breeze-icons-5.48.0.ebuild| 41 ---
 .../extra-cmake-modules-5.48.0.ebuild  | 61 
 .../frameworkintegration-5.48.0.ebuild | 53 --
 .../kactivities-stats-5.48.0.ebuild| 21 --
 .../kactivities/kactivities-5.48.0.ebuild  | 26 ---
 kde-frameworks/kapidox/kapidox-5.48.0.ebuild   | 28 
 kde-frameworks/karchive/karchive-5.48.0.ebuild | 27 ---
 kde-frameworks/kauth/kauth-5.48.0.ebuild   | 32 -
 kde-frameworks/kbookmarks/kbookmarks-5.48.0.ebuild | 29 
 kde-frameworks/kcmutils/kcmutils-5.48.0.ebuild | 31 
 kde-frameworks/kcodecs/kcodecs-5.48.0.ebuild   | 16 -
 .../kcompletion/kcompletion-5.48.0.ebuild  | 21 --
 kde-frameworks/kconfig/kconfig-5.48.0.ebuild   | 26 ---
 .../kconfigwidgets/kconfigwidgets-5.48.0.ebuild| 36 --
 .../kcoreaddons/kcoreaddons-5.48.0.ebuild  | 39 --
 kde-frameworks/kcrash/kcrash-5.48.0.ebuild | 28 
 .../kdbusaddons/kdbusaddons-5.48.0.ebuild  | 28 
 .../kdeclarative/kdeclarative-5.48.0.ebuild| 32 -
 kde-frameworks/kded/kded-5.48.0.ebuild | 36 --
 .../kdelibs4support/kdelibs4support-5.48.0.ebuild  | 84 --
 .../kdesignerplugin/kdesignerplugin-5.48.0.ebuild  | 54 --
 kde-frameworks/kdesu/kdesu-5.48.0.ebuild   | 32 -
 kde-frameworks/kdewebkit/kdewebkit-5.48.0.ebuild   | 30 
 kde-frameworks/kdnssd/kdnssd-5.48.0.ebuild | 31 
 kde-frameworks/kdoctools/kdoctools-5.48.0.ebuild   | 25 ---
 kde-frameworks/kemoticons/kemoticons-5.48.0.ebuild | 26 ---
 .../kfilemetadata/kfilemetadata-5.48.0.ebuild  | 63 
 .../kglobalaccel/kglobalaccel-5.48.0.ebuild| 29 
 kde-frameworks/kguiaddons/kguiaddons-5.48.0.ebuild | 22 --
 kde-frameworks/kholidays/kholidays-5.48.0.ebuild   | 30 
 kde-frameworks/khtml/khtml-5.48.0.ebuild   | 68 --
 kde-frameworks/ki18n/ki18n-5.48.1.ebuild   | 38 --
 .../kiconthemes/kiconthemes-5.48.0.ebuild  | 29 
 kde-frameworks/kidletime/kidletime-5.48.0.ebuild   | 46 
 .../kimageformats/kimageformats-5.48.0.ebuild  | 42 ---
 kde-frameworks/kinit/kinit-5.48.0.ebuild   | 45 
 kde-frameworks/kio/kio-5.48.0.ebuild   | 79 
 kde-frameworks/kirigami/kirigami-5.48.0.ebuild | 43 ---
 .../kitemmodels/kitemmodels-5.48.0.ebuild  | 14 
 kde-frameworks/kitemviews/kitemviews-5.48.0.ebuild | 20 --
 .../kjobwidgets/kjobwidgets-5.48.0.ebuild  | 35 -
 kde-frameworks/kjs/kjs-5.48.0.ebuild   | 22 --
 kde-frameworks/kjsembed/kjsembed-5.48.0.ebuild | 26 ---
 .../kmediaplayer/kmediaplayer-5.48.0.ebuild| 21 --
 kde-frameworks/knewstuff/knewstuff-5.48.0.ebuild   | 36 --
 .../knotifications/knotifications-5.48.0.ebuild| 44 
 .../knotifyconfig/knotifyconfig-5.48.0.ebuild  | 24 ---
 kde-frameworks/kpackage/kpackage-5.48.0.ebuild | 34 -
 kde-frameworks/kparts/kparts-5.48.0.ebuild | 30 
 kde-frameworks/kpeople/kpeople-5.48.0.ebuild   | 38 --
 kde-frameworks/kplotting/kplotting-5.48.0.ebuild   | 18 -
 kde-frameworks/kpty/kpty-5.48.0.ebuild | 26 ---
 kde-frameworks/kross/kross-5.48.0.ebuild   | 32 -
 kde-frameworks/krunner/krunner-5.48.0.ebuild   | 36 --
 kde-frameworks/kservice/kservice-5.48.0.ebuild | 46 
 .../ktexteditor/ktexteditor-5.48.0.ebuild  | 56 ---
 .../ktextwidgets/ktextwidgets-5.48.0.ebuild| 37 --
 .../kunitconversion/kunitconversion-5.48.0.ebuild  | 26 ---
 kde-frameworks/kwallet/kwallet-5.48.0.ebuild   | 56 ---
 kde-frameworks/kwayland/kwayland-5.48.0.ebuild | 27 ---
 .../kwidgetsaddons/kwidgetsaddons-5.48.0.ebuild| 26 ---
 .../kwindowsystem/kwindowsystem-5.48.0.ebuild  | 40 ---
 kde-frameworks/kxmlgui/kxmlgui-5.48.0.ebuild   | 52 --
 

[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/

2018-03-11 Thread Andreas Sturmlechner
commit: 0bf8d8508920f66509333f57024a4fa29735b027
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 11 16:42:04 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 11 23:59:22 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0bf8d850

kde-frameworks/extra-cmake-modules: Drop unused patch

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 ...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 38 --
 1 file changed, 38 deletions(-)

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
deleted file mode 100644
index d1bcf791fd..00
--- 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 32d596b8c64c1c963b053788f67ef012b836 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Sat, 2 Dec 2017 19:04:10 +0100
-Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump
-
-Summary:
-Without any hint, qmlplugindump version is whatever default is set by 
qtchooser.
-Fix uses the same approach as FindQtWaylandScanner.cmake.
-
-Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami.
-
-Reviewers: apol
-
-Subscribers: #frameworks, #build_system
-
-Tags: #frameworks, #build_system
-
-Differential Revision: https://phabricator.kde.org/D9116

- modules/ECMFindQMLModule.cmake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/ECMFindQMLModule.cmake.in 
b/modules/ECMFindQMLModule.cmake.in
-index 428d60a..d72c52b 100644
 a/modules/ECMFindQMLModule.cmake.in
-+++ b/modules/ECMFindQMLModule.cmake.in
-@@ -27,7 +27,7 @@
- 
- include(FindPackageHandleStandardArgs)
- 
--find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump)
-+find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS 
/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/)
- if(NOT QMLPLUGINDUMP_PROGRAM)
- message(WARNING "Could not find qmlplugindump. It is necessary to look up 
qml module dependencies.")
- endif()
--- 
-2.15.1
-



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/

2018-01-07 Thread Andreas Sturmlechner
commit: 49e87796953844e226f0037ede5baad8d767879b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan  7 19:15:38 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan  7 19:15:38 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=49e87796

kde-frameworks/extra-cmake-modules: Re-add qmlplugindump patch

Still pending upstream.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../extra-cmake-modules-5.42.0.ebuild  |  2 ++
 ...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 38 ++
 2 files changed, 40 insertions(+)

diff --git 
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild
index 8b14f01dc7..fb96d84501 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild
@@ -31,6 +31,8 @@ RDEPEND="
app-arch/libarchive[bzip2]
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.40.0-qmlplugindump-path.patch" )
+
 python_check_deps() {
has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
 }

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
new file mode 100644
index 00..d1bcf791fd
--- /dev/null
+++ 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
@@ -0,0 +1,38 @@
+From 32d596b8c64c1c963b053788f67ef012b836 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sat, 2 Dec 2017 19:04:10 +0100
+Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump
+
+Summary:
+Without any hint, qmlplugindump version is whatever default is set by 
qtchooser.
+Fix uses the same approach as FindQtWaylandScanner.cmake.
+
+Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami.
+
+Reviewers: apol
+
+Subscribers: #frameworks, #build_system
+
+Tags: #frameworks, #build_system
+
+Differential Revision: https://phabricator.kde.org/D9116
+---
+ modules/ECMFindQMLModule.cmake.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/ECMFindQMLModule.cmake.in 
b/modules/ECMFindQMLModule.cmake.in
+index 428d60a..d72c52b 100644
+--- a/modules/ECMFindQMLModule.cmake.in
 b/modules/ECMFindQMLModule.cmake.in
+@@ -27,7 +27,7 @@
+ 
+ include(FindPackageHandleStandardArgs)
+ 
+-find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump)
++find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS 
/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/)
+ if(NOT QMLPLUGINDUMP_PROGRAM)
+ message(WARNING "Could not find qmlplugindump. It is necessary to look up 
qml module dependencies.")
+ endif()
+-- 
+2.15.1
+



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/

2018-01-05 Thread Johannes Huber
commit: 62059b22d73b38cdbc1553fba036ad23644b8e49
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Jan  5 08:55:00 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Jan  5 08:55:00 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=62059b22

kde-frameworks/extra-cmake-modules: Remove unused patches

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 ...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 38 --
 1 file changed, 38 deletions(-)

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
deleted file mode 100644
index d1bcf791fd..00
--- 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 32d596b8c64c1c963b053788f67ef012b836 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Sat, 2 Dec 2017 19:04:10 +0100
-Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump
-
-Summary:
-Without any hint, qmlplugindump version is whatever default is set by 
qtchooser.
-Fix uses the same approach as FindQtWaylandScanner.cmake.
-
-Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami.
-
-Reviewers: apol
-
-Subscribers: #frameworks, #build_system
-
-Tags: #frameworks, #build_system
-
-Differential Revision: https://phabricator.kde.org/D9116

- modules/ECMFindQMLModule.cmake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/ECMFindQMLModule.cmake.in 
b/modules/ECMFindQMLModule.cmake.in
-index 428d60a..d72c52b 100644
 a/modules/ECMFindQMLModule.cmake.in
-+++ b/modules/ECMFindQMLModule.cmake.in
-@@ -27,7 +27,7 @@
- 
- include(FindPackageHandleStandardArgs)
- 
--find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump)
-+find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS 
/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/)
- if(NOT QMLPLUGINDUMP_PROGRAM)
- message(WARNING "Could not find qmlplugindump. It is necessary to look up 
qml module dependencies.")
- endif()
--- 
-2.15.1
-



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/

2017-12-03 Thread Andreas Sturmlechner
commit: 26d1964cd2967eccdad8ab55a7bb26f37a68b49c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  3 13:55:07 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  3 20:00:20 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=26d1964c

kde-frameworks/extra-cmake-modules: Fix ECMFindQMLModule.cmake.in

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 .../extra-cmake-modules-5.41.0.ebuild  |  2 ++
 ...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 38 ++
 2 files changed, 40 insertions(+)

diff --git 
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.41.0.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.41.0.ebuild
index f565f9c0be..06e3c7ef27 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.41.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.41.0.ebuild
@@ -31,6 +31,8 @@ RDEPEND="
app-arch/libarchive[bzip2]
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.40.0-qmlplugindump-path.patch" )
+
 python_check_deps() {
has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
 }

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
new file mode 100644
index 00..d1bcf791fd
--- /dev/null
+++ 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
@@ -0,0 +1,38 @@
+From 32d596b8c64c1c963b053788f67ef012b836 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sat, 2 Dec 2017 19:04:10 +0100
+Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump
+
+Summary:
+Without any hint, qmlplugindump version is whatever default is set by 
qtchooser.
+Fix uses the same approach as FindQtWaylandScanner.cmake.
+
+Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami.
+
+Reviewers: apol
+
+Subscribers: #frameworks, #build_system
+
+Tags: #frameworks, #build_system
+
+Differential Revision: https://phabricator.kde.org/D9116
+---
+ modules/ECMFindQMLModule.cmake.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/ECMFindQMLModule.cmake.in 
b/modules/ECMFindQMLModule.cmake.in
+index 428d60a..d72c52b 100644
+--- a/modules/ECMFindQMLModule.cmake.in
 b/modules/ECMFindQMLModule.cmake.in
+@@ -27,7 +27,7 @@
+ 
+ include(FindPackageHandleStandardArgs)
+ 
+-find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump)
++find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS 
/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/)
+ if(NOT QMLPLUGINDUMP_PROGRAM)
+ message(WARNING "Could not find qmlplugindump. It is necessary to look up 
qml module dependencies.")
+ endif()
+-- 
+2.15.1
+



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2017-09-03 Thread Andreas Sturmlechner
commit: e661c549b3d68be57f565aeb0a44b3c652572525
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep  3 15:17:52 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  3 15:17:52 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e661c549

kde-frameworks/extra-cmake-modules: Disable broken test

Gentoo-bug: 627806
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.38.0.ebuild | 3 ++-
 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.38.0.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.38.0.ebuild
index a1079a5899..6cb0dc2df7 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.38.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.38.0.ebuild
@@ -52,8 +52,9 @@ src_configure() {
 
 src_test() {
# ECMToolchainAndroidTest passes but then breaks src_install
+   # ECMPoQmToolsTest is broken, bug #627806
local myctestargs=(
-   -E "(ECMToolchainAndroidTest)"
+   -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
)
 
kde5_src_test

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index aa4cb7d3f0..c0c53f383f 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -52,8 +52,9 @@ src_configure() {
 
 src_test() {
# ECMToolchainAndroidTest passes but then breaks src_install
+   # ECMPoQmToolsTest is broken, bug #627806
local myctestargs=(
-   -E "(ECMToolchainAndroidTest)"
+   -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
)
 
kde5_src_test



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/

2017-08-15 Thread Andreas Sturmlechner
commit: 04fcdaa4e06d3878779436179ae26010a45129b0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug 14 21:45:18 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug 15 08:14:48 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=04fcdaa4

kde-frameworks/extra-cmake-modules: Drop ECMAddTest patch again

Package-Manager: Portage-2.3.7, Repoman-2.3.3

 .../extra-cmake-modules-.ebuild|  2 -
 .../extra-cmake-modules-5.37.0-ecmaddtest.patch| 74 --
 2 files changed, 76 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 0edb669dcb..aa4cb7d3f0 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -31,8 +31,6 @@ RDEPEND="
app-arch/libarchive[bzip2]
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.37.0-ecmaddtest.patch" )
-
 python_check_deps() {
has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
 }

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.37.0-ecmaddtest.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.37.0-ecmaddtest.patch
deleted file mode 100644
index fe86754188..00
--- 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.37.0-ecmaddtest.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From b99d2d2c5dedcaba9745dddc1dd7b8d4811babf1 Mon Sep 17 00:00:00 2001
-From: Kevin Funk 
-Date: Mon, 7 Aug 2017 15:50:25 +0200
-Subject: RFC: Make ECMAddTests respect BUILD_TESTING
-
-Summary:
-Use-case: Make building unit tests optional, by just following the CMake
-BUILD_TESTING option.
-
-The usual approach to conditionally build tests is to do:
-```
-if (BUILD_TESTING)
-add_executable(TestOne TestOne.cpp)
-target_link_libraries(TestOne my_library)
-endif()
-```
-
-or:
-
-```
-if (BUILD_TESTING)
-add_subdirectory(tests)
-endif()
-```
-
-This patch just turns all calls to ecm_add_test(...) into no-ops if
-BUILD_TESTING=OFF.
-
-See:
-  https://cmake.org/cmake/help/v3.6/module/CTest.html
-
-Reviewers: vkrause
-
-Reviewed By: vkrause
-
-Subscribers: kossebau, vkrause, elvisangelaccio, asturmlechner, apol, 
#frameworks, #build_system
-
-Tags: #frameworks, #build_system
-
-Differential Revision: https://phabricator.kde.org/D7187

- modules/ECMAddTests.cmake | 10 ++
- 1 file changed, 10 insertions(+)
-
-diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake
-index 9667388..c77a7aa 100644
 a/modules/ECMAddTests.cmake
-+++ b/modules/ECMAddTests.cmake
-@@ -49,6 +49,12 @@
- # be given; this will be used for both the target and test names (and, as with
- # ecm_add_tests(), the NAME_PREFIX argument will be prepended to the test 
name).
- #
-+# If BUILD_TESTING is set to OFF, ecm_add_test will turn into a no-op and thus
-+# will not add any test-related targets
-+#
-+# BUILD_TESTING is created as a cache variable by the CTest module and by the
-+# :kde-module:`KDECMakeSettings` module.
-+#
- #
- # Since pre-1.0.0.
- 
-@@ -84,6 +90,10 @@ include(ECMMarkAsTest)
- include(ECMMarkNonGuiExecutable)
- 
- function(ecm_add_test)
-+  if(NOT BUILD_TESTING)
-+  return() # turn this function into a no-op
-+  endif()
-+
-   set(options GUI)
-   # TARGET_NAME_VAR and TEST_NAME_VAR are undocumented args used by
-   # ecm_add_tests
--- 
-cgit v0.11.2



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2017-08-13 Thread Andreas Sturmlechner
commit: 7df7b343b407b184e48f02884386774836b49549
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 13 22:13:04 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug 13 22:13:04 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7df7b343

kde-frameworks/extra-cmake-modules: Revert upstream's ECMAddTest revert

All hope is not lost.

Gentoo-bug: 627764
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index aa4cb7d3f0..0edb669dcb 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -31,6 +31,8 @@ RDEPEND="
app-arch/libarchive[bzip2]
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.37.0-ecmaddtest.patch" )
+
 python_check_deps() {
has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
 }



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/

2017-08-08 Thread Andreas Sturmlechner
commit: 06d50c76fcc5d796c53c6ac4b1c0857f47eea3ef
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug  8 07:17:31 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug  8 07:17:31 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=06d50c76

kde-frameworks/extra-cmake-modules: Backport fix to ECMAddTests.cmake

Respecting BUILD_TESTING will enable us to drop a lot of eclass magic.

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 .../extra-cmake-modules-5.37.0.ebuild  |  2 +
 .../extra-cmake-modules-5.37.0-ecmaddtest.patch| 74 ++
 2 files changed, 76 insertions(+)

diff --git 
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0.ebuild
index a1079a5899..231e84818f 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0.ebuild
@@ -31,6 +31,8 @@ RDEPEND="
app-arch/libarchive[bzip2]
 "
 
+PATCHES=( "${FILESDIR}/${P}-ecmaddtest.patch" )
+
 python_check_deps() {
has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
 }

diff --git 
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.37.0-ecmaddtest.patch
 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.37.0-ecmaddtest.patch
new file mode 100644
index 00..fe86754188
--- /dev/null
+++ 
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.37.0-ecmaddtest.patch
@@ -0,0 +1,74 @@
+From b99d2d2c5dedcaba9745dddc1dd7b8d4811babf1 Mon Sep 17 00:00:00 2001
+From: Kevin Funk 
+Date: Mon, 7 Aug 2017 15:50:25 +0200
+Subject: RFC: Make ECMAddTests respect BUILD_TESTING
+
+Summary:
+Use-case: Make building unit tests optional, by just following the CMake
+BUILD_TESTING option.
+
+The usual approach to conditionally build tests is to do:
+```
+if (BUILD_TESTING)
+add_executable(TestOne TestOne.cpp)
+target_link_libraries(TestOne my_library)
+endif()
+```
+
+or:
+
+```
+if (BUILD_TESTING)
+add_subdirectory(tests)
+endif()
+```
+
+This patch just turns all calls to ecm_add_test(...) into no-ops if
+BUILD_TESTING=OFF.
+
+See:
+  https://cmake.org/cmake/help/v3.6/module/CTest.html
+
+Reviewers: vkrause
+
+Reviewed By: vkrause
+
+Subscribers: kossebau, vkrause, elvisangelaccio, asturmlechner, apol, 
#frameworks, #build_system
+
+Tags: #frameworks, #build_system
+
+Differential Revision: https://phabricator.kde.org/D7187
+---
+ modules/ECMAddTests.cmake | 10 ++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake
+index 9667388..c77a7aa 100644
+--- a/modules/ECMAddTests.cmake
 b/modules/ECMAddTests.cmake
+@@ -49,6 +49,12 @@
+ # be given; this will be used for both the target and test names (and, as with
+ # ecm_add_tests(), the NAME_PREFIX argument will be prepended to the test 
name).
+ #
++# If BUILD_TESTING is set to OFF, ecm_add_test will turn into a no-op and thus
++# will not add any test-related targets
++#
++# BUILD_TESTING is created as a cache variable by the CTest module and by the
++# :kde-module:`KDECMakeSettings` module.
++#
+ #
+ # Since pre-1.0.0.
+ 
+@@ -84,6 +90,10 @@ include(ECMMarkAsTest)
+ include(ECMMarkNonGuiExecutable)
+ 
+ function(ecm_add_test)
++  if(NOT BUILD_TESTING)
++  return() # turn this function into a no-op
++  endif()
++
+   set(options GUI)
+   # TARGET_NAME_VAR and TEST_NAME_VAR are undocumented args used by
+   # ecm_add_tests
+-- 
+cgit v0.11.2



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2017-08-06 Thread Andreas Sturmlechner
commit: c7b28f9fb107aa8823501cb25c93cdc05ba5b599
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug  6 19:18:15 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug  6 22:29:08 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c7b28f9f

kde-frameworks/extra-cmake-modules: Fix cmake warning

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index bbf1699f1b..aa4cb7d3f0 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -41,11 +41,11 @@ pkg_setup() {
 
 src_configure() {
local mycmakeargs=(
-   -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON
-DBUILD_HTML_DOCS="$(usex doc)"
-DBUILD_MAN_DOCS="$(usex doc)"
-DDOC_INSTALL_DIR="/usr/share/doc/${PF}"
)
+   use test && mycmakeargs+=( 
-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON )
 
cmake-utils_src_configure
 }



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2017-07-10 Thread Michael Palimaka
commit: 2d76c1e14f3ae51901d3b2af0b9bf9546ed5276d
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Jul 10 12:02:09 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Jul 10 12:03:22 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2d76c1e1

kde-frameworks/extra-cmake-modules: restrict test again

Add a comment this time so I don't do this again.

This reverts commit eed7137779d24050d127b53b091cf5d9cd586094.

 .../extra-cmake-modules/extra-cmake-modules-.ebuild  | 9 +
 1 file changed, 9 insertions(+)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index dad5b77baa..bbf1699f1b 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -49,3 +49,12 @@ src_configure() {
 
cmake-utils_src_configure
 }
+
+src_test() {
+   # ECMToolchainAndroidTest passes but then breaks src_install
+   local myctestargs=(
+   -E "(ECMToolchainAndroidTest)"
+   )
+
+   kde5_src_test
+}



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2017-07-09 Thread Michael Palimaka
commit: eed7137779d24050d127b53b091cf5d9cd586094
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jul  9 14:13:59 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jul  9 14:14:09 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=eed71377

kde-frameworks/extra-cmake-modules: the other test seems to be passing now

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../extra-cmake-modules/extra-cmake-modules-.ebuild   | 8 
 1 file changed, 8 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index d5c6c31228..dad5b77baa 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -49,11 +49,3 @@ src_configure() {
 
cmake-utils_src_configure
 }
-
-src_test() {
-   local myctestargs=(
-   -E "(ECMToolchainAndroidTest)"
-   )
-
-   kde5_src_test
-}



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2017-07-09 Thread Michael Palimaka
commit: 6e5006b9565a91534dfa7ea4c74e2a9e6d47465d
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jul  9 14:08:51 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jul  9 14:14:09 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6e5006b9

kde-frameworks/extra-cmake-modules: unrestrict fixed test

Upstream-commit: 0663867fd54cf2114e308839fa0d33ca4b0ed350
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index fdf6638b55..d5c6c31228 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -52,7 +52,7 @@ src_configure() {
 
 src_test() {
local myctestargs=(
-   -E 
"(ECMToolchainAndroidTest|KDEInstallDirsTest.relative_or_absolute_usr)"
+   -E "(ECMToolchainAndroidTest)"
)
 
kde5_src_test



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2017-07-09 Thread Andreas Sturmlechner
commit: 61ef3c6ed8925a77f41a1118660402787c3c0388
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul  9 11:24:09 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul  9 11:24:09 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=61ef3c6e

kde-frameworks/extra-cmake-modules: Disable python module generation

Does not work properly, fails test.

Gentoo-bug: 624352

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 0f17d7cc17..fdf6638b55 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -41,6 +41,7 @@ pkg_setup() {
 
 src_configure() {
local mycmakeargs=(
+   -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON
-DBUILD_HTML_DOCS="$(usex doc)"
-DBUILD_MAN_DOCS="$(usex doc)"
-DDOC_INSTALL_DIR="/usr/share/doc/${PF}"



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2017-07-08 Thread Andreas Sturmlechner
commit: 4f4d46fccfc179d56fe792c03f9a0fa3a2a46200
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jul  8 16:05:21 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jul  8 16:48:22 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4f4d46fc

kde-frameworks/extra-cmake-modules: Add KDE_QTHELP=false

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.36.0.ebuild | 1 +
 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git 
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.36.0.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.36.0.ebuild
index 8b08c248c3..a54e483ed3 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.36.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.36.0.ebuild
@@ -6,6 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 KDE_AUTODEPS="false"
 KDE_DEBUG="false"
+KDE_QTHELP="false"
 KDE_TEST="false"
 inherit kde5 python-any-r1
 

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 75880ee7e0..0f17d7cc17 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -6,6 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 KDE_AUTODEPS="false"
 KDE_DEBUG="false"
+KDE_QTHELP="false"
 KDE_TEST="false"
 inherit kde5 python-any-r1
 



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2017-05-06 Thread Andreas Sturmlechner
commit: b9c2ebedfa0396e12e3fcbb39bee31c61af9691d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May  6 20:18:12 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May  6 20:18:12 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b9c2ebed

kde-frameworks/extra-cmake-modules: Add python3_6 support

Tested-by: Manuel Rüger  gentoo.org>

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 49d7889473..75880ee7e0 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 KDE_AUTODEPS="false"
 KDE_DEBUG="false"
 KDE_TEST="false"



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2016-12-23 Thread Johannes Huber
commit: 02dde6b8f72325a0337c6e644d098a50bf2f4675
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Dec 23 09:13:00 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Dec 23 10:09:51 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=02dde6b8

kde-frameworks/extra-cmake-modules: Drop CMAKE_MIN_VERSION

Covered by cmake-utils eclass now.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 58d43e4..48451ec 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -5,7 +5,6 @@
 EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-CMAKE_MIN_VERSION="3.2"
 KDE_AUTODEPS="false"
 KDE_DEBUG="false"
 KDE_TEST="false"



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2016-11-27 Thread Michael Palimaka
commit: f119336bb93d29ea3cac9765ddbd28759241aafe
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Nov 26 21:15:04 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Nov 27 11:30:46 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f119336b

kde-frameworks/extra-cmake-modules: Raise CMAKE_MIN_VERSION to 3.2

Package-Manager: portage-2.3.0

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index ce1c7e9..58d43e4 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -5,6 +5,7 @@
 EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+CMAKE_MIN_VERSION="3.2"
 KDE_AUTODEPS="false"
 KDE_DEBUG="false"
 KDE_TEST="false"
@@ -18,7 +19,6 @@ KEYWORDS=""
 IUSE="doc test"
 
 DEPEND="
-   >=dev-util/cmake-2.8.12
doc? (
${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
@@ -28,7 +28,6 @@ DEPEND="
$(add_qt_dep linguist-tools)
)
 "
-
 RDEPEND="
app-arch/libarchive[bzip2]
 "



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2016-09-01 Thread Manuel Rüger
commit: 18439258c096e6630d7851da2bd9fb8e9164f41e
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Sep  1 11:21:51 2016 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Sep  1 11:21:51 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=18439258

kde-frameworks/extra-cmake-modules: Add support for python 3.5

Package-Manager: portage-2.3.0

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index c5aed05..335ad67 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 KDE_AUTODEPS="false"
 KDE_DEBUG="false"
 KDE_TEST="false"



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2016-07-07 Thread Michael Palimaka
commit: f60141c0242b72efd3e80712e2c4cd024f1cffa8
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Jul  7 16:56:14 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Jul  7 16:56:20 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f60141c0

kde-frameworks/extra-cmake-modules: disable broken test

Package-Manager: portage-2.3.0

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.24.0.ebuild | 2 +-
 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.24.0.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.24.0.ebuild
index a355efb..b8cfc2d 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.24.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.24.0.ebuild
@@ -53,7 +53,7 @@ src_configure() {
 
 src_test() {
local myctestargs=(
-   -E KDEInstallDirsTest.relative_or_absolute_usr
+   -E 
"(ECMToolchainAndroidTest|KDEInstallDirsTest.relative_or_absolute_usr)"
)
 
kde5_src_test

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 171dda1..c5aed05 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -53,7 +53,7 @@ src_configure() {
 
 src_test() {
local myctestargs=(
-   -E KDEInstallDirsTest.relative_or_absolute_usr
+   -E 
"(ECMToolchainAndroidTest|KDEInstallDirsTest.relative_or_absolute_usr)"
)
 
kde5_src_test



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2016-06-15 Thread Michael Palimaka
commit: 16b41e9f45fff3475dc9f07422aa67e9bdb9fd93
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jun 15 16:27:06 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jun 15 16:31:14 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=16b41e9f

kde-frameworks/extra-cmake-modules: disable failing test

Gentoo-bug: 583180

Package-Manager: portage-2.3.0_rc1

 .../extra-cmake-modules/extra-cmake-modules-5.23.0.ebuild | 8 
 .../extra-cmake-modules/extra-cmake-modules-.ebuild   | 8 
 2 files changed, 16 insertions(+)

diff --git 
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.23.0.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.23.0.ebuild
index ea887ac..61ae923 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.23.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.23.0.ebuild
@@ -50,3 +50,11 @@ src_configure() {
 
cmake-utils_src_configure
 }
+
+src_test() {
+   local myctestargs=(
+   -E KDEInstallDirsTest.relative_or_absolute_usr
+   )
+
+   kde5_src_test
+}

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index fd77aa8..171dda1 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -50,3 +50,11 @@ src_configure() {
 
cmake-utils_src_configure
 }
+
+src_test() {
+   local myctestargs=(
+   -E KDEInstallDirsTest.relative_or_absolute_usr
+   )
+
+   kde5_src_test
+}



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2016-04-16 Thread Johannes Huber
commit: ac9393da2582ca96019a1ce7a55ced368cde8608
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Apr 16 14:45:33 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Apr 16 14:54:28 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ac9393da

kde-frameworks/extra-cmake-modules: Add missing RDEPEND

When kde_package_app_templates is used by a reverse dependency
cmake -E tar "cvfj" is called in KDEPackageAppTemplates.cmake
which apparently uses libarchive.

Gentoo-bug: 577550

Package-Manager: portage-2.2.28

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index c548a0c..fd77aa8 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -29,6 +29,10 @@ DEPEND="
)
 "
 
+RDEPEND="
+   app-arch/libarchive[bzip2]
+"
+
 python_check_deps() {
has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
 }



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2016-03-26 Thread Michael Palimaka
commit: 9eaf81cc829b3bc6efe40e674868fa9345600dda
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Mar 26 17:38:46 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Mar 26 17:41:41 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9eaf81cc

kde-frameworks/extra-cmake-modules: improve test support

Package-Manager: portage-2.2.28

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 6a46101..c548a0c 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -7,6 +7,7 @@ EAPI=6
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 KDE_AUTODEPS="false"
 KDE_DEBUG="false"
+KDE_TEST="false"
 inherit kde5 python-any-r1
 
 DESCRIPTION="Extra modules and scripts for CMake"
@@ -14,7 +15,7 @@ 
HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules;
 
 LICENSE="BSD"
 KEYWORDS=""
-IUSE="doc"
+IUSE="doc test"
 
 DEPEND="
>=dev-util/cmake-2.8.12
@@ -22,6 +23,10 @@ DEPEND="
${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
)
+   test? (
+   $(add_qt_dep qtcore)
+   $(add_qt_dep linguist-tools)
+   )
 "
 
 python_check_deps() {



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2016-03-26 Thread Michael Palimaka
commit: 0efb4b00d16904295d1eee505f0765274db37397
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Mar 26 17:28:11 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Mar 26 17:28:42 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0efb4b00

kde-frameworks/extra-cmake-modules: drop dev-qt/qtcore RDEPEND

This was added in 83cadfedf9a2af7934f5456ab818c16ad5a1edf3 as certain modules
call qmake, but is now causing an unnecessary dependency as some consumers do
not use these modules and do not require qt at all.

Gentoo-bug: 572652

Package-Manager: portage-2.2.28

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 1a71cca..6a46101 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -23,9 +23,6 @@ DEPEND="
$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
)
 "
-RDEPEND="
-   $(add_qt_dep qtcore)
-"
 
 python_check_deps() {
has_version "dev-python/sphinx[${PYTHON_USEDEP}]"



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2016-01-16 Thread Michael Palimaka
commit: 3665e2bd8d42bbd344158ff31dd14fecac914a7f
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Jan 16 17:36:46 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Jan 16 17:36:46 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3665e2bd

kde-frameworks/extra-cmake-modules: install HTML docs into Gentoo location

Package-Manager: portage-2.2.26

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 4a49ff3..3e83ad1 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -37,6 +37,7 @@ pkg_setup() {
 
 src_configure() {
local mycmakeargs=(
+   -DDOC_INSTALL_DIR="/usr/share/doc/${PF}"
$(cmake-utils_use_build doc HTML_DOCS)
$(cmake-utils_use_build doc MAN_DOCS)
)



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/kmediaplayer/, ...

2015-11-09 Thread Michael Palimaka
commit: e9cac6b40563a2df656baf88f4d78e948d269563
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Nov  9 12:17:48 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Nov  9 12:18:17 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e9cac6b4

kde-frameworks: version bump 5.16.0

Package-Manager: portage-2.2.20.1

 kde-frameworks/attica/attica-5.16.0.ebuild | 17 +
 kde-frameworks/baloo/baloo-5.16.0.ebuild   | 32 +
 kde-frameworks/bluez-qt/bluez-qt-5.16.0.ebuild | 29 
 .../extra-cmake-modules-5.16.0.ebuild  | 45 
 .../frameworkintegration-5.16.0.ebuild | 48 +
 .../kactivities/kactivities-5.16.0.ebuild  | 36 ++
 kde-frameworks/kapidox/kapidox-5.16.0.ebuild   | 29 
 kde-frameworks/karchive/karchive-5.16.0.ebuild | 28 
 kde-frameworks/kauth/kauth-5.16.0.ebuild   | 33 +
 kde-frameworks/kbookmarks/kbookmarks-5.16.0.ebuild | 30 
 kde-frameworks/kcmutils/kcmutils-5.16.0.ebuild | 32 +
 kde-frameworks/kcodecs/kcodecs-5.16.0.ebuild   | 14 
 .../kcompletion/kcompletion-5.16.0.ebuild  | 22 ++
 kde-frameworks/kconfig/kconfig-5.16.0.ebuild   | 24 +++
 .../kconfigwidgets/kconfigwidgets-5.16.0.ebuild| 30 
 .../kcoreaddons/kcoreaddons-5.16.0.ebuild  | 41 +++
 kde-frameworks/kcrash/kcrash-5.16.0.ebuild | 39 ++
 .../kdbusaddons/kdbusaddons-5.16.0.ebuild  | 29 
 .../kdeclarative/kdeclarative-5.16.0.ebuild| 32 +
 kde-frameworks/kded/kded-5.16.0.ebuild | 28 
 .../kdelibs4support/kdelibs4support-5.16.0.ebuild  | 83 ++
 .../kdesignerplugin/kdesignerplugin-5.16.0.ebuild  | 54 ++
 kde-frameworks/kdesu/kdesu-5.16.0.ebuild   | 33 +
 kde-frameworks/kdewebkit/kdewebkit-5.16.0.ebuild   | 30 
 kde-frameworks/kdnssd/kdnssd-5.16.0.ebuild | 32 +
 kde-frameworks/kdoctools/kdoctools-5.16.0.ebuild   | 24 +++
 kde-frameworks/kemoticons/kemoticons-5.16.0.ebuild | 26 +++
 .../kfilemetadata/kfilemetadata-5.16.0.ebuild  | 39 ++
 .../kglobalaccel/kglobalaccel-5.16.0.ebuild| 31 
 kde-frameworks/kguiaddons/kguiaddons-5.16.0.ebuild | 23 ++
 kde-frameworks/khtml/khtml-5.16.0.ebuild   | 66 +
 kde-frameworks/ki18n/ki18n-5.16.0.ebuild   | 21 ++
 .../kiconthemes/kiconthemes-5.16.0.ebuild  | 27 +++
 kde-frameworks/kidletime/kidletime-5.16.0.ebuild   | 25 +++
 .../kimageformats/kimageformats-5.16.0.ebuild  | 34 +
 kde-frameworks/kinit/kinit-5.16.0.ebuild   | 38 ++
 kde-frameworks/kio/kio-5.16.0.ebuild   | 83 ++
 .../kitemmodels/kitemmodels-5.16.0.ebuild  | 15 
 kde-frameworks/kitemviews/kitemviews-5.16.0.ebuild | 21 ++
 .../kjobwidgets/kjobwidgets-5.16.0.ebuild  | 36 ++
 kde-frameworks/kjs/kjs-5.16.0.ebuild   | 22 ++
 kde-frameworks/kjsembed/kjsembed-5.16.0.ebuild | 26 +++
 .../kmediaplayer/kmediaplayer-5.16.0.ebuild| 21 ++
 kde-frameworks/knewstuff/knewstuff-5.16.0.ebuild   | 33 +
 .../knotifications/knotifications-5.16.0.ebuild| 43 +++
 .../knotifyconfig/knotifyconfig-5.16.0.ebuild  | 25 +++
 kde-frameworks/kpackage/kpackage-5.16.0.ebuild | 22 ++
 kde-frameworks/kparts/kparts-5.16.0.ebuild | 31 
 kde-frameworks/kpeople/kpeople-5.16.0.ebuild   | 33 +
 kde-frameworks/kplotting/kplotting-5.16.0.ebuild   | 19 +
 kde-frameworks/kpty/kpty-5.16.0.ebuild | 19 +
 kde-frameworks/kross/kross-5.16.0.ebuild   | 32 +
 kde-frameworks/krunner/krunner-5.16.0.ebuild   | 28 
 kde-frameworks/kservice/kservice-5.16.0.ebuild | 29 
 .../ktexteditor/ktexteditor-5.16.0.ebuild  | 53 ++
 .../ktextwidgets/ktextwidgets-5.16.0.ebuild| 29 
 .../kunitconversion/kunitconversion-5.16.0.ebuild  | 19 +
 kde-frameworks/kwallet/kwallet-5.16.0.ebuild   | 41 +++
 .../kwidgetsaddons/kwidgetsaddons-5.16.0.ebuild| 22 ++
 .../kwindowsystem/kwindowsystem-5.16.0.ebuild  | 41 +++
 kde-frameworks/kxmlgui/kxmlgui-5.16.0.ebuild   | 42 +++
 .../kxmlrpcclient/kxmlrpcclient-5.16.0.ebuild  | 23 ++
 .../modemmanager-qt/modemmanager-qt-5.16.0.ebuild  | 22 ++
 .../networkmanager-qt-5.16.0.ebuild| 27 +++
 kde-frameworks/plasma/plasma-5.16.0.ebuild | 68 ++
 kde-frameworks/solid/solid-5.16.0.ebuild   | 33 +
 kde-frameworks/sonnet/sonnet-5.16.0.ebuild | 31 
 .../threadweaver/threadweaver-5.16.0.ebuild| 17 +
 68 files changed, 2210 insertions(+)

diff --git 

[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2015-08-07 Thread Michael Palimaka
commit: 83cadfedf9a2af7934f5456ab818c16ad5a1edf3
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Fri Aug  7 18:01:23 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Fri Aug  7 18:01:23 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=83cadfed

[kde-frameworks/extra-cmake-modules] Add missing dependency wrt bug #556238.

CMake modules are installed that call qmake.

Package-Manager: portage-2.2.20

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.13.0.ebuild | 3 +++
 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild   | 3 +++
 2 files changed, 6 insertions(+)

diff --git 
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.13.0.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.13.0.ebuild
index 6773330..b5785c8 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.13.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.13.0.ebuild
@@ -23,6 +23,9 @@ DEPEND=
$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
)
 
+RDEPEND=
+   dev-qt/qtcore:5
+
 
 python_check_deps() {
has_version dev-python/sphinx[${PYTHON_USEDEP}]

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index b596e57..9951f74 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -23,6 +23,9 @@ DEPEND=
$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
)
 
+RDEPEND=
+   dev-qt/qtcore:5
+
 
 python_check_deps() {
has_version dev-python/sphinx[${PYTHON_USEDEP}]



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/kwindowsystem/, ...

2015-07-05 Thread Manuel Rüger
commit: 61a3aa5edc50e61c23d07a6cc614b4ef22f35465
Author: Manuel Rüger manuel AT rueg DOT eu
AuthorDate: Sun Jul  5 20:47:01 2015 +
Commit: Manuel Rüger mrueg AT gentoo DOT org
CommitDate: Sun Jul  5 20:47:01 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=61a3aa5e

[kde-frameworks] Version bump.

 kde-frameworks/attica/attica-5.12.0.ebuild | 17 +
 kde-frameworks/bluez-qt/bluez-qt-5.12.0.ebuild | 29 
 .../extra-cmake-modules-5.12.0.ebuild  | 42 +++
 .../frameworkintegration-5.12.0.ebuild | 48 +
 .../kactivities/kactivities-5.12.0.ebuild  | 36 ++
 kde-frameworks/kapidox/kapidox-5.12.0.ebuild   | 26 +++
 kde-frameworks/karchive/karchive-5.12.0.ebuild | 28 
 kde-frameworks/kauth/kauth-5.12.0.ebuild   | 33 +
 kde-frameworks/kbookmarks/kbookmarks-5.12.0.ebuild | 30 
 kde-frameworks/kcmutils/kcmutils-5.12.0.ebuild | 32 +
 kde-frameworks/kcodecs/kcodecs-5.12.0.ebuild   | 14 
 .../kcompletion/kcompletion-5.12.0.ebuild  | 22 ++
 kde-frameworks/kconfig/kconfig-5.12.0.ebuild   | 24 +++
 .../kconfigwidgets/kconfigwidgets-5.12.0.ebuild| 30 
 .../kcoreaddons/kcoreaddons-5.12.0.ebuild  | 41 +++
 kde-frameworks/kcrash/kcrash-5.12.0.ebuild | 39 ++
 .../kdbusaddons/kdbusaddons-5.12.0.ebuild  | 29 
 .../kdeclarative/kdeclarative-5.12.0.ebuild| 32 +
 kde-frameworks/kded/kded-5.12.0.ebuild | 28 
 .../kdelibs4support/kdelibs4support-5.12.0.ebuild  | 80 +
 .../kdesignerplugin/kdesignerplugin-5.12.0.ebuild  | 54 ++
 kde-frameworks/kdesu/kdesu-5.12.0.ebuild   | 33 +
 kde-frameworks/kdewebkit/kdewebkit-5.12.0.ebuild   | 30 
 kde-frameworks/kdnssd/kdnssd-5.12.0.ebuild | 32 +
 kde-frameworks/kdoctools/kdoctools-5.12.0.ebuild   | 24 +++
 kde-frameworks/kemoticons/kemoticons-5.12.0.ebuild | 26 +++
 .../kglobalaccel/kglobalaccel-5.12.0.ebuild| 31 
 kde-frameworks/kguiaddons/kguiaddons-5.12.0.ebuild | 23 ++
 kde-frameworks/khtml/khtml-5.12.0.ebuild   | 66 +
 kde-frameworks/ki18n/ki18n-5.12.0.ebuild   | 20 ++
 .../kiconthemes/kiconthemes-5.12.0.ebuild  | 27 +++
 kde-frameworks/kidletime/kidletime-5.12.0.ebuild   | 24 +++
 .../kimageformats/kimageformats-5.12.0.ebuild  | 34 +
 kde-frameworks/kinit/kinit-5.12.0.ebuild   | 38 ++
 kde-frameworks/kio/kio-5.12.0.ebuild   | 84 ++
 .../kitemmodels/kitemmodels-5.12.0.ebuild  | 15 
 kde-frameworks/kitemviews/kitemviews-5.12.0.ebuild | 21 ++
 .../kjobwidgets/kjobwidgets-5.12.0.ebuild  | 36 ++
 kde-frameworks/kjs/kjs-5.12.0.ebuild   | 22 ++
 kde-frameworks/kjsembed/kjsembed-5.12.0.ebuild | 26 +++
 .../kmediaplayer/kmediaplayer-5.12.0.ebuild| 21 ++
 kde-frameworks/knewstuff/knewstuff-5.12.0.ebuild   | 33 +
 .../knotifications/knotifications-5.12.0.ebuild| 45 
 .../knotifyconfig/knotifyconfig-5.12.0.ebuild  | 25 +++
 kde-frameworks/kpackage/kpackage-5.12.0.ebuild | 22 ++
 kde-frameworks/kparts/kparts-5.12.0.ebuild | 32 +
 kde-frameworks/kpeople/kpeople-5.12.0.ebuild   | 32 +
 kde-frameworks/kplotting/kplotting-5.12.0.ebuild   | 19 +
 kde-frameworks/kpty/kpty-5.12.0.ebuild | 19 +
 kde-frameworks/kross/kross-5.12.0.ebuild   | 32 +
 kde-frameworks/krunner/krunner-5.12.0.ebuild   | 28 
 kde-frameworks/kservice/kservice-5.12.0.ebuild | 29 
 .../ktexteditor/ktexteditor-5.12.0.ebuild  | 53 ++
 .../ktextwidgets/ktextwidgets-5.12.0.ebuild| 29 
 .../kunitconversion/kunitconversion-5.12.0.ebuild  | 19 +
 kde-frameworks/kwallet/kwallet-5.12.0.ebuild   | 41 +++
 .../kwidgetsaddons/kwidgetsaddons-5.12.0.ebuild| 22 ++
 .../kwindowsystem/kwindowsystem-5.12.0.ebuild  | 41 +++
 kde-frameworks/kxmlgui/kxmlgui-5.12.0.ebuild   | 42 +++
 .../kxmlrpcclient/kxmlrpcclient-5.12.0.ebuild  | 23 ++
 .../modemmanager-qt/modemmanager-qt-5.12.0.ebuild  | 22 ++
 .../networkmanager-qt-5.12.0.ebuild| 27 +++
 kde-frameworks/plasma/plasma-5.12.0.ebuild | 71 ++
 kde-frameworks/solid/solid-5.12.0.ebuild   | 33 +
 kde-frameworks/sonnet/sonnet-5.12.0.ebuild | 31 
 .../threadweaver/threadweaver-5.12.0.ebuild| 17 +
 66 files changed, 2134 insertions(+)

diff --git a/kde-frameworks/attica/attica-5.12.0.ebuild 
b/kde-frameworks/attica/attica-5.12.0.ebuild
new file mode 100644
index 000..f8a85eb
--- /dev/null
+++ b/kde-frameworks/attica/attica-5.12.0.ebuild
@@ 

[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/kitemviews/, ...

2015-04-05 Thread Michael Palimaka
commit: 9308c77c820dae58e611587b6c53647b1186c343
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sun Apr  5 17:06:23 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sun Apr  5 17:06:23 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9308c77c

[kde-frameworks] Add KDE Frameworks 5.9.0

 kde-frameworks/attica/attica-5.9.0.ebuild  | 17 +
 .../extra-cmake-modules-5.9.0.ebuild   | 41 +++
 .../frameworkintegration-5.9.0.ebuild  | 48 +
 .../kactivities/kactivities-5.9.0.ebuild   | 36 ++
 kde-frameworks/kapidox/kapidox-5.9.0.ebuild| 26 +++
 kde-frameworks/karchive/karchive-5.9.0.ebuild  | 28 
 kde-frameworks/kauth/kauth-5.9.0.ebuild| 33 +
 kde-frameworks/kbookmarks/kbookmarks-5.9.0.ebuild  | 30 
 kde-frameworks/kcmutils/kcmutils-5.9.0.ebuild  | 30 
 kde-frameworks/kcodecs/kcodecs-5.9.0.ebuild| 14 
 .../kcompletion/kcompletion-5.9.0.ebuild   | 22 ++
 kde-frameworks/kconfig/kconfig-5.9.0.ebuild| 24 +++
 .../kconfigwidgets/kconfigwidgets-5.9.0.ebuild | 30 
 .../kcoreaddons/kcoreaddons-5.9.0.ebuild   | 41 +++
 kde-frameworks/kcrash/kcrash-5.9.0.ebuild  | 39 ++
 .../kdbusaddons/kdbusaddons-5.9.0.ebuild   | 29 
 .../kdeclarative/kdeclarative-5.9.0.ebuild | 32 +
 kde-frameworks/kded/kded-5.9.0.ebuild  | 28 
 .../kdelibs4support/kdelibs4support-5.9.0.ebuild   | 80 +
 .../kdesignerplugin/kdesignerplugin-5.9.0.ebuild   | 54 ++
 kde-frameworks/kdesu/kdesu-5.9.0.ebuild| 33 +
 kde-frameworks/kdewebkit/kdewebkit-5.9.0.ebuild| 30 
 kde-frameworks/kdnssd/kdnssd-5.9.0.ebuild  | 32 +
 kde-frameworks/kdoctools/kdoctools-5.9.0.ebuild| 24 +++
 kde-frameworks/kemoticons/kemoticons-5.9.0.ebuild  | 26 +++
 .../kglobalaccel/kglobalaccel-5.9.0.ebuild | 32 +
 kde-frameworks/kguiaddons/kguiaddons-5.9.0.ebuild  | 23 ++
 kde-frameworks/khtml/khtml-5.9.0.ebuild| 66 +
 kde-frameworks/ki18n/ki18n-5.9.0.ebuild| 20 ++
 .../kiconthemes/kiconthemes-5.9.0.ebuild   | 27 +++
 kde-frameworks/kidletime/kidletime-5.9.0.ebuild| 24 +++
 .../kimageformats/kimageformats-5.9.0.ebuild   | 34 +
 kde-frameworks/kinit/kinit-5.9.0.ebuild| 38 ++
 kde-frameworks/kio/kio-5.9.0.ebuild| 84 ++
 .../kitemmodels/kitemmodels-5.9.0.ebuild   | 15 
 kde-frameworks/kitemviews/kitemviews-5.9.0.ebuild  | 21 ++
 .../kjobwidgets/kjobwidgets-5.9.0.ebuild   | 36 ++
 kde-frameworks/kjs/kjs-5.9.0.ebuild| 22 ++
 kde-frameworks/kjsembed/kjsembed-5.9.0.ebuild  | 26 +++
 .../kmediaplayer/kmediaplayer-5.9.0.ebuild | 21 ++
 kde-frameworks/knewstuff/knewstuff-5.9.0.ebuild| 32 +
 .../knotifications/knotifications-5.9.0.ebuild | 45 
 .../knotifyconfig/knotifyconfig-5.9.0.ebuild   | 26 +++
 kde-frameworks/kpackage/kpackage-5.9.0.ebuild  | 22 ++
 kde-frameworks/kparts/kparts-5.9.0.ebuild  | 31 
 kde-frameworks/kpeople/kpeople-5.9.0.ebuild| 31 
 kde-frameworks/kplotting/kplotting-5.9.0.ebuild| 19 +
 kde-frameworks/kpty/kpty-5.9.0.ebuild  | 19 +
 kde-frameworks/kross/kross-5.9.0.ebuild| 33 +
 kde-frameworks/krunner/krunner-5.9.0.ebuild| 28 
 kde-frameworks/kservice/kservice-5.9.0.ebuild  | 29 
 .../ktexteditor/ktexteditor-5.9.0.ebuild   | 53 ++
 .../ktextwidgets/ktextwidgets-5.9.0.ebuild | 30 
 .../kunitconversion/kunitconversion-5.9.0.ebuild   | 19 +
 kde-frameworks/kwallet/kwallet-5.9.0.ebuild| 29 
 .../kwidgetsaddons/kwidgetsaddons-5.9.0.ebuild | 22 ++
 .../kwindowsystem/kwindowsystem-5.9.0.ebuild   | 41 +++
 kde-frameworks/kxmlgui/kxmlgui-5.9.0.ebuild| 42 +++
 .../kxmlrpcclient/kxmlrpcclient-5.9.0.ebuild   | 22 ++
 .../modemmanager-qt/modemmanager-qt-5.9.0.ebuild   | 22 ++
 .../networkmanager-qt-5.9.0.ebuild | 27 +++
 kde-frameworks/plasma/plasma-5.9.0.ebuild  | 71 ++
 kde-frameworks/solid/solid-5.9.0.ebuild| 32 +
 kde-frameworks/sonnet/sonnet-5.9.0.ebuild  | 31 
 .../threadweaver/threadweaver-5.9.0.ebuild | 17 +
 65 files changed, 2089 insertions(+)

diff --git a/kde-frameworks/attica/attica-5.9.0.ebuild 
b/kde-frameworks/attica/attica-5.9.0.ebuild
new file mode 100644
index 000..f8a85eb
--- /dev/null
+++ b/kde-frameworks/attica/attica-5.9.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo 

[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2015-04-05 Thread Michael Palimaka
commit: add8b4a0cbb953ab937c66ab242f6f4e264594ec
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sun Apr  5 16:41:12 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sun Apr  5 16:41:12 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=add8b4a0

[kde-frameworks/extra-cmake-modules] Use kde5.eclass

Package-Manager: portage-2.2.18

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 88e5ba8..7d4bcf2 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -5,15 +5,13 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit cmake-utils git-r3 python-any-r1
+KDE_AUTODEPS=false
+inherit kde5 python-any-r1
 
 DESCRIPTION=Extra modules and scripts for CMake
 HOMEPAGE=https://projects.kde.org/projects/kdesupport/extra-cmake-modules;
-EGIT_REPO_URI=( git://anongit.kde.org/${PN} )
 
 LICENSE=BSD
-SLOT=0
 KEYWORDS=
 IUSE=doc
 



[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/

2015-04-05 Thread Michael Palimaka
commit: 6864b90d2501dc677fbafb4e7ce8404eabb24d94
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sun Apr  5 17:14:20 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sun Apr  5 17:14:20 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6864b90d

[kde-frameworks/extra-cmake-modules] Disable debug.

Package-Manager: portage-2.2.18

 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.9.0.ebuild | 1 +
 kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git 
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.9.0.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.9.0.ebuild
index 960eb2e..c7bbc49 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.9.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.9.0.ebuild
@@ -6,6 +6,7 @@ EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 KDE_AUTODEPS=false
+KDE_DEBUG=false
 inherit kde5 python-any-r1
 
 DESCRIPTION=Extra modules and scripts for CMake

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index 7d4bcf2..b596e57 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -6,6 +6,7 @@ EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 KDE_AUTODEPS=false
+KDE_DEBUG=false
 inherit kde5 python-any-r1
 
 DESCRIPTION=Extra modules and scripts for CMake