gentoo resync : 15.12.2019

5 files changed, 118 insertions, 4 deletions

diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index dff695f7b004..046610e6a836 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,10 +1,13 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
+AUX alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch 720 BLAKE2B 9f160f4e4976b71ed69f8dac448978c3707e8cfcbbe4818d713ba0f7ab4eb15f5c1ecf4043abd821d613a1aa72e1f966fa6a179dde68b480b58cd5bffc507e57 SHA512 bbfa90c089bfd1a85cbeb4bb4200ae89795116bfda13e3ef7c47d7807d8c5236b7bbc5864878b00ad6243e34b06f9cf400b15dd5c1faa903d3e1544d47104028
 DIST alsa-lib-1.1.2.tar.bz2 947423 BLAKE2B 09cd6a625d8f681c5515fd925191fb5468158ed77cc3878c076f4344e4d8f7b15e9872d3d6635710049ca14199851f2343246e94810fe2a0bb0d1e02915c941e SHA512 a6c6675b1fd86955ef5072b9e6090795fc6b0b16f32481bece049e5f100e689be48b6416ff7cf36abfc67e0b94f420e08c15ff13a9701987d6bb69a8fa567e8a
 DIST alsa-lib-1.1.8.tar.bz2 1002562 BLAKE2B a531ab501943924d007f7ae0e4489deea805ccbc8f2f02d3ee392aa2dbe54ffe31f58ee1744308f851a68f693c83125088708e901d0d83e4a7a5f644ef448aa3 SHA512 50ae107c6efe8200b4c41e0463e099d16e149332f1d3a22c3e81d3e7d980b7f93f3610fc9711ef62067caeb1054e7ea612ba3903bf8a91ebeffa48687cf80eed
 DIST alsa-lib-1.1.9.tar.bz2 1058187 BLAKE2B 60454be162a0f36334602586762f8ce657d2883636bcb65ae91dedce62297bd40f3dbdc6213ef773542708b367f8796e143b1fc987c40de6d5d5a69a648f6b18 SHA512 402e39cca82d17555e3e52ef06b8ed9dcf58531da393809a7b5cf18658299fa90ee8a60bfc5213482d7a02b13140c441f1333b144556f44ab4adb786a2fb3c49
-DIST alsa-lib-1.2.1.tar.bz2 1003711 BLAKE2B 6aa34238a07c9da2c1fe86e51111018541a647779e0ab4a5ecbfc4a8dcfdc168d5d921ec1c5ae4822227a31ea317cccc41a5c23f19d0e92a6302bba81bfa1423 SHA512 a5bd60ed0cfca3911db534364554412c479d2cb6ded6c8e7011d2510797a6cbd10613d6e1d42cb589afec8e7408c8fd5465360ddd14df8701af7dc414961c19e
+DIST alsa-lib-1.2.1.1.tar.bz2 1002960 BLAKE2B 6df2145e0fdd42b86759a6250f6fa3d18075d1bbff1c5ec0b4b6130f934ab369e5cc0edd9a53c3b6298dce0d374a9888c5fc63ae0d42b3fd0ef5ca97eff00369 SHA512 8a0b6f1ecc58d60991b4509e791b1581eebae57cd754b0b4829e66b1cfee81d588b04f42a17f598f06310b9658d9f46fd748cca516cc48b6f2989389c22c42e9
+DIST alsa-lib-1.2.1.2.tar.bz2 1004129 BLAKE2B e8bf117f3036a32b020897f16b9648ac105c499f547ae157508720502722d4e1a651719c86a4e2756ca7a3c573a1f17c02524125ccaad12bcb8c7c71675c898a SHA512 e8286fd55f63ee0d95513279d0885c287533de89b7af6c338413dec5d38ba4f5a15da1a4a4ce36e052614e4b730e3778782dab9979d82958283be17b48604913
 EBUILD alsa-lib-1.1.2.ebuild 2123 BLAKE2B 97a24d65932fdd5d1a08a94d77e1a456cdc20501c50bfbb5766df74a6246d4ba5f37578240543c9c2ede9544e0a50ea11e4f886e9c77e7ee872c7ccb30ab2aee SHA512 7368a2744004ceff3ea41b39f5417cc6f190bcf2823f1db76ecffcec753e855c3cc6d2668d02b95f4df4d507a0d087f0c7dd2fb5de7a94e95d4fba83e9757050
-EBUILD alsa-lib-1.1.8.ebuild 2071 BLAKE2B 529064b0608b135c5514f802ac6eae8184980d809c59082f71e4ae44c5853e8d29b48cdb6c489498dbd9ed4a8ef6b44546d47c1ba182cb1eecaa3a70480fabaf SHA512 93ffab825893c1ea5189021d4d7e8df6e267694d4628b2d700c34fbde0bda026d6268e754f5af853a2c3b9f3477eef0a4d8a153923712fe446ea806c8d7b3b55
+EBUILD alsa-lib-1.1.8.ebuild 2070 BLAKE2B 4d82e902423c47404cddc5ae583a4119faebb7361e507c805f482704455d980756e66601062e3c88ac0366ad574154af9a4eea072b8fbcd17847ea68d19e8eb6 SHA512 468d0516920e27a5afe79d8b061922d0d584cfd9351c240503d87ab006f010ff88dd7dfd2efdc05bf3bb7e0cec67436d3e30c1fe21359e510228010e68d96755
 EBUILD alsa-lib-1.1.9.ebuild 2078 BLAKE2B e26d36574a8610f822ed53cdcca3a6199f4b6d23c544b39996684ca42dc51a13e5466499ecaabc9ad07bed13f1f44e97797eba99356559db63cc98e3a3c38018 SHA512 f37d9860383098876f1b8278cce9f7b9711f2a47f0d9b117927b8f5c3e41c9cfa7cc59a5d80bdc87f60ab406fbc36d95a63344338759501818f41815697a647c
-EBUILD alsa-lib-1.2.1.ebuild 2095 BLAKE2B 13615b3dd4e6971800d51678e4cec2026261a25f92ebbf88d8f3e2bed76ccc3adf3c96a724c61b803ca698661676b53bce5a51f2b37a2a76d7d3f3393e25a055 SHA512 b1499113fdbb948563df08095a8b81a5e761b2a0663314fd4b4e475e08d6b140c9aaded17fc5bc4879c3db2079759b5d4408113e164d3314a509d9710239723c
+EBUILD alsa-lib-1.2.1.1-r1.ebuild 2149 BLAKE2B 030086ae17c1a8f0ea612671bdba894e9e47361738fc0452ded7cae80a74a7ce2899caca30cec8551cbe7c86281b6784a249a177d34682812df8cb5a55715c25 SHA512 1d84e2bd2b6d5b63fb924b7aa2547d02971fff0231149cdfac3792c7b64caa9c1d38d4e44a68d8231cdfe6bf0743311f8c3688117efbdb778e6b930eb91fa3ab
+EBUILD alsa-lib-1.2.1.2.ebuild 2095 BLAKE2B 13615b3dd4e6971800d51678e4cec2026261a25f92ebbf88d8f3e2bed76ccc3adf3c96a724c61b803ca698661676b53bce5a51f2b37a2a76d7d3f3393e25a055 SHA512 b1499113fdbb948563df08095a8b81a5e761b2a0663314fd4b4e475e08d6b140c9aaded17fc5bc4879c3db2079759b5d4408113e164d3314a509d9710239723c
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
index 6bd44f7bd1e4..57d9380777de 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
@@ -13,7 +13,7 @@ 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 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild
new file mode 100644
index 000000000000..704317dcf5a9
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit autotools multilib multilib-minimal python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="https://alsa-project.org/"
+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 ~sh ~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} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
+	"${FILESDIR}/${P}-ucm_add_asoundlib_h.patch" #700870
+)
+
+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/509886
+	if use elibc_uclibc ; then
+		sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die
+	fi
+	# 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)
+		$(usex elibc_uclibc --without-versioned '')
+	)
+
+	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}::"
+	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_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.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
index ba7e99bdece2..ba7e99bdece2 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch
new file mode 100644
index 000000000000..3c6072b8c3dc
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch
@@ -0,0 +1,25 @@
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Sat, 23 Nov 2019 14:38:35 +0000 (+0100)
+Subject: ucm: use-case.h - add <alsa/asoundlib.h> include
+X-Git-Url: https://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff_plain;h=1a4b362115b5e1bb4f5b888919ffd11736adbf0c
+
+ucm: use-case.h - add <alsa/asoundlib.h> include
+
+It is required for snd_ctl_elem_id_t and snd_mixer_selem_id_t.
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+
+diff --git a/include/use-case.h b/include/use-case.h
+index 8a37121..80073ef 100644
+--- a/include/use-case.h
++++ b/include/use-case.h
+@@ -42,6 +42,8 @@
+ extern "C" {
+ #endif
+ 
++#include <alsa/asoundlib.h>
++
+ /**
+  *  \defgroup ucm Use Case Interface
+  *  The ALSA Use Case manager interface.