From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 2E2A715808A for ; Mon, 04 Aug 2025 08:27:34 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 192F1340DE6 for ; Mon, 04 Aug 2025 08:27:34 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 2F3C11104DB; Mon, 04 Aug 2025 08:27:29 +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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 2A5611104DB for ; Mon, 04 Aug 2025 08:27:29 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D9068340B4D for ; Mon, 04 Aug 2025 08:27:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 464B2326A for ; Mon, 04 Aug 2025 08:27:27 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1754295932.4a032eb726162510c234a8e4ebb91d7242498f9f.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/gssdp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/gssdp/gssdp-1.4.1.ebuild net-libs/gssdp/gssdp-1.6.4.ebuild X-VCS-Directories: net-libs/gssdp/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 4a032eb726162510c234a8e4ebb91d7242498f9f X-VCS-Branch: master Date: Mon, 04 Aug 2025 08:27:27 +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: 075dc773-d61a-4ba7-be14-cbe75f132cbd X-Archives-Hash: 704c44d0c56d61a95c0ec56499c52c76 commit: 4a032eb726162510c234a8e4ebb91d7242498f9f Author: Cristian Othón Martínez Vera cfuga mx> AuthorDate: Thu Jul 31 22:56:10 2025 +0000 Commit: Pacho Ramos gentoo 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.mx> Part-of: https://github.com/gentoo/gentoo/pull/43280 Closes: https://github.com/gentoo/gentoo/pull/43280 Signed-off-by: Pacho Ramos 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 }