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 A3FF1158015 for ; Thu, 28 Dec 2023 17:39:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E67F92BC016; Thu, 28 Dec 2023 17:39:12 +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 BC1772BC016 for ; Thu, 28 Dec 2023 17:39:12 +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 CB0B634027D for ; Thu, 28 Dec 2023 17:39:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3BB4412BB for ; Thu, 28 Dec 2023 17:39:10 +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: <1703784892.68f4a320f492f0eca5f72860ee7f39694acd281e.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/breeze-icons/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/breeze-icons/breeze-icons-5.247.0-r1.ebuild kde-frameworks/breeze-icons/breeze-icons-5.247.0.ebuild X-VCS-Directories: kde-frameworks/breeze-icons/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 68f4a320f492f0eca5f72860ee7f39694acd281e X-VCS-Branch: master Date: Thu, 28 Dec 2023 17:39:10 +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: 77cc46f6-4e5f-4bdd-b0c1-c34e11656d91 X-Archives-Hash: ed8f7d9e2d369416184aeef98e5e3e16 commit: 68f4a320f492f0eca5f72860ee7f39694acd281e Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Dec 28 17:34:52 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Dec 28 17:34:52 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68f4a320 kde-frameworks/breeze-icons: Merge ${PN}-rcc back into it There is no dependency savings or size concern here. Signed-off-by: Andreas Sturmlechner gentoo.org> ...-5.247.0.ebuild => breeze-icons-5.247.0-r1.ebuild} | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.247.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.247.0-r1.ebuild similarity index 81% rename from kde-frameworks/breeze-icons/breeze-icons-5.247.0.ebuild rename to kde-frameworks/breeze-icons/breeze-icons-5.247.0-r1.ebuild index 5a2cd1ced383..adf44cf9dd97 100644 --- a/kde-frameworks/breeze-icons/breeze-icons-5.247.0.ebuild +++ b/kde-frameworks/breeze-icons/breeze-icons-5.247.0-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 PVCUT=$(ver_cut 1-2) PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake frameworks.kde.org python-any-r1 xdg-utils +inherit cmake frameworks.kde.org python-any-r1 xdg DESCRIPTION="Breeze SVG icon theme" @@ -15,7 +15,11 @@ IUSE="test" RESTRICT="!test? ( test )" -RDEPEND="!kde-frameworks/${PN}:5" +RDEPEND=" + !kde-frameworks/${PN}:5 + !kde-frameworks/${PN}-rcc:5 + !kde-frameworks/${PN}-rcc:6 +" BDEPEND="${PYTHON_DEPS} $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') dev-qt/qtbase:6 @@ -35,7 +39,8 @@ src_prepare() { src_configure() { local mycmakeargs=( -DPython_EXECUTABLE="${PYTHON}" - -DBINARY_ICONS_RESOURCE=OFF + -DBINARY_ICONS_RESOURCE=ON + -DSKIP_INSTALL_ICONS=OFF ) cmake_src_configure } @@ -46,11 +51,3 @@ src_install() { find "${ED}"/usr/share/icons/ -type d -empty -delete || die find "${ED}"/usr/share/icons/ -xtype l -delete || die } - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -}