Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: net-im/ktp-accounts-kcm/files/, net-im/ktp-accounts-kcm/
Date: Thu, 31 Oct 2013 16:35:52
Message-Id: 1383237328.582e5e671782951c8c9b274e0d1e9a8c21ebb8fb.johu@gentoo
1 commit: 582e5e671782951c8c9b274e0d1e9a8c21ebb8fb
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 31 16:35:28 2013 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 31 16:35:28 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=582e5e67
7
8 [net-im/ktp-accounts-kcm] Patched merged into master by upstream.
9
10 Package-Manager: portage-2.2.7
11
12 ---
13 .../ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch | 27 ----------------------
14 .../ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild | 2 --
15 2 files changed, 29 deletions(-)
16
17 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
18 deleted file mode 100644
19 index 54f1534..0000000
20 --- a/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch
21 +++ /dev/null
22 @@ -1,27 +0,0 @@
23 -commit de71c97def75f047ec0dbaabffb8bc698938e84f
24 -Author: David Edmundson <kde@×××××××××××××××××.uk>
25 -Date: Wed Oct 30 19:19:23 2013 +0100
26 -
27 - Make each plugin optional
28 -
29 -diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
30 -index e270078..e752ef1 100644
31 ---- a/plugins/CMakeLists.txt
32 -+++ b/plugins/CMakeLists.txt
33 -@@ -1,8 +1,8 @@
34 --add_subdirectory (gabble)
35 --add_subdirectory (butterfly)
36 --add_subdirectory (idle)
37 --add_subdirectory (haze)
38 --add_subdirectory (rakia)
39 --add_subdirectory (salut)
40 --add_subdirectory (sunshine)
41 --add_subdirectory (pintxo)
42 -+macro_optional_add_subdirectory (gabble)
43 -+macro_optional_add_subdirectory (butterfly)
44 -+macro_optional_add_subdirectory (idle)
45 -+macro_optional_add_subdirectory (haze)
46 -+macro_optional_add_subdirectory (rakia)
47 -+macro_optional_add_subdirectory (salut)
48 -+macro_optional_add_subdirectory (sunshine)
49 -+macro_optional_add_subdirectory (pintxo)
50
51 diff --git a/net-im/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
52 index af724e3..a2226f5 100644
53 --- a/net-im/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
54 +++ b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
55 @@ -32,8 +32,6 @@ DEPEND="
56 "
57 RDEPEND="${DEPEND}"
58
59 -PATCHES=( "${FILESDIR}/${PN}-0.7.0-libmm-qt-optional.patch" )
60 -
61 src_configure() {
62 local mycmakeargs=(
63 $(cmake-utils_use_build modemmanager pintxo)