gentoo resync : 15.11.2017

4 files changed, 18 insertions, 13 deletions

diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 488b95be5e5c..2d76b017e11d 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.ebuild 4384 SHA256 a1ae4f10965d19d784febb6d52732557eaca2cc563348362ee4d3f0aa26c870d SHA512 76259281bc1261421376d36981b52dec0cadb040da45c7da5ed9ddfe72562a75f8fbf0c7b7b769a416b713507301c1ac57034db316347f4100192500554b18cc WHIRLPOOL bac10fb72103f845b854ec42a04171a09522a1e6dda397e5d9fd46b8b16b270246ef3888d3fdd3fc31d1ba37c666d041dd78cd77930138475b7feb07023eb3de
-EBUILD audacious-plugins-9999.ebuild 4384 SHA256 a1ae4f10965d19d784febb6d52732557eaca2cc563348362ee4d3f0aa26c870d SHA512 76259281bc1261421376d36981b52dec0cadb040da45c7da5ed9ddfe72562a75f8fbf0c7b7b769a416b713507301c1ac57034db316347f4100192500554b18cc WHIRLPOOL bac10fb72103f845b854ec42a04171a09522a1e6dda397e5d9fd46b8b16b270246ef3888d3fdd3fc31d1ba37c666d041dd78cd77930138475b7feb07023eb3de
+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
 MISC ChangeLog 6166 SHA256 15805c49b05d880e4d283084ea89af8896ded1f46d15e2a5bee0efbc3f0a4ed9 SHA512 94caa4b34c4cb2cbc73d29f816248faaf026605db8732935b64cc2a28d3b459ea873d877fcaed465662fda231dd58443d64d8d370e416e76a36dde012d0ac0d9 WHIRLPOOL 67034f46dda55432cdad44e15805da6428234638f2f808d50ef96356e60a5429cb8bd46f69bb2bb76044297d9fe38ca0935930831ca3974eec05efa1c9185c46
 MISC ChangeLog-2015 57436 SHA256 41d7d70ec5933f3f981a2bfcae2d7db5377d27564a5bbe2604fc06eeb72db3ed SHA512 c8b6ea2b96bf70c38330eea2ee77185deae3139905f5d53f2aff58389071537bef88e41a16f7536589f798b635c00beb7fbce0d1715aab9b5c87c5e974f05c69 WHIRLPOOL b4baace48ff9e617aa27c776c914ead6a0434149930d8f6e3b826f8f9e1f230a9922d0bfb153f25dbdef8911bc381ff0d21035a93513b744e285dd8971710809
-MISC metadata.xml 1368 SHA256 286486fdeffef7a735381fdfbf39b9eb2c754518cb3fd218cc00b510f16ba12f SHA512 8634f8f19bdcb98406cce8b678eb6cdf5557784a47046169c4645ac04dc268f587d19f9ec7e971e1c129db763c8bcbe15f19f1f6662282a5b23369f8ce9e99a4 WHIRLPOOL 28aeae70fd02a3b3dafe10bd1f7dcc237225dc10cd663f0ade73580723b961129131f6742c73414e46c9ba047e026a0405e2d6f572ded725ebae9873df59f562
+MISC metadata.xml 1428 SHA256 dad00cbbfbcd399a36aa7a4549b37e7bbfd09e4e3a20c0d18701f06802d635b2 SHA512 720a609a086b8477062fa836b1e7ac2dcca5e9a0aaac25848fd6a6c69d48fcc8161885ac9bc3c428d81c3e8e1b2256f0343c799cc07e8ceb7ec4fd2ce3d7680d WHIRLPOOL 82a776cdb03df831e48827c31a54441c74f9395f37d7fc63d9842f7e07c5d131051770c0e81773e92ae8293f4a4c871dce313218ff616979c9c1944d2e5dbbfe
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.9.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild
index cc21399c3a93..0bafc219b4b2 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.9.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild
@@ -21,11 +21,12 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth gnome hotkeys http gme gtk gtk3 jack lame libav
-	libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr vorbis wavpack"
+	libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
 REQUIRED_USE="
 	^^ ( gtk gtk3 qt5 )
 	qt5? ( !libnotify )
-	|| ( alsa jack pulseaudio sdl )"
+	|| ( alsa jack pulseaudio sdl )
+	ampache? ( qt5 http )"
 
 # The following plugins REQUIRE a GUI build of audacious, because non-GUI
 # builds do NOT install the libaudgui library & headers.
@@ -47,12 +48,12 @@ REQUIRED_USE="
 RDEPEND="
 	app-arch/unzip
 	dev-libs/dbus-glib
-	dev-libs/glib[utils]
+	dev-libs/glib
 	dev-libs/libxml2:2
 	~media-sound/audacious-${PV}[gtk?,gtk3?,qt5?]
 	aac? ( >=media-libs/faad2-2.7 )
 	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	ampache? ( www-apps/ampache )
+	ampache? ( =media-libs/ampache_browser-1* )
 	aosd? (
 		x11-libs/libXrender
 		x11-libs/libXcomposite
@@ -85,7 +86,7 @@ RDEPEND="
 	)
 	lame? ( media-sound/lame )
 	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate )
+	libsamplerate? ( media-libs/libsamplerate:= )
 	lirc? ( app-misc/lirc )
 	mms? ( >=media-libs/libmms-0.3 )
 	modplug? ( media-libs/libmodplug )
@@ -96,6 +97,7 @@ RDEPEND="
 	sid? ( >=media-libs/libsidplayfp-1.0.0 )
 	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
 	soxr? ( media-libs/soxr )
+	speedpitch? ( media-libs/libsamplerate:= )
 	vorbis? (
 		>=media-libs/libvorbis-1.2.0
 		>=media-libs/libogg-1.1.3
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index cc21399c3a93..0bafc219b4b2 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -21,11 +21,12 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth gnome hotkeys http gme gtk gtk3 jack lame libav
-	libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr vorbis wavpack"
+	libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
 REQUIRED_USE="
 	^^ ( gtk gtk3 qt5 )
 	qt5? ( !libnotify )
-	|| ( alsa jack pulseaudio sdl )"
+	|| ( alsa jack pulseaudio sdl )
+	ampache? ( qt5 http )"
 
 # The following plugins REQUIRE a GUI build of audacious, because non-GUI
 # builds do NOT install the libaudgui library & headers.
@@ -47,12 +48,12 @@ REQUIRED_USE="
 RDEPEND="
 	app-arch/unzip
 	dev-libs/dbus-glib
-	dev-libs/glib[utils]
+	dev-libs/glib
 	dev-libs/libxml2:2
 	~media-sound/audacious-${PV}[gtk?,gtk3?,qt5?]
 	aac? ( >=media-libs/faad2-2.7 )
 	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	ampache? ( www-apps/ampache )
+	ampache? ( =media-libs/ampache_browser-1* )
 	aosd? (
 		x11-libs/libXrender
 		x11-libs/libXcomposite
@@ -85,7 +86,7 @@ RDEPEND="
 	)
 	lame? ( media-sound/lame )
 	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate )
+	libsamplerate? ( media-libs/libsamplerate:= )
 	lirc? ( app-misc/lirc )
 	mms? ( >=media-libs/libmms-0.3 )
 	modplug? ( media-libs/libmodplug )
@@ -96,6 +97,7 @@ RDEPEND="
 	sid? ( >=media-libs/libsidplayfp-1.0.0 )
 	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
 	soxr? ( media-libs/soxr )
+	speedpitch? ( media-libs/libsamplerate:= )
 	vorbis? (
 		>=media-libs/libvorbis-1.2.0
 		>=media-libs/libogg-1.1.3
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 1e9c7798ca0f..4fc91fc80a76 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -23,5 +23,6 @@
 		<flag name="scrobbler">Build with scrobbler/LastFM submission support</flag>
 		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
 		<flag name="soxr">Build with SoX Resampler support</flag>
+		<flag name="speedpitch">Enable speed/pitch effects</flag>
 	</use>
 </pkgmetadata>