gentoo resync : 29.12.2022

6 files changed, 37 insertions, 137 deletions

diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 3346525e9835..af4575c6c6e0 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,11 +1,8 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
-AUX alsa-lib-1.2.4-musl.patch 1082 BLAKE2B f905b0b020afcc8124a128c29da015ce0629d46a2671a1af65a3e2bf666c383b0b85387a337c268eb8e1217d17b6dd8e5eabd66e2cb3e8dafcbe0959cfe4574a SHA512 b809b547822acb486baa33038771aef4a66930a3bfe495dde815d1f551e15f1543484efffe30bb6faf2f21e309c8b6956b4479ac1edf19933af32ff5517867e3
-DIST alsa-lib-1.2.4.tar.bz2 1044405 BLAKE2B e1d5d9afe21dac693645274ae4ec8a607c9fcc9915ba4ebccfdb539d44b9353ba07529e2c8eaca119884b926d4467285313c945c9015a788101fe532064442db SHA512 12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844
-DIST alsa-lib-1.2.5.1.tar.bz2 1069073 BLAKE2B 5464cc7f263bdf7b10aa7e1f542ad6dbc55bf300156fd1bded00375c41a518d4b14f96e28eb1c60a6ce7cc6e27da4b2e8598cd867f15417f260fc23513f93e11 SHA512 01998ffa449e925ff552c13aea47f9540903afdc533086067c78dcaba4d239c347180d3d28bb0000e6d19b7779c7249fcc77a30057930ca22d18ba55e163fa1c
 DIST alsa-lib-1.2.6.1.tar.bz2 1079670 BLAKE2B 4f3d1d078678773b4f6a569d0eea95d0cf89a846605c3a95e11b92f1fe0bd9fb164b8f710906f0de9675ade7ef2123375eb1221945bec511708d6fdd85c051b9 SHA512 70e539cf092b5d43e00e4134d8a3e184f0dc34312823e4b58a574320cbf06cb7369bc3251ecb1858033756a7a8c35d36faa8da48d49f6efe0cec905784adbd45
-DIST alsa-lib-1.2.6.tar.bz2 1079598 BLAKE2B 84a7a20fbea4025f2ac08acefa3a9ea9d2737585c5d5f09c8df3b5ccb998eaa09a7ec16a019a40c4d3e3e4b5209b961f9da23ec57c0bb9824bade9a3a0dd4350 SHA512 ae95718813abf62811fe44c6df2a8de5a1227da4b022c4dd97dd8e7c1001f48307ba36bf04208bdbe24e8a8eebf4ed5a59f40ee6750dcbe976678071c3f2f5b7
-EBUILD alsa-lib-1.2.4.ebuild 1986 BLAKE2B 75c4ca91c6f79e7a639341f8ea27f11ef704c42ba00eb9dc0f58884d257c505b069433559bbab92db87113bdf050e1c611131a02c989465957d17f3c92b6a3d0 SHA512 2bb97a7ae3fa3e7531957e42e8978fbd7b41408671db0f906c668687897180f168db6d0e67a354bc687f873cc95156921b6277f4c8bd335feadd0bbe5ebb528c
-EBUILD alsa-lib-1.2.5.1.ebuild 2314 BLAKE2B 00075780d4b4f7421556ff3ea10965e9f8a98433f786cc539fd72f3e039098f10a11cc7fa69f3d5a2b63f0f3297b40eec28afbed912e812452b8f2e3a3adbcef SHA512 159fb7ca0549fe84b86d9faf3e1f9b98d20b57be00b1d1055ba1d1926998c52e30838029907b74523b706d9fcc30fc2a3ac19568df3e083e00aed1da9fbd04d6
-EBUILD alsa-lib-1.2.6.1.ebuild 2306 BLAKE2B aa32972911c915e2f235e69392d34b11034aac3d5b83ca2ccaf0cb82a959815d65fc86aee7fb8d42eda9f12d9de79a80c1b68165e542c181af944bab17d06023 SHA512 7f335702d57aa771955a5f18f18ae206dc02ef03540b4c7de047ea81d2b8f27e0856104daa458711e739f24cd450f29f2d8c52c2fca2cfc75b61d7b9390940f1
-EBUILD alsa-lib-1.2.6.ebuild 2314 BLAKE2B 884305ffaf821401f6b9f20726612d04ce65beb330c122c45a99540062fd96270c4872b02e1743a98cf7045b134d34121a4b7924568e24566f332e4b8cd562df SHA512 8acba14cf89e03f43e9b0caece170688b1139a49c65dd80ed62a044f20721787b8b341d2985e3e771cf523286d97059ffae2048696ff7cf2bbaf05a4be27e29e
+DIST alsa-lib-1.2.7.1.tar.bz2 1084711 BLAKE2B b7be12a51453a82d0eb2e57fb8f9391c8778e8c63b78b6e6f46437bca39e3efb13394ba0e060547781ccde75fcdc19da532d5aed24fe0d5cfb885c1604e4e8ce SHA512 2a0b4205e8bf602b56a6f5007ba219799e5443827393058e439adf5b391bb6c4815a48bb994b5d108b9f31a90db0eb43a96a0d7741216e2d710dc63d372de27e
+DIST alsa-lib-1.2.7.tar.bz2 1084924 BLAKE2B a3bfbbfcf31625be0749218b3c02b307da9077d4bd82e9f980b8e3d6f9275f3a3f3c8158bb28fb1c61724a35e794eb3f6cc8872202ff42fb847725058109087e SHA512 6bd48b07d659fddad792876326a93b2a549ce94bc191131670365599c31f81f737bfd8e94dec6fe296bc5d86df2e3e381bbb7a694d24fe7e8e501f1c994ed084
+EBUILD alsa-lib-1.2.6.1.ebuild 2313 BLAKE2B 02d78d02d665db5d31f937be8983f86ba45d28f1b8f9961edd7b97fc83c2186929836ca7c217b9989c651e9dee75e0e37d3daa462fe099ee9a8a6685bc1cc6a3 SHA512 af89550a294ef1932045604cf81c9f37a40f94acd731a55d654391d96eb5bd7c026716ba72303af64621cf0a98c2bdd92abd22881e4a776845e5e235778d4762
+EBUILD alsa-lib-1.2.7.1.ebuild 2574 BLAKE2B 8f30c5cac3083fb8afbf3b20052b9234c22572289b7283106bdc4917ea66ae3f0838b0fa588552d191195626fd83120328a7587b1ad328d61963a6bc62b07535 SHA512 6fec4746221fe2f71fdb5e05bf599aef8a6f7e560ec65ceeaff212a6b5bb9540632775c339e4aa97c8091f9dc452520cb3b88f400ae16b6cc89191e050e44520
+EBUILD alsa-lib-1.2.7.ebuild 2307 BLAKE2B eb062334ed34d1d40a32fec1cbd63fde78c17b5e71752dd15f53a9e562457c685894f6676e60fa2c1f566bf6015dae9195f56d735b00d13015d8bdb6a16968de SHA512 e0adc0f5412c292871e46a216afcd28050f77aa32b13093709087d560b6ee80be3362775c4151ed06ce923ba39e0f4d21e017c8606cf6c408c3e3022cf455f05
 MISC metadata.xml 503 BLAKE2B 89b5c41a55784ff388766f60c106e719edd59a3bd47a1f2c240ad185ce750b1dc1a2efec704361b09c5e6e30d965514955f32fffa304200db7ff031a27d7fd85 SHA512 43f3a7e18f13ac58b4cbf31a92bd809c0618be1dd34a6a47d03e00ededd66343c3082bddac98cc286683ba32436b62aa2d61102de832f5fb21925ecfb2b54755
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
deleted file mode 100644
index a79d156fc211..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools multilib-minimal python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc python +thread-safety"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	media-libs/alsa-topology-conf
-	media-libs/alsa-ucm-conf
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
-	"${FILESDIR}/${PN}-1.2.4-musl.patch" # bug #792570
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# https://bugs.gentoo.org/545950
-	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-resmgr
-		--enable-aload
-		--enable-rawmidi
-		--enable-seq
-		--enable-shared
-		# enable Python only on final ABI
-		$(multilib_native_use_enable python)
-		$(use_enable alisp)
-		$(use_enable thread-safety)
-		$(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.6.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.6.1.ebuild
index d495e667ccef..6368e7ce3b6d 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.6.1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.6.1.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc python +thread-safety"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.7.1.ebuild
index 5bae5dbf8736..2fb3f286446d 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.7.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools multilib-minimal python-single-r1
+PYTHON_COMPAT=( python3_{8..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"
@@ -20,17 +20,17 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc python +thread-safety"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	media-libs/alsa-topology-conf
+RDEPEND="media-libs/alsa-topology-conf
 	media-libs/alsa-ucm-conf
+	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}"
+BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
@@ -41,14 +41,21 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# https://bugs.gentoo.org/545950
+	# bug #545950
 	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-	default
+
 	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-flags -flto=* -flto
+
 	local myeconfargs=(
 		--disable-maintainer-mode
 		--disable-resmgr
@@ -56,6 +63,7 @@ multilib_src_configure() {
 		--enable-rawmidi
 		--enable-seq
 		--enable-shared
+
 		# enable Python only on final ABI
 		$(multilib_native_use_enable python)
 		$(use_enable alisp)
@@ -78,10 +86,12 @@ multilib_src_compile() {
 
 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.6.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.7.ebuild
index c9ea9965ca37..94d96f7b806b 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.6.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
@@ -20,17 +20,17 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc python +thread-safety"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	media-libs/alsa-topology-conf
+RDEPEND="media-libs/alsa-topology-conf
 	media-libs/alsa-ucm-conf
+	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}"
+BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
@@ -41,10 +41,12 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# https://bugs.gentoo.org/545950
+	# bug #545950
 	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-	default
+
 	eautoreconf
 }
 
@@ -56,6 +58,7 @@ multilib_src_configure() {
 		--enable-rawmidi
 		--enable-seq
 		--enable-shared
+
 		# enable Python only on final ABI
 		$(multilib_native_use_enable python)
 		$(use_enable alisp)
@@ -78,10 +81,12 @@ multilib_src_compile() {
 
 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/files/alsa-lib-1.2.4-musl.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.4-musl.patch
deleted file mode 100644
index 54e6c0e0d23e..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.2.4-musl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://github.com/alsa-project/alsa-lib/commit/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e
-https://bugs.gentoo.org/792570
-
-From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Thu, 22 Oct 2020 20:57:32 +0200
-Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be
- declared even for \!DL_ORIGIN_AVAILABLE
-
-Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable")
-BugLink: https://github.com/alsa-project/alsa-lib/issues/91
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- src/dlmisc.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/dlmisc.c b/src/dlmisc.c
-index c9517c55..f20eb593 100644
---- a/src/dlmisc.c
-+++ b/src/dlmisc.c
-@@ -42,11 +42,9 @@
- #ifndef PIC
- struct snd_dlsym_link *snd_dlsym_start = NULL;
- #endif
--#ifdef DL_ORIGIN_AVAILABLE
- static int snd_plugin_dir_set = 0;
- static char *snd_plugin_dir = NULL;
- #endif
--#endif
- 
- #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD)
- static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER;