gentoo resync : 18.05.2019

3 files changed, 3 insertions, 106 deletions

diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index e70bc5f2bd57..8d80b9033d9e 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -6,11 +6,10 @@ AUX alsa-plugins-1.1.7-double_free_fix.patch 876 BLAKE2B 782924142a0523ae800b1f5
 AUX pulse-default.conf 196 BLAKE2B 4293e2ba9b4c87c35e3bdfe45781f86af733341c8bada5a78b38d08c59c5774e5679487e877d11fb7866b2ed7d9f9441552f864e9c2b9e42119eda62e1459ae8 SHA512 c64f73a46c9f50704d4b2bef09d95ce3bc2352da1437750f49974ab8e6f60d5467d5d94ab0e1490deea5f2b1f67b20aa60a10c502e7d6e049649bca4208f7c1e
 DIST alsa-plugins-1.1.1.tar.bz2 366193 BLAKE2B 02892b0c241cf34d3bfce6cf580dbb6bedbce9253c3e57f04d3093a6cbb1d5b5e9b92566945962b875de20ba3e556e9c1fc4bb4e970502e3c03fc821e5e264fe SHA512 9dd277cb5cce144ce4e5e0010cebcba0f8634c783e7bcd80ce6d04b198d6de5150a2764df3087a39a468b5fb7c4578de2e252095568e811dedaa5e7ffdbeb7c9
 DIST alsa-plugins-1.1.6.tar.bz2 367485 BLAKE2B efe8b8447db4f68761060e4f48c86c76f821fd7795d8edec0c8f5a03f7406a422f630f012433ac12c3af3222b7b587820a92e937c80dba6bb8766deb854b9706 SHA512 f01633cd7166a2fba4c5b4d5d786b5a2122f6a810f5b5b7209c42033759d116a4515174e7ee57973d5de716be88a246d733dc5a2daf92b72377c274b04db401b
-DIST alsa-plugins-1.1.7.tar.bz2 369866 BLAKE2B 8305f17a7e72e159f1710168cc3a4f0c7deb870c813a8a48b335911717422ac584b6846b047a29880448bdc0597a80881b87e5df1ff018a1e174aea490d3e9df SHA512 c3bb22ec3c5a167fb246cfc94131d53800e321b486ab743c3395a9d91dee0ff9703f6e4a2feaea5a4ee42a7e486d835d48ab880c784c5c34bb4eb5e9ded06d8e
 DIST alsa-plugins-1.1.8.tar.bz2 375346 BLAKE2B 65c161ee375e7aed85dbe918a39bc2aa4818bbcfbaadf405f5f0170d9944ff55b5a9da3690e3cd78bd7ffff74ecf235f49cfc3a5dfe18b627c5a9cb0dc1eb207 SHA512 bb1a4411921ec332f47b43515f6d3b4c03a01568854950b9b5c3f0d8172d9a0c4a5b3652bc64c62eae5ea3aaa5d95fe3d32c0a213fe99adf490a9807bcb58ecd
+DIST alsa-plugins-1.1.9.tar.bz2 406127 BLAKE2B 10bf3e96289a88edabfa3018d33ab4666982fe409eb41c486e6b9eee0dde87e926f3241c31e240b3bab114c8ab2c6d6bab92dd6192bceb467a01fcb6adc44b8e SHA512 1969dfe8f2bb4283e81a18da73d2f7f86d8788d1a8764d7195b4830b2f4704c208eacb50a1e26e20c9fe57e7d5bb06a004112d84cc86b4682b4180d2fec4d5d9
 EBUILD alsa-plugins-1.1.1-r1.ebuild 2698 BLAKE2B 3fac1377af069760efcc93fe6daa55a3d821742e7ffd5c0976dc0f3a066151ff087d20a65803aa59f253f27f8077d20345da879f92fd3dc28398440e31b3d148 SHA512 9df4f03ae71fe97423bdb37cd28755873a915f210ce92f5f394e15bcecd6662f321acff20b9f212fdb06b63337a7f58d2fb25a6c18eac2be3c5820bc21394860
 EBUILD alsa-plugins-1.1.6.ebuild 2870 BLAKE2B 4dbfa2bf67ebcaf0102e3e000965acb1a7ddebd9a4cc2071c6e40046d5d2f40c0a9939b55559563880c384620ab4b49d8c5fa54bf795d7edc4ad373d94919034 SHA512 4ee600a04dc60852a8a05948434c53e72c500773bf0ef9b569125787e32f934723588bffea4dea1500aad4a2e974c77cd6e5d63110244154aa23b2d8b53556f8
-EBUILD alsa-plugins-1.1.7-r1.ebuild 2875 BLAKE2B 69390fa6e62ddfb8a415ab06e3ec2fa37851fa0b7a6e02ed3e9ee96291e8d82a09902c8e78068f36ebea1521af07429e603ec0c6e62acd97f9538f97bf148153 SHA512 bd2e1ca77192e0f551a41bbc0cff271284e8be137833a3056b47692dabbbc50ce317217eb6bd66b68cd33df675d86edec8480ccb72cc05e0545decf415037335
-EBUILD alsa-plugins-1.1.8-r1.ebuild 2922 BLAKE2B 4382f4ede827c8ff22057023071e1e0894f9ed8f603573f5978f6fda264bdd20b2669cd1acd8a118ff15201287610844d10f755912794f077cc71ddfce28cc66 SHA512 7c257e388c22d6b10e47691a01c89d311537d4fee453e573071c46f6294b541f64f8aeb265d819c4e8c0f5d4f88169f09d8ba7de257e1c83e4a3f663076616c2
 EBUILD alsa-plugins-1.1.8.ebuild 2817 BLAKE2B 43d2a624a12ea3ee44c58214b9258ab05cd8b03187f26080eddda13ee84020d475ed88f9e3444563ea5e2ab77bf2929875f2e5c0a990bcd83185dd564de356c9 SHA512 f7a1dad7522630889128d88e8c3b0fdebb23040f976ea7caf9b7aa2420eb656fa34c13233110e43621accb8137e107ef2067fdc2d0212ee821aa2debfd865177
+EBUILD alsa-plugins-1.1.9.ebuild 2921 BLAKE2B 082e1bb7fdfdac8ea826cabd171eeaf25445dc9b9520527b479357440ea4b9b29690e835fb6b097e23f3fc415cfbd5dd2e53ffb98233e49b853be8f3d8e1dcf6 SHA512 8c6413bc5e31b14a9fc2b44974b8a3587db8626ce2ef5287b2add5fc1bcc1c4dff18a48ed6eaff67ee9668cddb5e22164c74d85217fa39e18c94c74754adadb6
 MISC metadata.xml 512 BLAKE2B 2fa80544d70890c99164643bc1706b8c2e5f3d50c991e781e68441072366b1b89d0082507bf1c27d11d95bcd1c7d508f09ce0b193bd7d4ca77f27a2bdf9e24c8 SHA512 fce90766306d36d97ae40cbebf7b788f6f11766afc6d9680f563271ea184373ae20480b99b6e60edc74d9bfb222acd1d11c50163a31520f073a00bba9050e361
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.7-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.7-r1.ebuild
deleted file mode 100644
index f97cc166249b..000000000000
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic multilib multilib-minimal
-
-DESCRIPTION="ALSA extra plugins"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream"
-
-RDEPEND="
-	>=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	speex? (
-		>=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
-		media-libs/speexdsp[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-double_free_fix.patch
-)
-
-src_prepare() {
-	default
-
-	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
-	# failed assert. As the code works just fine with asserts disabled, for now
-	# disable them waiting for a better solution.
-	sed -i \
-		-e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
-		pulse/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	use debug || append-cppflags -DNDEBUG
-
-	local myeconfargs=(
-		--with-speex="$(usex speex lib no)"
-		$(use_enable arcam_av arcamav)
-		$(use_enable ffmpeg libav)
-		$(use_enable jack)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable mix)
-		$(use_enable oss)
-		$(use_enable pulseaudio)
-		$(use_enable speex speexdsp)
-		$(use_enable usb_stream usbstream)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	cd doc || die
-	dodoc upmix.txt vdownmix.txt README-pcm-oss
-	use jack && dodoc README-jack
-	use libsamplerate && dodoc samplerate.txt
-	use ffmpeg && dodoc lavrate.txt a52.txt
-
-	if use pulseaudio; then
-		dodoc README-pulse
-		# install ALSA configuration files
-		# making PA to be used by alsa clients
-		insinto /usr/share/alsa
-		doins "${FILESDIR}"/pulse-default.conf
-		insinto /usr/share/alsa/alsa.conf.d
-		doins "${FILESDIR}"/51-pulseaudio-probe.conf
-		# bug #410261, comment 5+
-		# seems to work fine without any path
-		sed -i \
-			-e "s:/usr/lib/alsa-lib/::" \
-			"${ED%/}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
-	fi
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	if use pulseaudio; then
-		einfo "The PulseAudio device is now set as the default device if the"
-		einfo "PulseAudio server is found to be running. Any custom"
-		einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
-		einfo "purpose should now be unnecessary."
-	fi
-}
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.8-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.9.ebuild
index ee154ee1e670..2585860ccc1c 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.8-r1.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
 IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream"
 
 RDEPEND="