[gentoo-commits] proj/kde:master commit in: net-im/ktp-accounts-kcm/files/, net-im/ktp-accounts-kcm/

[Johannes Huber]

commit:     0087d4b33b4d6fb1443b743be504ab3f79d8d5e6
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 30 21:26:49 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Oct 30 21:26:49 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0087d4b3

[net-im/ktp-accounts-kcm] Make modemmanager support optional.

Package-Manager: portage-2.2.7

---
 .../ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch | 27 ++++++++++++++++++++++
 .../ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild  | 18 +++++++++++----
 net-im/ktp-accounts-kcm/metadata.xml               |  5 +++-
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch b/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch
new file mode 100644
index 0000000..54f1534
--- /dev/null
+++ b/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch
@@ -0,0 +1,27 @@
+commit de71c97def75f047ec0dbaabffb8bc698938e84f
+Author: David Edmundson <kde@×××××××××××××××××.uk>
+Date:   Wed Oct 30 19:19:23 2013 +0100
+
+    Make each plugin optional
+
+diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
+index e270078..e752ef1 100644
+--- a/plugins/CMakeLists.txt
++++ b/plugins/CMakeLists.txt
+@@ -1,8 +1,8 @@
+-add_subdirectory (gabble)
+-add_subdirectory (butterfly)
+-add_subdirectory (idle)
+-add_subdirectory (haze)
+-add_subdirectory (rakia)
+-add_subdirectory (salut)
+-add_subdirectory (sunshine)
+-add_subdirectory (pintxo)
++macro_optional_add_subdirectory (gabble)
++macro_optional_add_subdirectory (butterfly)
++macro_optional_add_subdirectory (idle)
++macro_optional_add_subdirectory (haze)
++macro_optional_add_subdirectory (rakia)
++macro_optional_add_subdirectory (salut)
++macro_optional_add_subdirectory (sunshine)
++macro_optional_add_subdirectory (pintxo)

diff --git a/net-im/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
index cde851a..af724e3 100644
--- a/net-im/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
+++ b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 KDE_MINIMAL="4.7"
 KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hu ia it
-ja kk km lt mai mr nb nds nl pl pt pt_BR ro ru sk sl sr sr@ijekavian
+ja kk km lt mai mr nb nds nl pa pl pt pt_BR ro ru sk sl sr sr@ijekavian
 sr@ijekavianlatin sr@latin sv tr ug uk vi wa zh_CN zh_TW"
 inherit kde4-base
 
@@ -21,13 +21,23 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="4"
-IUSE="debug"
+IUSE="debug modemmanager"
 
 DEPEND="
 	>=net-im/ktp-common-internals-${PV}
 	net-im/telepathy-mission-control
 	net-libs/telepathy-glib
 	>=net-libs/telepathy-qt-0.9.3
+	modemmanager? ( net-libs/libmm-qt )
 "
-RDEPEND="${DEPEND}
-"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.7.0-libmm-qt-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build modemmanager pintxo)
+	)
+
+	kde4-base_src_configure
+}

diff --git a/net-im/ktp-accounts-kcm/metadata.xml b/net-im/ktp-accounts-kcm/metadata.xml
index 8d1e86a..c5ae96e 100644
--- a/net-im/ktp-accounts-kcm/metadata.xml
+++ b/net-im/ktp-accounts-kcm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+	<herd>kde</herd>
+	<use>
+		<flag name="modemmanager">Enable support for mobile broadband devices</flag>
+	</use>
 </pkgmetadata>