media-sound/beets: 1.4.7 version bump with many improvements

EAPI-6 bump.
python3 support.
Decouple use flag names from plugin names with rm_use_plugins()
Consolidate various use flags and use more common names.
Re-add USE replaygain.
Add missing || die.
Add missing USE=badfiles handling.
Fix and sort RDEPENDs.
Tests are broken since at least 1.4.3.

Bug: https://bugs.gentoo.org/625974
Closes: https://bugs.gentoo.org/563380
Closes: https://bugs.gentoo.org/625578
Package-Manager: Portage-2.3.48, Repoman-2.3.10

diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index f620929dd778b400abe2b3329ae8aa55408dc2ce..6f517f7471ead080474e7eeb8c54c65a325812c0 100644 (file)
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1 +1,2 @@
 DIST beets-1.4.3.tar.gz 1428494 BLAKE2B 29adc617c4efbb304b05c6bc027a09fd34c11af70b22a86a329fe9048de31828f729114db929e97b103a6f6d8210c0b74716f327f8b4f853f745433fea5f1e14 SHA512 b95a9056abae5da3db7786342e8969b4f9c86c2c4589dd48bad244d28ef3d3da4900d3d3eaee1e45964960c62ecaa8d754a33829e0d7f497f01ecc763c0f492d
+DIST beets-1.4.7.tar.gz 1458621 BLAKE2B f7dd19a7dd92415c29e9b1a7932ba33cb5d43000d35a58b2f42c1487db68c6374dd159960f67e1ac68722693d91d364b24297fb2c0c86a39b82fe5b40a1e739d SHA512 6663a2ffece208a510fce9f5d3dd9c8e617cab60cdb994f7bdb13fd759cfea8882290c75c3cdf4f6de9c7d9b78845b6ed29f98b41c787c89ff8782e4ac3ec152

diff --git a/media-sound/beets/beets-1.4.7.ebuild b/media-sound/beets/beets-1.4.7.ebuild
new file mode 100644 (file)
index 0000000..7a21e50
--- /dev/null
+++ b/media-sound/beets/beets-1.4.7.ebuild
@@ -0,0 +1,139 @@
+# 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 flac gstreamer lastfm mpd ogg opus 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}]
+       )
+       replaygain? (
+               gstreamer? (
+                       dev-python/pygobject:3[${PYTHON_USEDEP}]
+                       media-libs/gstreamer:1.0[introspection]
+                       media-libs/gst-plugins-base:1.0[ogg?]
+                       media-libs/gst-plugins-good:1.0
+                       flac? ( media-plugins/gst-plugins-flac:1.0 )
+                       opus? ( media-plugins/gst-plugins-opus:1.0 )
+               )
+               !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 46b548c1ee8cfb33c50c042c4e8d9c57f135d3de..c57948828caeddf106d76ad5774fbfdceab5e341 100644 (file)
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -30,15 +30,21 @@
                <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="chromaprint">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="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="lastfm">Enable support for importing personal last.fm playcounts and music genres from last.fm tags</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="mpd">Enable support for <pkg>media-sound/mpd</pkg> server emulation and statistic gathered from <pkg>media-sound/mpd</pkg></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="replaygain">Enable support for Replay Gain metadata calculation during import</flag>
+               <flag name="thumbnail">Enable album thumbnails generation</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="webserver">Enable embedded webserver support through <pkg>dev-python/flask</pkg></flag>
        </use>
        <upstream>
                <remote-id type="pypi">beets</remote-id>