gentoo resync : 15.12.2019

4 files changed, 5 insertions, 172 deletions

diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 366c4e371379..6be367a91c66 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,6 +1,3 @@
-AUX beets-1.4.8-imagemagick-detection.patch 770 BLAKE2B 120e0af71fe9c63548f49bf20fa94ec20f8b0cfb8395b319d6f8e2a62b5212adb229691c35297615a3b0272b215c87e1ff861e1887d227fc9460501900edae48 SHA512 6c5da1591e0bfc0936dca52c48f74b80b57c18bb0398877d38deb7d448df9466a8544628e0ce6948204a8deae4679c8dd454dab9a2f0778a236eaa60387a1751
-DIST beets-1.4.8.tar.gz 1493539 BLAKE2B 63c44f05bbf139cd43b5f5ada972fd30beeea2303c6b479b1be35ea21fabb0039b3c8eb6e90f8f1b2a61fed36d97ce09a32c6346cbd3b84c7c978e796505f4b4 SHA512 449bed88185a5ecb4781719e092c2428ddc52fb8084033db64a4c0eca8899154192e7cea82517993d60326c7fe39b26429584ba368ffc35800f722d8d6a03217
 DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
-EBUILD beets-1.4.8-r1.ebuild 3664 BLAKE2B 094cc8dfbf32cea571e4789db182a60ad07eeb772a47be47d45843eefe70c20e619f7524e98f533d14e899983b534d7b5c7aeeeed4e8aa00a723ec325d4449de SHA512 62f4c4d9619fc07388427830fc3a8248e7b7477c6a18a451b75e4291dd928adf40db39ddf606b2b1a9feeaa5e4728796d184b2e905aadec09ff0946a7961d8c0
-EBUILD beets-1.4.9.ebuild 3614 BLAKE2B ea994ce3c35058ab24813c663b5182650c06e9d5f0f3e875065ba09abdb413031a0a80047b3c9d179887be9db6d765e6ecc868b236aa550ab502b1a39227b9e4 SHA512 8185506e4c7c3b343bd072c169d352c39507fc83dcbffe9e15752a227ce03532c14439dd63e03707e98c3f17201149a1b785fd3512d9ad9aa53b0012197d6230
+EBUILD beets-1.4.9-r1.ebuild 3641 BLAKE2B 602fc8c9eb237bdac3e483e79a8575ae3a8cee21d6ac8b2fb0bde29f9b15c1cf2710bd43d49cd30b158dfba02348ef8d4fc28ace94e915740790f13e30c71701 SHA512 13b5d03db6412d1bd50b6132d76ef380fa7936d798193d33f1fc899a638dafc0a99e651457c6574af2e9ed6043114f7df6f550089bdaa72e7b1d83b3a7f7a0a5
 MISC metadata.xml 2707 BLAKE2B f178a50b9b107e6c5083cc255750416751d0e077f95fc8111b826e458e30d72ce978fe8c8a29056ad076b121fe2690fd636212eb68c758eedb4f380afd29a6d9 SHA512 58ea485657e54c0f1aecbbed49a6c3ce683ef5560f66a02d95c7c89de597a038499b8268771db9fe344dd9baaafe4af750c9402f1725bb791c89dbf4de90d705
diff --git a/media-sound/beets/beets-1.4.8-r1.ebuild b/media-sound/beets/beets-1.4.8-r1.ebuild
deleted file mode 100644
index 4cfc7d72806a..000000000000
--- a/media-sound/beets/beets-1.4.8-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV/_beta/-beta.}
-MY_P=${PN}-${MY_PV}
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="sqlite"
-inherit distutils-r1
-
-DESCRIPTION="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 discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
-
-RDEPEND="
-	>=dev-python/jellyfish-0.7.1[${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] )
-	icu? ( dev-db/sqlite[icu] )
-	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
-
-PATCHES=( "${FILESDIR}/${P}-imagemagick-detection.patch" )
-
-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 icu loadext
-	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/beets-1.4.9.ebuild b/media-sound/beets/beets-1.4.9-r1.ebuild
index e2da8e5f2f7f..f7001b9fd20a 100644
--- a/media-sound/beets/beets-1.4.9.ebuild
+++ b/media-sound/beets/beets-1.4.9-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PV=${PV/_beta/-beta.}
 MY_P=${PN}-${MY_PV}
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 inherit distutils-r1
 
@@ -80,7 +80,9 @@ RESTRICT="test" # tests broken in 1.4.3 already
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
 	rm_use_plugins() {
 		[[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
 		local use=${1}
@@ -101,8 +103,6 @@ src_prepare() {
 		done
 	}
 
-	default
-
 	rm_use_plugins chromaprint chroma
 	rm_use_plugins ffmpeg convert
 	rm_use_plugins icu loadext
diff --git a/media-sound/beets/files/beets-1.4.8-imagemagick-detection.patch b/media-sound/beets/files/beets-1.4.8-imagemagick-detection.patch
deleted file mode 100644
index 1564cd80b1ff..000000000000
--- a/media-sound/beets/files/beets-1.4.8-imagemagick-detection.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 299cb53e44efdbccd2ad623434edcdbd4073547a Mon Sep 17 00:00:00 2001
-From: Filipe Fortes <fortes@users.noreply.github.com>
-Date: Fri, 17 May 2019 15:02:18 -0400
-Subject: [PATCH] Fix ImageMagick Detection
-
-The `return` statement was at the wrong indent level, so we never checked for the legacy `convert` executable
----
- beets/util/artresizer.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/beets/util/artresizer.py b/beets/util/artresizer.py
-index 3590dcf22..1ee3e560d 100644
---- a/beets/util/artresizer.py
-+++ b/beets/util/artresizer.py
-@@ -278,7 +278,7 @@ def get_im_version():
-                                int(match.group(3)))
-                     return version, legacy
- 
--        return None
-+    return None
- 
- 
- def get_pil_version():