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

[Michael Palimaka]

commit:     d0513bfd2b9b84d9ad1848f94493c3499cd06051
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Aug 16 06:25:52 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 12:48:50 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d0513bfd

kde-apps/libkcompactdisc: Frameworks merged to master

Package-Manager: portage-2.2.28

 .../libkcompactdisc/libkcompactdisc-5.9999.ebuild  | 29 ----------------------
 .../libkcompactdisc/libkcompactdisc-9999.ebuild    | 16 +++++++-----
 2 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild
deleted file mode 100644
index fc089d8..0000000
--- a/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="Library for playing & ripping CDs"
-KEYWORDS=""
-IUSE="alsa"
-
-DEPEND="
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdelibs4support)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep solid)
-       $(add_qt_dep qtdbus)
-       media-libs/phonon[qt5]
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-       local mycmakeargs=(
-               $(cmake-utils_use_find_package alsa Alsa)
-       )
-       kde5_src_configure
-}

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
index a1b37f3..90dd6ac 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
@@ -4,15 +4,19 @@
 
 EAPI=6
 
-inherit kde4-base
+inherit kde5
 
-DESCRIPTION="KDE library for playing & ripping CDs"
+DESCRIPTION="Library for playing & ripping CDs"
 KEYWORDS=""
-IUSE="alsa debug"
+IUSE="alsa"
 
 DEPEND="
-       media-libs/phonon[qt4]
-       alsa? ( media-libs/alsa-lib )
+       $(add_frameworks_dep kcoreaddons)
+       $(add_frameworks_dep kdelibs4support)
+       $(add_frameworks_dep ki18n)
+       $(add_frameworks_dep solid)
+       $(add_qt_dep qtdbus)
+       media-libs/phonon[qt5]
 "
 RDEPEND="${DEPEND}"
 
@@ -20,5 +24,5 @@ src_configure() {
        local mycmakeargs=(
                $(cmake-utils_use_find_package alsa Alsa)
        )
-       kde4-base_src_configure
+       kde5_src_configure
 }