commit: 3549c4fde0b5d065208c64887767b7da2ec7b46a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Nov 5 18:47:52 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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
