gentoo resync 08.09.2018

4 files changed, 146 insertions, 108 deletions

diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index a46b82b00a82..8fce5d6ad15f 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,3 +1,3 @@
-DIST beets-1.4.3.tar.gz 1428494 BLAKE2B 29adc617c4efbb304b05c6bc027a09fd34c11af70b22a86a329fe9048de31828f729114db929e97b103a6f6d8210c0b74716f327f8b4f853f745433fea5f1e14 SHA512 b95a9056abae5da3db7786342e8969b4f9c86c2c4589dd48bad244d28ef3d3da4900d3d3eaee1e45964960c62ecaa8d754a33829e0d7f497f01ecc763c0f492d
-EBUILD beets-1.4.3-r1.ebuild 3039 BLAKE2B 8bb9b66ba6d8f888fce8c2cf12be4f3f2058b34f5a224b98875b43062f1a472dd3dc3c300d1710bd500e4ff1a830d5517fb7fa66640aa518a444bd79a12c0adb SHA512 57d2023f68f873622b74526840de782953fd2230a0afe2bb874c0a010d137322129af288d42489904b10b277497349fc910a7e4d9994c3f0bfbf2491da47bf9a
-MISC metadata.xml 2577 BLAKE2B dcd49b8888d4e54b9a6ad53f18864773285aeb4d98dd98bba680968d217a474d141d2730126c27f7778a4d984e113445c390a538ceaa7961227289916905aebf SHA512 7a6178f3e0f60ac36bbf2408c2a5b98ddbb3407d2aa6e44317c7b71bba917079bd71b777d837e2921f5eb4dad7cee35a276aab020db610551b5da314810e52a5
+DIST beets-1.4.7.tar.gz 1458621 BLAKE2B f7dd19a7dd92415c29e9b1a7932ba33cb5d43000d35a58b2f42c1487db68c6374dd159960f67e1ac68722693d91d364b24297fb2c0c86a39b82fe5b40a1e739d SHA512 6663a2ffece208a510fce9f5d3dd9c8e617cab60cdb994f7bdb13fd759cfea8882290c75c3cdf4f6de9c7d9b78845b6ed29f98b41c787c89ff8782e4ac3ec152
+EBUILD beets-1.4.7.ebuild 3546 BLAKE2B 58368f23a27a357214b86b767f8317f01dfbd7fe82f8d71a6cf3bef0e1867003ea0ab133c546cd9cb36c2d0f090511abd20c84617f5c3ccdbe50ff0140c6d9e4 SHA512 a592d5cc11ecf49aea157a44bbc574f79be4b887ef06283eba9d520cf4684b94fa3d1e851865c2bb275722095547fe2efa2ce2b9ed3dd40ffb4eec16e729080e
+MISC metadata.xml 2395 BLAKE2B 0df8a5d3fa7b94b5b8e3e45f25e2c4dc0716c438dd51a6061f2276e20bf9779847c34bc571bcdd8948289c75c879cae6ef76fa8432a550855e9f74966fb80374 SHA512 ea2c961e7380a8c05e0e90b34f50323ca932e06ba33d5a214a633e8eba4281577993a870a7d294f286a90c0492256d3142b9e17aa02e2ea129c9c28e24bf90ec
diff --git a/media-sound/beets/beets-1.4.3-r1.ebuild b/media-sound/beets/beets-1.4.3-r1.ebuild
deleted file mode 100644
index 20b305abb9c1..000000000000
--- a/media-sound/beets/beets-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-inherit distutils-r1 eutils
-
-MY_PV=${PV/_beta/-beta.}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="MIT"
-IUSE="badfiles bpd chroma convert doc discogs flac gstreamer lastgenre lastimport mpdstats ogg opus replaygain test thumbnails web"
-REQUIRED_USE="replaygain? ( gstreamer )"
-
-RDEPEND=">=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]
-	dev-python/jellyfish[${PYTHON_USEDEP}]
-	dev-python/munkres[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-	>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
-	badfiles? ( media-sound/mp3val media-libs/flac )
-	bpd? ( dev-python/bluelet[${PYTHON_USEDEP}] )
-	chroma? ( dev-python/pyacoustid[${PYTHON_USEDEP}] )
-	convert? ( media-video/ffmpeg:0[encode] )
-	discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	mpdstats? ( dev-python/python-mpd[${PYTHON_USEDEP}] )
-	lastgenre? ( dev-python/pylast[${PYTHON_USEDEP}] )
-	lastimport? ( dev-python/pylast[${PYTHON_USEDEP}] )
-	replaygain? (
-		gstreamer? ( media-libs/gstreamer:1.0[introspection]
-			media-libs/gst-plugins-good:1.0
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			ogg? ( media-plugins/gst-plugins-ogg )
-			flac? ( media-plugins/gst-plugins-flac:1.0 )
-			opus? ( media-plugins/gst-plugins-opus:1.0 ) )
-		)
-	thumbnails? (
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		dev-python/pathlib[${PYTHON_USEDEP}]
-		|| ( dev-python/pillow[${PYTHON_USEDEP}] media-gfx/imagemagick )
-		)
-	web? ( dev-python/flask[${PYTHON_USEDEP}] dev-python/flask-cors[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# remove plugins that do not have appropriate dependencies installed
-	for flag in bpd chroma convert discogs lastgenre lastimport mpdstats replaygain thumbnails web; do
-		if ! use ${flag}; then
-			rm -r beetsplug/${flag}.py || \
-			rm -r beetsplug/${flag}/ ||
-				die "Unable to remove ${flag} plugin"
-		fi
-	done
-
-	for flag in bpd lastgenre web; do
-		if ! use ${flag}; then
-			sed -e "s:'beetsplug.${flag}',::" -i setup.py || \
-				die "Unable to disable ${flag} plugin "
-		fi
-	done
-
-	use bpd || rm -f test/test_player.py
-
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	cd test
-	if ! use web; then
-		rm test_web.py || die "Failed to remove test_web.py"
-	fi
-	"${PYTHON}" testall.py || die "Testsuite failed"
-}
-
-python_install_all() {
-	doman man/beet.1 man/beetsconfig.5
-	use doc && dohtml -r docs/_build/html/
-}
diff --git a/media-sound/beets/beets-1.4.7.ebuild b/media-sound/beets/beets-1.4.7.ebuild
new file mode 100644
index 000000000000..580bf88dca80
--- /dev/null
+++ b/media-sound/beets/beets-1.4.7.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1
+
+MY_PV=${PV/_beta/-beta.}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="MIT"
+IUSE="badfiles chromaprint doc discogs ffmpeg gstreamer lastfm mpd replaygain test thumbnail webserver"
+
+RDEPEND="
+	dev-python/jellyfish[${PYTHON_USEDEP}]
+	dev-python/munkres[${PYTHON_USEDEP}]
+	>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	badfiles? (
+		media-libs/flac
+		media-sound/mp3val
+	)
+	chromaprint? (
+		dev-python/pyacoustid[${PYTHON_USEDEP}]
+		media-libs/chromaprint[tools]
+	)
+	discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	ffmpeg? ( media-video/ffmpeg:0[encode] )
+	lastfm? ( dev-python/pylast[${PYTHON_USEDEP}] )
+	mpd? (
+		dev-python/bluelet[${PYTHON_USEDEP}]
+		dev-python/python-mpd[${PYTHON_USEDEP}]
+		gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
+	)
+	replaygain? (
+		gstreamer? (
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			media-libs/gst-plugins-good:1.0
+			media-plugins/gst-plugins-meta:1.0[ffmpeg]
+		)
+		!gstreamer? ( media-sound/mp3gain )
+	)
+	thumbnail? (
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		virtual/python-pathlib[${PYTHON_USEDEP}]
+		|| (
+			dev-python/pillow[${PYTHON_USEDEP}]
+			media-gfx/imagemagick
+		)
+	)
+	webserver? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/flask-cors[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+RESTRICT="test" # tests broken in 1.4.3 already
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	rm_use_plugins() {
+		[[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
+		local use=${1}
+		local plugins=${use}
+		use ${use} && return
+		einfo "no ${use}:"
+		[[ $# -gt 1 ]] && plugins="${@:2}"
+		for arg in ${plugins[@]}; do
+			einfo "  removing ${arg}"
+			if [[ -e "beetsplug/${arg}.py" ]]; then
+				rm beetsplug/${arg}.py || die "Unable to remove ${arg} plugin"
+			fi
+			if [[ -d "beetsplug/${arg}" ]]; then
+				rm -r beetsplug/${arg} || die "Unable to remove ${arg} plugin"
+			fi
+			sed -e "s:'beetsplug.${arg}',::" -i setup.py || \
+				die "Unable to disable ${arg} plugin "
+		done
+	}
+
+	default
+
+	rm_use_plugins chromaprint chroma
+	rm_use_plugins ffmpeg convert
+	rm_use_plugins lastfm lastgenre lastimport
+	rm_use_plugins mpd bpd mpdstats
+	rm_use_plugins webserver web
+	rm_use_plugins thumbnail thumbnails
+
+	# remove plugins that do not have appropriate dependencies installed
+	for flag in badfiles discogs replaygain; do
+		rm_use_plugins ${flag}
+	done
+
+	if ! use mpd; then
+		rm -f test/test_player.py || die
+	fi
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cd test || die
+	if ! use webserver; then
+		rm test_web.py || die "Failed to remove test_web.py"
+	fi
+	"${PYTHON}" testall.py || die "Testsuite failed"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman man/beet.1 man/beetsconfig.5
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	einstalldocs
+}
diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index 46b548c1ee8c..a30fde9062e0 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -28,17 +28,14 @@
 	</longdescription>
 	<use>
 		<flag name="badfiles">Validate MP3 &amp; FLAC files</flag>
-		<flag name="bpd">Enable support for <pkg>media-sound/mpd</pkg> server emulation</flag>
-		<flag name="chroma">Enable support for acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
-		<flag name="convert">Enable support for the convert plugin which makes it possible to transcode files</flag>
+		<flag name="chromaprint">Enable support for acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
+		<flag name="ffmpeg">Enable support for the convert plugin to transcode files via <pkg>media-video/ffmpeg</pkg></flag>
 		<flag name="discogs">Enable support for the discogs API plugin</flag>
-		<flag name="lastgenre">Enable support for importing music genres from last.fm tags</flag>
-		<flag name="lastimport">Enable support for importing your last.fm playcounts</flag>
-		<flag name="mpdstats">Enable support for collecting statistic about listening habits from <pkg>media-sound/mpd</pkg></flag>
-		<flag name="opus">Enable opus support in gstreamer-based replaygain</flag>
+		<flag name="lastfm">Enable support for importing personal last.fm playcounts and music genres from last.fm tags</flag>
+		<flag name="mpd">Enable support for <pkg>media-sound/mpd</pkg> server emulation and statistic gathered from <pkg>media-sound/mpd</pkg></flag>
 		<flag name="replaygain">Enable support for Replay Gain metadata calculation during import</flag>
-		<flag name="thumbnails">Generate thumbnails for albums</flag>
-		<flag name="web">Enable embedded webserver support through <pkg>dev-python/flask</pkg></flag>
+		<flag name="thumbnail">Enable album thumbnails generation</flag>
+		<flag name="webserver">Enable embedded webserver support through <pkg>dev-python/flask</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="pypi">beets</remote-id>