gentoo auto-resync : 28:01:2024 - 18:57:25

15 files changed, 141 insertions, 423 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1d3ede105169..d87848b5f60f 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 5291e927751e..7eba6deb7e4a 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -4,13 +4,7 @@ AUX alsa-lib-1.2.10-musl-string.patch 1435 BLAKE2B ad0e72c63652a2ba1c92f05a0b415
 AUX alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch 2319 BLAKE2B f56f6117f4513451de67ca91a00561891a979543bfe5d596a58d5a485e7a64bbb2a0e3100b83fd2a40a91dcc5f1f2465dbe9618bb195a870f25592957fefe357 SHA512 b0536d567bde218a989f1ab64129cd1967e0b0003490277233d299bcb751e3a4aa305dce7ac72ded354eae351e606b43718e62ca096611eb088e26910fc309d5
 AUX alsa-lib-1.2.10-reshuffle-included-files-config-h.patch 3874 BLAKE2B 87bd7a55d90e2186115bbc176562f3b69dd7db8984ef077a979c5a30ed772b4da0b6d7df4cf988d0be4655112ee42e9a79e8956e4ab97196098350247b8a9ae3 SHA512 940f012a5d3657cca9de20f4c27422143903fb5ed6bffa45dcbd32973d77d9c3e29488716c924ff3f4bb110498b4ccdd8302ecb516c453d8b762b901376532ef
 AUX alsa-lib-1.2.10-ump-header-detection.patch 1624 BLAKE2B da7a512d1e389d8dbf004ee3924a079f337e83fe7006dd8ed92bb838968c4550ac3474083e8ccef817e2f701a62c02c2890b2a384686fda9bd91622f41fad9d8 SHA512 98a22f53368265bed1918235adc12e9a2b7910e79d2151d48846837a7941cf8ecf7e1fe86b9def72c2b3facd6567e7c8d24051374e686353cb526762234a4528
-AUX alsa-lib-1.2.8-clang16-macro.patch 1171 BLAKE2B d9c48d70ece2365ce8d4783b4e5f932f472a2d6cc53c9d10373a76def7a7e7e21f33b6cf804630a7b6b4c37c8422fe4580cfa9e8e490abb2faf89cbf98d05f03 SHA512 5be97f4a609a285a976197b6f7320f82c2c1a3425e00b7c7c2f58cc4e8c61ce4270ec49c068882268924fe7dec32557f36c206870df5abf3b715e8ad2494655e
 DIST alsa-lib-1.2.10.tar.bz2 1107007 BLAKE2B b2e4f8431e61f5bb56b2b5d124e67d5a68bbca3c647bebfa93f5e5ff092ec9ef3f6cb6315801fcd93e21151784814ff238d357313b8b44f32d4e7c9ee565388f SHA512 4ccbd1dc5a612044571c26290923009e4c3f7959b30a5d0bed47daa68bbefaff9059c4f0fa3bc16f22c1eed2d36f079139369f40243da5921ae4de02a4541939
-DIST alsa-lib-1.2.8.tar.bz2 1091475 BLAKE2B e6171ac557db6265e3f02df7bd269eca62d09afaf2c04dc913d3bb217df23a8e66e808ad453fea5ed90d4d9226feb05065ad5d9b3575241b76675ccd27b9b4d4 SHA512 865ff05a8f589996f8d63d43a91c961f1b64144f3e1d17c7074b7ac16f25b3fd1c371d46ed63a8cc20fa01e63c76b75f1a9802b56889ae1073854dd050d27688
-DIST alsa-lib-1.2.9.tar.bz2 1094660 BLAKE2B ec0c6966802196016679652292a579c6301cce33a2e887fce79cdb80629b6df047269787445cf0645e6cf43d3d2aae8fa57ddad5ab79fc254ee65a0ed695f449 SHA512 8f39c8166c3648d46695a9287d9b9a35e5bfffed11d79e868ff7aba92d0fee792e82784186ebeb2a3e44d6b617c916025c7fce9a802565bb8e0dc8fdcce2311a
-EBUILD alsa-lib-1.2.10-r1.ebuild 2735 BLAKE2B f074c2412e9d358e90f5016af9c44a9523c85a19cf47c7e5f48f53342a8f2d1184584b6c690b4cb4a482eedf327f7cfe71baeae7d4c25de5a371f464efb9ce32 SHA512 4b497dc155fb45be2c534054c4985274c111601ffaa1cef0a30970a999b6e7213a5a8fde1046b1c94182f17cbcff9db59abee5698f5a335d890ad62254eda118
 EBUILD alsa-lib-1.2.10-r2.ebuild 2863 BLAKE2B 13aef97c3efab8d9ba88cb3896ab69d72a9a6ba2fc28ccb5ca4b7b0fb6de4f8ae79e9e70cb8634381bec06b24f432c2929cea423545804b691565783432416b9 SHA512 2842ac667bdf1d88296ebb2025a6e62bdc49a87afb542c817966794ffb8b33943efa31b90a67309e992e69b73ee564656b661568a217c5fa0aeba1a2cfee9be2
 EBUILD alsa-lib-1.2.10-r3.ebuild 2928 BLAKE2B 18f181785f53c5a63decfbef727aaf30bd4aaac07f5ce22b208e3ca0938a7ef781e7e3f7822f9712a46e6825c78e167cfa971964c1dbc7076782c7f38d5723fb SHA512 4139559c54a284cc7588fe29c678a5f4df1b27d490e6445b69cd86ce172a5393f716642d05eed8f26c6de48623123bad7a783f4daa8d09d597edf3fa4b2248c4
-EBUILD alsa-lib-1.2.8-r1.ebuild 2541 BLAKE2B 492aafef311436e38cae013ec09dc7acbf622966c32f66f08e1b3d30ec80be3091e0f4e02c08b8a18b89ffaadaa0ee624ca0b7e7f02a29ec478b1b779b5fa485 SHA512 37bc84bb160cb5c507c44011712dceaf18a8a040bfa18027bf6205b0ae780cd3e13686519f75a0ec66c763da5289f42eb079b13770596440e826b04392074e0d
-EBUILD alsa-lib-1.2.9.ebuild 2594 BLAKE2B dc92f76f065bfd80b0be2ce463ce15c67c854797af0ef482c78430b197a53ad1af3fc2281f0cd75f9f2f7559159d48815103df30209c141958a8b71d93baaedb SHA512 8c641fff7d0bea8b67a5ecbfbff0059dc687c7a6078f9cdfaee0b58846ce7df55ee73d5ea60b6c67cdb419180fa254ab1546e152dcb5cb31e6486572de0ed017
 MISC metadata.xml 562 BLAKE2B e5944d48c846097392d401c5aec1c25adc58aa78cc441df8ac6ecc351ee338094f70cbe526cb0c8b9b87750b76d11bd24ddfab63d9ef87938ee25d5a9930b23f SHA512 d2ea1565bc3dcd9899ce0c108aca7ecc50a89621fcfda7d2dc111dc12c83e7551468a54c08bc7ffbbab4884d2a8bcb280005e54d11f12e9c31770f94a7728c02
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.10-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.10-r1.ebuild
deleted file mode 100644
index 98cbaa2d28db..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.10-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit autotools multilib-minimal flag-o-matic python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-if [[ ${PV} == *_p* ]] ; then
-	# Please set correct commit ID for a snapshot release!
-	COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
-	SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${COMMIT:0:7}
-else
-	# TODO: Upstream does publish .sig files, so someone could implement verify-sig ;)
-	SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	media-libs/alsa-topology-conf
-	media-libs/alsa-ucm-conf
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( >=app-text/doxygen-1.2.6 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
-	"${FILESDIR}/${P}-musl-string.patch" # bug #913573, backport
-	"${FILESDIR}/${P}-ump-header-detection.patch" # bug #913573, backport
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# bug #545950
-	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Broken upstream. Could in theory work with -flto-partitions=none
-	# but it's a hack to workaround the real problem and not strictly safe.
-	# bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6.
-	# (This bug is closed as of 1.2.9 but there's been no clear actual fix to it.
-	# Let us know if you can identify one.)
-	filter-lto
-
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-resmgr
-		--enable-aload
-		--enable-rawmidi
-		--enable-seq
-		--enable-shared
-		--enable-thread-safety
-
-		$(multilib_native_use_enable python)
-		$(use_enable alisp)
-		$(use_with debug)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi && use doc; then
-		emake doc
-		grep -FZrl "${S}" doc/doxygen/html | \
-			xargs -0 sed -i -e "s:${S}::" || die
-	fi
-}
-
-multilib_src_install() {
-	multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
-
-	default
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.8-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.8-r1.ebuild
deleted file mode 100644
index 0b20928ae7e6..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.8-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools multilib-minimal flag-o-matic python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-if [[ ${PV} == *_p* ]] ; then
-	# Please set correct commit ID for a snapshot release!
-	COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
-	SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${COMMIT:0:7}
-else
-	# TODO: Upstream does publish .sig files, so someone could implement verify-sig ;)
-	SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	media-libs/alsa-topology-conf
-	media-libs/alsa-ucm-conf
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( >=app-text/doxygen-1.2.6 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
-	"${FILESDIR}/${PN}-1.2.8-clang16-macro.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# bug #545950
-	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Broken upstream. Could in theory work with -flto-partitions=none
-	# but it's a hack to workaround the real problem and not strictly safe.
-	# bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6.
-	filter-lto
-
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-resmgr
-		--enable-aload
-		--enable-rawmidi
-		--enable-seq
-		--enable-shared
-		--enable-thread-safety
-
-		$(multilib_native_use_enable python)
-		$(use_enable alisp)
-		$(use_with debug)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi && use doc; then
-		emake doc
-		grep -FZrl "${S}" doc/doxygen/html | \
-			xargs -0 sed -i -e "s:${S}::" || die
-	fi
-}
-
-multilib_src_install() {
-	multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
-
-	default
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
-
-	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.9.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.9.ebuild
deleted file mode 100644
index 0c516bf1bbbb..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.9.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit autotools multilib-minimal flag-o-matic python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-if [[ ${PV} == *_p* ]] ; then
-	# Please set correct commit ID for a snapshot release!
-	COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
-	SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${COMMIT:0:7}
-else
-	# TODO: Upstream does publish .sig files, so someone could implement verify-sig ;)
-	SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	media-libs/alsa-topology-conf
-	media-libs/alsa-ucm-conf
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( >=app-text/doxygen-1.2.6 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# bug #545950
-	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Broken upstream. Could in theory work with -flto-partitions=none
-	# but it's a hack to workaround the real problem and not strictly safe.
-	# bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6.
-	# (This bug is closed as of 1.2.9 but there's been no clear actual fix to it.
-	# Let us know if you can identify one.)
-	filter-lto
-
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-resmgr
-		--enable-aload
-		--enable-rawmidi
-		--enable-seq
-		--enable-shared
-		--enable-thread-safety
-
-		$(multilib_native_use_enable python)
-		$(use_enable alisp)
-		$(use_with debug)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi && use doc; then
-		emake doc
-		grep -FZrl "${S}" doc/doxygen/html | \
-			xargs -0 sed -i -e "s:${S}::" || die
-	fi
-}
-
-multilib_src_install() {
-	multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
-
-	default
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.8-clang16-macro.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.8-clang16-macro.patch
deleted file mode 100644
index c74a7cc73e26..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.2.8-clang16-macro.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/alsa-project/alsa-lib/pull/278
-
-From 68a233404279366f7c7e34afb6197bcc70f4b7d7 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 30 Oct 2022 18:06:37 +0000
-Subject: [PATCH] utils/alsa.m4: include <stdlib.h> for exit()
-
-Clang 16 makes -Wimplicit-function-declaration an error by default
-and it's easier to just explicitly include <stdlib.h> rather
-than hope the ALSA headers always have it.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/utils/alsa.m4
-+++ b/utils/alsa.m4
-@@ -85,6 +85,7 @@ AC_LANG_PUSH([C])
- AC_MSG_CHECKING([for libasound headers version >= $alsa_min_major_version.$alsa_min_minor_version.$alsa_min_micro_version ($min_alsa_version)])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <alsa/asoundlib.h>
-+#include <stdlib.h>
- ]], [[
- /* ensure backward compatibility */
- #if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR)
-@@ -130,6 +131,7 @@ AC_MSG_CHECKING([for libatopology (sound headers version > 1.1.9)])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <alsa/asoundlib.h>
- #include <alsa/topology.h>
-+#include <stdlib.h>
- ]], [[
- /* ensure backward compatibility */
- #if !defined(SND_LIB_VERSION)
-
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index 762554d5a132..1131a67bc778 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,10 +1,4 @@
 AUX alsa-ucm-conf-1.2.10-fix-splitpcm.patch 734 BLAKE2B 66264d2cf2e479d530233708c92964c931dd5fd6e9e9ff3fca4d2253fea5261c55ed675b283b54ac60bbd0a444eaed8b421a3a7c7babd6c95537c8f6551a44e8 SHA512 6492b18cfe1a14ed7b2306ca3b0221060144ecc7cbfd9da4d5b397c0cce243383f4c91ccf554127d63b42ccf39c2db47e42150e2c3d35eccd4b5691182f1a209
-AUX alsa-ucm-conf-1.2.9-fix-sof-essx8336.patch 653 BLAKE2B 0b985d5767f5e6f842a16da92af4d3b5c3461d7d201e1469dd1d15c47bd7f053579d8aa949c53c39246c8007ea15626a0aa5731cb84d319a29ad78956cb1276e SHA512 889b374a66a8f373c74ec5e2fa1dc40b78f4b6f7c9f3c2edb15ddc896ae3f61b403dfe4ed777d1e5ea167411b6eee4302342ba6a55b0305cd7bea7c70744112f
 DIST alsa-ucm-conf-1.2.10.tar.bz2 44749 BLAKE2B 215842f1f59c2dea5e3f3fe880dc49d6263998746a50c2591b8a9786ead3afae2c713e179ff6e8caa518b3a8516a1b031872c1fad2a17fbd3afbb0390a803693 SHA512 172956a2c127e9afa5be9c6ada43bfa9fda825823f8f6acbe252edef3381afe3adfa3299c1419f04375599be7721a551c6800be99db44b091611aeb824ffcd72
-DIST alsa-ucm-conf-1.2.8.tar.bz2 37843 BLAKE2B f2281a3a5d8b4fcbc4c75ce99a911a4ce3230abfa6f6d0aff8e175fe1b870750f43c087339490ed9f4d5ab314fda391e06e41cbed79239a16326a8f2d02ac262 SHA512 a15a9ca52c108ee95a421b91f3fad4329f1e9fb1c004a40d5ff1a57d6701bad19a31d5a296426d26439be9b87d2d543ce51588a98402d24c17f0f92aaf1096ca
-DIST alsa-ucm-conf-1.2.9.tar.bz2 42802 BLAKE2B fe71790aa8658ab12378baa55f95a03aaebd3eb0aef2535b65b89884de6cb404a75b44fd238d2089e0a005ca81720f3c44d1912452908e97aa75fcda513908cf SHA512 3aced4d4df76044a5525f1217851e05f7ad177389d2008e3e3dd0fb4d2cf72cd0897b140659a7729cc37d5b737c2d0cf5b607df4f576647044accd560d8cb87b
 EBUILD alsa-ucm-conf-1.2.10-r1.ebuild 561 BLAKE2B fd0a551f57a7de30354b0bf625f7cfb81ffac90199c8fdbc48d59918d77074d2c034cc8106640c8ee489c2ead0d05c6f0d4c3e8914581a57b4df4aee1a2e54f8 SHA512 bab713c0808c3aa07b66bd9726fa11d003d63824129cc56024501c04ffe1200e79f387b3811bb10595f5aa5a91fad888c6629ea7c822ada3725a4fe3cd673d10
-EBUILD alsa-ucm-conf-1.2.10.ebuild 517 BLAKE2B 4ea775cacec644c89a60ce552b4de539b67a1f735743b28ee9ca21d8db8e769a5259b5f1bae8fee42ca41f3c71de79bfb2bcdda6175a64e2b398522625579a47 SHA512 0294299c46a27c7eb09a53f2d91176c5b2d62493842f48328e0f423a289f5f255f563ee387f531f37798834e79245fa95cd7a0160d1582b8030261f1469f6e7f
-EBUILD alsa-ucm-conf-1.2.8.ebuild 517 BLAKE2B 86309cde65282c8d01ea47e2bf1d7e12e0e141bc7289b9af6deee856267175e907db7b40d111b891982f0457ad60d7e1f24b5528c9b003da46b677627939d4b4 SHA512 6b8e3406d1eaeb6a5dc3361ed1a4ec8e22ec039eb3236d6c10370e2323441db025dd4993b897051c021d6eecc4643b68d152c58558202d32214a8336ea03feb3
-EBUILD alsa-ucm-conf-1.2.9.ebuild 565 BLAKE2B 9bebd76bfc410f61aea5ee7474a114e83fa5f6d5712aec297a48272755a87ce54bd5d43a86c17c804c194abf480978ea9e6700d32495eb12c36024ff2320161e SHA512 f7382f60831faabeb2b9fc6360f057bc6310e0c5a8dcbce9b3ad41a938c61a4a9ccab89ff4c8b4ca6dc3ac310704425ed058055fe707e9a3c66e33224216063e
 MISC metadata.xml 457 BLAKE2B 68d8f949d705562928ce4f6a25faf692611f14d63e659723ca5095be6befb5c03bf7dca73a158973d58ac242626a8a4b6f7d8835377e21d5bc8d2307906fee7b SHA512 8b65e913e4d6fbdcd2c760c383d9d026cf053dd10a63689b782f19f88b199443542488bacb08fa02ffffff09165813323dcde06529c9ff744182b728aead0c6d
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.10.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.10.ebuild
deleted file mode 100644
index 81cc728dafd4..000000000000
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.10.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="!<media-libs/alsa-lib-1.2.1"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	insinto /usr/share/alsa
-	doins -r ucm{,2}
-}
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.8.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.8.ebuild
deleted file mode 100644
index 5edc43d8516f..000000000000
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.8.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-RDEPEND="!<media-libs/alsa-lib-1.2.1"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	insinto /usr/share/alsa
-	doins -r ucm{,2}
-}
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.9.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.9.ebuild
deleted file mode 100644
index 8be5e9ebcab5..000000000000
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="!<media-libs/alsa-lib-1.2.1"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-sof-essx8336.patch
-)
-
-src_install() {
-	insinto /usr/share/alsa
-	doins -r ucm{,2}
-}
diff --git a/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.9-fix-sof-essx8336.patch b/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.9-fix-sof-essx8336.patch
deleted file mode 100644
index 83b7b4d16048..000000000000
--- a/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.9-fix-sof-essx8336.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/alsa-project/alsa-ucm-conf/commit/906f692e4ed84dc136c270c05e1b490a554de99b
-
-From 906f692e4ed84dc136c270c05e1b490a554de99b Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Thu, 4 May 2023 14:36:49 +0200
-Subject: [PATCH] sof-essx8336: Dmic is not a valid UCM device identifier, use
- Mic
-
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---- a/ucm2/Intel/sof-essx8336/sof-essx8336.conf
-+++ b/ucm2/Intel/sof-essx8336/sof-essx8336.conf
-@@ -32,7 +32,7 @@ If.devdmic {
- 		Haystack "${CardComponents}"
- 		Needle "cfg-dmics:"
- 	}
--	True.Define.DeviceDmic "Dmic"
-+	True.Define.DeviceDmic "Mic"
- }
- 
- SectionUseCase."HiFi" {
diff --git a/media-libs/musicbrainz/Manifest b/media-libs/musicbrainz/Manifest
index 07cf4d2dcdc7..17391beaa111 100644
--- a/media-libs/musicbrainz/Manifest
+++ b/media-libs/musicbrainz/Manifest
@@ -1,4 +1,7 @@
+AUX musicbrainz-5.1.0-libxml2-2.12-compat.patch 951 BLAKE2B aeacea1a849ad244fb63d2404fc9b1c1003fba7cfdfb3ed861da52ebf1378370bb5f85875bba91c54b9b86ff759bdfb39c31875f8d88378e628488010f9eac7c SHA512 128540b7b0e50cfbe773cf473add4ffabdfb592df143fe800475caa981749b3f56045a0ec2dc5bb3454427ef288fc44c20ce82ef5b348b465b6bad09dd5eb946
+AUX musicbrainz-5.1.0-libxml2-2.12.patch 2426 BLAKE2B dea9dca81545dc48ce64e2052eb3cd143c07100289b8aaffbc7aa7543dd36434b123eb681caae2c223c756cc25d5a39eb28d7c357df174832f06bb95923a53d6 SHA512 49d0a6e55101b41c4a7d62535c8d66ef97528bff27f16c2e662ee41024764e7af618fb37c003072006267c31ce54ec43c7b7bfaa736f8e3f9f6bd400cccbb10c
 AUX musicbrainz-5.1.0-no-wildcards.patch 1316 BLAKE2B 39eb1691ec5967432cbcc166fda63f33cbb5d1ca9761ba47839733d2e78a84bc425e7b7fa200f397d6f6be982ce48688048db73ca55f2e0c84537f504b4afdab SHA512 2768c4c054fb3b1df312e7d9d41c0d9c618ce50ada9013739251933a4f84b32d147d6033507395d8d189b2d203f9c4c982d07375913907bd374587fabd8402b6
 DIST libmusicbrainz-5.1.0.tar.gz 77220 BLAKE2B c655ae4a9a11adb15de559a1e518b5c5aab47ce3c36e3a264faddda36112d9caccc42d2013e451ffdf200147ffca4cbba883affa1a6465f6071fa14e1d67fbe5 SHA512 daa7ccb94e517e90f7d88a0659c84b00f04c6a73ef7771b7e3bd9101fa6569b1935a68a3689502ed0cc8c0d71ba9d2d0ebd9c074dd5eed9f75a3db390b222e03
+EBUILD musicbrainz-5.1.0-r1.ebuild 1094 BLAKE2B 4f8a9bfae6fb9cab195e45b3d96431c319a3851169012c11e6b65d085ca9f520e19b9e519415fffba7a88fe7b9f47d3ab928278d13755293c02fb688365d6297 SHA512 778afa3e9f344d1cb6d77e873d8f40ec9a3c9484386a1c03aca5f1746cf1e07427e2322f02371ee23ec7d0e0b5409cddcaec5cf47ad6415b998b50858fd809f2
 EBUILD musicbrainz-5.1.0.ebuild 1000 BLAKE2B e90a8ac848380103735e2628c34995faf70986cd91d8cd5b1ec5d7b18671fdfe6508a1d2621c1341ef11b4c63e4e7589f20f93e5032cad951aec13db42c1be20 SHA512 48397025a98a4775a28c5b47f5ba845c4c2cad3c8bc1ffdacd3ecd8a135f4b0f6e69760a021e0d22691952ca1048d99031ba408d9b5462a028af5110c347aeef
 MISC metadata.xml 417 BLAKE2B 30faa0db0a303a9bf9db3fbebf4eacb4496d252f29d664fa1ae781788216e4ade2257fb10383219b0096ecb5e555cb301a08b82cfc700192bffc886c61b39898 SHA512 31060609e30d13424ee72f528fb93b7e40eeae21122e8e4b1d493b1e8bc60b0572ec11186e216e1c4a1b5bcbc84cd472eedeea3b3f6464e49ca4c34126814c25
diff --git a/media-libs/musicbrainz/files/musicbrainz-5.1.0-libxml2-2.12-compat.patch b/media-libs/musicbrainz/files/musicbrainz-5.1.0-libxml2-2.12-compat.patch
new file mode 100644
index 000000000000..a835ffbb0f2e
--- /dev/null
+++ b/media-libs/musicbrainz/files/musicbrainz-5.1.0-libxml2-2.12-compat.patch
@@ -0,0 +1,21 @@
+Fix build with <libxml2-2.12.
+--- a/src/xmlParser.cc
++++ b/src/xmlParser.cc
+@@ -57,7 +57,7 @@ XMLNode *XMLRootNode::parseFile(const std::string &filename, XMLResults* results
+ 
+     doc = xmlParseFile(filename.c_str());
+     if ((doc == NULL) && (results != NULL)) {
+-        const xmlError *error = xmlGetLastError();
++        const xmlError *error = (const xmlError*) xmlGetLastError();
+         results->message = error->message;
+         results->line = error->line;
+         results->code = error->code;
+@@ -72,7 +72,7 @@ XMLNode *XMLRootNode::parseString(const std::string &xml, XMLResults* results)
+ 
+     doc = xmlParseMemory(xml.c_str(), xml.length());
+     if ((doc == NULL) && (results != NULL)) {
+-        const xmlError *error = xmlGetLastError();
++        const xmlError *error = (const xmlError*) xmlGetLastError();
+         results->message = error->message;
+         results->line = error->line;
+         results->code = error->code;
diff --git a/media-libs/musicbrainz/files/musicbrainz-5.1.0-libxml2-2.12.patch b/media-libs/musicbrainz/files/musicbrainz-5.1.0-libxml2-2.12.patch
new file mode 100644
index 000000000000..41956918bb93
--- /dev/null
+++ b/media-libs/musicbrainz/files/musicbrainz-5.1.0-libxml2-2.12.patch
@@ -0,0 +1,69 @@
+https://bugs.gentoo.org/923011
+https://github.com/metabrainz/libmusicbrainz/commit/9ba00067a15479a52262a5126bcb6889da5884b7
+https://github.com/metabrainz/libmusicbrainz/commit/558c9ba0e6d702d5c877f75be98176f57abf1b02
+
+From 9ba00067a15479a52262a5126bcb6889da5884b7 Mon Sep 17 00:00:00 2001
+From: Christopher Degawa <ccom@randomderp.com>
+Date: Sun, 8 Oct 2023 11:41:30 -0500
+Subject: [PATCH] libxml: include parser.h
+
+libxml2 removed the inclusion of global.h in a few of its include files,
+so we can no longer rely on transitive includes.
+
+This applies to functions like xmlParseFile.
+
+Signed-off-by: Christopher Degawa <ccom@randomderp.com>
+---
+ src/xmlParser.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/xmlParser.cc b/src/xmlParser.cc
+index e63df55..53dec25 100644
+--- a/src/xmlParser.cc
++++ b/src/xmlParser.cc
+@@ -30,6 +30,7 @@
+ 
+ #include <cstring>
+ #include <libxml/tree.h>
++#include <libxml/parser.h>
+ 
+ XMLResults::XMLResults()
+     : line(0),
+
+
+From 558c9ba0e6d702d5c877f75be98176f57abf1b02 Mon Sep 17 00:00:00 2001
+From: Christopher Degawa <ccom@randomderp.com>
+Date: Sun, 8 Oct 2023 11:42:55 -0500
+Subject: [PATCH] libxml: constify the storage of xmlGetLastError()
+
+libxml2 recently made it a const return.
+Since nothing is being modified of it, this should have no real effect
+past satisfying the compiler.
+
+Signed-off-by: Christopher Degawa <ccom@randomderp.com>
+---
+ src/xmlParser.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/xmlParser.cc b/src/xmlParser.cc
+index 53dec25..fee684c 100644
+--- a/src/xmlParser.cc
++++ b/src/xmlParser.cc
+@@ -57,7 +57,7 @@ XMLNode *XMLRootNode::parseFile(const std::string &filename, XMLResults* results
+ 
+     doc = xmlParseFile(filename.c_str());
+     if ((doc == NULL) && (results != NULL)) {
+-        xmlErrorPtr error = xmlGetLastError();
++        const xmlError *error = xmlGetLastError();
+         results->message = error->message;
+         results->line = error->line;
+         results->code = error->code;
+@@ -72,7 +72,7 @@ XMLNode *XMLRootNode::parseString(const std::string &xml, XMLResults* results)
+ 
+     doc = xmlParseMemory(xml.c_str(), xml.length());
+     if ((doc == NULL) && (results != NULL)) {
+-        xmlErrorPtr error = xmlGetLastError();
++        const xmlError *error = xmlGetLastError();
+         results->message = error->message;
+         results->line = error->line;
+         results->code = error->code;
diff --git a/media-libs/musicbrainz/musicbrainz-5.1.0-r1.ebuild b/media-libs/musicbrainz/musicbrainz-5.1.0-r1.ebuild
new file mode 100644
index 000000000000..c0ca4e48189b
--- /dev/null
+++ b/media-libs/musicbrainz/musicbrainz-5.1.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Client Library for accessing the latest XML based MusicBrainz web service"
+HOMEPAGE="https://musicbrainz.org/doc/libmusicbrainz"
+SRC_URI="https://github.com/metabrainz/lib${PN}/releases/download/release-${PV}/lib${P}.tar.gz"
+S="${WORKDIR}/lib${P}"
+
+LICENSE="LGPL-2.1"
+SLOT="5/1" # soname of libmusicbrainz5.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libxml2
+	net-libs/neon
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-wildcards.patch"
+	"${FILESDIR}/${P}-libxml2-2.12.patch"
+	"${FILESDIR}/${P}-libxml2-2.12-compat.patch"
+)
+
+src_prepare() {
+	use test || cmake_comment_add_subdirectory tests
+	cmake_src_prepare
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,cc,txt}
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}