commit: 4a032eb726162510c234a8e4ebb91d7242498f9f Author: Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx> AuthorDate: Thu Jul 31 22:56:10 2025 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Mon Aug 4 08:25:32 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a032eb7
net-libs/gssdp: remove dependency on old slot When net-libs/gssdp:1.6 was added in commit 9b9c244c7c5611c550ff38dfdc748dcbf13ab8b6 to the Gentoo tree, depended on previous slot 0 to manage a file collision. The older slot still depends on deprecated net-libs/libsoup:2.4. Now, we switch the logic to prefer the file from the newer slot, and rename (not delete) the file in the older slot. Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> cfuga.mx> Part-of: https://github.com/gentoo/gentoo/pull/43280 Closes: https://github.com/gentoo/gentoo/pull/43280 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> net-libs/gssdp/gssdp-1.4.1.ebuild | 7 +++++++ net-libs/gssdp/gssdp-1.6.4.ebuild | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/net-libs/gssdp/gssdp-1.4.1.ebuild b/net-libs/gssdp/gssdp-1.4.1.ebuild index dd85975c3a68..fcab87ef74b6 100644 --- a/net-libs/gssdp/gssdp-1.4.1.ebuild +++ b/net-libs/gssdp/gssdp-1.4.1.ebuild @@ -61,4 +61,11 @@ multilib_src_install_all() { mv "${ED}"/usr/share/doc/${PF}/{reference,html} || die rmdir "${ED}"/usr/share/doc/gssdp-1.2 fi + + # has file collision with slot 1.6 (/usr/bin/gssdp-device-sniffer), + # so we rename it in this build + if use gtk; then + mv "${ED}"/usr/bin/gssdp-device-sniffer \ + "${ED}"/usr/bin/gssdp-device-sniffer-1.4 || die + fi } diff --git a/net-libs/gssdp/gssdp-1.6.4.ebuild b/net-libs/gssdp/gssdp-1.6.4.ebuild index f1d1b7ddd728..4d82391ae675 100644 --- a/net-libs/gssdp/gssdp-1.6.4.ebuild +++ b/net-libs/gssdp/gssdp-1.6.4.ebuild @@ -17,15 +17,12 @@ REQUIRED_USE=" vala? ( introspection ) " -# has file collision with Slot 0 (/usr/bin/gssdp-device-sniffer), so we remove that from this build -# and depend on the other slot that has the file as well RDEPEND=" >=dev-libs/glib-2.70:2[${MULTILIB_USEDEP}] >=net-libs/libsoup-2.99.0:3.0[${MULTILIB_USEDEP},introspection?] gtk? ( gui-libs/gtk:4 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) man? ( virtual/pandoc ) - >=net-libs/gssdp-1.4:0 " DEPEND="${RDEPEND}" BDEPEND=" @@ -65,8 +62,4 @@ multilib_src_install_all() { mkdir "${ED}"/usr/share/gtk-doc || die mv "${ED}"/usr/share/{doc,gtk-doc}/gssdp-1.6 || die fi - - if use gtk; then - rm "${ED}"/usr/bin/gssdp-device-sniffer || die # because of file collision with slot 0 - fi }
