gentoo resync : 16.11.2017

5 files changed, 111 insertions, 4 deletions

diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 72fa0a2c8e15..55d8bb1a91dc 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -4,8 +4,10 @@ AUX alsa-plugins-1.0.28-libav10.patch 10113 SHA256 f95e97a6001596d76c785c97d3714
 AUX pulse-default.conf 196 SHA256 331ddca02bf9324f924baa7ab14460d8878f1db917e509bfc8c314938c53c26f SHA512 c64f73a46c9f50704d4b2bef09d95ce3bc2352da1437750f49974ab8e6f60d5467d5d94ab0e1490deea5f2b1f67b20aa60a10c502e7d6e049649bca4208f7c1e WHIRLPOOL 373d276717005df7531b9a517d5392d7ff6ac765d677819ffc59799cfa6fd944428008e7e6e827bc31db0ed861044576f45eea67137158bb5a543717e17b00f1
 DIST alsa-plugins-1.1.1.tar.bz2 366193 SHA256 8ea4d1e082c36528a896a2581e5eb62d4dc2683238e353050d0d624e65f901f1 SHA512 9dd277cb5cce144ce4e5e0010cebcba0f8634c783e7bcd80ce6d04b198d6de5150a2764df3087a39a468b5fb7c4578de2e252095568e811dedaa5e7ffdbeb7c9 WHIRLPOOL 20f36afcb01dfe47172b6470fea929ffb267e0b7a78ac4ca8c2031b33faa6fe15bd0608d9963e053366ac6bf3b2f540d776537c8547418a0d2b80b5c0366a76f
 DIST alsa-plugins-1.1.4.tar.bz2 366931 SHA256 530d1c3bdaeb058f2a03607a33b9e16ee5369bfd30a96bc09bd2c69b4ddd1a8a SHA512 edbc9dd762e2500ce6f820d81fcd8d2577506afcea0b33a32cece95f8d6651840f4f8a55664f274d735ab3effa13cdbfc0331690c37a64a9ad050c15dc77cac6 WHIRLPOOL 38229f5d194ee0ef47b00d1464ed5392fbdb33f8d63a9b8dbdf26e39db3d096314fbe1f9220566a30aa905ec38607ebeb042611c3defd0f93543075d23382e45
+DIST alsa-plugins-1.1.5.tar.bz2 366999 SHA256 797da5f8f53379fbea28817bc466de16affd2c07849e84f1af8d5e22f7bb7f1c SHA512 50a79d9dbcca72b2133aba7dca594302dcd5816eb71afc311a4c2a96aac7632a0a034875faf3100f2c8a44f3fbbede264e5cd9beacf2a07f2fa6786f66edae39 WHIRLPOOL b34067b474e403d982a07846bcaa70587f09dfff1e48ae61734c6252188581409e4a96bab301373489d94f4a4f7900f3cb50b0b9a6a92d73d3a40690f155540e
 EBUILD alsa-plugins-1.1.1-r1.ebuild 2809 SHA256 4f4ad595b30510cf1ce8e35ec9024269cf9d2635a268353ab5883ec857cbc1e5 SHA512 9a69ff136d03d28aedf1e82522653e2276f705a04e538e8ac226031c4439f3646ace3b72eb3a757841d988ba92e2ea0beaac0b97cf629d3105b838d84cc52fa4 WHIRLPOOL ee05627c7764f5da1e2d098dca2af04976b65f7cf6b662364df20d4bd819e8fd0dac194936bdcf9bc2aa599618563318e81576a8f0da9e89510663aee9871810
 EBUILD alsa-plugins-1.1.4-r1.ebuild 2783 SHA256 fea234b073e08585be8b2a88e3b443f034facfefaded3bee3df482f5dbb5dc16 SHA512 1650dbeb541884554a00f17d84bd88659944c4c32cd018a3858ce8674b3f7db6c87d22771dadf93677f528e6171463118265a2054caeef2b3a4b1ff2d6efb245 WHIRLPOOL c94fbabeb19fcc64c60e166cb72f2beca1e99006e206bca8c7204b221b8e934f791b1e24d6921efe756f3b97d5a04a41f7eb9c37f22ed9d3e1cba988b5d953b8
+EBUILD alsa-plugins-1.1.5.ebuild 2783 SHA256 fea234b073e08585be8b2a88e3b443f034facfefaded3bee3df482f5dbb5dc16 SHA512 1650dbeb541884554a00f17d84bd88659944c4c32cd018a3858ce8674b3f7db6c87d22771dadf93677f528e6171463118265a2054caeef2b3a4b1ff2d6efb245 WHIRLPOOL c94fbabeb19fcc64c60e166cb72f2beca1e99006e206bca8c7204b221b8e934f791b1e24d6921efe756f3b97d5a04a41f7eb9c37f22ed9d3e1cba988b5d953b8
 MISC ChangeLog 5082 SHA256 6a71b5f21215995bb504fd9d3e6f5042b7edbc102c4d62d129203fab07b5d4d4 SHA512 82dc33c4c97e4c9a44ef9f922b997074f336cf19bebc9fbb037db4f088accd8f455b4bc5da1e8459b9bcb4f1c94551a99bfb7036c504da39ae66437c9b5ba4b1 WHIRLPOOL fc0ce1c58b51bb7ad31c23bb072a879112bae822a1093a87cd462b1680f6a8b9e1f362085ef16c754e7a269ca897b582717ca5d0ad08eaab64e87e8a7812390e
 MISC ChangeLog-2015 31933 SHA256 a575adb0e1819ae57d6b291a6bf09c1a8ae04c6106f6fe3215bcba752cc2e7fc SHA512 5cefcff7cc6c154ba5179bfaa0a71fc403f3bb2e5e6da7e2c41cf385de4c3d94dc27fd8d9484215618612a967d138e46b140564a75a629b9ed2ddae016f770fd WHIRLPOOL c020d754a7ca4a07ff83f211ffa7aee46895297cff1c1f01c729d2469ce51e0b410df184ef3d3d8d2e0978f2032570682415754d263c3682ff3f1bad13c88aa2
 MISC metadata.xml 307 SHA256 cb315f1695a9cb14064679d26b259fe9afe772d726a913b82a7501d03b83abc7 SHA512 7b22a0f5e9128917a130bad101de3a7d081d41fc85735547b0409c38ac533f2b468a339b870000fad5ab68de903c1eaf72ff18f1b79bd198ac2f97e9ddc1437b WHIRLPOOL c2e12b4d59671f0d05c8640e10cd74d50ce7b6909402a8bb6b679a4947b6ce0eabea6d90d67d89ab1192446e126e0e13bba2e51df445222ccdacbcb4f1eb9021
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.5.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.5.ebuild
new file mode 100644
index 000000000000..28a0efe54381
--- /dev/null
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.5.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils 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="debug ffmpeg jack libav libsamplerate pulseaudio speex"
+
+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}]
+			)
+			<media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
+		)
+		media-libs/speex:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.23-automagic.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 myspeex=no
+	use speex && myspeex=lib
+
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable ffmpeg avcodec) \
+		$(use_enable jack) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable pulseaudio) \
+		--with-speex=${myspeex}
+}
+
+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 lavcrate.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
+
+	prune_libtool_files --all
+}
+
+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/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 2d76b017e11d..8ffe4d86bb8c 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -11,8 +11,8 @@ EBUILD audacious-plugins-3.6.2-r1.ebuild 3883 SHA256 f9806fe31adcf41ab96b5265250
 EBUILD audacious-plugins-3.7.1-r1.ebuild 4674 SHA256 31696f361eaaf95f07a64af00eacd45d02afef103fd29af59449ccbde5d0bc6b SHA512 2663757e39584dceef129102de9e0217e2d799ba9546afdb52f2b4cdcaddf7efdc2323d25a5bed99a0bbc016ad5bbe4fabe83f29699de1cb57b11bff7467aab3 WHIRLPOOL 929c59499ee8ae73478555741dd868cf673fb9a0667d4a362d178f77d72aed80cc5cf9ef9eaec0d79be4e071d88e3ff21622885bb908fffd58acd87c12e09466
 EBUILD audacious-plugins-3.7.1.ebuild 4150 SHA256 a65b8be32c77191d8a6b8be5982afe1b2e1b31ade10e3f11a9b4a7f7470fb543 SHA512 2f1ddbbffad8c71f1c52d17f2d423c142832ccc921c8337d3b2a4b4ef1f81629de1f22a56803cb950f8b8a15f0f90cdca118c8ce750c6f064d5dcc1de219b877 WHIRLPOOL e623e376e4b5545dea9009b42ac08aef7793db1f98c017e7fc163d83f8e8c0ef1dead4c93f316063a345c17e9467f94834abf3a98b11fe32894d3ea40c5cd34e
 EBUILD audacious-plugins-3.8.2.ebuild 4690 SHA256 a04555af471460af72d7b412f3a259d6774106b1d0df4d80a075fe5b1db999a1 SHA512 ebdb470887627beab02472528f8ac3b2bfe275e4a2699c444fa51b275928d9a24b2724ffc7e75c4aa2e292c40daf19a260a636a91b3e7e003f21b1cef12098de WHIRLPOOL 2f34500308f35f3cc4964a62abf0e43c9f4da0dd5fae18cd05b3f1e8406f1c7b05b028b399a88335dda14ef7aa1c91dc64384c72d2abb4336b60786d33797639
-EBUILD audacious-plugins-3.9-r1.ebuild 4471 SHA256 04b456b80225abe4cf51a887bd631215f7abc15ff2d7dcdb2579509500cc6e91 SHA512 44010373e0c986df71e10ef5d1561abf4c09faa4fe348d43668c3a34a1eada8efa376f48b900a17e326365d9676e24bd818e179375d2246510148d0d617be2ad WHIRLPOOL 218a81e71aba08ab1cfda528ca549886604a333c71d03abd02313a324646511f644c84016789b5dd093743d1f1c64fbcb8c829b35ea8996378818ff19c9254d2
-EBUILD audacious-plugins-9999.ebuild 4471 SHA256 04b456b80225abe4cf51a887bd631215f7abc15ff2d7dcdb2579509500cc6e91 SHA512 44010373e0c986df71e10ef5d1561abf4c09faa4fe348d43668c3a34a1eada8efa376f48b900a17e326365d9676e24bd818e179375d2246510148d0d617be2ad WHIRLPOOL 218a81e71aba08ab1cfda528ca549886604a333c71d03abd02313a324646511f644c84016789b5dd093743d1f1c64fbcb8c829b35ea8996378818ff19c9254d2
+EBUILD audacious-plugins-3.9-r1.ebuild 4476 SHA256 a24663c560b33348125a0796cc4fb8914e520df70cf47b96ade3deea491015fe SHA512 21a930cf927e3660ce682d564c46a20dbeddeccb6448e5fd8d8344a9d6983bd0da24f81554286f0cc2af4c4e2e1b968c2466f720ddae7f4d9cb042aa2f3c27f4 WHIRLPOOL c762a81e6eb9fc5551f46b31286bddbdaed19c71927d478a9317ce7215e6e38a00daba9c74af51c1f7982e4954ff7a436237005e8174ceb53ba9b191bd9e65aa
+EBUILD audacious-plugins-9999.ebuild 4476 SHA256 a24663c560b33348125a0796cc4fb8914e520df70cf47b96ade3deea491015fe SHA512 21a930cf927e3660ce682d564c46a20dbeddeccb6448e5fd8d8344a9d6983bd0da24f81554286f0cc2af4c4e2e1b968c2466f720ddae7f4d9cb042aa2f3c27f4 WHIRLPOOL c762a81e6eb9fc5551f46b31286bddbdaed19c71927d478a9317ce7215e6e38a00daba9c74af51c1f7982e4954ff7a436237005e8174ceb53ba9b191bd9e65aa
 MISC ChangeLog 6166 SHA256 15805c49b05d880e4d283084ea89af8896ded1f46d15e2a5bee0efbc3f0a4ed9 SHA512 94caa4b34c4cb2cbc73d29f816248faaf026605db8732935b64cc2a28d3b459ea873d877fcaed465662fda231dd58443d64d8d370e416e76a36dde012d0ac0d9 WHIRLPOOL 67034f46dda55432cdad44e15805da6428234638f2f808d50ef96356e60a5429cb8bd46f69bb2bb76044297d9fe38ca0935930831ca3974eec05efa1c9185c46
 MISC ChangeLog-2015 57436 SHA256 41d7d70ec5933f3f981a2bfcae2d7db5377d27564a5bbe2604fc06eeb72db3ed SHA512 c8b6ea2b96bf70c38330eea2ee77185deae3139905f5d53f2aff58389071537bef88e41a16f7536589f798b635c00beb7fbce0d1715aab9b5c87c5e974f05c69 WHIRLPOOL b4baace48ff9e617aa27c776c914ead6a0434149930d8f6e3b826f8f9e1f230a9922d0bfb153f25dbdef8911bc381ff0d21035a93513b744e285dd8971710809
 MISC metadata.xml 1428 SHA256 dad00cbbfbcd399a36aa7a4549b37e7bbfd09e4e3a20c0d18701f06802d635b2 SHA512 720a609a086b8477062fa836b1e7ac2dcca5e9a0aaac25848fd6a6c69d48fcc8161885ac9bc3c428d81c3e8e1b2256f0343c799cc07e8ceb7ec4fd2ce3d7680d WHIRLPOOL 82a776cdb03df831e48827c31a54441c74f9395f37d7fc63d9842f7e07c5d131051770c0e81773e92ae8293f4a4c871dce313218ff616979c9c1944d2e5dbbfe
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild
index 0bafc219b4b2..4f71f7575bfc 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild
@@ -135,7 +135,6 @@ src_configure() {
 	econf \
 		--enable-mpris2 \
 		--enable-songchange \
-		--enable-speedpitch \
 		--disable-oss4 \
 		--disable-qtaudio \
 		--disable-qtglspectrum \
@@ -172,6 +171,7 @@ src_configure() {
 		$(use_enable sid) \
 		$(use_enable sndfile) \
 		$(use_enable soxr) \
+		$(use_enable speedpitch) \
 		$(use_enable vorbis) \
 		$(use_enable wavpack) \
 		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index 0bafc219b4b2..4f71f7575bfc 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -135,7 +135,6 @@ src_configure() {
 	econf \
 		--enable-mpris2 \
 		--enable-songchange \
-		--enable-speedpitch \
 		--disable-oss4 \
 		--disable-qtaudio \
 		--disable-qtglspectrum \
@@ -172,6 +171,7 @@ src_configure() {
 		$(use_enable sid) \
 		$(use_enable sndfile) \
 		$(use_enable soxr) \
+		$(use_enable speedpitch) \
 		$(use_enable vorbis) \
 		$(use_enable wavpack) \
 		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))