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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2ACD5158041 for ; Sun, 3 Mar 2024 16:37:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D399E2A30; Sun, 3 Mar 2024 16:37:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 56611E2A30 for ; Sun, 3 Mar 2024 16:37:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 826EB33FEF1 for ; Sun, 3 Mar 2024 16:37:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F898137F for ; Sun, 3 Mar 2024 16:37:48 +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: <1709483841.f4a6d15842cd05117e24f86d8bf1dd2ad4860fb1.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/plasma-wayland-protocols/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0-r1.ebuild dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0.ebuild X-VCS-Directories: dev-libs/plasma-wayland-protocols/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f4a6d15842cd05117e24f86d8bf1dd2ad4860fb1 X-VCS-Branch: master Date: Sun, 3 Mar 2024 16:37:48 +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: 8a25a94b-fdb5-4ac0-aaac-a2a6978a60d4 X-Archives-Hash: e709c19e5080357d921937a0ae24d35b commit: f4a6d15842cd05117e24f86d8bf1dd2ad4860fb1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 3 16:24:08 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 3 16:37:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4a6d158 dev-libs/plasma-wayland-protocols: Use cmake instead of ecm.eclass The latter was just overkill for the needs of this simple build system, this ensures that it works for Qt5/Qt6 "purity" builds alike. Closes: https://bugs.gentoo.org/923502 Closes: https://github.com/gentoo/kde/pull/980 Signed-off-by: Andreas Sturmlechner gentoo.org> ...ld => plasma-wayland-protocols-1.12.0-r1.ebuild} | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0-r1.ebuild similarity index 54% rename from dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0.ebuild rename to dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0-r1.ebuild index 5a9c09e22f1e..ad0d538fed5b 100644 --- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0.ebuild +++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0-r1.ebuild @@ -3,8 +3,7 @@ EAPI=8 -ECM_NONGUI=true -inherit ecm kde.org +inherit cmake kde.org DESCRIPTION="Plasma Specific Protocols for Wayland" HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols" @@ -16,3 +15,21 @@ fi LICENSE="LGPL-2.1" SLOT="0" + +BDEPEND=" + dev-libs/libpcre2:* + >=kde-frameworks/extra-cmake-modules-5.115.0:* + || ( + dev-qt/qtbase:6 + dev-qt/qtcore:5 + ) +" + +ecm_src_configure() { + local mycmakeargs=( + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON # ecm.eclass + -DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" # ecm.eclass + ) + + cmake_src_configure +}