gentoo resync : 29.12.2022

4 files changed, 122 insertions, 2 deletions

diff --git a/media-libs/libmatemixer/Manifest b/media-libs/libmatemixer/Manifest
index b898922077ee..4b851ab9d33c 100644
--- a/media-libs/libmatemixer/Manifest
+++ b/media-libs/libmatemixer/Manifest
@@ -1,3 +1,6 @@
+AUX libmatemixer-1.26.0-slibtool.patch 2778 BLAKE2B fd62d368d5b292bdc0693c6a2d03e53c42d621f3f88475c0297358577c5fa8b2b62a3f4ebd434c9b619032528c25b23428edb75f434be5f136a152f89f047376 SHA512 daca074f6d353950693d7b551ef07d25337619db95d7027d0351bcdd1fe0be1fc188bf3c6b742c73e4d674bd6e2d4315dc81079b3a4c634f01ad3d5d9c85f855
 DIST libmatemixer-1.24.1.tar.xz 484864 BLAKE2B 21458cdfa14119364c564993f6e67c320332fabc0595d5422b75dd57ea13bfd2754549de29be6cb11708cb016b459494920000df4f86953d55e0102652dc9816 SHA512 c4620d70c66196521296d2d4197a6e025629faf1324e726df7dd7b0e0444ee17b83355c5059ec17ef36f9f15e6ab3bf3bb82a152b087a11e929d7749c1e1d4e6
-EBUILD libmatemixer-1.24.1-r1.ebuild 768 BLAKE2B d9f01b771f0bf2298c2101adcfdc0f130235712bab44cd78f413667d1549d4676625dd3512242a359522635db718bb6d454b57b0b050bcd4be4bbd031906cb4c SHA512 a732593f69b3a85fc5409b5701f87477f8120daccf872fe8f2dfd8fa161a57c9afa5b1e1696e2914cf356b4881296f0351e742636caf9a5b334f18ba6e9a756b
+DIST libmatemixer-1.26.0.tar.xz 489092 BLAKE2B 4b87b92904f038fb957dd17dfecc91a82597663b3470169658ed1325ffdc7c54f24269c1226fbb696337006729211e61d21af5dcdf18c3d05ce348656ae81f39 SHA512 6e97594f9a43f4e66c31e466d8a46ea5d77cb5b5ead26df6461b1529a3b6f1448768a981e7a527a4c07dda0e4cba7470e1fff8b316731da293cfdc0f18aacc73
+EBUILD libmatemixer-1.24.1-r1.ebuild 775 BLAKE2B b16ce4bead94738df86ae8ff457ee26e4d504121110acdb01c29c93dc79a3451748da0b5b7c182d562919770483d1371c75747a8707c21bd7f4752431b8c401d SHA512 6dd111638563c7998de0ffed1360f75e94659765a39fb8e0f5e09e7312a3b8d420b24900f86dc3d5575ca1db190ad4d57d0f9cee99c3745a11b92b055d7863cc
+EBUILD libmatemixer-1.26.0.ebuild 834 BLAKE2B 33ec4620853bca05cfc1b447d43f10b390362945cae8bc9023d6e8b6d46c221d0f35c99db25621b9bf34bdfb291e65d8fbff881ced79973bf8fda9dca5f35eef SHA512 6b1d94c5dfcc0ffe72bd560f645cdcfbe249f61bb53d514603e575853d53e55f49b94d18f877021b8f6218a46632526fa02b2a87ec62583106a0c2c2d72a3925
 MISC metadata.xml 342 BLAKE2B 7003d4ae792752fb338346cf2dc5c76e54ea8bf8f3eb4b130bf55e65b7a3faaa64e311737920dacebd6a787d25b96ed71a476faa852d8a37df6397d3bada34f9 SHA512 04787f69a60ae67bdf2db0204bb4f01d968b4ce2cfad97e7ef50e16c9674b6d3016587aee3c08e9c2d35385dfb65c612568a1ffe79b52a858c4849155a25bbae
diff --git a/media-libs/libmatemixer/files/libmatemixer-1.26.0-slibtool.patch b/media-libs/libmatemixer/files/libmatemixer-1.26.0-slibtool.patch
new file mode 100644
index 000000000000..05ad6a744fa8
--- /dev/null
+++ b/media-libs/libmatemixer/files/libmatemixer-1.26.0-slibtool.patch
@@ -0,0 +1,71 @@
+Upstream-PR: https://github.com/mate-desktop/libmatemixer/pull/37
+
+From 903dfc62b1898efb630286228c2e797162f5816c Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Thu, 12 May 2022 18:34:52 -0700
+Subject: [PATCH] backends: Add missing dependencies
+
+When building the backends with slibtool they will fail with undefined
+references to libmatemixer.la. This is because they use -no-undefined
+which slibtool explicitly supports while GNU libtool will silently
+ignore it.
+
+Gentoo Bug: https://bugs.gentoo.org/785232
+---
+ backends/alsa/Makefile.am  | 1 +
+ backends/null/Makefile.am  | 4 +++-
+ backends/oss/Makefile.am   | 1 +
+ backends/pulse/Makefile.am | 1 +
+ 4 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/backends/alsa/Makefile.am b/backends/alsa/Makefile.am
+index 798ce8b..44990b5 100644
+--- a/backends/alsa/Makefile.am
++++ b/backends/alsa/Makefile.am
+@@ -43,6 +43,7 @@ libmatemixer_alsa_la_SOURCES =                                  \
+ 	alsa-types.h
+ 
+ libmatemixer_alsa_la_LIBADD =                                   \
++	$(top_builddir)/libmatemixer/libmatemixer.la            \
+ 	$(GLIB_LIBS)                                            \
+ 	$(UDEV_LIBS)						\
+ 	$(ALSA_LIBS)
+diff --git a/backends/null/Makefile.am b/backends/null/Makefile.am
+index f0371a7..11d4b7f 100644
+--- a/backends/null/Makefile.am
++++ b/backends/null/Makefile.am
+@@ -18,7 +18,9 @@ libmatemixer_null_la_SOURCES =                                  \
+ 	null-backend.c                                          \
+ 	null-backend.h
+ 
+-libmatemixer_null_la_LIBADD = $(GLIB_LIBS)
++libmatemixer_null_la_LIBADD =                                   \
++	$(top_builddir)/libmatemixer/libmatemixer.la            \
++	$(GLIB_LIBS)
+ 
+ libmatemixer_null_la_LDFLAGS =                                  \
+ 	-avoid-version                                          \
+diff --git a/backends/oss/Makefile.am b/backends/oss/Makefile.am
+index d9e1fa7..cc5735f 100644
+--- a/backends/oss/Makefile.am
++++ b/backends/oss/Makefile.am
+@@ -32,6 +32,7 @@ libmatemixer_oss_la_SOURCES =                                   \
+ 	oss-types.h
+ 
+ libmatemixer_oss_la_LIBADD =                                    \
++	$(top_builddir)/libmatemixer/libmatemixer.la            \
+ 	$(GLIB_LIBS)                                            \
+ 	$(OSS_LIBS)
+ 
+diff --git a/backends/pulse/Makefile.am b/backends/pulse/Makefile.am
+index b07cc7e..a079af1 100644
+--- a/backends/pulse/Makefile.am
++++ b/backends/pulse/Makefile.am
+@@ -62,6 +62,7 @@ libmatemixer_pulse_la_SOURCES =                                 \
+ 	pulse-types.h
+ 
+ libmatemixer_pulse_la_LIBADD =                                  \
++	$(top_builddir)/libmatemixer/libmatemixer.la            \
+ 	$(GLIB_LIBS)                                            \
+ 	$(PULSEAUDIO_LIBS)
+ 
diff --git a/media-libs/libmatemixer/libmatemixer-1.24.1-r1.ebuild b/media-libs/libmatemixer/libmatemixer-1.24.1-r1.ebuild
index 5bb125a158b0..40b85fb8cb19 100644
--- a/media-libs/libmatemixer/libmatemixer-1.24.1-r1.ebuild
+++ b/media-libs/libmatemixer/libmatemixer-1.24.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="Mixer library for MATE Desktop"
diff --git a/media-libs/libmatemixer/libmatemixer-1.26.0.ebuild b/media-libs/libmatemixer/libmatemixer-1.26.0.ebuild
new file mode 100644
index 000000000000..11789e114894
--- /dev/null
+++ b/media-libs/libmatemixer/libmatemixer-1.26.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+DESCRIPTION="Mixer library for MATE Desktop"
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="+alsa oss pulseaudio"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.50:2
+	>=sys-devel/gettext-0.19.8:*
+	alsa? ( >=media-libs/alsa-lib-1.0.5 )
+	pulseaudio? ( >=media-sound/pulseaudio-5.0.0:0[glib] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-slibtool.patch # 785232
+)
+
+src_configure() {
+	mate_src_configure \
+		--disable-null \
+		$(use_enable alsa) \
+		$(use_enable oss) \
+		$(use_enable pulseaudio)
+}