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 6DD05138334 for ; Sun, 24 Mar 2019 16:49:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B50CE0A4F; Sun, 24 Mar 2019 16:49:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 63510E0A0B for ; Sun, 24 Mar 2019 16:49:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 72C79335CC8 for ; Sun, 24 Mar 2019 16:49:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F68F577 for ; Sun, 24 Mar 2019 16:49:14 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1553446142.4004703ae7c93e235d66b10574586efa37409436.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/kid3/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/kid3/kid3-3.7.1.ebuild X-VCS-Directories: media-sound/kid3/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 4004703ae7c93e235d66b10574586efa37409436 X-VCS-Branch: master Date: Sun, 24 Mar 2019 16:49:14 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 10c9973f-ce2e-4905-98bd-c2a9e909bba3 X-Archives-Hash: 0b7fe18bc33e06a5a5893f5d1702e65b commit: 4004703ae7c93e235d66b10574586efa37409436 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 24 16:44:43 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 24 16:49:02 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4004703a media-sound/kid3: Switch from kde5.eclass to cmake-utils,xdg Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-sound/kid3/kid3-3.7.1.ebuild | 51 ++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/media-sound/kid3/kid3-3.7.1.ebuild b/media-sound/kid3/kid3-3.7.1.ebuild index 6ae8aae4340..0ae648d6fa2 100644 --- a/media-sound/kid3/kid3-3.7.1.ebuild +++ b/media-sound/kid3/kid3-3.7.1.ebuild @@ -3,9 +3,7 @@ EAPI=7 -ECM_KDEINSTALLDIRS="false" -KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950 -inherit kde5 +inherit cmake-utils xdg DESCRIPTION="Simple tag editor based on Qt" HOMEPAGE="https://kid3.sourceforge.io/" @@ -18,14 +16,18 @@ IUSE="acoustid flac kde mp3 mp4 +taglib vorbis" REQUIRED_USE="flac? ( vorbis )" -COMMON_DEPEND=" - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtmultimedia) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) +BDEPEND=" + dev-qt/linguist-tools:5 +" +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint @@ -36,11 +38,11 @@ COMMON_DEPEND=" media-libs/libvorbis ) kde? ( - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) + kde-frameworks/kconfig:5 + kde-frameworks/kconfigwidgets:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/kwidgetsaddons:5 + kde-frameworks/kxmlgui:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) @@ -50,24 +52,15 @@ COMMON_DEPEND=" media-libs/libvorbis ) " -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} !media-sound/kid3:4 " -DEPEND="${COMMON_DEPEND}" -BDEPEND=" - $(add_qt_dep linguist-tools) -" src_prepare() { # overengineered upstream build system - # kde5 eclass src_prepare leads to compile failure - - # only enable handbook when required - if ! use_if_iuse handbook ; then - cmake_comment_add_subdirectory ${KDE_DOC_DIR} - fi - cmake-utils_src_prepare + # applies broken python hacks, bug #614950 + cmake_comment_add_subdirectory doc } src_configure() { @@ -86,5 +79,5 @@ src_configure() { mycmakeargs+=( "-DWITH_APPS=Qt;CLI" ) fi - kde5_src_configure + cmake-utils_src_configure }