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 (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DFB1B158042 for ; Tue, 5 Nov 2024 19:09:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1AE89E02D2; Tue, 5 Nov 2024 19:09:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 04FA6E02D2 for ; Tue, 5 Nov 2024 19:09:07 +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 39121335DE9 for ; Tue, 5 Nov 2024 19:09:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 729B51A26 for ; Tue, 5 Nov 2024 19:09:04 +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: <1730833323.3549c4fde0b5d065208c64887767b7da2ec7b46a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libcanberra-gtk3/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild X-VCS-Directories: media-libs/libcanberra-gtk3/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 3549c4fde0b5d065208c64887767b7da2ec7b46a X-VCS-Branch: master Date: Tue, 5 Nov 2024 19:09:04 +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: 0e4ab11b-54ce-44c3-872e-5e982481482e X-Archives-Hash: f572add18517f2ce0b329096a046711c commit: 3549c4fde0b5d065208c64887767b7da2ec7b46a Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Nov 5 18:47:52 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Nov 5 19:02:03 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3549c4fd media-libs/libcanberra-gtk3: Fix file collision removals Closes: https://bugs.gentoo.org/942895 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild b/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild index ec20d28ae8db..a8771a5d9054 100644 --- a/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild +++ b/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild @@ -69,19 +69,18 @@ multilib_src_configure() { multilib_src_install() { # Disable parallel installation until bug #253862 is solved emake DESTDIR="${D}" -j1 install - - rm "${D}"/usr/include/canberra.h \ - "${D}"/usr/lib64/libcanberra-0.30/libcanberra-{multi,null}.so \ - "${D}"/usr/lib64/libcanberra.so{,.0,.0.2.5} \ - "${D}"/usr/lib64/pkgconfig/libcanberra.pc \ - "${D}"/usr/share/vala/vapi/libcanberra.vapi \ - || die } multilib_src_install_all() { einstalldocs find "${ED}" -type f -name '*.la' -delete || die + rm "${ED}"/usr/include/canberra.h || die + + find "${ED}"/usr \( -iname libcanberra.pc -o -iname libcanberra.vapi \ + -o -iname libcanberra-multi.so -o -iname libcanberra-null.so \ + -o -iname libcanberra.so* \) -delete || die + # This is needed for desktops different than GNOME, bug #520550 exeinto /etc/X11/xinit/xinitrc.d newexe "${FILESDIR}"/${MY_PN}-gtk-module.sh 40-${MY_PN}-gtk-module