[gentoo-commits] repo/gentoo:master commit in: media-libs/libcanberra-gtk3/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libcanberra-gtk3/

[Andreas Sturmlechner]

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

[gentoo-commits] repo/gentoo:master commit in: media-libs/libcanberra-gtk3/

[Arthur Zamarin]

commit:     60fc3bc2faa571750792b921e643f4ab8987b66a
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 12:35:00 2025 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 12:35:00 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60fc3bc2

media-libs/libcanberra-gtk3: Stabilize 0.30 sparc, #944026

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild b/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild
index fe43589ddbed..e36909966861 100644
--- a/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild
+++ b/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gnome"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libcanberra-gtk3/

[Arthur Zamarin]

commit:     6a69ea907974c152b23fcf58c23f8662e4bb4307
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 12:34:52 2025 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 12:34:52 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a69ea90

media-libs/libcanberra-gtk3: Stabilize 0.30 ppc, #944026

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild b/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild
index 222f8f2e5182..e6d74053f7dd 100644
--- a/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild
+++ b/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.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
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gnome"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libcanberra-gtk3/

[Arthur Zamarin]

commit:     759a99a4ffb5a309804af86eccbffc8e9f23ca36
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 12:34:55 2025 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 12:34:55 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=759a99a4

media-libs/libcanberra-gtk3: Stabilize 0.30 ppc64, #944026

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild b/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild
index e6d74053f7dd..fe43589ddbed 100644
--- a/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild
+++ b/media-libs/libcanberra-gtk3/libcanberra-gtk3-0.30.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gnome"
 
 COMMON_DEPEND="