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 B43DE15800D for ; Sat, 8 Jul 2023 15:18:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0621EE089F; Sat, 8 Jul 2023 15:18:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id DFCE1E089F for ; Sat, 8 Jul 2023 15:18:02 +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 F0CCD340DF9 for ; Sat, 8 Jul 2023 15:18:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 73609AC7 for ; Sat, 8 Jul 2023 15:18:00 +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: <1688829207.f2bf9cec5d1cc111a2ef631a406d235305e42c8c.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/breeze-icons-rcc/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.108.0.ebuild kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.9999.ebuild X-VCS-Directories: kde-frameworks/breeze-icons-rcc/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f2bf9cec5d1cc111a2ef631a406d235305e42c8c X-VCS-Branch: master Date: Sat, 8 Jul 2023 15:18:00 +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: 4ba0bf30-82d4-4522-ac93-eebaed884199 X-Archives-Hash: da268eb9f02ad193f85998f04bc42964 commit: f2bf9cec5d1cc111a2ef631a406d235305e42c8c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 8 15:13:27 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 8 15:13:27 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f2bf9cec kde-frameworks/breeze-icons-rcc: Fix conflict with breeze-icons Upstream commit 1c6a2711aa0de1e736a6f918d7f7a56aa60e0c79 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.108.0.ebuild | 9 ++++++++- kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.9999.ebuild | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.108.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.108.0.ebuild index 0f66be8ae7..98ddbf49a6 100644 --- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.108.0.ebuild +++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.108.0.ebuild @@ -15,13 +15,13 @@ IUSE="test" RESTRICT="!test? ( test )" +DEPEND="test? ( dev-qt/qttest:5 )" BDEPEND="${PYTHON_DEPS} $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-${PVCUT}:5 test? ( app-misc/fdupes ) " -DEPEND="test? ( dev-qt/qttest:5 )" python_check_deps() { python_has_version "dev-python/lxml[${PYTHON_USEDEP}]" @@ -40,3 +40,10 @@ src_configure() { ) cmake_src_configure } + +src_install() { + cmake_src_install + + # provided by kde-frameworks/breeze-icons + rm -rv "${ED}"/usr/$(get_libdir)/cmake/KF5BreezeIcons || die +} diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.9999.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.9999.ebuild index c1645b7ff9..8205fa3f4d 100644 --- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.9999.ebuild +++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.9999.ebuild @@ -15,13 +15,13 @@ IUSE="test" RESTRICT="!test? ( test )" +DEPEND="test? ( dev-qt/qttest:5 )" BDEPEND="${PYTHON_DEPS} $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-${PVCUT}:5 test? ( app-misc/fdupes ) " -DEPEND="test? ( dev-qt/qttest:5 )" python_check_deps() { python_has_version "dev-python/lxml[${PYTHON_USEDEP}]" @@ -40,3 +40,10 @@ src_configure() { ) cmake_src_configure } + +src_install() { + cmake_src_install + + # provided by kde-frameworks/breeze-icons + rm -rv "${ED}"/usr/$(get_libdir)/cmake/KF5BreezeIcons || die +}