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

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

commit:     efdfc785873f650e3867cef7b672c271cbe3a74f
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  7 11:28:31 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan  7 11:28:31 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=efdfc785

[app-office/akonadi-server] Fix breakage when Qt5 is installed.

Package-Manager: portage-2.1.11.38

---
 .../akonadi-server/akonadi-server-1.9.0.ebuild     |    3 ++
 .../files/akonadi-server-1.9.0-qt5.patch           |   24 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.9.0.ebuild b/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
index 1cfcc99..aa7fea1 100644
--- a/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
@@ -44,6 +44,8 @@ REQUIRED_USE="|| ( sqlite mysql postgres )"
 
 RESTRICT=test
 
+PATCHES=( "${FILESDIR}/${P}-qt5.patch" )
+
 pkg_setup() {
 	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
 	# reverse driver check to keep the order
@@ -83,6 +85,7 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		-DAKONADI_USE_STRIGI_SEARCH=OFF
+		-DWITH_QT5=OFF
 		$(cmake-utils_use test AKONADI_BUILD_TESTS)
 		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
 	)

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
new file mode 100644
index 0000000..132557a
--- /dev/null
+++ b/app-office/akonadi-server/files/akonadi-server-1.9.0-qt5.patch
@@ -0,0 +1,24 @@
+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)