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

[Michael Palimaka]

commit:     bb3d982df2cceeaa21a8c1fcc9c3e719a51fc05c
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Aug 15 10:10:59 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=bb3d982d

kde-apps/audiocd-kio: Frameworks merged to master

Package-Manager: portage-2.2.28

 kde-apps/audiocd-kio/audiocd-kio-5.9999.ebuild | 42 --------------------------
 kde-apps/audiocd-kio/audiocd-kio-9999.ebuild   | 22 +++++++++-----
 2 files changed, 15 insertions(+), 49 deletions(-)

diff --git a/kde-apps/audiocd-kio/audiocd-kio-5.9999.ebuild 
b/kde-apps/audiocd-kio/audiocd-kio-5.9999.ebuild
deleted file mode 100644
index 74a7720..0000000
--- a/kde-apps/audiocd-kio/audiocd-kio-5.9999.ebuild
+++ /dev/null
@@ -1,42 +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_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="kioslaves from the kdemultimedia package by KDE"
-KEYWORDS=""
-IUSE="flac vorbis"
-
-DEPEND="
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdelibs4support)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kio)
-       $(add_kdeapps_dep libkcddb)
-       $(add_kdeapps_dep libkcompactdisc)
-       $(add_qt_dep qtwidgets)
-       media-sound/cdparanoia
-       flac? ( >=media-libs/flac-1.1.2 )
-       vorbis? (
-               media-libs/libogg
-               media-libs/libvorbis
-       )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-       local mycmakeargs=(
-               $(cmake-utils_use_find_package flac FLAC)
-               $(cmake-utils_use_find_package vorbis OggVorbis)
-       )
-
-       kde5_src_configure
-}

diff --git a/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild 
b/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild
index 768214e..003f88f 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild
@@ -4,16 +4,24 @@
 
 EAPI=6
 
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_HANDBOOK="forceoptional"
+inherit kde5
 
-DESCRIPTION="KDE kioslaves from the kdemultimedia package"
+DESCRIPTION="kioslave for accessing audio CDs"
 KEYWORDS=""
-IUSE="debug flac vorbis"
+IUSE="flac vorbis"
 
 DEPEND="
+       $(add_frameworks_dep kcompletion)
+       $(add_frameworks_dep kconfig)
+       $(add_frameworks_dep kconfigwidgets)
+       $(add_frameworks_dep kcoreaddons)
+       $(add_frameworks_dep kdelibs4support)
+       $(add_frameworks_dep ki18n)
+       $(add_frameworks_dep kio)
        $(add_kdeapps_dep libkcddb)
        $(add_kdeapps_dep libkcompactdisc)
+       $(add_qt_dep qtwidgets)
        media-sound/cdparanoia
        flac? ( >=media-libs/flac-1.1.2 )
        vorbis? (
@@ -25,9 +33,9 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               -DWITH_Flac=$(usex flac)
-               -DWITH_OggVorbis=$(usex vorbis)
+               $(cmake-utils_use_find_package flac FLAC)
+               $(cmake-utils_use_find_package vorbis OggVorbis)
        )
 
-       kde4-base_src_configure
+       kde5_src_configure
 }