Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
Date: Mon, 04 Jan 2016 16:22:01
Message-Id: 1451924494.135b6c8b86392808e936d743252860c4c5c9f294.kensington@gentoo
1 commit: 135b6c8b86392808e936d743252860c4c5c9f294
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Sat Jan 2 18:47:13 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 4 16:21:34 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=135b6c8b
7
8 app-cdr/k3b: Patches go into PATCHES; force handbook optional
9
10 Important: Requires b56904fffadd50e7f13d49d47797604fd0ecbc87
11
12 Package-Manager: portage-2.2.24
13
14 app-cdr/k3b/k3b-9999.ebuild | 13 +++----------
15 1 file changed, 3 insertions(+), 10 deletions(-)
16
17 diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
18 index 47fd6cd..390e160 100644
19 --- a/app-cdr/k3b/k3b-9999.ebuild
20 +++ b/app-cdr/k3b/k3b-9999.ebuild
21 @@ -5,10 +5,10 @@
22 EAPI=5
23
24 EGIT_BRANCH="kf5"
25 -KDE_HANDBOOK="true"
26 +KDE_HANDBOOK="forceoptional"
27 KDE_TEST="true"
28 # Translations are only in the tarballs, not in the git repo
29 -if [[ ${PV} != *9999* ]]; then
30 +if [[ ${KDE_BUILD_TYPE} != live ]] ; then
31 SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
32 DOCS=( FAQ PERMISSIONS README )
33 S=${WORKDIR}/${P/_*}
34 @@ -31,7 +31,6 @@ DEPEND="
35 $(add_frameworks_dep kcmutils)
36 $(add_frameworks_dep kconfig)
37 $(add_frameworks_dep kcoreaddons)
38 - $(add_frameworks_dep kdoctools)
39 $(add_frameworks_dep kdelibs4support)
40 $(add_frameworks_dep kfilemetadata)
41 $(add_frameworks_dep ki18n)
42 @@ -43,7 +42,6 @@ DEPEND="
43 $(add_kdeapps_dep libkcddb)
44 dev-qt/qtdbus:5
45 dev-qt/qtgui:5
46 - dev-qt/qttest:5
47 dev-qt/qtwebkit:5
48 dev-qt/qtwidgets:5
49 media-libs/libsamplerate
50 @@ -60,7 +58,6 @@ DEPEND="
51 taglib? ( >=media-libs/taglib-1.5 )
52 vorbis? ( media-libs/libvorbis )
53 "
54 -# $(add_frameworks_dep kdelibs 'udev,udisks(+)')
55 RDEPEND="${DEPEND}
56 app-cdr/cdrdao
57 media-sound/cdparanoia
58 @@ -82,11 +79,7 @@ REQUIRED_USE="
59 sox? ( encode )
60 "
61
62 -src_prepare() {
63 - # we have to patch first, because some doc sed magic in kde5.eclass will make the patch invalid
64 - epatch "${FILESDIR}/${PN}-tests-optional.patch"
65 - kde5_src_prepare
66 -}
67 +PATCHES=( "${FILESDIR}/${PN}-tests-optional.patch" )
68
69 src_configure() {
70 local mycmakeargs=(