commit: a9f7bb31fb67c3fadb6b6c1b008c7c130ecc63a8
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 11:17:19 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 11:17:19 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a9f7bb31
kde-apps/libkcddb: Frameworks merged to master
Package-Manager: portage-2.3.0
kde-apps/libkcddb/libkcddb-5.9999.ebuild | 40 --------------------------------
kde-apps/libkcddb/libkcddb-9999.ebuild | 32 ++++++++++++-------------
2 files changed, 15 insertions(+), 57 deletions(-)
diff --git a/kde-apps/libkcddb/libkcddb-5.9999.ebuild
b/kde-apps/libkcddb/libkcddb-5.9999.ebuild
deleted file mode 100644
index da23710..0000000
--- a/kde-apps/libkcddb/libkcddb-5.9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-EGIT_BRANCH="kf5"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE library for CDDB"
-KEYWORDS=""
-IUSE="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}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package musicbrainz MusicBrainz5)
- )
-
- kde5_src_configure
-}
diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild
b/kde-apps/libkcddb/libkcddb-9999.ebuild
index fb9baf3..4d983d4 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -4,38 +4,36 @@
EAPI=6
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_TEST="true"
+inherit kde5
DESCRIPTION="KDE library for CDDB"
KEYWORDS=""
-IUSE="debug musicbrainz"
+IUSE="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=(
- -DWITH_MusicBrainz5=$(usex musicbrainz)
+ $(cmake-utils_use_find_package musicbrainz MusicBrainz5)
)
- kde4-base_src_configure
+ kde5_src_configure
}
