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-wireless/bluedevil/files/, net-wireless/bluedevil/
Date: Wed, 28 May 2014 18:37:41
Message-Id: 1401302214.c759cddbf3d8b23a0c62e8486c376748b671fa78.johu@gentoo
1 commit: c759cddbf3d8b23a0c62e8486c376748b671fa78
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 28 18:36:54 2014 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Wed May 28 18:36:54 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c759cddb
7
8 [net-wireless/bluedevil] KF5 version
9
10 Package-Manager: portage-2.2.10
11
12 ---
13 ...uedevil-9999.ebuild => bluedevil-4.9999.ebuild} | 0
14 net-wireless/bluedevil/bluedevil-9999.ebuild | 31 +++++++++++++++-------
15 .../bluedevil/files/bluedevil-9999-ecm-cmake.patch | 13 +++++++++
16 3 files changed, 35 insertions(+), 9 deletions(-)
17
18 diff --git a/net-wireless/bluedevil/bluedevil-9999.ebuild b/net-wireless/bluedevil/bluedevil-4.9999.ebuild
19 similarity index 100%
20 copy from net-wireless/bluedevil/bluedevil-9999.ebuild
21 copy to net-wireless/bluedevil/bluedevil-4.9999.ebuild
22
23 diff --git a/net-wireless/bluedevil/bluedevil-9999.ebuild b/net-wireless/bluedevil/bluedevil-9999.ebuild
24 index 95b1c40..c1378c3 100644
25 --- a/net-wireless/bluedevil/bluedevil-9999.ebuild
26 +++ b/net-wireless/bluedevil/bluedevil-9999.ebuild
27 @@ -4,25 +4,38 @@
28
29 EAPI=5
30
31 -KDE_LINGUAS="ar bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
32 -hu it ja kk km ko lt mai mr ms nb nds nl pa pl pt pt_BR ro ru sk sl sr
33 -sr@ijekavian sr@ijekavianlatin sr@latin sv th tr ug uk zh_CN zh_TW"
34 -inherit kde4-base
35 +EGIT_BRANCH="frameworks"
36 +inherit kde5
37
38 DESCRIPTION="Bluetooth stack for KDE"
39 HOMEPAGE="http://projects.kde.org/projects/extragear/base/bluedevil"
40 -
41 -LICENSE="GPL-2+"
42 KEYWORDS=""
43 -SLOT="4"
44 -IUSE="debug"
45 +IUSE=""
46
47 DEPEND="
48 - >=net-libs/libbluedevil-2
49 + $(add_frameworks_dep kcompletion)
50 + $(add_frameworks_dep kconfig)
51 + $(add_frameworks_dep kconfigwidgets)
52 + $(add_frameworks_dep kcoreaddons)
53 + $(add_frameworks_dep kdbusaddons)
54 + $(add_frameworks_dep kdelibs4support)
55 + $(add_frameworks_dep ki18n)
56 + $(add_frameworks_dep kiconthemes)
57 + $(add_frameworks_dep kio)
58 + $(add_frameworks_dep knotifications)
59 + $(add_frameworks_dep kservice)
60 + $(add_frameworks_dep kwidgetsaddons)
61 + dev-qt/qtdbus:5
62 + dev-qt/qtgui:5
63 + dev-qt/qtwidgets:5
64 + net-libs/libbluedevil:5
65 x11-misc/shared-mime-info
66 "
67 RDEPEND="${DEPEND}
68 !app-mobilephone/obexd
69 !app-mobilephone/obex-data-server
70 + !net-wireless/bluedevil:4
71 !net-wireless/kbluetooth
72 "
73 +
74 +PATCHES=( "${FILESDIR}/${P}-ecm-cmake.patch" )
75
76 diff --git a/net-wireless/bluedevil/files/bluedevil-9999-ecm-cmake.patch b/net-wireless/bluedevil/files/bluedevil-9999-ecm-cmake.patch
77 new file mode 100644
78 index 0000000..29284c5
79 --- /dev/null
80 +++ b/net-wireless/bluedevil/files/bluedevil-9999-ecm-cmake.patch
81 @@ -0,0 +1,13 @@
82 +diff --git a/CMakeLists.txt b/CMakeLists.txt
83 +index cdfcd06..edfffa6 100644
84 +--- a/CMakeLists.txt
85 ++++ b/CMakeLists.txt
86 +@@ -17,7 +17,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
87 + Widgets
88 + DBus)
89 +
90 +-find_package(KF5 CONFIG REQUIRED COMPONENTS
91 ++find_package(KF5 REQUIRED COMPONENTS
92 + CoreAddons
93 + WidgetsAddons
94 + DBusAddons