Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: net-libs/libnm-qt/
Date: Wed, 24 Sep 2014 15:03:24
Message-Id: 1411570990.105fd8762d499190fe037983ff873464f112ee87.kensington@gentoo
1 commit: 105fd8762d499190fe037983ff873464f112ee87
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 24 15:02:52 2014 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 24 15:03:10 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=105fd876
7
8 [net-libs/libnm-qt] Introduce teamd USE flag to avoid requiring net-misc/networkmanager[teamd] unconditionally.
9
10 Package-Manager: portage-2.2.10
11
12 ---
13 net-libs/libnm-qt/libnm-qt-5.0.93.ebuild | 8 ++++----
14 net-libs/libnm-qt/libnm-qt-9999.ebuild | 6 +++---
15 net-libs/libnm-qt/metadata.xml | 3 +++
16 3 files changed, 10 insertions(+), 7 deletions(-)
17
18 diff --git a/net-libs/libnm-qt/libnm-qt-5.0.93.ebuild b/net-libs/libnm-qt/libnm-qt-5.0.93.ebuild
19 index 9025fde..66db949 100644
20 --- a/net-libs/libnm-qt/libnm-qt-5.0.93.ebuild
21 +++ b/net-libs/libnm-qt/libnm-qt-5.0.93.ebuild
22 @@ -11,7 +11,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
23 KEYWORDS="~amd64 ~x86"
24 SRC_URI="mirror://kde/stable/plasma/5.0.2/${P}.tar.xz"
25 else
26 - KEYWORDS=""
27 + KEYWORDS=" ~amd64"
28 fi
29
30 DESCRIPTION="NetworkManager bindings for Qt"
31 @@ -20,14 +20,14 @@ HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libnm-qt"
32 LICENSE="LGPL-2"
33 # maybe remove SLOT when it becomes official KDE Framework
34 SLOT="0"
35 -IUSE=""
36 +IUSE="teamd"
37
38 RDEPEND="
39 dev-qt/qtdbus:5
40 dev-qt/qtnetwork:5
41 || (
42 - >=net-misc/networkmanager-0.9.10.0[consolekit,teamd]
43 - >=net-misc/networkmanager-0.9.10.0[systemd,teamd]
44 + >=net-misc/networkmanager-0.9.10.0[consolekit,teamd=]
45 + >=net-misc/networkmanager-0.9.10.0[systemd,teamd=]
46 )
47 "
48 DEPEND="${RDEPEND}
49
50 diff --git a/net-libs/libnm-qt/libnm-qt-9999.ebuild b/net-libs/libnm-qt/libnm-qt-9999.ebuild
51 index 5e08506..f5db79c 100644
52 --- a/net-libs/libnm-qt/libnm-qt-9999.ebuild
53 +++ b/net-libs/libnm-qt/libnm-qt-9999.ebuild
54 @@ -20,14 +20,14 @@ HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libnm-qt"
55 LICENSE="LGPL-2"
56 # maybe remove SLOT when it becomes official KDE Framework
57 SLOT="0"
58 -IUSE=""
59 +IUSE="teamd"
60
61 RDEPEND="
62 dev-qt/qtdbus:5
63 dev-qt/qtnetwork:5
64 || (
65 - >=net-misc/networkmanager-0.9.10.0[consolekit,teamd]
66 - >=net-misc/networkmanager-0.9.10.0[systemd,teamd]
67 + >=net-misc/networkmanager-0.9.10.0[consolekit,teamd=]
68 + >=net-misc/networkmanager-0.9.10.0[systemd,teamd=]
69 )
70 "
71 DEPEND="${RDEPEND}
72
73 diff --git a/net-libs/libnm-qt/metadata.xml b/net-libs/libnm-qt/metadata.xml
74 index a23f444..7aa99ba 100644
75 --- a/net-libs/libnm-qt/metadata.xml
76 +++ b/net-libs/libnm-qt/metadata.xml
77 @@ -2,4 +2,7 @@
78 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
79 <pkgmetadata>
80 <herd>kde</herd>
81 + <use>
82 + <flag name="teamd">Enable Teamd control support</flag>
83 + </use>
84 </pkgmetadata>