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 45A3B13830E for ; Fri, 15 Jul 2016 11:19:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E9FEE09A9; Fri, 15 Jul 2016 11:19:16 +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 22E1EE09A9 for ; Fri, 15 Jul 2016 11:19:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 2076A340CD6 for ; Fri, 15 Jul 2016 11:19:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B6C3AE60 for ; Fri, 15 Jul 2016 11:19:11 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1468581439.a9f7bb31fb67c3fadb6b6c1b008c7c130ecc63a8.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/libkcddb/libkcddb-5.9999.ebuild kde-apps/libkcddb/libkcddb-9999.ebuild X-VCS-Directories: kde-apps/libkcddb/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: a9f7bb31fb67c3fadb6b6c1b008c7c130ecc63a8 X-VCS-Branch: master Date: Fri, 15 Jul 2016 11:19:11 +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: db11997d-2ff6-401e-a1e6-03de97566d52 X-Archives-Hash: 8405dc2ecb8e42a65d354c5969f48fb8 commit: a9f7bb31fb67c3fadb6b6c1b008c7c130ecc63a8 Author: Johannes Huber gentoo org> AuthorDate: Fri Jul 15 11:17:19 2016 +0000 Commit: Johannes Huber gentoo 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 }