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 A5870138334 for ; Wed, 16 Oct 2019 13:21:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E95DFE0966; Wed, 16 Oct 2019 13:21:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 C066AE075F for ; Wed, 16 Oct 2019 13:21:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 9FA1D34BDB3 for ; Wed, 16 Oct 2019 13:21:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2587788B for ; Wed, 16 Oct 2019 13:21:09 +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: <1571228782.08117c7ec3a9f2d10b5df646e8d782f4e581fdba.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild X-VCS-Directories: kde-frameworks/extra-cmake-modules/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 08117c7ec3a9f2d10b5df646e8d782f4e581fdba X-VCS-Branch: master Date: Wed, 16 Oct 2019 13:21:09 +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: d0ed5897-42a8-443f-99cf-208bce769b68 X-Archives-Hash: 5a1bfcbc14fc24505ad89ddea8f233a9 commit: 08117c7ec3a9f2d10b5df646e8d782f4e581fdba Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Oct 16 12:26:22 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Oct 16 12:26:22 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=08117c7e kde-frameworks/extra-cmake-modules: Port away from kde5.eclass Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> .../extra-cmake-modules-9999.ebuild | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild index bd0f45ebea..5cfdab0f5d 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild @@ -4,12 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python{2_7,3_{6,7}} ) -ECM_KDEINSTALLDIRS="false" -KDE_AUTODEPS="false" -KDE_DEBUG="false" -KDE_QTHELP="false" -KDE_TEST="false" -inherit kde5 python-any-r1 +inherit cmake-utils kde.org python-any-r1 DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git" @@ -22,11 +17,11 @@ BDEPEND=" doc? ( ${PYTHON_DEPS} $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - $(add_qt_dep qthelp) + dev-qt/qthelp:5 ) test? ( - $(add_qt_dep qtcore) - $(add_qt_dep linguist-tools) + dev-qt/linguist-tools:5 + dev-qt/qtcore:5 ) " RDEPEND=" @@ -44,7 +39,7 @@ pkg_setup() { } src_prepare() { - kde5_src_prepare + cmake-utils_src_prepare # Requires PyQt5, bug #680256 sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \ tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests" @@ -58,7 +53,7 @@ src_configure() { -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" ) - kde5_src_configure + cmake-utils_src_configure } src_test() { @@ -68,5 +63,5 @@ src_test() { -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" ) - kde5_src_test + cmake-utils_src_test }