gentoo resync : 15.06.2021

6 files changed, 32 insertions, 9 deletions

diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index f7063d218513..00c491063318 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,9 +1,10 @@
+AUX alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch 646 BLAKE2B 271b720dbcfe5d32794b38125c0d947b62623a8f24b9cbe8a215281cd0586c65de805be2c5192f855f46744fda9b21a5fd463df7d540bf42f9c3035aedcda374 SHA512 aea5277bd5aa68680e31ffb09cd8853e13b9417bf8070480d450873f2864eb4037eabc8c23fafaa7fc482b5b2605ad1b9e45ff13b2b15ad8cb504b2d940d8bfa
 DIST alsa-ucm-conf-1.2.2.tar.bz2 14608 BLAKE2B ce850415a115f673267f6ab32f176c2ab73aad8bd7cf2be244bfbb7342756c6de2212044cb92b3524dc4189955c8144b134af144b6a15aabf33c06cbcfe1fdf6 SHA512 25e3f341c110772c7cffc8c7745b320f2ddd12fe6460380c088939b5dc67b99ae4ad92e69375179574e0e1c40d14ff49961e86494e223fde009e51590f00ca8f
 DIST alsa-ucm-conf-1.2.3.tar.bz2 17482 BLAKE2B d280ebb530c58df706d9b01c169472af8a88ec87735a8c5639981a2fddee31add0d78a2e47b43abf5bd13ef051dbb25749c701174aa0ea1b7255f771856e3e12 SHA512 1bdb024170f1dc18170c1d3699798c14d9cc7bbaccfe6eaef1fac0ec8c28074d08ed722bf47996682d4a0737138112b7eb4d45e224f00b027b3331da728e47cd
 DIST alsa-ucm-conf-1.2.4.tar.bz2 20141 BLAKE2B 545f3bfb36c6c41e48a5d6c2a98b936b2e71d8aab99227faecfcb1dd1dec9a03eb25f1664ca9aad3f9371f140b548258bba5a3904f5a3ec83513eb72abe7c7c2 SHA512 9043460e92b2ed44757b08b9faca888e8bfae40d84e4ad7e7df44df2bb3b0617e86ef23783973accd62fb6681788262e67212e2bf67178d75781e57a0fa346d2
 DIST alsa-ucm-conf-1.2.5.tar.bz2 23992 BLAKE2B 8ecd5adee6c9f429ab2791dfd57b0f9b1d58272b04d2c6cd3ad9aba36b53b380cfe626cae1e5c40f703eb7f891fb53b0bf70a78f9e5d2d8ae6b2dfb30fd6f659 SHA512 f16e8f04018c65de5e24f2a3eb0b3edff26cbce78cc1820c42c46907c903913c571797b59e803ae36b8ec3136487d0a5aacd034e2a8df3e15ed998b7a70152b7
-EBUILD alsa-ucm-conf-1.2.2.ebuild 487 BLAKE2B dee942c9912f55e5379cb80fdcec2aafdd6892e5d4ab7638c81fe4270c29dd7a1775e15ad9d49eec97f5033111b98c49e08b54ae35a00b9efbc176a3b3e90ef5 SHA512 6b45cb1b367b442a565aea32e3635193405c59ed519aea1a3bae8507f69eeba60d989360cd6683436dbbb79f4e9746e052efa17fee9b4b0b9998138f296e5def
-EBUILD alsa-ucm-conf-1.2.3.ebuild 487 BLAKE2B dee942c9912f55e5379cb80fdcec2aafdd6892e5d4ab7638c81fe4270c29dd7a1775e15ad9d49eec97f5033111b98c49e08b54ae35a00b9efbc176a3b3e90ef5 SHA512 6b45cb1b367b442a565aea32e3635193405c59ed519aea1a3bae8507f69eeba60d989360cd6683436dbbb79f4e9746e052efa17fee9b4b0b9998138f296e5def
-EBUILD alsa-ucm-conf-1.2.4.ebuild 495 BLAKE2B 5a7fad73d0723cfd71638c6a3a1e3bca99daf6c37accbbfed4fee49eef8a683f5cbd75ad375034d48416bd560a5738e9b43078abc62c917534a4f709365a33cf SHA512 8c9a2c4d69e2b9e23b9c5eba95b065aa83fe82c1b306484923362241ce04e07c4db4c4a812db1fe80dff641c2f473998ed912bf8dec9ab37054ed688f7758e47
-EBUILD alsa-ucm-conf-1.2.5.ebuild 553 BLAKE2B 7a3244a22de8962e5fcc2bede58f28638a2e474f15a3b4c4596bee02c9536ce73c21197e984e7ebba053603237f68d036093be9c859b6d871d61f1e0cdfdb164 SHA512 bcdc43a3170a910718f6861adbecc64aa514aa6389b75817252334112c226d0bd736b870ebee28c9a2add6ffcff99c7c5928f416876d208169ab686080a326c6
+EBUILD alsa-ucm-conf-1.2.2.ebuild 498 BLAKE2B 69b771656e59b7d0931db204557d74b863416df222db6417470dc5918407013ef691f99809556d1b31a61b8996500518c23438bacc9b8f5eee60d29069552870 SHA512 23513e4e794dff21c134690c325333dd9f839fc44c5b6795b988786b435dd7ea72bd193ef7d169218b59274265cfaa58bb916fe3a1aa6b38e720a73dc7fd2f48
+EBUILD alsa-ucm-conf-1.2.3.ebuild 498 BLAKE2B 69b771656e59b7d0931db204557d74b863416df222db6417470dc5918407013ef691f99809556d1b31a61b8996500518c23438bacc9b8f5eee60d29069552870 SHA512 23513e4e794dff21c134690c325333dd9f839fc44c5b6795b988786b435dd7ea72bd193ef7d169218b59274265cfaa58bb916fe3a1aa6b38e720a73dc7fd2f48
+EBUILD alsa-ucm-conf-1.2.4.ebuild 505 BLAKE2B 8877c4840182eb78b2359c503599aed365024c0954cc3d2dca5c0e21802010acb3f0c05f694404b3d4a281e76d2d15a4fa7d7906d9147e4fb7e6484e53bfde9e SHA512 f8ce73bcf18ac0237386fb9fc097ccba571d377a10ba588013660ce38389ce6355314d540ec2c4ef2b5b7032e1911619d79d481902aaf82a7436db77d565b3c9
+EBUILD alsa-ucm-conf-1.2.5-r1.ebuild 673 BLAKE2B 1e2b6c7a59bb27e2a0c97a4fea11250a2d51c5c3ad927fb6ac9a1b7229ef892fb8aa1d023cd215387a7446db873ba88d1be37794a40f1692066683298784f164 SHA512 ee6e0d1ee59f3f83bcfe4c7b815c408753bef852a0370d42f01b1c0f5bf44c02cac46a4c53d30256df08e79db14d52e94dd92446ee61196384b8eb4bd7c775dc
 MISC metadata.xml 324 BLAKE2B 8c9dd8aec6c9ed94966ecbce2a5db369f6d9c76751a77c70ca425d2a8d5cf54f15c6a211c553b9159d798e812e59b6f98505951290edc75ce92fe9e48aeae50d SHA512 84d140218362decc45a6474ac04c5e461730718051b8b0c608165a1ba2263cc91bd700fb25f98f76015949fcd5917822876dce13c17d89410ee7f5a648456c4b
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
index d85f2a03a32a..a89cadbba436 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+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"
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild
index d85f2a03a32a..a89cadbba436 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+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"
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild
index 6c74519bf103..555b0339b236 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild
@@ -4,12 +4,12 @@
 EAPI=7
 
 DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+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 ~mips ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild
index 2b01161620d6..444cc259d28b 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+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"
@@ -17,6 +17,8 @@ DEPEND="${RDEPEND}"
 MY_P="${PN}-1.2.4.81.g4884e"
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}/${PN}-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch" ) # bug #793410
+
 src_install() {
 	insinto /usr/share/alsa
 	doins -r ucm{,2}
diff --git a/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch b/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch
new file mode 100644
index 000000000000..6564be8977c1
--- /dev/null
+++ b/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch
@@ -0,0 +1,20 @@
+From 3f34021beffba4e39f064a14c5faceeaa224b766 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Tue, 1 Jun 2021 21:08:53 +0200
+Subject: [PATCH] HDA-Intel: the lookups are supported from syntax 4
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ ucm2/HDA-Intel/HDA-Intel.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ucm2/HDA-Intel/HDA-Intel.conf b/ucm2/HDA-Intel/HDA-Intel.conf
+index 5794e72..8a8e0e7 100644
+--- a/ucm2/HDA-Intel/HDA-Intel.conf
++++ b/ucm2/HDA-Intel/HDA-Intel.conf
+@@ -1,4 +1,4 @@
+-Syntax 3
++Syntax 4
+
+ Define.Use ""	# a non-empty string to use UCM configuration for HDA devices
+