[gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/, app-office/akonadi-server/files/

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

commit:     5233458b4150a75223fb37652569deb7403030e6
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 13:54:50 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 13:54:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5233458b

[app-office/akonadi-server] Match upstream changes for building Qt5 support. Remove unused patch.

Package-Manager: portage-2.1.11.57

---
 .../akonadi-server/akonadi-server-9999.ebuild      |    2 +-
 .../files/akonadi-server-1.9.0-qt5.patch           |   24 --------------------
 2 files changed, 1 insertions(+), 25 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 737c938..4840149 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -102,7 +102,7 @@ src_configure() {
 		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
 		$(cmake-utils_use test AKONADI_BUILD_TESTS)
 		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
+		$(cmake-utils_use qt5 QT5_BUILD)
 	)
 
 	cmake-utils_src_configure

diff --git a/app-office/akonadi-server/files/akonadi-server-1.9.0-qt5.patch b/app-office/akonadi-server/files/akonadi-server-1.9.0-qt5.patch
deleted file mode 100644
index 132557a..0000000
--- a/app-office/akonadi-server/files/akonadi-server-1.9.0-qt5.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e0efd25..efcdbe0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,6 +21,7 @@ option(AKONADI_BUILD_QSQLITE "Build the Sqlite backend." TRUE)
- option(AKONADI_USE_STRIGI_SEARCH "Build Akonadi with strigi as search engine." FALSE)
- option(INSTALL_QSQLITE_IN_QT_PREFIX "Install the QSQLite plugin in QT_PLUGIN_DIR" FALSE)
- option(STATIC_LIBRARY "Build Akonadi as a static library." FALSE)
-+OPTION(WITH_QT5 "Build against Qt5." TRUE)
- 
- if(NOT DEFINED DATABASE_BACKEND)
-   set(DATABASE_BACKEND "MYSQL" CACHE STRING "The default database backend to use for Akonadi. Can be either MYSQL, POSTGRES or SQLITE")
-@@ -128,7 +129,10 @@ set_default_db_backend(${DATABASE_BACKEND})
- set(QT_USE_IMPORTED_TARGETS TRUE) # Qt 4 only
- set(QT_MIN_VERSION 4.6.0)         # Qt 4 only
- 
--find_package(Qt5Core QUIET)
-+if (WITH_QT5)
-+  find_package(Qt5Core QUIET)
-+endif()
-+
- if (Qt5Core_FOUND)
-   find_package(Qt5Gui REQUIRED)
-   find_package(Qt5Widgets REQUIRED)