commit:     135b6c8b86392808e936d743252860c4c5c9f294
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jan  2 18:47:13 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan  4 16:21:34 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=135b6c8b

app-cdr/k3b: Patches go into PATCHES; force handbook optional

Important: Requires b56904fffadd50e7f13d49d47797604fd0ecbc87

Package-Manager: portage-2.2.24

 app-cdr/k3b/k3b-9999.ebuild | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 47fd6cd..390e160 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -5,10 +5,10 @@
 EAPI=5
 
 EGIT_BRANCH="kf5"
-KDE_HANDBOOK="true"
+KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 # Translations are only in the tarballs, not in the git repo
-if [[ ${PV} != *9999* ]]; then
+if [[ ${KDE_BUILD_TYPE} != live ]] ; then
        SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
        DOCS=( FAQ PERMISSIONS README )
        S=${WORKDIR}/${P/_*}
@@ -31,7 +31,6 @@ DEPEND="
        $(add_frameworks_dep kcmutils)
        $(add_frameworks_dep kconfig)
        $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdoctools)
        $(add_frameworks_dep kdelibs4support)
        $(add_frameworks_dep kfilemetadata)
        $(add_frameworks_dep ki18n)
@@ -43,7 +42,6 @@ DEPEND="
        $(add_kdeapps_dep libkcddb)
        dev-qt/qtdbus:5
        dev-qt/qtgui:5
-       dev-qt/qttest:5
        dev-qt/qtwebkit:5
        dev-qt/qtwidgets:5
        media-libs/libsamplerate
@@ -60,7 +58,6 @@ DEPEND="
        taglib? ( >=media-libs/taglib-1.5 )
        vorbis? ( media-libs/libvorbis )
 "
-#      $(add_frameworks_dep kdelibs 'udev,udisks(+)')
 RDEPEND="${DEPEND}
        app-cdr/cdrdao
        media-sound/cdparanoia
@@ -82,11 +79,7 @@ REQUIRED_USE="
        sox? ( encode )
 "
 
-src_prepare() {
-       # we have to patch first, because some doc sed magic in kde5.eclass 
will make the patch invalid
-       epatch "${FILESDIR}/${PN}-tests-optional.patch"
-       kde5_src_prepare
-}
+PATCHES=( "${FILESDIR}/${PN}-tests-optional.patch" )
 
 src_configure() {
        local mycmakeargs=(

Reply via email to