From b68dfd3e172b0f70464d00c95913d322b6bc520f Mon Sep 17 00:00:00 2001 From: Alfred Wingate Date: Sat, 3 May 2025 19:45:46 +0300 Subject: [PATCH] net-misc/icaclient: add proper libxml2 subslot + compat Not going to open the can of worms on selfservice any further... Signed-off-by: Alfred Wingate Part-of: https://github.com/gentoo/gentoo/pull/41919 Signed-off-by: Sam James --- ...nt-24.11.0.85.ebuild => icaclient-24.11.0.85-r1.ebuild} | 5 ++++- ...ient-24.2.0.65.ebuild => icaclient-24.2.0.65-r1.ebuild} | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) rename net-misc/icaclient/{icaclient-24.11.0.85.ebuild => icaclient-24.11.0.85-r1.ebuild} (99%) rename net-misc/icaclient/{icaclient-24.2.0.65.ebuild => icaclient-24.2.0.65-r1.ebuild} (98%) diff --git a/net-misc/icaclient/icaclient-24.11.0.85.ebuild b/net-misc/icaclient/icaclient-24.11.0.85-r1.ebuild similarity index 99% rename from net-misc/icaclient/icaclient-24.11.0.85.ebuild rename to net-misc/icaclient/icaclient-24.11.0.85-r1.ebuild index 48b7caabf498c..f51d80a227514 100644 --- a/net-misc/icaclient/icaclient-24.11.0.85.ebuild +++ b/net-misc/icaclient/icaclient-24.11.0.85-r1.ebuild @@ -54,6 +54,10 @@ RDEPEND=" >=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret dev-libs/glib:2 + || ( + dev-libs/libxml2:2/0 + dev-libs/libxml2-compat + ) media-fonts/font-adobe-100dpi media-fonts/font-cursor-misc media-fonts/font-misc-ethiopic @@ -98,7 +102,6 @@ RDEPEND=" !hdx? ( !media-plugins/hdx-realtime-media-engine ) usb? ( virtual/libudev ) selfservice? ( - dev-libs/libxml2 net-libs/webkit-gtk:4.1 dev-libs/xerces-c ) diff --git a/net-misc/icaclient/icaclient-24.2.0.65.ebuild b/net-misc/icaclient/icaclient-24.2.0.65-r1.ebuild similarity index 98% rename from net-misc/icaclient/icaclient-24.2.0.65.ebuild rename to net-misc/icaclient/icaclient-24.2.0.65-r1.ebuild index 470438af514cb..805b49efe06e5 100644 --- a/net-misc/icaclient/icaclient-24.2.0.65.ebuild +++ b/net-misc/icaclient/icaclient-24.2.0.65-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -54,7 +54,10 @@ RDEPEND=" >=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret dev-libs/glib:2 - dev-libs/libxml2 + || ( + dev-libs/libxml2:2/0 + dev-libs/libxml2-compat + ) media-fonts/font-adobe-100dpi media-fonts/font-cursor-misc media-fonts/font-misc-ethiopic