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

["Michael Palimaka" <kensington@gentoo.org>]

commit:     f1c4b0e2578215f90ad549a23c1a171e4bc034e4
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Feb  2 00:26:26 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 10:53:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f1c4b0e2

kde-apps/akonadi: Patches upstreamed, small fixes

Package-Manager: portage-2.2.27

 kde-apps/akonadi/akonadi-15.12.1.ebuild            |  5 +-
 kde-apps/akonadi/akonadi-15.12.49.9999.ebuild      |  7 +-
 kde-apps/akonadi/akonadi-9999.ebuild               | 14 ++--
 .../akonadi/files/akonadi-libxml2-optional.patch   | 40 -----------
 .../akonadi/files/akonadi-tools-optional.patch     | 77 ----------------------
 5 files changed, 9 insertions(+), 134 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-15.12.1.ebuild b/kde-apps/akonadi/akonadi-15.12.1.ebuild
index b5adb12..970fb70 100644
--- a/kde-apps/akonadi/akonadi-15.12.1.ebuild
+++ b/kde-apps/akonadi/akonadi-15.12.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-KDE_TESTS=true
+KDE_TEST=true
 VIRTUALDBUS_TEST=true
 inherit kde5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Storage service for PIM data"
 HOMEPAGE="https://pim.kde.org/akonadi"
 KEYWORDS=" ~amd64 ~x86"
 LICENSE="LGPL-2.1"
-IUSE="+mysql postgres sqlite test"
+IUSE="+mysql postgres sqlite"
 
 REQUIRED_USE="|| ( sqlite mysql postgres )"
 
@@ -21,7 +21,6 @@ CDEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtsql 'mysql?,postgres?')
-	$(add_qt_dep qttest)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	x11-misc/shared-mime-info

diff --git a/kde-apps/akonadi/akonadi-15.12.49.9999.ebuild b/kde-apps/akonadi/akonadi-15.12.49.9999.ebuild
index ff55ab7..13c2048 100644
--- a/kde-apps/akonadi/akonadi-15.12.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-15.12.49.9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_TESTS=true
+KDE_TEST=true
 VIRTUALDBUS_TEST=true
 inherit kde5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Storage service for PIM data"
 HOMEPAGE="https://pim.kde.org/akonadi"
 KEYWORDS=""
 LICENSE="LGPL-2.1"
-IUSE="+mysql postgres sqlite test"
+IUSE="+mysql postgres sqlite"
 
 REQUIRED_USE="|| ( sqlite mysql postgres )"
 
@@ -21,7 +21,6 @@ CDEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtsql 'mysql?,postgres?')
-	$(add_qt_dep qttest)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	x11-misc/shared-mime-info

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 622210b..6eec273 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_DOXYGEN=true
-KDE_TESTS=true
+KDE_TEST=true
 VIRTUALDBUS_TEST=true
 VIRTUALX_REQUIRED=test
 inherit kde5
@@ -14,7 +14,7 @@ DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
 HOMEPAGE="https://pim.kde.org/akonadi"
 KEYWORDS=""
 LICENSE="LGPL-2.1"
-IUSE="designer +mysql postgres sqlite test tools xml"
+IUSE="designer +mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"
 
@@ -38,7 +38,6 @@ COMMON_DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtsql 'mysql?,postgres?')
-	$(add_qt_dep qttest)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	x11-misc/shared-mime-info
@@ -62,11 +61,7 @@ RDEPEND="${COMMON_DEPEND}
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
 RESTRICT="test"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-15.12-mysql56-crash.patch"
-	"${FILESDIR}/${PN}-libxml2-optional.patch"
-	"${FILESDIR}/${PN}-tools-optional.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-15.12-mysql56-crash.patch" )
 
 pkg_setup() {
 	# Set default storage backend in order: MySQL, SQLite PostgreSQL
@@ -104,7 +99,6 @@ src_configure() {
 		$(cmake-utils_use_find_package designer Qt5Designer)
 		$(cmake-utils_use_find_package xml LibXml2)
 		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-		-DBUILD_TESTING=$(usex test)
 		-DBUILD_TOOLS=$(usex tools)
 		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
 	)

diff --git a/kde-apps/akonadi/files/akonadi-libxml2-optional.patch b/kde-apps/akonadi/files/akonadi-libxml2-optional.patch
deleted file mode 100644
index 2bde11a..0000000
--- a/kde-apps/akonadi/files/akonadi-libxml2-optional.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 75f87727dbcad2e6b6f1e97c8a6784fcf8616da9
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Thu Jan 21 00:10:16 2016 +0100
-
-    Move LibXML2 detection into xml subdir, make optional
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 503ba48..b05eb4d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -66,13 +66,6 @@ set_package_properties(Boost PROPERTIES
-     TYPE REQUIRED
- )
- 
--find_package(LibXml2)
--set_package_properties(LibXml2 PROPERTIES
--    DESCRIPTION "The LibXML2 library"
--    URL "http://xmlsoft.org"
--    TYPE REQUIRED
--)
--
- set(AKONADI_TESTS_EXPORT AKONADICORE_EXPORT)
- configure_file(akonaditests_export.h.in "${CMAKE_CURRENT_BINARY_DIR}/akonaditests_export.h")
- 
-diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
-index ad116d8..71e6ef4 100644
---- a/src/xml/CMakeLists.txt
-+++ b/src/xml/CMakeLists.txt
-@@ -1,4 +1,11 @@
- 
-+find_package(LibXml2)
-+set_package_properties(LibXml2 PROPERTIES
-+    DESCRIPTION "Required for XML schema validation in akonadixml"
-+    URL "http://xmlsoft.org"
-+    TYPE OPTIONAL
-+)
-+
- # Turn exceptions on
- if (LIBXML2_FOUND)
-     add_definitions(-DHAVE_LIBXML2)

diff --git a/kde-apps/akonadi/files/akonadi-tools-optional.patch b/kde-apps/akonadi/files/akonadi-tools-optional.patch
deleted file mode 100644
index 1c01a84..0000000
--- a/kde-apps/akonadi/files/akonadi-tools-optional.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 108770da124b52c089acb976f4d8f2070f73fac4
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Thu Jan 21 00:29:49 2016 +0100
-
-    Add switch to build development/testing tools optionally
-    
-    BUILD_TESTING=TRUE currently alters the install image, this change
-    introduces BUILD_TOOLS to conditionally build akonadixml as well as
-    akonadi_knut_resource, akonaditest and akonadi_test_searchplugin.
-    BUILD_TESTING=TRUE however will still trigger BUILD_TOOLS=TRUE.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b05eb4d..aeabc34 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,6 +80,11 @@ endif()
- ############### Build Options ###############
- option(AKONADI_BUILD_QSQLITE "Build the Sqlite backend." TRUE)
- option(ENABLE_ASAN "Build Akonadi with AddressSanitzer - https://code.google.com/p/address-sanitizer/" FALSE)
-+option(BUILD_TOOLS "Build and install tools for development and testing purposes." TRUE)
-+
-+if(BUILD_TESTING)
-+   set(BUILD_TOOLS TRUE)
-+endif()
- 
- set(SMI_MIN_VERSION "0.20")
- find_package(SharedMimeInfo ${SMI_MIN_VERSION} REQUIRED)
-@@ -289,9 +294,17 @@ include_directories(
- 
- add_subdirectory(src)
- 
-+if(BUILD_TOOLS)
-+    # add testrunner (application for managing a self-contained
-+    # test environment)
-+    add_subdirectory(autotests/libs/testrunner)
-+    add_subdirectory(autotests/libs/testresource)
-+    add_subdirectory(autotests/libs/testsearchplugin)
-+endif()
-+
- if(BUILD_TESTING)
--   add_subdirectory(autotests)
--   add_subdirectory(tests)
-+    add_subdirectory(autotests)
-+    add_subdirectory(tests)
- endif()
- 
- 
-diff --git a/autotests/libs/CMakeLists.txt b/autotests/libs/CMakeLists.txt
-index 562454d..7e3a2b4 100644
---- a/autotests/libs/CMakeLists.txt
-+++ b/autotests/libs/CMakeLists.txt
-@@ -22,13 +22,6 @@ include_directories(
-   ${Boost_INCLUDE_DIR}
- )
- 
--# add testrunner (application for managing a self-contained test
--# environment)
--
--add_subdirectory(testrunner)
--add_subdirectory(testresource)
--add_subdirectory(testsearchplugin)
--
- # convenience macro to add akonadi qtestlib unit-tests
- macro(add_akonadi_test _source)
-   set(_test ${_source} ${CMAKE_BINARY_DIR}/src/core/akonadicore_debug.cpp)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 4e79dc0..4141947 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -16,4 +16,6 @@ add_subdirectory(core)
- add_subdirectory(agentbase)
- add_subdirectory(widgets)
- add_subdirectory(selftest)
--add_subdirectory(xml)
-+if(BUILD_TOOLS)
-+    add_subdirectory(xml)
-+endif()