public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: net-im/ktp-accounts-kcm/files/, net-im/ktp-accounts-kcm/
Date: Wed, 30 Oct 2013 21:27:08 +0000 (UTC)	[thread overview]
Message-ID: <1383168409.0087d4b33b4d6fb1443b743be504ab3f79d8d5e6.johu@gentoo> (raw)

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@davidedmundson.co.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>


             reply	other threads:[~2013-10-30 21:27 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-30 21:27 Johannes Huber [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-10-31 16:35 [gentoo-commits] proj/kde:master commit in: net-im/ktp-accounts-kcm/files/, net-im/ktp-accounts-kcm/ Johannes Huber
2013-10-11 23:38 Alexey Shvetsov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1383168409.0087d4b33b4d6fb1443b743be504ab3f79d8d5e6.johu@gentoo \
    --to=johu@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox