[gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/

[Johannes Huber]

commit:     5e76266b5737a4b7b70163152ed862a99c8ed561
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 16 09:17:41 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 09:17:41 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5e76266b

kde-apps/libkcddb: Frameworks merge was reverted

Upstream reverted the merge so we need to follow.

This reverts commit a9f7bb31fb67c3fadb6b6c1b008c7c130ecc63a8.

 ...libkcddb-9999.ebuild => libkcddb-5.9999.ebuild} |  1 +
 kde-apps/libkcddb/libkcddb-9999.ebuild             | 32 ++++++++++++----------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild 
b/kde-apps/libkcddb/libkcddb-5.9999.ebuild
similarity index 97%
copy from kde-apps/libkcddb/libkcddb-9999.ebuild
copy to kde-apps/libkcddb/libkcddb-5.9999.ebuild
index 4d983d4..da23710 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-5.9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=6
 
+EGIT_BRANCH="kf5"
 KDE_TEST="true"
 inherit kde5
 

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild 
b/kde-apps/libkcddb/libkcddb-9999.ebuild
index 4d983d4..fb9baf3 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -4,36 +4,38 @@
 
 EAPI=6
 
-KDE_TEST="true"
-inherit kde5
+KDE_HANDBOOK="optional"
+inherit kde4-base
 
 DESCRIPTION="KDE library for CDDB"
 KEYWORDS=""
-IUSE="musicbrainz"
+IUSE="debug musicbrainz"
 
 # tests require network access and compare static data with online data
 # bug 280996
 RESTRICT=test
 
 DEPEND="
-       $(add_frameworks_dep kcodecs)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtnetwork)
-       $(add_qt_dep qtwidgets)
        musicbrainz? ( media-libs/musicbrainz:5 )
 "
 RDEPEND="${DEPEND}"
 
+KMSAVELIBS="true"
+
+src_prepare() {
+       kde4-base_src_prepare
+
+       if ! use handbook ; then
+               pushd kcmcddb > /dev/null || die
+               cmake_comment_add_subdirectory doc
+               popd > /dev/null || die
+       fi
+}
+
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package musicbrainz MusicBrainz5)
+               -DWITH_MusicBrainz5=$(usex musicbrainz)
        )
 
-       kde5_src_configure
+       kde4-base_src_configure
 }