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

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

[Michael Palimaka]

commit:     b9c60a48cdad024cf2778ea323e9b4d4223c169f
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Dec 17 23:22:19 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 16:03:48 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b9c60a48

kde-apps/libkdepim: Add USE=designer

Backport patch to 15.12

Package-Manager: portage-2.2.24

 .../files/libkdepim-15.12.0-find-qt5designer.patch | 27 ++++++++++++++++++++++
 ....49.9999.ebuild => libkdepim-15.12.0-r1.ebuild} | 14 +++++++++--
 kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild  | 12 +++++++++-
 kde-apps/libkdepim/libkdepim-9999.ebuild           | 10 +++++++-
 kde-apps/libkdepim/metadata.xml                    |  3 +++
 5 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/kde-apps/libkdepim/files/libkdepim-15.12.0-find-qt5designer.patch b/kde-apps/libkdepim/files/libkdepim-15.12.0-find-qt5designer.patch
new file mode 100644
index 0000000..1bfc631
--- /dev/null
+++ b/kde-apps/libkdepim/files/libkdepim-15.12.0-find-qt5designer.patch
@@ -0,0 +1,27 @@
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Thu, 17 Dec 2015 15:22:42 +0000
+Subject: Search for Qt5Designer
+X-Git-Url: http://quickgit.kde.org/?p=libkdepim.git&a=commitdiff&h=b6005eb9e45965ae2249aaa41d03919824ec6dfc
+---
+Search for Qt5Designer
+
+Otherwise Qt5Designer_FOUND in src/designer/CMakeLists.txt is always
+false and the corresponding code never built.
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,6 +45,11 @@
+ find_package(KF5AkonadiSearch ${AKONADISEARCH_LIB_VERSION} CONFIG REQUIRED)
+ set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
+ 
++find_package(Qt5Designer CONFIG)
++set_package_properties(Qt5Designer PROPERTIES
++   PURPOSE "Required to build the Qt Designer plugins"
++   TYPE OPTIONAL
++)
+ 
+ ecm_setup_version(${LIBKDEPIM_LIB_VERSION} VARIABLE_PREFIX LIBKDEPIM
+                         VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/libkdepim_version.h"
+

diff --git a/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild b/kde-apps/libkdepim/libkdepim-15.12.0-r1.ebuild
similarity index 79%
copy from kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild
copy to kde-apps/libkdepim/libkdepim-15.12.0-r1.ebuild
index e2040e9..271d0fe 100644
--- a/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild
+++ b/kde-apps/libkdepim/libkdepim-15.12.0-r1.ebuild
@@ -10,8 +10,8 @@ inherit kde5
 
 DESCRIPTION="Common PIM libraries"
 LICENSE="LGPL-2+"
-KEYWORDS=""
-IUSE=""
+KEYWORDS="~amd64 ~x86"
+IUSE="designer"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
@@ -33,6 +33,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
+	designer? ( dev-qt/designer:5 )
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kdepim-15.08.50:5
@@ -45,3 +46,12 @@ if [[ ${KDE_BUILD_TYPE} = live ]] ; then
 else
 	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
 fi
+
+PATCHES=( "${FILESDIR}/${PN}-15.12.0-find-qt5designer.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package designer Qt5Designer)
+	)
+	kde5_src_configure
+}

diff --git a/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild b/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild
index e2040e9..510abaf 100644
--- a/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild
+++ b/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Common PIM libraries"
 LICENSE="LGPL-2+"
 KEYWORDS=""
-IUSE=""
+IUSE="designer"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
@@ -33,6 +33,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
+	designer? ( dev-qt/designer:5 )
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kdepim-15.08.50:5
@@ -45,3 +46,12 @@ if [[ ${KDE_BUILD_TYPE} = live ]] ; then
 else
 	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
 fi
+
+PATCHES=( "${FILESDIR}/${PN}-15.12.0-find-qt5designer.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package designer Qt5Designer)
+	)
+	kde5_src_configure
+}

diff --git a/kde-apps/libkdepim/libkdepim-9999.ebuild b/kde-apps/libkdepim/libkdepim-9999.ebuild
index 58c76a3..4ca9503 100644
--- a/kde-apps/libkdepim/libkdepim-9999.ebuild
+++ b/kde-apps/libkdepim/libkdepim-9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Common PIM libraries"
 LICENSE="LGPL-2+"
 KEYWORDS=""
-IUSE=""
+IUSE="designer"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
@@ -32,9 +32,17 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
+	designer? ( dev-qt/designer:5 )
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kdepim-15.08.50:5
 	!kde-base/kdepim-common-libs:4
 	!kde-base/libkdepim:4
 "
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package designer Qt5Designer)
+	)
+	kde5_src_configure
+}

diff --git a/kde-apps/libkdepim/metadata.xml b/kde-apps/libkdepim/metadata.xml
index a23f444..774f7f1 100644
--- a/kde-apps/libkdepim/metadata.xml
+++ b/kde-apps/libkdepim/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
+	<use>
+		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
+	</use>
 </pkgmetadata>