[gentoo-commits] proj/kde:master commit in: kde-apps/kapptemplate/, kde-apps/kapptemplate/files/

[gentoo-commits] proj/kde:master commit in: kde-apps/kapptemplate/, kde-apps/kapptemplate/files/

[Johannes Huber]

commit:     52f646111106c38e769db57d9d6d17480cf6acf5
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Jan 28 22:59:07 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jan 30 23:31:29 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=52f64611

[kde-apps/kapptemplate] Make tests optional

Package-Manager: portage-2.2.15

---
 .../files/kapptemplate-9999-tests-optional.patch     | 20 ++++++++++++++++++++
 kde-apps/kapptemplate/kapptemplate-9999.ebuild       |  8 +++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/kde-apps/kapptemplate/files/kapptemplate-9999-tests-optional.patch b/kde-apps/kapptemplate/files/kapptemplate-9999-tests-optional.patch
new file mode 100644
index 0000000..b512f74
--- /dev/null
+++ b/kde-apps/kapptemplate/files/kapptemplate-9999-tests-optional.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt	2015-01-28 23:35:43.818842308 +0100
++++ b/CMakeLists.txt	2015-01-28 23:39:20.690063158 +0100
+@@ -12,7 +12,6 @@
+ include(FeatureSummary)
+ include(KAppTemplateMacro)
+ 
+-find_package(Qt5 REQUIRED COMPONENTS Test)
+ find_package(KF5 REQUIRED COMPONENTS CoreAddons ConfigWidgets Completion Archive KIO I18n DocTools)
+ 
+ add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+@@ -20,4 +19,8 @@
+ add_subdirectory(doc)
+ add_subdirectory(icons)
+ add_subdirectory(src)
+-add_subdirectory(tests)
++
++if(BUILD_TESTING)
++    find_package(Qt5Test REQUIRED)
++    add_subdirectory(tests)
++endif()

diff --git a/kde-apps/kapptemplate/kapptemplate-9999.ebuild b/kde-apps/kapptemplate/kapptemplate-9999.ebuild
index c28a606..3c584e0 100644
--- a/kde-apps/kapptemplate/kapptemplate-9999.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 KDE_HANDBOOK="true"
+KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="A shell script to create the necessary framework to develop KDE applications"
@@ -24,6 +25,7 @@ DEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 "
-RDEPEND="${DEPEND}
-	!kde-base/kapptemplate:4
-"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}"-9999-tests-optional.patch )

[gentoo-commits] proj/kde:master commit in: kde-apps/kapptemplate/, kde-apps/kapptemplate/files/

[Michael Palimaka]

commit:     e297ab57729b27658bcf7be738bfe481dd9daea5
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 16 17:45:41 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Apr 16 17:45:41 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e297ab57

[kde-apps/kapptemplate] Punt bogus deps wrt bug #546118.

Package-Manager: portage-2.2.18

 .../files/kapptemplate-9999-tests-optional.patch     | 20 --------------------
 kde-apps/kapptemplate/kapptemplate-14.12.3.ebuild    |  1 +
 kde-apps/kapptemplate/kapptemplate-9999.ebuild       |  1 +
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/kde-apps/kapptemplate/files/kapptemplate-9999-tests-optional.patch b/kde-apps/kapptemplate/files/kapptemplate-9999-tests-optional.patch
deleted file mode 100644
index b512f74..0000000
--- a/kde-apps/kapptemplate/files/kapptemplate-9999-tests-optional.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/CMakeLists.txt	2015-01-28 23:35:43.818842308 +0100
-+++ b/CMakeLists.txt	2015-01-28 23:39:20.690063158 +0100
-@@ -12,7 +12,6 @@
- include(FeatureSummary)
- include(KAppTemplateMacro)
- 
--find_package(Qt5 REQUIRED COMPONENTS Test)
- find_package(KF5 REQUIRED COMPONENTS CoreAddons ConfigWidgets Completion Archive KIO I18n DocTools)
- 
- add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
-@@ -20,4 +19,8 @@
- add_subdirectory(doc)
- add_subdirectory(icons)
- add_subdirectory(src)
--add_subdirectory(tests)
-+
-+if(BUILD_TESTING)
-+    find_package(Qt5Test REQUIRED)
-+    add_subdirectory(tests)
-+endif()

diff --git a/kde-apps/kapptemplate/kapptemplate-14.12.3.ebuild b/kde-apps/kapptemplate/kapptemplate-14.12.3.ebuild
index 7ee5b8e..6152d13 100644
--- a/kde-apps/kapptemplate/kapptemplate-14.12.3.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-14.12.3.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 KDE_HANDBOOK="true"
+KDE_PUNT_BOGUS_DEPS="true"
 inherit kde5
 
 DESCRIPTION="A shell script to create the necessary framework to develop KDE applications"

diff --git a/kde-apps/kapptemplate/kapptemplate-9999.ebuild b/kde-apps/kapptemplate/kapptemplate-9999.ebuild
index 3c584e0..f28fb6f 100644
--- a/kde-apps/kapptemplate/kapptemplate-9999.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 KDE_HANDBOOK="true"
+KDE_PUNT_BOGUS_DEPS="true"
 KDE_TEST="true"
 inherit kde5