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/telepathy-logger-qt/
Date: Mon, 01 Dec 2014 12:38:46
Message-Id: 1417437511.d79d97f425b3f2add9b8cda86bdd23b72ed0005f.kensington@gentoo
1 commit: d79d97f425b3f2add9b8cda86bdd23b72ed0005f
2 Author: Karol Herbst <git <AT> karolherbst <DOT> de>
3 AuthorDate: Thu Nov 27 10:30:22 2014 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 1 12:38:31 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d79d97f4
7
8 [net-libs/telepathy-logger-qt] added Qt5 based live ebuild
9
10 ---
11 ...99.ebuild => telepathy-logger-qt-4.9999.ebuild} | 0
12 .../telepathy-logger-qt-9999.ebuild | 37 ++++++++++------------
13 2 files changed, 16 insertions(+), 21 deletions(-)
14
15 diff --git a/net-libs/telepathy-logger-qt/telepathy-logger-qt-9999.ebuild b/net-libs/telepathy-logger-qt/telepathy-logger-qt-4.9999.ebuild
16 similarity index 100%
17 copy from net-libs/telepathy-logger-qt/telepathy-logger-qt-9999.ebuild
18 copy to net-libs/telepathy-logger-qt/telepathy-logger-qt-4.9999.ebuild
19
20 diff --git a/net-libs/telepathy-logger-qt/telepathy-logger-qt-9999.ebuild b/net-libs/telepathy-logger-qt/telepathy-logger-qt-9999.ebuild
21 index d036a44..bfa745f 100644
22 --- a/net-libs/telepathy-logger-qt/telepathy-logger-qt-9999.ebuild
23 +++ b/net-libs/telepathy-logger-qt/telepathy-logger-qt-9999.ebuild
24 @@ -5,27 +5,24 @@
25 EAPI=5
26
27 PYTHON_COMPAT=( python2_7 )
28 -KDE_REQUIRED="never"
29 -inherit kde4-base python-any-r1
30 +EGIT_BRANCH="qt5"
31 +inherit kde5 python-any-r1
32
33 -DESCRIPTION="Qt4 bindings for the Telepathy logger"
34 +DESCRIPTION="Qt bindings for the Telepathy logger"
35 HOMEPAGE="https://projects.kde.org/projects/extragear/network/telepathy/telepathy-logger-qt"
36 -if [[ ${PV} != *9999* ]]; then
37 - SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
38 - KEYWORDS="~amd64 ~x86"
39 -else
40 - KEYWORDS=""
41 -fi
42
43 LICENSE="LGPL-2.1"
44 -SLOT="0"
45 -IUSE="debug"
46 +SLOT="5"
47 +IUSE=""
48
49 RDEPEND="
50 - media-libs/qt-gstreamer
51 - >=net-im/telepathy-logger-0.8.0
52 + dev-libs/glib
53 + dev-qt/qtcore:5
54 + dev-qt/qtdbus:5
55 + media-libs/qt-gstreamer[qt5]
56 + net-im/telepathy-logger
57 net-libs/telepathy-glib
58 - >=net-libs/telepathy-qt-0.9.1
59 + net-libs/telepathy-qt[qt5]
60 "
61 DEPEND="${RDEPEND}
62 ${PYTHON_DEPS}
63 @@ -33,14 +30,12 @@ DEPEND="${RDEPEND}
64 sys-devel/flex
65 "
66
67 -pkg_setup() {
68 - python-any-r1_pkg_setup
69 - kde4-base_pkg_setup
70 +
71 +src_prepare() {
72 + sed -i -e 's/INCLUDE(Qt5Macros)//g' cmake/modules/FindQt5.cmake || die "couldn't remove Qt5Macros include"
73 }
74
75 src_configure() {
76 - local mycmakeargs=(
77 - -DBUILD_SHARED_LIBS=ON
78 - )
79 - kde4-base_src_configure
80 + export QT_SELECT=5
81 + cmake-utils_src_configure
82 }