From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AF4C513832E for ; Thu, 18 Aug 2016 12:49:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41E83E084B; Thu, 18 Aug 2016 12:49:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5FF67E084B for ; Thu, 18 Aug 2016 12:49:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3504A3408CF for ; Thu, 18 Aug 2016 12:49:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54980245F for ; Thu, 18 Aug 2016 12:48:59 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1471524530.bb3d982df2cceeaa21a8c1fcc9c3e719a51fc05c.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/audiocd-kio/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/audiocd-kio/audiocd-kio-5.9999.ebuild kde-apps/audiocd-kio/audiocd-kio-9999.ebuild X-VCS-Directories: kde-apps/audiocd-kio/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: bb3d982df2cceeaa21a8c1fcc9c3e719a51fc05c X-VCS-Branch: master Date: Thu, 18 Aug 2016 12:48:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b814bfd4-d66a-43c2-9676-ff5d82abbd75 X-Archives-Hash: 14231ee854329536f42180dbf9f0f60b commit: bb3d982df2cceeaa21a8c1fcc9c3e719a51fc05c Author: Andreas Sturmlechner gmail com> AuthorDate: Mon Aug 15 10:10:59 2016 +0000 Commit: Michael Palimaka gentoo 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 }