gentoo resync : 14.05.2020

4 files changed, 203 insertions, 15 deletions

diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index e2ded256cd38..5c553a4de1ce 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,6 +1,8 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
+AUX alsa-lib-1.2.2-change-order-of-pcm-devices.patch 2198 BLAKE2B 21db0baeb6bb130c2ed537eaf6509f54fa4970a54ddc90b82217e47e63e1161e76bed54161f5cb19f79d999ccb1079571938bb7591ac378ca13cb94527d6b629 SHA512 3be6b6a50dc570df19e77132b519aba4b5a04fc25056eaaa882c8a32f632389efd358bfe7aec833651acd63e964b1f411f86fcfbb9abf30072ba14f561af3bc5
+AUX alsa-lib-1.2.2-namehint-add-omit_noargs.patch 3450 BLAKE2B f5fc66626a8f99d018bf476ec327c5734e96adf9f5dfdf97212cb220837f42c93879ef7641d3775c8238fc5fe27a5fc85959d4fca7e0fcd62b69009d895bdd1c SHA512 6f71ab0b4424b684dbd6ba0b2a3ce0de05ec3124ec1c3223ccb35afaff02dfed834af2d42d8d1cb8bb7f2e96051277bbf18ba5687e94f15d753cf1b86cdd33f8
 DIST alsa-lib-1.2.1.2.tar.bz2 1004129 BLAKE2B e8bf117f3036a32b020897f16b9648ac105c499f547ae157508720502722d4e1a651719c86a4e2756ca7a3c573a1f17c02524125ccaad12bcb8c7c71675c898a SHA512 e8286fd55f63ee0d95513279d0885c287533de89b7af6c338413dec5d38ba4f5a15da1a4a4ce36e052614e4b730e3778782dab9979d82958283be17b48604913
 DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
 EBUILD alsa-lib-1.2.1.2.ebuild 2081 BLAKE2B fd2d0ee1156be52d3c71585e44660bff6b0fc387b04be344dcb6ffe514739e192602b9979c3f58aa38e8a014e2888779b4f185d1c2162b156ece817fdf01238d SHA512 f21334e3525ddbc6621d0b588b73208d88348e51c8b3c89ec645cd322449046c86b30de99accf3f943ddd444aba08d62546376bb22569bd9ba5f8126270a12f3
-EBUILD alsa-lib-1.2.2.ebuild 2091 BLAKE2B 14a56424ba86099d4db40cdeaa9581f6a8ec423b121ad259f60d9eac4325de82b84b835b47a7ffb59e44378ae879ce7a3809f2991340810817f7d6704e48c946 SHA512 2d341e07794bddde8e6dda03407fd664a88aa2f4ac5525355045703a3055e0ff945997e371874ecc81bdcab35f1aa0bbfa6d2acd00ae97b78a6a314767eebda2
+EBUILD alsa-lib-1.2.2-r1.ebuild 2177 BLAKE2B 263db5805070d0c436255435b0ad6d8788f30b01b62dba79adf8705d5736760d9be0bf3f821f212406c9b353416a7125a687ef27a97b44e99fc50b6aa3a57365 SHA512 0f79c21aa74feb187d563c472d95628f7558cd2e80778a861fc220282e7ab2c1949e003a50722af9dbac5798572da2afa70da859e7bf082b7ece76672d91af01
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
index 19216bb87366..4f118f5082fc 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
-
-inherit autotools multilib multilib-minimal python-single-r1
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
 HOMEPAGE="https://alsa-project.org/"
@@ -13,17 +12,19 @@ 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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.2.6 )"
-
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
 PATCHES=(
 	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
+	"${FILESDIR}/${P}-change-order-of-pcm-devices.patch" #718106
+	"${FILESDIR}/${P}-namehint-add-omit_noargs.patch" #718106
 )
 
 pkg_setup() {
@@ -67,16 +68,13 @@ multilib_src_compile() {
 	if multilib_is_native_abi && use doc; then
 		emake doc
 		grep -FZrl "${S}" doc/doxygen/html | \
-			xargs -0 sed -i -e "s:${S}::"
+			xargs -0 sed -i -e "s:${S}::" || die
 	fi
 }
 
 multilib_src_install() {
-	emake DESTDIR="${D}" install
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/doxygen/html/.
-	fi
+	multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
+	default
 }
 
 multilib_src_install_all() {
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.2-change-order-of-pcm-devices.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.2-change-order-of-pcm-devices.patch
new file mode 100644
index 000000000000..b21e184f8770
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.2-change-order-of-pcm-devices.patch
@@ -0,0 +1,80 @@
+From 27c7927842a691ef13724cd16fb26264680c6aa2 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Sat, 29 Feb 2020 10:30:37 +0100
+Subject: [PATCH] conf: change the order of PCM devices in alsa.conf
+
+Appearently, some applications use the first device for probe or so.
+
+Fixes: https://github.com/alsa-project/alsa-lib/issues/27
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ src/conf/alsa.conf | 46 +++++++++++++++++++++++-----------------------
+ 1 file changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
+index 0998058..a091b81 100644
+--- a/src/conf/alsa.conf
++++ b/src/conf/alsa.conf
+@@ -119,29 +119,6 @@ defaults.timer.subdevice 0
+ #  PCM interface
+ #
+ 
+-# redirect to load-on-demand extended pcm definitions
+-pcm.cards cards.pcm
+-
+-pcm.default cards.pcm.default
+-pcm.sysdefault cards.pcm.default
+-pcm.front cards.pcm.front
+-pcm.rear cards.pcm.rear
+-pcm.center_lfe cards.pcm.center_lfe
+-pcm.side cards.pcm.side
+-pcm.surround21 cards.pcm.surround21
+-pcm.surround40 cards.pcm.surround40
+-pcm.surround41 cards.pcm.surround41
+-pcm.surround50 cards.pcm.surround50
+-pcm.surround51 cards.pcm.surround51
+-pcm.surround71 cards.pcm.surround71
+-pcm.iec958 cards.pcm.iec958
+-pcm.spdif iec958
+-pcm.hdmi cards.pcm.hdmi
+-pcm.dmix cards.pcm.dmix
+-pcm.dsnoop cards.pcm.dsnoop
+-pcm.modem cards.pcm.modem
+-pcm.phoneline cards.pcm.phoneline
+-
+ pcm.hw {
+ 	@args [ CARD DEV SUBDEV ]
+ 	@args.CARD {
+@@ -323,6 +300,29 @@ pcm.null {
+ 	}
+ }
+ 
++# redirect to load-on-demand extended pcm definitions
++pcm.cards cards.pcm
++
++pcm.default cards.pcm.default
++pcm.sysdefault cards.pcm.default
++pcm.front cards.pcm.front
++pcm.rear cards.pcm.rear
++pcm.center_lfe cards.pcm.center_lfe
++pcm.side cards.pcm.side
++pcm.surround21 cards.pcm.surround21
++pcm.surround40 cards.pcm.surround40
++pcm.surround41 cards.pcm.surround41
++pcm.surround50 cards.pcm.surround50
++pcm.surround51 cards.pcm.surround51
++pcm.surround71 cards.pcm.surround71
++pcm.iec958 cards.pcm.iec958
++pcm.spdif iec958
++pcm.hdmi cards.pcm.hdmi
++pcm.dmix cards.pcm.dmix
++pcm.dsnoop cards.pcm.dsnoop
++pcm.modem cards.pcm.modem
++pcm.phoneline cards.pcm.phoneline
++
+ #
+ #  Control interface
+ #
+-- 
+1.8.3.1
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.2-namehint-add-omit_noargs.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.2-namehint-add-omit_noargs.patch
new file mode 100644
index 000000000000..34ffa01f1055
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.2-namehint-add-omit_noargs.patch
@@ -0,0 +1,108 @@
+From 09e78da4cade7b8fecb8f36717b85c456f2e5487 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Sun, 1 Mar 2020 19:57:06 +0100
+Subject: [PATCH] conf: namehint - add omit_noargs to the hint section
+
+Do not list simple surround devices in the namehint function by default.
+
+Fixes: https://github.com/alsa-project/alsa-lib/issues/27
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ src/conf/pcm/surround21.conf | 1 +
+ src/conf/pcm/surround40.conf | 1 +
+ src/conf/pcm/surround41.conf | 1 +
+ src/conf/pcm/surround50.conf | 1 +
+ src/conf/pcm/surround51.conf | 1 +
+ src/conf/pcm/surround71.conf | 1 +
+ src/control/namehint.c       | 6 +++++-
+ 7 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/conf/pcm/surround21.conf b/src/conf/pcm/surround21.conf
+index 1cf1b7a..ad19507 100644
+--- a/src/conf/pcm/surround21.conf
++++ b/src/conf/pcm/surround21.conf
+@@ -57,5 +57,6 @@ pcm.!surround21 {
+ 	hint {
+ 		description "2.1 Surround output to Front and Subwoofer speakers"
+ 		device_output $DEV
++		omit_noargs true
+ 	}
+ }
+diff --git a/src/conf/pcm/surround40.conf b/src/conf/pcm/surround40.conf
+index 9788ad4..7c61502 100644
+--- a/src/conf/pcm/surround40.conf
++++ b/src/conf/pcm/surround40.conf
+@@ -55,5 +55,6 @@ pcm.!surround40 {
+ 	hint {
+ 		description "4.0 Surround output to Front and Rear speakers"
+ 		device_output $DEV
++		omit_noargs true
+ 	}
+ }
+diff --git a/src/conf/pcm/surround41.conf b/src/conf/pcm/surround41.conf
+index 7b4ef3b..cb6c044 100644
+--- a/src/conf/pcm/surround41.conf
++++ b/src/conf/pcm/surround41.conf
+@@ -61,5 +61,6 @@ pcm.!surround41 {
+ 	hint {
+ 		description "4.1 Surround output to Front, Rear and Subwoofer speakers"
+ 		device_output $DEV
++		omit_noargs true
+ 	}
+ }
+diff --git a/src/conf/pcm/surround50.conf b/src/conf/pcm/surround50.conf
+index 7d9a9e7..70d5406 100644
+--- a/src/conf/pcm/surround50.conf
++++ b/src/conf/pcm/surround50.conf
+@@ -61,5 +61,6 @@ pcm.!surround50 {
+ 	hint {
+ 		description "5.0 Surround output to Front, Center and Rear speakers"
+ 		device_output $DEV
++		omit_noargs true
+ 	}
+ }
+diff --git a/src/conf/pcm/surround51.conf b/src/conf/pcm/surround51.conf
+index e67f007..d0236e4 100644
+--- a/src/conf/pcm/surround51.conf
++++ b/src/conf/pcm/surround51.conf
+@@ -57,5 +57,6 @@ pcm.!surround51 {
+ 	hint {
+ 		description "5.1 Surround output to Front, Center, Rear and Subwoofer speakers"
+ 		device_output $DEV
++		omit_noargs true
+ 	}
+ }
+diff --git a/src/conf/pcm/surround71.conf b/src/conf/pcm/surround71.conf
+index a26c3f3..66792dd 100644
+--- a/src/conf/pcm/surround71.conf
++++ b/src/conf/pcm/surround71.conf
+@@ -59,5 +59,6 @@ pcm.!surround71 {
+ 	hint {
+ 		description "7.1 Surround output to Front, Center, Side, Rear and Woofer speakers"
+ 		device_output $DEV
++		omit_noargs true
+ 	}
+ }
+diff --git a/src/control/namehint.c b/src/control/namehint.c
+index 60c48ae..169bd42 100644
+--- a/src/control/namehint.c
++++ b/src/control/namehint.c
+@@ -287,10 +287,14 @@ static int try_config(snd_config_t *config,
+ 			err = -EINVAL;
+ 			goto __cleanup;
+ 		}
++		if (list->card < 0 &&
++		    snd_config_search(cfg, "omit_noargs", &n) >= 0 &&
++		    snd_config_get_bool(n) > 0)
++			goto __skip_add;
+ 		if (level == 1 &&
+ 		    snd_config_search(cfg, "show", &n) >= 0 &&
+ 		    snd_config_get_bool(n) <= 0)
+-		    	goto __skip_add;
++			goto __skip_add;
+ 		if (buf1 == NULL &&
+ 		    snd_config_search(cfg, "description", &n) >= 0 &&
+ 		    snd_config_get_string(n, &str) >= 0) {
+-- 
+1.8.3.1