[gentoo-commits] proj/kde:master commit in: kde-frameworks/breeze-icons-rcc/

[Andreas Sturmlechner]

commit:     f2bf9cec5d1cc111a2ef631a406d235305e42c8c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 15:13:27 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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
+}