summaryrefslogtreecommitdiff
path: root/media-sound/beets
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound/beets')
-rw-r--r--media-sound/beets/Manifest5
-rw-r--r--media-sound/beets/beets-1.4.8.ebuild (renamed from media-sound/beets/beets-1.4.7.ebuild)8
-rw-r--r--media-sound/beets/files/beets-1.4.8-imagemagick-detection.patch23
3 files changed, 32 insertions, 4 deletions
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 8fce5d6ad15f..1d38c5b4909c 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,3 +1,4 @@
-DIST beets-1.4.7.tar.gz 1458621 BLAKE2B f7dd19a7dd92415c29e9b1a7932ba33cb5d43000d35a58b2f42c1487db68c6374dd159960f67e1ac68722693d91d364b24297fb2c0c86a39b82fe5b40a1e739d SHA512 6663a2ffece208a510fce9f5d3dd9c8e617cab60cdb994f7bdb13fd759cfea8882290c75c3cdf4f6de9c7d9b78845b6ed29f98b41c787c89ff8782e4ac3ec152
-EBUILD beets-1.4.7.ebuild 3546 BLAKE2B 58368f23a27a357214b86b767f8317f01dfbd7fe82f8d71a6cf3bef0e1867003ea0ab133c546cd9cb36c2d0f090511abd20c84617f5c3ccdbe50ff0140c6d9e4 SHA512 a592d5cc11ecf49aea157a44bbc574f79be4b887ef06283eba9d520cf4684b94fa3d1e851865c2bb275722095547fe2efa2ce2b9ed3dd40ffb4eec16e729080e
+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
+EBUILD beets-1.4.8.ebuild 3664 BLAKE2B 5614f65a3489bc6ee055f25592811fb693123af75b5da4c78c2519244003f81438e162bf6d861b6f023d6a9829f63ec937feb8f37848e7e6091d6aba90ba04d9 SHA512 49049389dd652571f82da01da5ce2f676e6bd4340d989669c58db436d819e0fe27e2b1c8a202c9ff40978a4fb4465e64291918283b3f86e1db372e249eb5cebe
MISC metadata.xml 2395 BLAKE2B 0df8a5d3fa7b94b5b8e3e45f25e2c4dc0716c438dd51a6061f2276e20bf9779847c34bc571bcdd8948289c75c879cae6ef76fa8432a550855e9f74966fb80374 SHA512 ea2c961e7380a8c05e0e90b34f50323ca932e06ba33d5a214a633e8eba4281577993a870a7d294f286a90c0492256d3142b9e17aa02e2ea129c9c28e24bf90ec
diff --git a/media-sound/beets/beets-1.4.7.ebuild b/media-sound/beets/beets-1.4.8.ebuild
index 580bf88dca80..432eaabd9850 100644
--- a/media-sound/beets/beets-1.4.7.ebuild
+++ b/media-sound/beets/beets-1.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,7 @@ 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"
+IUSE="badfiles chromaprint doc discogs ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
RDEPEND="
dev-python/jellyfish[${PYTHON_USEDEP}]
@@ -41,6 +41,7 @@ RDEPEND="
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}]
@@ -74,6 +75,8 @@ DEPEND="
RESTRICT="test" # tests broken in 1.4.3 already
+PATCHES=( "${FILESDIR}/${P}-imagemagick-detection.patch" )
+
S=${WORKDIR}/${MY_P}
src_prepare() {
@@ -101,6 +104,7 @@ src_prepare() {
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
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
new file mode 100644
index 000000000000..1564cd80b1ff
--- /dev/null
+++ b/media-sound/beets/files/beets-1.4.8-imagemagick-detection.patch
@@ -0,0 +1,23 @@
+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():