[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Michael Palimaka]

commit:     c1f1611b6ba7693f660ef0d6d85ac4276613278f
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 20:17:15 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 20:18:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f1611b

media-sound/beets: remove echonest USE flag

Gentoo-bug: 587976

Package-Manager: portage-2.3.0

 media-sound/beets/beets-1.3.13-r1.ebuild | 91 ++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

diff --git a/media-sound/beets/beets-1.3.13-r1.ebuild b/media-sound/beets/beets-1.3.13-r1.ebuild
new file mode 100644
index 0000000..1480cc5
--- /dev/null
+++ b/media-sound/beets/beets-1.3.13-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.radbox.org/ https://pypi.python.org/pypi/beets"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="MIT"
+IUSE="bpd chroma convert doc discogs flac gstreamer lastgenre mpdstats
+	ogg opus replaygain test web"
+
+RDEPEND=">=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]
+	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/unidecode[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.27[${PYTHON_USEDEP}]
+	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}] )
+	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 ) )
+		!gstreamer? ( || ( media-sound/mp3gain
+			media-sound/aacgain ) ) )
+	web? ( dev-python/flask[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# requires removed package pyechonest, bug #587976
+	rm beetsplug/echonest.py || die
+
+	# remove plugins that do not have appropriate dependencies installed
+	for flag in bpd chroma convert discogs lastgenre mpdstats replaygain 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/
+}

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Michael Palimaka]

commit:     e2b144ff5fdf186e248e630a5f4be391fa8c4f0b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 20:17:46 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 20:18:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2b144ff

media-sound/beets: remove old

Package-Manager: portage-2.3.0

 media-sound/beets/Manifest              |  1 -
 media-sound/beets/beets-1.3.13.ebuild   | 89 ---------------------------------
 media-sound/beets/beets-1.3.3-r1.ebuild | 87 --------------------------------
 media-sound/beets/metadata.xml          |  5 --
 4 files changed, 182 deletions(-)

diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index f7bae6d..5fc04fe 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,2 +1 @@
 DIST beets-1.3.13.tar.gz 1269748 SHA256 6d973c3484079b22b7d281f771a97c03f9bb14bdd94f45b673f9d754875b2c59 SHA512 ffee7e16a115f16c26ab07a75e614746cd5871a7311660d37978deff34245f3aeab97b1a453fc0900442f40e6ac7d102c5adfce910edfec78387fc149fbea261 WHIRLPOOL 79b345612b04965aa6d4b7cc819d7ed1942b5686bf3990612f2c243dc47a2cfc3f15550f97ee30502ce42f4c24cf2ade27e9db6393f40022ffedf6842f4dc05c
-DIST beets-1.3.3.tar.gz 679050 SHA256 028e08b7bab2f9c14063f318e617fa82716410170753d6b2dbe8471a8bb1975e SHA512 0e715b4d042a96c5c521f8acc12c481baad11fb9ff2b825984f6f46a1ed6dea876000fde292851292c4466e9df93ec0439d2c0f57241174014ffbb46225792ab WHIRLPOOL 6999973bb1cafa6c211ef2c709062dc322437574a874e3997319542b65c677525365c94eb9d2fcac403e0c6e59440e8beb3e50558204d216025981418fdf6e3c

diff --git a/media-sound/beets/beets-1.3.13.ebuild b/media-sound/beets/beets-1.3.13.ebuild
deleted file mode 100644
index b8a2a7c..0000000
--- a/media-sound/beets/beets-1.3.13.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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.radbox.org/ https://pypi.python.org/pypi/beets"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="MIT"
-IUSE="bpd chroma convert doc discogs echonest flac gstreamer lastgenre mpdstats
-	ogg opus replaygain test web"
-
-RDEPEND=">=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]
-	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/unidecode[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.27[${PYTHON_USEDEP}]
-	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}] )
-	echonest? ( >=dev-python/pyechonest-8.0.1[${PYTHON_USEDEP}] )
-	mpdstats? ( dev-python/python-mpd[${PYTHON_USEDEP}] )
-	lastgenre? ( 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 ) )
-		!gstreamer? ( || ( media-sound/mp3gain
-			media-sound/aacgain ) ) )
-	web? ( dev-python/flask[${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 echonest lastgenre mpdstats replaygain 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.3.3-r1.ebuild b/media-sound/beets/beets-1.3.3-r1.ebuild
deleted file mode 100644
index 8584bc0..0000000
--- a/media-sound/beets/beets-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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.radbox.org/ https://pypi.python.org/pypi/beets"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="MIT"
-IUSE="beatport bpd chroma convert doc discogs echonest echonest_tempo lastgenre mpdstats replaygain test web"
-
-RDEPEND="
-	dev-python/munkres[${PYTHON_USEDEP}]
-	>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.22[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	beatport? ( dev-python/requests[${PYTHON_USEDEP}] )
-	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 )
-	echonest? ( dev-python/pyechonest[${PYTHON_USEDEP}] )
-	echonest_tempo? ( dev-python/pyechonest[${PYTHON_USEDEP}] )
-	mpdstats? ( dev-python/python-mpd[${PYTHON_USEDEP}] )
-	lastgenre? ( dev-python/pylast[${PYTHON_USEDEP}] )
-	replaygain? ( || ( media-sound/mp3gain media-sound/aacgain ) )
-	web? ( dev-python/flask[${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 beatport bpd chroma convert discogs echonest echonest_tempo lastgenre \
-				mpdstats replaygain 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 -i "s:'beetsplug.$flag',::" 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/metadata.xml b/media-sound/beets/metadata.xml
index e6fed38..b6db1c9 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -27,7 +27,6 @@
     shockingly simple if you know a little Python.
   </longdescription>
   <use>
-    <flag name="beatport">Enable support for beatport.com API</flag>
     <flag name="bpd">
       Enable support for <pkg>media-sound/mpd</pkg> server emulation
     </flag>
@@ -36,10 +35,6 @@
     <flag name="convert">Enable support for the convert plugin which makes it
       possible to transcode files</flag>
     <flag name="discogs">Enable support for the discogs API plugin</flag>
-    <flag name="echonest_tempo">Enable support for writing the BPM of a track
-      into its metadata</flag>
-    <flag name="echonest">Enable support for fetching and storing acoustic
-      attributes of a track from Echo Nest</flag>
     <flag name="lastgenre">Enable support for importing music genres from
       last.fm tags</flag>
     <flag name="mpdstats">Enable support for collecting statistic about

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Robin H. Johnson]

commit:     50ea6e227e5b6340aa926b1060efba4605023a61
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 00:36:02 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 00:36:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ea6e22

media-sound/beets: bump.

Package-Manager: portage-2.3.2

 media-sound/beets/Manifest            |  2 +
 media-sound/beets/beets-1.3.19.ebuild | 91 ++++++++++++++++++++++++++++++++
 media-sound/beets/beets-1.4.3.ebuild  | 97 +++++++++++++++++++++++++++++++++++
 media-sound/beets/metadata.xml        |  5 ++
 4 files changed, 195 insertions(+)

diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 5fc04fe9c0..337f74570f 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1 +1,3 @@
 DIST beets-1.3.13.tar.gz 1269748 SHA256 6d973c3484079b22b7d281f771a97c03f9bb14bdd94f45b673f9d754875b2c59 SHA512 ffee7e16a115f16c26ab07a75e614746cd5871a7311660d37978deff34245f3aeab97b1a453fc0900442f40e6ac7d102c5adfce910edfec78387fc149fbea261 WHIRLPOOL 79b345612b04965aa6d4b7cc819d7ed1942b5686bf3990612f2c243dc47a2cfc3f15550f97ee30502ce42f4c24cf2ade27e9db6393f40022ffedf6842f4dc05c
+DIST beets-1.3.19.tar.gz 1349402 SHA256 6b241e62764a9c4bf9bf570acacc4681d30513f0f2268faa5da494ec066c21ee SHA512 86d2bae8d047a81b7a21f3fc322bb23e383193004de02e8ba0641d564054b58c8828dd112ba437e6fb1d40d9b9521d00b7717c29f33b88b8b559cdbf0ca407ae WHIRLPOOL bb25144deff5234db04b9e18c7e4c0be15a754251671f7a5461731114023fac6b866bb0abe8275a4efa66d3eec0096081dc8ed3c3e029dc0270236c4dcb818c2
+DIST beets-1.4.3.tar.gz 1428494 SHA256 b93fbe11998a29cd432b0a88741b9ced0e5ac50e80362d41e13e867d851ae464 SHA512 b95a9056abae5da3db7786342e8969b4f9c86c2c4589dd48bad244d28ef3d3da4900d3d3eaee1e45964960c62ecaa8d754a33829e0d7f497f01ecc763c0f492d WHIRLPOOL 514aef47d59db4489d0bf48e9ed3a4e8c9a9e1d7dee2a8b1ecf0568bb319511c3bedec012cfa6270e5d5ef50ecc0befd17c908951df2da1875a5c4e088abab2b

diff --git a/media-sound/beets/beets-1.3.19.ebuild b/media-sound/beets/beets-1.3.19.ebuild
new file mode 100644
index 0000000000..3ad0373fb3
--- /dev/null
+++ b/media-sound/beets/beets-1.3.19.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.radbox.org/ https://pypi.python.org/pypi/beets"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="MIT"
+IUSE="badfiles bpd chroma convert doc discogs flac gstreamer lastgenre mpdstats
+	ogg opus replaygain test web"
+
+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}]
+	>=media-libs/mutagen-1.27[${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}] )
+	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 ) )
+		!gstreamer? ( || ( media-sound/mp3gain
+			media-sound/aacgain ) ) )
+	web? ( dev-python/flask[${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 badfiles bpd chroma convert discogs lastgenre mpdstats replaygain 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.3.ebuild b/media-sound/beets/beets-1.4.3.ebuild
new file mode 100644
index 0000000000..7aacc65aab
--- /dev/null
+++ b/media-sound/beets/beets-1.4.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.python.org/pypi/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"
+
+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 ) )
+		!gstreamer? ( || ( media-sound/mp3gain media-sound/aacgain ) )
+		)
+	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/metadata.xml b/media-sound/beets/metadata.xml
index b6db1c9af3..a6f2243141 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -27,6 +27,9 @@
     shockingly simple if you know a little Python.
   </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>
@@ -37,11 +40,13 @@
     <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="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>

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Pacho Ramos]

commit:     fbfcbe19da08a5ecf744b2e3439dffe943029896
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 11:16:01 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 12:40:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbfcbe19

media-sound/beets: Disable mp3gain/aacgain support (#643400)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/beets/{beets-1.4.3.ebuild => beets-1.4.3-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/beets/beets-1.4.3.ebuild b/media-sound/beets/beets-1.4.3-r1.ebuild
similarity index 96%
rename from media-sound/beets/beets-1.4.3.ebuild
rename to media-sound/beets/beets-1.4.3-r1.ebuild
index 80bae16a2ef..80af3567acb 100644
--- a/media-sound/beets/beets-1.4.3.ebuild
+++ b/media-sound/beets/beets-1.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,6 +17,7 @@ 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}]
@@ -44,7 +45,6 @@ RDEPEND=">=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]
 			ogg? ( media-plugins/gst-plugins-ogg )
 			flac? ( media-plugins/gst-plugins-flac:1.0 )
 			opus? ( media-plugins/gst-plugins-opus:1.0 ) )
-		!gstreamer? ( || ( media-sound/mp3gain media-sound/aacgain ) )
 		)
 	thumbnails? (
 		dev-python/pyxdg[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Pacho Ramos]

commit:     85e647a70aff32e1ec536a78555cda705e937802
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 11:16:41 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 12:40:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85e647a7

media-sound/beets: Drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/beets/Manifest               |  2 -
 media-sound/beets/beets-1.3.13-r1.ebuild | 90 --------------------------------
 media-sound/beets/beets-1.3.19.ebuild    | 90 --------------------------------
 3 files changed, 182 deletions(-)

diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 158a6e2fd40..f620929dd77 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,3 +1 @@
-DIST beets-1.3.13.tar.gz 1269748 BLAKE2B 1e22618ad38342abcb6b5061e7191d0798aa15d885c2cc1831e9953e814decc68843a8275e931dc73bf2607298665e9aae56fe942f15342f78bf66155c5c5ff7 SHA512 ffee7e16a115f16c26ab07a75e614746cd5871a7311660d37978deff34245f3aeab97b1a453fc0900442f40e6ac7d102c5adfce910edfec78387fc149fbea261
-DIST beets-1.3.19.tar.gz 1349402 BLAKE2B c153ec5328b4171841b09168930c224f10b0e8a2285bb90c853baa76fab549aa427eea27968a0f97b32273e540d0e9ac8aa74bcad09d7b9ad700b8da18686104 SHA512 86d2bae8d047a81b7a21f3fc322bb23e383193004de02e8ba0641d564054b58c8828dd112ba437e6fb1d40d9b9521d00b7717c29f33b88b8b559cdbf0ca407ae
 DIST beets-1.4.3.tar.gz 1428494 BLAKE2B 29adc617c4efbb304b05c6bc027a09fd34c11af70b22a86a329fe9048de31828f729114db929e97b103a6f6d8210c0b74716f327f8b4f853f745433fea5f1e14 SHA512 b95a9056abae5da3db7786342e8969b4f9c86c2c4589dd48bad244d28ef3d3da4900d3d3eaee1e45964960c62ecaa8d754a33829e0d7f497f01ecc763c0f492d

diff --git a/media-sound/beets/beets-1.3.13-r1.ebuild b/media-sound/beets/beets-1.3.13-r1.ebuild
deleted file mode 100644
index 2382db78d40..00000000000
--- a/media-sound/beets/beets-1.3.13-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2016 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.radbox.org/ https://pypi.python.org/pypi/beets"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="MIT"
-IUSE="bpd chroma convert doc discogs flac gstreamer lastgenre mpdstats
-	ogg opus replaygain test web"
-
-RDEPEND=">=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]
-	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/unidecode[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.27[${PYTHON_USEDEP}]
-	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}] )
-	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 ) )
-		!gstreamer? ( || ( media-sound/mp3gain
-			media-sound/aacgain ) ) )
-	web? ( dev-python/flask[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# requires removed package pyechonest, bug #587976
-	rm beetsplug/echonest.py || die
-
-	# remove plugins that do not have appropriate dependencies installed
-	for flag in bpd chroma convert discogs lastgenre mpdstats replaygain 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.3.19.ebuild b/media-sound/beets/beets-1.3.19.ebuild
deleted file mode 100644
index 97f53817e3b..00000000000
--- a/media-sound/beets/beets-1.3.19.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 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.radbox.org/ https://pypi.python.org/pypi/beets"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="MIT"
-IUSE="badfiles bpd chroma convert doc discogs flac gstreamer lastgenre mpdstats
-	ogg opus replaygain test web"
-
-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}]
-	>=media-libs/mutagen-1.27[${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}] )
-	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 ) )
-		!gstreamer? ( || ( media-sound/mp3gain
-			media-sound/aacgain ) ) )
-	web? ( dev-python/flask[${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 badfiles bpd chroma convert discogs lastgenre mpdstats replaygain 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/
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Andreas Sturmlechner]

commit:     9d8706f11b83454bf7c9ed4c27c8707c77446513
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  5 21:04:23 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep  5 21:06:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d8706f1

media-sound/beets: +replaygain,+gstreamer needs gst-plugins-meta[ffmpeg]

Reported-by: <apaterson <AT> protonmail.com>
Closes: https://bugs.gentoo.org/663398
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-sound/beets/beets-1.4.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/beets/beets-1.4.7.ebuild b/media-sound/beets/beets-1.4.7.ebuild
index b0ea1935a00..580bf88dca8 100644
--- a/media-sound/beets/beets-1.4.7.ebuild
+++ b/media-sound/beets/beets-1.4.7.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
 		gstreamer? (
 			dev-python/pygobject:3[${PYTHON_USEDEP}]
 			media-libs/gst-plugins-good:1.0
-			media-plugins/gst-plugins-meta:1.0
+			media-plugins/gst-plugins-meta:1.0[ffmpeg]
 		)
 		!gstreamer? ( media-sound/mp3gain )
 	)

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Andreas Sturmlechner]

commit:     338e033483efc12d7bbe7e78a01e6262942b8a57
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  5 20:56:36 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep  5 21:06:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=338e0334

media-sound/beets: Drop old

Closes: https://bugs.gentoo.org/625974
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-sound/beets/Manifest              |  1 -
 media-sound/beets/beets-1.4.3-r1.ebuild | 96 ---------------------------------
 media-sound/beets/metadata.xml          |  9 ----
 3 files changed, 106 deletions(-)

diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 6f517f7471e..e6047ad865d 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,2 +1 @@
-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.3-r1.ebuild b/media-sound/beets/beets-1.4.3-r1.ebuild
deleted file mode 100644
index 20b305abb9c..00000000000
--- 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/metadata.xml b/media-sound/beets/metadata.xml
index c57948828ca..a30fde9062e 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -28,22 +28,13 @@
 	</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="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>

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Andreas Sturmlechner]

commit:     4a879481536068780fda845e214f5f6f28128860
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  5 20:43:42 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep  5 21:06:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a879481

media-sound/beets: Remove USE flac,ogg,opus; fix USE gstreamer

They were effectively only used if USE +replaygain +gstreamer were enabled,
not ticking any build switches but purely forwarding USE dependencies.
Depend on media-plugins/gst-plugins-meta instead.

gstreamer is also being used if USE +mpd.

Reviewed-by: Mart Raudsepp <leio <AT> gentoo.org>

Quote:
replaygain uses decodebin, thus should depend on
media-plugins/gst-plugins-meta:1.0 to pull in any decided by user decoders.
It uses rganalysis explicitly, for which it needs to depend on
media-libs/gst-plugins-good:1.0. Other explicitly used elements are all
from core or base, thus the gst-plugins-meta dep will cover it, or you can
be explicit (core = media-libs/gstreamer).

Additionally there is beetsplug/bpd/gstplayer.py that uses playbin. I don't
know what that thing is about, but it seems irrelevant to replaygain, so
might want a gstreamer? ( media-plugins/gst-plugins-meta:1.0 ) independent
of USE=replaygain, if it's optional enough to work fine without it
installed without losing anything important.

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-sound/beets/beets-1.4.7.ebuild | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/media-sound/beets/beets-1.4.7.ebuild b/media-sound/beets/beets-1.4.7.ebuild
index 7a21e504abd..b0ea1935a00 100644
--- a/media-sound/beets/beets-1.4.7.ebuild
+++ b/media-sound/beets/beets-1.4.7.ebuild
@@ -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 flac gstreamer lastfm mpd ogg opus replaygain test thumbnail webserver"
+IUSE="badfiles chromaprint doc discogs ffmpeg gstreamer lastfm mpd replaygain test thumbnail webserver"
 
 RDEPEND="
 	dev-python/jellyfish[${PYTHON_USEDEP}]
@@ -45,15 +45,13 @@ RDEPEND="
 	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/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 )
+			media-plugins/gst-plugins-meta:1.0
 		)
 		!gstreamer? ( media-sound/mp3gain )
 	)

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Andreas Sturmlechner]

commit:     9923e14b1646b58c044afae815684290744fa1f3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 22 14:11:05 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep  5 21:06:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9923e14b

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

 media-sound/beets/Manifest           |   1 +
 media-sound/beets/beets-1.4.7.ebuild | 139 +++++++++++++++++++++++++++++++++++
 media-sound/beets/metadata.xml       |   6 ++
 3 files changed, 146 insertions(+)

diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index f620929dd77..6f517f7471e 100644
--- 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
index 00000000000..7a21e504abd
--- /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 46b548c1ee8..c57948828ca 100644
--- 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>

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Andreas Sturmlechner]

commit:     0217f3cbcb93b8d24f0aaa74e5dff5d95cdc5317
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 15:28:04 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 19 16:55:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0217f3cb

media-sound/beets: Drop 1.4.7

Bug: https://bugs.gentoo.org/683814
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/beets/Manifest           |   1 -
 media-sound/beets/beets-1.4.7.ebuild | 137 -----------------------------------
 2 files changed, 138 deletions(-)

diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 0d2b246872b..a75afe9cac4 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,2 +1 @@
-DIST beets-1.4.7.tar.gz 1458621 BLAKE2B f7dd19a7dd92415c29e9b1a7932ba33cb5d43000d35a58b2f42c1487db68c6374dd159960f67e1ac68722693d91d364b24297fb2c0c86a39b82fe5b40a1e739d SHA512 6663a2ffece208a510fce9f5d3dd9c8e617cab60cdb994f7bdb13fd759cfea8882290c75c3cdf4f6de9c7d9b78845b6ed29f98b41c787c89ff8782e4ac3ec152
 DIST beets-1.4.8.tar.gz 1493539 BLAKE2B 63c44f05bbf139cd43b5f5ada972fd30beeea2303c6b479b1be35ea21fabb0039b3c8eb6e90f8f1b2a61fed36d97ce09a32c6346cbd3b84c7c978e796505f4b4 SHA512 449bed88185a5ecb4781719e092c2428ddc52fb8084033db64a4c0eca8899154192e7cea82517993d60326c7fe39b26429584ba368ffc35800f722d8d6a03217

diff --git a/media-sound/beets/beets-1.4.7.ebuild b/media-sound/beets/beets-1.4.7.ebuild
deleted file mode 100644
index 580bf88dca8..00000000000
--- a/media-sound/beets/beets-1.4.7.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Andreas Sturmlechner]

commit:     a5c9a3d5d0ec26b29eb77c12bbe7b8d2c9e720e7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 12:59:22 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  1 14:26:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5c9a3d5

media-sound/beets: Fix minimum dev-python/jellyfish dep

Closes: https://bugs.gentoo.org/686806
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../beets/{beets-1.4.8.ebuild => beets-1.4.8-r1.ebuild}    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/media-sound/beets/beets-1.4.8.ebuild b/media-sound/beets/beets-1.4.8-r1.ebuild
similarity index 93%
rename from media-sound/beets/beets-1.4.8.ebuild
rename to media-sound/beets/beets-1.4.8-r1.ebuild
index 432eaabd985..4cfc7d72806 100644
--- a/media-sound/beets/beets-1.4.8.ebuild
+++ b/media-sound/beets/beets-1.4.8-r1.ebuild
@@ -3,24 +3,24 @@
 
 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"
+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 doc discogs ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
+IUSE="badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
 
 RDEPEND="
-	dev-python/jellyfish[${PYTHON_USEDEP}]
+	>=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}]

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Joonas Niilola]

commit:     10e4e3f38bf769075720a46272e0c553ca6d99aa
Author:     Bernardo Meurer <bernardo <AT> standard <DOT> ai>
AuthorDate: Thu Aug 29 19:52:40 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 11:45:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10e4e3f3

media-sound/beets: add myself as maintainer

Approved-by: mgorny
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Bernardo Meurer <bernardo <AT> standard.ai>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-sound/beets/metadata.xml | 79 ++++++++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 37 deletions(-)

diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index a30fde9062e..c94e37c4b59 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -1,43 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-	</maintainer>
-	<longdescription lang="en">
-		The purpose of beets is to get your music collection right once and for
-		all. It catalogs your collection, automatically improving its metadata as
-		it goes using the MusicBrainz database. (It also downloads cover art for
-		albums it imports.) Then it provides a bouquet of tools for manipulating
-		and accessing your music.
+  <maintainer type="person">
+    <email>bernardo@standard.ai</email>
+    <name>Bernardo Meurer</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Gentoo Proxy Maintainers Project</name>
+  </maintainer>
+  <longdescription lang="en">
+        The purpose of beets is to get your music collection right once and for
+        all. It catalogs your collection, automatically improving its metadata as
+        it goes using the MusicBrainz database. (It also downloads cover art for
+        albums it imports.) Then it provides a bouquet of tools for manipulating
+        and accessing your music.
 
-		Because beets is designed as a library, it can do almost anything you can
-		imagine for your music collection. Via plugins, beets becomes a panacea:
-		* Embed and extract album art from files’ tags.
-		* Listen to your library with a music player that speaks the MPD protocol
-		and works with a staggering variety of interfaces.
-		* Fetch lyrics for all your songs from databases on the Web.
-		* Manage your MusicBrainz music collection.
-		* Analyze music files’ metadata from the command line.
-		* Clean up crufty tags left behind by other, less-awesome tools.
-		* Browse your music library graphically through a Web browser and play it
-		in any browser that supports HTML5 Audio.
+        Because beets is designed as a library, it can do almost anything you can
+        imagine for your music collection. Via plugins, beets becomes a panacea:
+        * Embed and extract album art from files’ tags.
+        * Listen to your library with a music player that speaks the MPD protocol
+        and works with a staggering variety of interfaces.
+        * Fetch lyrics for all your songs from databases on the Web.
+        * Manage your MusicBrainz music collection.
+        * Analyze music files’ metadata from the command line.
+        * Clean up crufty tags left behind by other, less-awesome tools.
+        * Browse your music library graphically through a Web browser and play it
+        in any browser that supports HTML5 Audio.
 
-		If beets doesn’t do what you want yet, writing your own plugin is
-		shockingly simple if you know a little Python.
-	</longdescription>
-	<use>
-		<flag name="badfiles">Validate MP3 &amp; FLAC 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="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="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>
-	</upstream>
+        If beets doesn’t do what you want yet, writing your own plugin is
+        shockingly simple if you know a little Python.
+  </longdescription>
+  <use>
+    <flag name="badfiles">Validate MP3 &amp; FLAC 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="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="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>
+  </upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Joonas Niilola]

commit:     aa1f3c48ab47e76595f59cbdc73d79a2e48e2bf8
Author:     Bernardo Meurer <meurerbernardo <AT> gmail <DOT> com>
AuthorDate: Tue Jul 30 21:30:30 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 11:45:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa1f3c48

media-sound/beets: bump to 1.4.9

Closes: https://bugs.gentoo.org/689182
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Bernardo Meurer <bernardo <AT> standard.ai>
Closes: https://github.com/gentoo/gentoo/pull/12582
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-sound/beets/Manifest           |   1 +
 media-sound/beets/beets-1.4.9.ebuild | 142 +++++++++++++++++++++++++++++++++++
 2 files changed, 143 insertions(+)

diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index a75afe9cac4..98aff304f12 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1 +1,2 @@
 DIST beets-1.4.8.tar.gz 1493539 BLAKE2B 63c44f05bbf139cd43b5f5ada972fd30beeea2303c6b479b1be35ea21fabb0039b3c8eb6e90f8f1b2a61fed36d97ce09a32c6346cbd3b84c7c978e796505f4b4 SHA512 449bed88185a5ecb4781719e092c2428ddc52fb8084033db64a4c0eca8899154192e7cea82517993d60326c7fe39b26429584ba368ffc35800f722d8d6a03217
+DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a

diff --git a/media-sound/beets/beets-1.4.9.ebuild b/media-sound/beets/beets-1.4.9.ebuild
new file mode 100644
index 00000000000..e2da8e5f2f7
--- /dev/null
+++ b/media-sound/beets/beets-1.4.9.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	>=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}] )
+	ffmpeg? ( media-video/ffmpeg:0[encode] )
+	gstreamer? (
+		media-libs/gst-plugins-good:1.0
+		media-libs/gst-plugins-bad:1.0
+	)
+	icu? ( dev-db/sqlite[icu] )
+	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-plugins/gst-plugins-libav: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}]
+	)
+"
+RDEPEND="${DEPEND}"
+
+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 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 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
+	"${EPYTHON}" 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
+}

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Michał Górny]

commit:     c4ec5e6e389bce8955ecc1dad60cd3d64117209b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 16 18:44:54 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 18:44:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4ec5e6e

media-sound/beets: Remove py2 virtuals

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-sound/beets/beets-1.4.9-r1.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/media-sound/beets/beets-1.4.9-r1.ebuild b/media-sound/beets/beets-1.4.9-r1.ebuild
index f7001b9fd20..c8b7ae1874f 100644
--- a/media-sound/beets/beets-1.4.9-r1.ebuild
+++ b/media-sound/beets/beets-1.4.9-r1.ebuild
@@ -33,7 +33,6 @@ DEPEND="
 	>=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
@@ -63,7 +62,6 @@ DEPEND="
 	)
 	thumbnail? (
 		dev-python/pyxdg[${PYTHON_USEDEP}]
-		virtual/python-pathlib[${PYTHON_USEDEP}]
 		|| (
 			dev-python/pillow[${PYTHON_USEDEP}]
 			media-gfx/imagemagick

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Joonas Niilola]

commit:     c0ead648b4774b4edb6becf3b874caa4ea124464
Author:     Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Sat Apr 25 20:41:57 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 12:28:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ead648

media-sound/beets: Add 9999 ebuild

Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15519
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-sound/beets/beets-9999.ebuild | 176 ++++++++++++++++++++++++++++++++++++
 1 file changed, 176 insertions(+)

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
new file mode 100644
index 00000000000..d3bc4cc7ad1
--- /dev/null
+++ b/media-sound/beets/beets-9999.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 bash-completion-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
+	inherit git-r3
+	KEYWORDS="~amd64 ~x86"
+else
+	MY_PV=${PV/_beta/-beta.}
+	MY_P=${PN}-${MY_PV}
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
+HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
+
+RDEPEND="${DEPEND}"
+DEPEND="
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
+			dev-python/flask[${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
+			dev-python/responses[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
+		)
+		>=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/munkres[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
+		dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
+		>=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/confuse-1.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/mediafile-0.2.0[${PYTHON_MULTI_USEDEP}]
+		badfiles? (
+			media-libs/flac
+			media-sound/mp3val
+		)
+		chromaprint? (
+			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
+			media-libs/chromaprint[tools]
+		)
+		discogs? ( dev-python/discogs-client[${PYTHON_MULTI_USEDEP}] )
+		ffmpeg? ( media-video/ffmpeg:0[encode] )
+		gstreamer? (
+			media-libs/gst-plugins-good:1.0
+			media-libs/gst-plugins-bad:1.0
+		)
+		icu? ( dev-db/sqlite[icu] )
+		lastfm? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] )
+		mpd? (
+			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
+			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
+		)
+		replaygain? (
+			gstreamer? (
+				dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+				media-plugins/gst-plugins-libav:1.0
+			)
+			!gstreamer? ( media-sound/mp3gain )
+		)
+		thumbnail? (
+			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+				media-gfx/imagemagick
+			)
+		)
+		webserver? (
+			dev-python/flask[${PYTHON_MULTI_USEDEP}]
+			dev-python/flask-cors[${PYTHON_MULTI_USEDEP}]
+		)
+	')"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+	')"
+
+DOCS=( README.rst docs/changelog.rst )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	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
+	}
+
+	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 test/test_player.py || die
+		rm test/test_mpdstats.py || die
+	fi
+	if ! use webserver; then
+		rm test/test_web.py || die "Failed to remove test_web.py"
+	fi
+	if use test; then
+		# Those test need network
+		rm test/test_art.py || die
+		rm test/test_discogs.py || die
+		rm test/test_embyupdate.py || die
+		rm test/test_lastgenre.py || die
+		rm test/test_spotify.py || die
+		# rm test/test_plexupdate.py
+		rm test/test_thumbnails.py || die
+		# Not working
+		rm test/test_replaygain.py || die
+		# Not working
+		rm test/test_convert.py || die
+	fi
+}
+
+python_compile_all() {
+	esetup.py build_sphinx -b man --build-dir=docs/build
+	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/build/man/*
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	einstalldocs
+
+	"${D}$(python_get_scriptdir)/beet" completion > "${T}/beet.bashcomp"
+	newbashcomp "${T}/beet.bashcomp" beet
+}

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Joonas Niilola]

commit:     93f6a0560d901aedba2b0eb752ab2fcd5f50c93b
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  1 12:26:15 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 12:28:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93f6a056

media-sound/beets: DISTUTILS_USE_SETUPTOOLS=rdepend & sphinx

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-sound/beets/{beets-1.4.9-r1.ebuild => beets-1.4.9-r2.ebuild} | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/media-sound/beets/beets-1.4.9-r1.ebuild b/media-sound/beets/beets-1.4.9-r2.ebuild
similarity index 98%
rename from media-sound/beets/beets-1.4.9-r1.ebuild
rename to media-sound/beets/beets-1.4.9-r2.ebuild
index 8925b67b676..ccf3108564d 100644
--- a/media-sound/beets/beets-1.4.9-r1.ebuild
+++ b/media-sound/beets/beets-1.4.9-r2.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 bash-completion-r1
 
@@ -88,10 +89,7 @@ DEPEND="
 			dev-python/flask-cors[${PYTHON_MULTI_USEDEP}]
 		)
 	')"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-	')"
+BDEPEND="dev-python/sphinx"
 
 DOCS=( README.rst docs/changelog.rst )
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Joonas Niilola]

commit:     3b599ad6587752063fd42e3b9c7fed33771d494e
Author:     Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Sat Apr 25 17:31:10 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 12:28:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b599ad6

media-sound/beets: cleanup ebuild

Closes: https://bugs.gentoo.org/718398
Bug: https://bugs.gentoo.org/702914
Bug: https://bugs.gentoo.org/693164
Closes: https://bugs.gentoo.org/584276

Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-sound/beets/beets-1.4.9-r1.ebuild | 179 +++++++++++++++++++-------------
 1 file changed, 107 insertions(+), 72 deletions(-)

diff --git a/media-sound/beets/beets-1.4.9-r1.ebuild b/media-sound/beets/beets-1.4.9-r1.ebuild
index c8b7ae1874f..8925b67b676 100644
--- a/media-sound/beets/beets-1.4.9-r1.ebuild
+++ b/media-sound/beets/beets-1.4.9-r1.ebuild
@@ -1,82 +1,101 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-MY_PV=${PV/_beta/-beta.}
-MY_P=${PN}-${MY_PV}
-
-PYTHON_COMPAT=( python3_6 )
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 PYTHON_REQ_USE="sqlite"
-inherit distutils-r1
+
+inherit distutils-r1 bash-completion-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
+	inherit git-r3
+	KEYWORDS="~amd64 ~x86"
+else
+	MY_PV=${PV/_beta/-beta.}
+	MY_P=${PN}-${MY_PV}
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
 
 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"
+SLOT="0"
 IUSE="badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
 
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
+RDEPEND="${DEPEND}"
 DEPEND="
-	>=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}]
-	badfiles? (
-		media-libs/flac
-		media-sound/mp3val
-	)
-	chromaprint? (
-		dev-python/pyacoustid[${PYTHON_USEDEP}]
-		media-libs/chromaprint[tools]
-	)
-	discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
-	ffmpeg? ( media-video/ffmpeg:0[encode] )
-	gstreamer? (
-		media-libs/gst-plugins-good:1.0
-		media-libs/gst-plugins-bad:1.0
-	)
-	icu? ( dev-db/sqlite[icu] )
-	lastfm? ( dev-python/pylast[${PYTHON_USEDEP}] )
-	mpd? (
-		dev-python/bluelet[${PYTHON_USEDEP}]
-		dev-python/python-mpd[${PYTHON_USEDEP}]
-	)
-	replaygain? (
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
+			dev-python/flask[${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
+			dev-python/responses[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		)
+		>=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/munkres[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
+		dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
+		>=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
+		badfiles? (
+			media-libs/flac
+			media-sound/mp3val
+		)
+		chromaprint? (
+			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
+			media-libs/chromaprint[tools]
+		)
+		discogs? ( dev-python/discogs-client[${PYTHON_MULTI_USEDEP}] )
+		ffmpeg? ( media-video/ffmpeg:0[encode] )
 		gstreamer? (
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			media-plugins/gst-plugins-libav:1.0
+			media-libs/gst-plugins-good:1.0
+			media-libs/gst-plugins-bad:1.0
 		)
-		!gstreamer? ( media-sound/mp3gain )
-	)
-	thumbnail? (
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		|| (
-			dev-python/pillow[${PYTHON_USEDEP}]
-			media-gfx/imagemagick
+		icu? ( dev-db/sqlite[icu] )
+		lastfm? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] )
+		mpd? (
+			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
+			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
 		)
-	)
-	webserver? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/flask-cors[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${DEPEND}"
+		replaygain? (
+			gstreamer? (
+				dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+				media-plugins/gst-plugins-libav:1.0
+			)
+			!gstreamer? ( media-sound/mp3gain )
+		)
+		thumbnail? (
+			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+				media-gfx/imagemagick
+			)
+		)
+		webserver? (
+			dev-python/flask[${PYTHON_MULTI_USEDEP}]
+			dev-python/flask-cors[${PYTHON_MULTI_USEDEP}]
+		)
+	')"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+	')"
 
-RESTRICT="test" # tests broken in 1.4.3 already
+DOCS=( README.rst docs/changelog.rst )
 
-S="${WORKDIR}/${MY_P}"
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	distutils-r1_python_prepare_all
@@ -116,25 +135,41 @@ python_prepare_all() {
 
 	if ! use mpd; then
 		rm test/test_player.py || die
+		rm test/test_mpdstats.py || die
+	fi
+	if ! use webserver; then
+		rm test/test_web.py || die "Failed to remove test_web.py"
+	fi
+	if use test; then
+		# Those test need network
+		rm test/test_art.py || die
+		rm test/test_discogs.py || die
+		rm test/test_embyupdate.py || die
+		rm test/test_lastgenre.py || die
+		rm test/test_spotify.py || die
+		# rm test/test_plexupdate.py
+		rm test/test_thumbnails.py || die
+		# Not working
+		rm test/test_replaygain.py || die
+		# Not working
+		rm test/test_convert.py || die
+		# Not working and dropped in master
+		rm test/test_mediafile.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
-	"${EPYTHON}" testall.py || die "Testsuite failed"
+	esetup.py build_sphinx -b man --build-dir=docs/build
+	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
 
-	doman man/beet.1 man/beetsconfig.5
-	use doc && local HTML_DOCS=( docs/_build/html/. )
+	doman docs/build/man/*
+	use doc && local HTML_DOCS=( docs/build/html/. )
 	einstalldocs
+
+	"${D}$(python_get_scriptdir)/beet" completion > "${T}/beet.bashcomp"
+	newbashcomp "${T}/beet.bashcomp" beet
 }

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Joonas Niilola]

commit:     67e1ddcb958f6c342a4945780f4743fd54517c3f
Author:     Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Tue Apr 21 13:17:29 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 12:28:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67e1ddcb

media-sound/beets: Add myself and proxy-maint

Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-sound/beets/metadata.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index 00d7ac2d135..54468263575 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>guillaumeseren@gmail.com</email>
+    <name>Guillaume Seren</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
         The purpose of beets is to get your music collection right once and for
         all. It catalogs your collection, automatically improving its metadata as

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Joonas Niilola]

commit:     4589ad5b03e4c90492024f1a1dfc1b491b38308b
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  1 12:52:25 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 13:07:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4589ad5b

media-sound/beets: remove KEYWORDS from -9999

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-sound/beets/beets-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index d3bc4cc7ad1..70b21d390ef 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -12,7 +12,6 @@ inherit distutils-r1 bash-completion-r1
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
 	inherit git-r3
-	KEYWORDS="~amd64 ~x86"
 else
 	MY_PV=${PV/_beta/-beta.}
 	MY_P=${PN}-${MY_PV}

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Joonas Niilola]

commit:     334a2445efd0b6a174a590a14ae040fa4e0bee84
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  1 13:06:56 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 13:07:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=334a2445

media-sound/beets: remove python2_7 support, doesn't seem to work

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-sound/beets/beets-1.4.9-r2.ebuild | 2 +-
 media-sound/beets/beets-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/beets/beets-1.4.9-r2.ebuild b/media-sound/beets/beets-1.4.9-r2.ebuild
index ccf3108564d..438c4eac98d 100644
--- a/media-sound/beets/beets-1.4.9-r2.ebuild
+++ b/media-sound/beets/beets-1.4.9-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 70b21d390ef..01d7ec3b1be 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1 bash-completion-r1

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Joonas Niilola]

commit:     3f8dd2a62cec7e0f274da786a4bfabdc6bdeda17
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  1 13:09:59 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 13:09:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f8dd2a6

media-sound/beets: sync 1.4.9 ebuild with -9999

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-sound/beets/beets-1.4.9-r2.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-sound/beets/beets-1.4.9-r2.ebuild b/media-sound/beets/beets-1.4.9-r2.ebuild
index 438c4eac98d..6fa58e40129 100644
--- a/media-sound/beets/beets-1.4.9-r2.ebuild
+++ b/media-sound/beets/beets-1.4.9-r2.ebuild
@@ -13,7 +13,6 @@ inherit distutils-r1 bash-completion-r1
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
 	inherit git-r3
-	KEYWORDS="~amd64 ~x86"
 else
 	MY_PV=${PV/_beta/-beta.}
 	MY_P=${PN}-${MY_PV}

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Joonas Niilola]

commit:     e5548eb37c36e798c008665d6ca82c215e04c4ca
Author:     Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Tue Sep 29 16:15:40 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 12:27:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5548eb3

media-sound/beets: Cleanup live-ebuild

Closes: https://bugs.gentoo.org/693164
Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-sound/beets/beets-9999.ebuild | 140 ++++++++++++++++--------------------
 1 file changed, 63 insertions(+), 77 deletions(-)

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 01d7ec3b1be..fe7c12adf3a 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,6 +6,7 @@ EAPI=7
 DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 bash-completion-r1
 
@@ -21,36 +22,23 @@ else
 fi
 
 DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
-HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
+HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
+IUSE="badfiles chromaprint cors discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
 
-RDEPEND="${DEPEND}"
-DEPEND="
+RDEPEND="
 	$(python_gen_cond_dep '
-		test? (
-			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
-			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
-			dev-python/flask[${PYTHON_MULTI_USEDEP}]
-			dev-python/mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
-			dev-python/responses[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
-		)
 		>=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
 		dev-python/munkres[${PYTHON_MULTI_USEDEP}]
+		>=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
 		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
 		dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
 		dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
-		>=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/confuse-1.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/mediafile-0.2.0[${PYTHON_MULTI_USEDEP}]
 		badfiles? (
 			media-libs/flac
 			media-sound/mp3val
@@ -59,14 +47,22 @@ DEPEND="
 			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
 			media-libs/chromaprint[tools]
 		)
-		discogs? ( dev-python/discogs-client[${PYTHON_MULTI_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg:0[encode] )
+		discogs? (
+			dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
+		)
+		ffmpeg? (
+			media-video/ffmpeg:0[encode]
+		)
 		gstreamer? (
-			media-libs/gst-plugins-good:1.0
 			media-libs/gst-plugins-bad:1.0
+			media-libs/gst-plugins-good:1.0
+		)
+		icu? (
+			dev-db/sqlite[icu]
+		)
+		lastfm? (
+			dev-python/pylast[${PYTHON_MULTI_USEDEP}]
 		)
-		icu? ( dev-db/sqlite[icu] )
-		lastfm? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] )
 		mpd? (
 			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
 			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
@@ -87,14 +83,33 @@ DEPEND="
 		)
 		webserver? (
 			dev-python/flask[${PYTHON_MULTI_USEDEP}]
-			dev-python/flask-cors[${PYTHON_MULTI_USEDEP}]
+			cors? (
+				dev-python/flask-cors[${PYTHON_MULTI_USEDEP}]
+			)
 		)
 	')"
+DEPEND="
+	${RDEPEND}
+"
 BDEPEND="
+	dev-python/sphinx
 	$(python_gen_cond_dep '
-		dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		test? (
+			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
+			dev-python/flask[${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
+			dev-python/responses[${PYTHON_MULTI_USEDEP}]
+			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+		)
 	')"
 
+PATCHES=(
+	"${FILESDIR}/${PV}-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch"
+	"${FILESDIR}/${PV}-0002-Disable-test_completion.patch"
+)
+
 DOCS=( README.rst docs/changelog.rst )
 
 distutils_enable_tests pytest
@@ -102,60 +117,29 @@ distutils_enable_tests pytest
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
-	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
-	}
-
-	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
-
+	rm test/test_art.py || die "Failed to remove test_art.py"
+	rm test/test_discogs.py || die "Failed to remove test_discogs.py"
+	rm test/test_embyupdate.py || die "Failed to remove test_embyupdate.py"
+	rm test/test_lastgenre.py || die "Failed to remove test_lastgenre.py"
+	rm test/test_spotify.py || die "Failed to remove test_spotify.py"
+	# Not working and dropped in master
+	rm test/test_mediafile.py || die "Failed to remove test_mediafile.py"
+	if ! use ffmpeg; then
+		rm test/test_convert.py || die "Failed to remove test_convert.py"
+	fi
 	if ! use mpd; then
-		rm test/test_player.py || die
-		rm test/test_mpdstats.py || die
+		rm test/test_player.py || die "Failed to remove test_player.py"
+		rm test/test_mpdstats.py || die "Failed to remove test_mpdstats.py"
+	fi
+	if ! use replaygain; then
+		rm test/test_replaygain.py || die "Failed to remove test_replaygain.py"
+	fi
+	if ! use thumbnail; then
+		rm test/test_thumbnails.py || die "Failed to remove test_thumbnails.py"
 	fi
 	if ! use webserver; then
 		rm test/test_web.py || die "Failed to remove test_web.py"
 	fi
-	if use test; then
-		# Those test need network
-		rm test/test_art.py || die
-		rm test/test_discogs.py || die
-		rm test/test_embyupdate.py || die
-		rm test/test_lastgenre.py || die
-		rm test/test_spotify.py || die
-		# rm test/test_plexupdate.py
-		rm test/test_thumbnails.py || die
-		# Not working
-		rm test/test_replaygain.py || die
-		# Not working
-		rm test/test_convert.py || die
-	fi
 }
 
 python_compile_all() {
@@ -170,6 +154,8 @@ python_install_all() {
 	use doc && local HTML_DOCS=( docs/build/html/. )
 	einstalldocs
 
-	"${D}$(python_get_scriptdir)/beet" completion > "${T}/beet.bashcomp"
-	newbashcomp "${T}/beet.bashcomp" beet
+	${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
+	newbashcomp "${T}/beet.bash" beet
+	insinto /usr/share/zsh/site-functions
+	newins "${WORKDIR}/${P}/extra/_beet" _beet
 }

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Joonas Niilola]

commit:     5369b341888433a3444dfe6bbe6d2b8dabf00d0b
Author:     Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Mon Jun  1 23:30:50 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 12:27:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5369b341

media-sound/beets: Drop old ebuild

Closes: https://bugs.gentoo.org/693164
Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-sound/beets/beets-1.4.9-r2.ebuild | 172 --------------------------------
 1 file changed, 172 deletions(-)

diff --git a/media-sound/beets/beets-1.4.9-r2.ebuild b/media-sound/beets/beets-1.4.9-r2.ebuild
deleted file mode 100644
index 6fa58e40129..00000000000
--- a/media-sound/beets/beets-1.4.9-r2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 bash-completion-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_beta/-beta.}
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
-HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
-
-RDEPEND="${DEPEND}"
-DEPEND="
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
-			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
-			dev-python/flask[${PYTHON_MULTI_USEDEP}]
-			dev-python/mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
-			dev-python/responses[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-		)
-		>=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/munkres[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
-		dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
-		>=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
-		badfiles? (
-			media-libs/flac
-			media-sound/mp3val
-		)
-		chromaprint? (
-			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
-			media-libs/chromaprint[tools]
-		)
-		discogs? ( dev-python/discogs-client[${PYTHON_MULTI_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg:0[encode] )
-		gstreamer? (
-			media-libs/gst-plugins-good:1.0
-			media-libs/gst-plugins-bad:1.0
-		)
-		icu? ( dev-db/sqlite[icu] )
-		lastfm? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] )
-		mpd? (
-			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
-		)
-		replaygain? (
-			gstreamer? (
-				dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-				media-plugins/gst-plugins-libav:1.0
-			)
-			!gstreamer? ( media-sound/mp3gain )
-		)
-		thumbnail? (
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-				media-gfx/imagemagick
-			)
-		)
-		webserver? (
-			dev-python/flask[${PYTHON_MULTI_USEDEP}]
-			dev-python/flask-cors[${PYTHON_MULTI_USEDEP}]
-		)
-	')"
-BDEPEND="dev-python/sphinx"
-
-DOCS=( README.rst docs/changelog.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	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
-	}
-
-	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 test/test_player.py || die
-		rm test/test_mpdstats.py || die
-	fi
-	if ! use webserver; then
-		rm test/test_web.py || die "Failed to remove test_web.py"
-	fi
-	if use test; then
-		# Those test need network
-		rm test/test_art.py || die
-		rm test/test_discogs.py || die
-		rm test/test_embyupdate.py || die
-		rm test/test_lastgenre.py || die
-		rm test/test_spotify.py || die
-		# rm test/test_plexupdate.py
-		rm test/test_thumbnails.py || die
-		# Not working
-		rm test/test_replaygain.py || die
-		# Not working
-		rm test/test_convert.py || die
-		# Not working and dropped in master
-		rm test/test_mediafile.py || die
-	fi
-}
-
-python_compile_all() {
-	esetup.py build_sphinx -b man --build-dir=docs/build
-	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/build/man/*
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	einstalldocs
-
-	"${D}$(python_get_scriptdir)/beet" completion > "${T}/beet.bashcomp"
-	newbashcomp "${T}/beet.bashcomp" beet
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Joonas Niilola]

commit:     fbddb8ec8d54d2e1ec001d97f3e52c81deb7043f
Author:     Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Wed Dec  9 19:45:36 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 12:27:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbddb8ec

media-sound/beets: Use pre-builded man page

Closes: https://bugs.gentoo.org/758647
Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16046
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-sound/beets/beets-1.4.9-r3.ebuild | 7 ++++---
 media-sound/beets/beets-9999.ebuild     | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/media-sound/beets/beets-1.4.9-r3.ebuild b/media-sound/beets/beets-1.4.9-r3.ebuild
index fe7c12adf3a..d07f7f6efe2 100644
--- a/media-sound/beets/beets-1.4.9-r3.ebuild
+++ b/media-sound/beets/beets-1.4.9-r3.ebuild
@@ -92,7 +92,9 @@ DEPEND="
 	${RDEPEND}
 "
 BDEPEND="
-	dev-python/sphinx
+	doc? (
+		dev-python/sphinx
+	)
 	$(python_gen_cond_dep '
 		test? (
 			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
@@ -143,14 +145,13 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-	esetup.py build_sphinx -b man --build-dir=docs/build
 	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
 
-	doman docs/build/man/*
+	doman man/*
 	use doc && local HTML_DOCS=( docs/build/html/. )
 	einstalldocs
 

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index fe7c12adf3a..d07f7f6efe2 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -92,7 +92,9 @@ DEPEND="
 	${RDEPEND}
 "
 BDEPEND="
-	dev-python/sphinx
+	doc? (
+		dev-python/sphinx
+	)
 	$(python_gen_cond_dep '
 		test? (
 			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
@@ -143,14 +145,13 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-	esetup.py build_sphinx -b man --build-dir=docs/build
 	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
 
-	doman docs/build/man/*
+	doman man/*
 	use doc && local HTML_DOCS=( docs/build/html/. )
 	einstalldocs
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Joonas Niilola]

commit:     a0f27a00a98b0faf2f66f76e1b8f6fe826cee271
Author:     Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Tue Jan 19 13:56:08 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 08:09:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0f27a00

media-sound/beets: upgrade live-ebuild

Closes: https://bugs.gentoo.org/766132
Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-sound/beets/beets-9999.ebuild | 109 ++++++++++++++----------------------
 1 file changed, 42 insertions(+), 67 deletions(-)

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index d07f7f6efe2..9f25baf0397 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -4,11 +4,11 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..8} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 bash-completion-r1
+inherit distutils-r1 bash-completion-r1 optfeature
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
@@ -26,7 +26,8 @@ HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="badfiles chromaprint cors discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep '
@@ -39,54 +40,6 @@ RDEPEND="
 		dev-python/requests[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
 		dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
-		badfiles? (
-			media-libs/flac
-			media-sound/mp3val
-		)
-		chromaprint? (
-			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
-			media-libs/chromaprint[tools]
-		)
-		discogs? (
-			dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
-		)
-		ffmpeg? (
-			media-video/ffmpeg:0[encode]
-		)
-		gstreamer? (
-			media-libs/gst-plugins-bad:1.0
-			media-libs/gst-plugins-good:1.0
-		)
-		icu? (
-			dev-db/sqlite[icu]
-		)
-		lastfm? (
-			dev-python/pylast[${PYTHON_MULTI_USEDEP}]
-		)
-		mpd? (
-			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
-		)
-		replaygain? (
-			gstreamer? (
-				dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-				media-plugins/gst-plugins-libav:1.0
-			)
-			!gstreamer? ( media-sound/mp3gain )
-		)
-		thumbnail? (
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-				media-gfx/imagemagick
-			)
-		)
-		webserver? (
-			dev-python/flask[${PYTHON_MULTI_USEDEP}]
-			cors? (
-				dev-python/flask-cors[${PYTHON_MULTI_USEDEP}]
-			)
-		)
 	')"
 DEPEND="
 	${RDEPEND}
@@ -97,19 +50,41 @@ BDEPEND="
 	)
 	$(python_gen_cond_dep '
 		test? (
+			dev-db/sqlite[icu]
 			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
+			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
+			dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
 			dev-python/flask[${PYTHON_MULTI_USEDEP}]
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
+			dev-python/pylast[${PYTHON_MULTI_USEDEP}]
+			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
 			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+				media-gfx/imagemagick
+			)
 			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
 			dev-python/responses[${PYTHON_MULTI_USEDEP}]
 			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+			media-libs/chromaprint[tools]
+			media-libs/flac
+			media-libs/gst-plugins-bad:1.0
+			media-libs/gst-plugins-good:1.0
+			media-sound/mp3val
+			media-sound/mp3gain
+			|| (
+				dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+				media-plugins/gst-plugins-libav:1.0
+			)
+			media-video/ffmpeg:0[encode]
 		)
 	')"
 
 PATCHES=(
 	"${FILESDIR}/${PV}-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch"
 	"${FILESDIR}/${PV}-0002-Disable-test_completion.patch"
+	"${FILESDIR}/${PV}-0003-Try-to-work-around-a-Werkzeug-change.patch"
 )
 
 DOCS=( README.rst docs/changelog.rst )
@@ -119,6 +94,7 @@ distutils_enable_tests pytest
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	# Tests that need network
 	rm test/test_art.py || die "Failed to remove test_art.py"
 	rm test/test_discogs.py || die "Failed to remove test_discogs.py"
 	rm test/test_embyupdate.py || die "Failed to remove test_embyupdate.py"
@@ -126,22 +102,6 @@ python_prepare_all() {
 	rm test/test_spotify.py || die "Failed to remove test_spotify.py"
 	# Not working and dropped in master
 	rm test/test_mediafile.py || die "Failed to remove test_mediafile.py"
-	if ! use ffmpeg; then
-		rm test/test_convert.py || die "Failed to remove test_convert.py"
-	fi
-	if ! use mpd; then
-		rm test/test_player.py || die "Failed to remove test_player.py"
-		rm test/test_mpdstats.py || die "Failed to remove test_mpdstats.py"
-	fi
-	if ! use replaygain; then
-		rm test/test_replaygain.py || die "Failed to remove test_replaygain.py"
-	fi
-	if ! use thumbnail; then
-		rm test/test_thumbnails.py || die "Failed to remove test_thumbnails.py"
-	fi
-	if ! use webserver; then
-		rm test/test_web.py || die "Failed to remove test_web.py"
-	fi
 }
 
 python_compile_all() {
@@ -159,4 +119,19 @@ python_install_all() {
 	newbashcomp "${T}/beet.bash" beet
 	insinto /usr/share/zsh/site-functions
 	newins "${WORKDIR}/${P}/extra/_beet" _beet
+
+	elog "Optional dependencies:"
+	optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
+	optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"
+	optfeature "discogs support" dev-python/discogs-client
+	optfeature "ffmpeg support" media-video/ffmpeg[encode]
+	optfeature "gstreamer support" "media-libs/gst-plugins-bad media-libs/gst-plugins-good"
+	optfeature "icu support" dev-db/sqlite[icu]
+	optfeature "lastfm support" dev-python/pylast
+	optfeature "mpd support" "dev-python/bluelet dev-python/python-mpd"
+	optfeature "replaygain with gstreamer support" "dev-python/pygobject media-plugins/gst-plugins-libav"
+	optfeature "replaygain without gstreamer support" media-sound/mp3gain
+	optfeature "thumbnail support" dev-python/pyxdg "dev-python/pillow media-gfx/imagemagick"
+	optfeature "webserver support" dev-python/flask
+	optfeature "webserver cors support" dev-python/flask-cors
 }

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Joonas Niilola]

commit:     3e2dc6a492f8036d01365a6a9ea542e4145ed87c
Author:     Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Fri Jan 22 14:44:57 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 08:09:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e2dc6a4

media-sound/beets: Delete old version

Closes: https://bugs.gentoo.org/766132
Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19127
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-sound/beets/beets-1.4.9-r3.ebuild | 162 --------------------------------
 1 file changed, 162 deletions(-)

diff --git a/media-sound/beets/beets-1.4.9-r3.ebuild b/media-sound/beets/beets-1.4.9-r3.ebuild
deleted file mode 100644
index d07f7f6efe2..00000000000
--- a/media-sound/beets/beets-1.4.9-r3.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 bash-completion-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_beta/-beta.}
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
-HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="badfiles chromaprint cors discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/munkres[${PYTHON_MULTI_USEDEP}]
-		>=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
-		dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
-		badfiles? (
-			media-libs/flac
-			media-sound/mp3val
-		)
-		chromaprint? (
-			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
-			media-libs/chromaprint[tools]
-		)
-		discogs? (
-			dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
-		)
-		ffmpeg? (
-			media-video/ffmpeg:0[encode]
-		)
-		gstreamer? (
-			media-libs/gst-plugins-bad:1.0
-			media-libs/gst-plugins-good:1.0
-		)
-		icu? (
-			dev-db/sqlite[icu]
-		)
-		lastfm? (
-			dev-python/pylast[${PYTHON_MULTI_USEDEP}]
-		)
-		mpd? (
-			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
-		)
-		replaygain? (
-			gstreamer? (
-				dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-				media-plugins/gst-plugins-libav:1.0
-			)
-			!gstreamer? ( media-sound/mp3gain )
-		)
-		thumbnail? (
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-				media-gfx/imagemagick
-			)
-		)
-		webserver? (
-			dev-python/flask[${PYTHON_MULTI_USEDEP}]
-			cors? (
-				dev-python/flask-cors[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-	')"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	doc? (
-		dev-python/sphinx
-	)
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
-			dev-python/flask[${PYTHON_MULTI_USEDEP}]
-			dev-python/mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
-			dev-python/responses[${PYTHON_MULTI_USEDEP}]
-			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
-		)
-	')"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch"
-	"${FILESDIR}/${PV}-0002-Disable-test_completion.patch"
-)
-
-DOCS=( README.rst docs/changelog.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	rm test/test_art.py || die "Failed to remove test_art.py"
-	rm test/test_discogs.py || die "Failed to remove test_discogs.py"
-	rm test/test_embyupdate.py || die "Failed to remove test_embyupdate.py"
-	rm test/test_lastgenre.py || die "Failed to remove test_lastgenre.py"
-	rm test/test_spotify.py || die "Failed to remove test_spotify.py"
-	# Not working and dropped in master
-	rm test/test_mediafile.py || die "Failed to remove test_mediafile.py"
-	if ! use ffmpeg; then
-		rm test/test_convert.py || die "Failed to remove test_convert.py"
-	fi
-	if ! use mpd; then
-		rm test/test_player.py || die "Failed to remove test_player.py"
-		rm test/test_mpdstats.py || die "Failed to remove test_mpdstats.py"
-	fi
-	if ! use replaygain; then
-		rm test/test_replaygain.py || die "Failed to remove test_replaygain.py"
-	fi
-	if ! use thumbnail; then
-		rm test/test_thumbnails.py || die "Failed to remove test_thumbnails.py"
-	fi
-	if ! use webserver; then
-		rm test/test_web.py || die "Failed to remove test_web.py"
-	fi
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman man/*
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	einstalldocs
-
-	${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
-	newbashcomp "${T}/beet.bash" beet
-	insinto /usr/share/zsh/site-functions
-	newins "${WORKDIR}/${P}/extra/_beet" _beet
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Joonas Niilola]

commit:     db9f2e25fade4c860b55b56fff9132d9fbebffca
Author:     Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Mon Jan 25 16:59:24 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 11:26:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db9f2e25

media-sound/beets: Fix replaygain deps v1.4.9-r5

Closes: https://bugs.gentoo.org/767163
Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-sound/beets/beets-1.4.9-r5.ebuild | 135 ++++++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)

diff --git a/media-sound/beets/beets-1.4.9-r5.ebuild b/media-sound/beets/beets-1.4.9-r5.ebuild
new file mode 100644
index 00000000000..68328df9060
--- /dev/null
+++ b/media-sound/beets/beets-1.4.9-r5.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 bash-completion-r1 optfeature
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_beta/-beta.}
+	MY_P=${PN}-${MY_PV}
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
+HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/munkres[${PYTHON_MULTI_USEDEP}]
+		>=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
+		dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
+	')"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	doc? (
+		dev-python/sphinx
+	)
+	$(python_gen_cond_dep '
+		test? (
+			dev-db/sqlite[icu]
+			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
+			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
+			dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
+			dev-python/flask[${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
+			dev-python/pylast[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+				media-gfx/imagemagick
+			)
+			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
+			dev-python/responses[${PYTHON_MULTI_USEDEP}]
+			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+			media-libs/chromaprint[tools]
+			media-libs/flac
+			media-libs/gst-plugins-bad:1.0
+			media-libs/gst-plugins-good:1.0
+			media-sound/mp3val
+			media-sound/mp3gain
+			media-plugins/gst-plugins-libav:1.0
+			media-video/ffmpeg:0[encode]
+		)
+	')"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch"
+	"${FILESDIR}/${PV}-0002-Disable-test_completion.patch"
+	"${FILESDIR}/${PV}-0003-Try-to-work-around-a-Werkzeug-change.patch"
+)
+
+DOCS=( README.rst docs/changelog.rst )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Tests that need network
+	rm test/test_art.py || die "Failed to remove test_art.py"
+	rm test/test_discogs.py || die "Failed to remove test_discogs.py"
+	rm test/test_embyupdate.py || die "Failed to remove test_embyupdate.py"
+	rm test/test_lastgenre.py || die "Failed to remove test_lastgenre.py"
+	rm test/test_spotify.py || die "Failed to remove test_spotify.py"
+	# Not working and dropped in master
+	rm test/test_mediafile.py || die "Failed to remove test_mediafile.py"
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman man/*
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	einstalldocs
+
+	${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
+	newbashcomp "${T}/beet.bash" beet
+	insinto /usr/share/zsh/site-functions
+	newins "${WORKDIR}/${P}/extra/_beet" _beet
+
+	elog "Optional dependencies:"
+	optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
+	optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"
+	optfeature "discogs support" dev-python/discogs-client
+	optfeature "ffmpeg support" media-video/ffmpeg[encode]
+	optfeature "gstreamer support" "media-libs/gst-plugins-bad media-libs/gst-plugins-good"
+	optfeature "icu support" dev-db/sqlite[icu]
+	optfeature "lastfm support" dev-python/pylast
+	optfeature "mpd support" "dev-python/bluelet dev-python/python-mpd"
+	optfeature "replaygain with gstreamer support" "dev-python/pygobject media-plugins/gst-plugins-libav"
+	optfeature "replaygain without gstreamer support" media-sound/mp3gain
+	optfeature "thumbnail support" dev-python/pyxdg "dev-python/pillow media-gfx/imagemagick"
+	optfeature "webserver support" dev-python/flask
+	optfeature "webserver cors support" dev-python/flask-cors
+}

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Joonas Niilola]

commit:     e0a1278547950cf7583d3ff964b89766480604c6
Author:     Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Mon Jan 25 17:04:08 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 11:26:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0a12785

media-sound/beets: Clean old version

Closes: https://bugs.gentoo.org/767163
Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19214
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-sound/beets/beets-1.4.9-r4.ebuild | 137 --------------------------------
 1 file changed, 137 deletions(-)

diff --git a/media-sound/beets/beets-1.4.9-r4.ebuild b/media-sound/beets/beets-1.4.9-r4.ebuild
deleted file mode 100644
index 9f25baf0397..00000000000
--- a/media-sound/beets/beets-1.4.9-r4.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{6..8} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 bash-completion-r1 optfeature
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_beta/-beta.}
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
-HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/munkres[${PYTHON_MULTI_USEDEP}]
-		>=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
-		dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
-	')"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	doc? (
-		dev-python/sphinx
-	)
-	$(python_gen_cond_dep '
-		test? (
-			dev-db/sqlite[icu]
-			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
-			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
-			dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
-			dev-python/flask[${PYTHON_MULTI_USEDEP}]
-			dev-python/mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
-			dev-python/pylast[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-				media-gfx/imagemagick
-			)
-			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
-			dev-python/responses[${PYTHON_MULTI_USEDEP}]
-			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
-			media-libs/chromaprint[tools]
-			media-libs/flac
-			media-libs/gst-plugins-bad:1.0
-			media-libs/gst-plugins-good:1.0
-			media-sound/mp3val
-			media-sound/mp3gain
-			|| (
-				dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-				media-plugins/gst-plugins-libav:1.0
-			)
-			media-video/ffmpeg:0[encode]
-		)
-	')"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch"
-	"${FILESDIR}/${PV}-0002-Disable-test_completion.patch"
-	"${FILESDIR}/${PV}-0003-Try-to-work-around-a-Werkzeug-change.patch"
-)
-
-DOCS=( README.rst docs/changelog.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Tests that need network
-	rm test/test_art.py || die "Failed to remove test_art.py"
-	rm test/test_discogs.py || die "Failed to remove test_discogs.py"
-	rm test/test_embyupdate.py || die "Failed to remove test_embyupdate.py"
-	rm test/test_lastgenre.py || die "Failed to remove test_lastgenre.py"
-	rm test/test_spotify.py || die "Failed to remove test_spotify.py"
-	# Not working and dropped in master
-	rm test/test_mediafile.py || die "Failed to remove test_mediafile.py"
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman man/*
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	einstalldocs
-
-	${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
-	newbashcomp "${T}/beet.bash" beet
-	insinto /usr/share/zsh/site-functions
-	newins "${WORKDIR}/${P}/extra/_beet" _beet
-
-	elog "Optional dependencies:"
-	optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
-	optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"
-	optfeature "discogs support" dev-python/discogs-client
-	optfeature "ffmpeg support" media-video/ffmpeg[encode]
-	optfeature "gstreamer support" "media-libs/gst-plugins-bad media-libs/gst-plugins-good"
-	optfeature "icu support" dev-db/sqlite[icu]
-	optfeature "lastfm support" dev-python/pylast
-	optfeature "mpd support" "dev-python/bluelet dev-python/python-mpd"
-	optfeature "replaygain with gstreamer support" "dev-python/pygobject media-plugins/gst-plugins-libav"
-	optfeature "replaygain without gstreamer support" media-sound/mp3gain
-	optfeature "thumbnail support" dev-python/pyxdg "dev-python/pillow media-gfx/imagemagick"
-	optfeature "webserver support" dev-python/flask
-	optfeature "webserver cors support" dev-python/flask-cors
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Joonas Niilola]

commit:     6f8451df5bc09bde7875c15938ef751afb592bf1
Author:     Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Mon Jan 25 17:03:03 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 11:26:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f8451df

media-sound/beets: Fix replaygain deps 9999

Closes: https://bugs.gentoo.org/767163
Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-sound/beets/beets-9999.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 9f25baf0397..68328df9060 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -58,6 +58,7 @@ BDEPEND="
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
 			dev-python/pylast[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
 			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
 			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
 			|| (
@@ -73,10 +74,7 @@ BDEPEND="
 			media-libs/gst-plugins-good:1.0
 			media-sound/mp3val
 			media-sound/mp3gain
-			|| (
-				dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-				media-plugins/gst-plugins-libav:1.0
-			)
+			media-plugins/gst-plugins-libav:1.0
 			media-video/ffmpeg:0[encode]
 		)
 	')"

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Sam James]

commit:     d428ee68a6b548419212a8a3e90115ab3c0121b5
Author:     Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Mon May 10 21:14:38 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 14 11:21:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d428ee68

media-sound/beets: enable Python3.9

Closes: https://bugs.gentoo.org/789141
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20760
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/beets/beets-1.4.9-r5.ebuild | 2 +-
 media-sound/beets/beets-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/beets/beets-1.4.9-r5.ebuild b/media-sound/beets/beets-1.4.9-r5.ebuild
index 77bfe827365..cc6a223082b 100644
--- a/media-sound/beets/beets-1.4.9-r5.ebuild
+++ b/media-sound/beets/beets-1.4.9-r5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 77bfe827365..cc6a223082b 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Sam James]

commit:     980bc9023c2336350130027a75421e35b3babdbb
Author:     Guillaume Seren <guillaumeseren <AT> gmail <DOT> com>
AuthorDate: Wed May 26 11:14:03 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun  1 00:27:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=980bc902

media-sound/beets: Clean old ebuild

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Closes: https://bugs.gentoo.org/790215
Signed-off-by: Guillaume Seren <guillaumeseren <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21016
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/beets/beets-1.4.9-r5.ebuild | 134 --------------------------------
 1 file changed, 134 deletions(-)

diff --git a/media-sound/beets/beets-1.4.9-r5.ebuild b/media-sound/beets/beets-1.4.9-r5.ebuild
deleted file mode 100644
index cc6a223082b..00000000000
--- a/media-sound/beets/beets-1.4.9-r5.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 bash-completion-r1 optfeature
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_beta/-beta.}
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
-HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/munkres[${PYTHON_MULTI_USEDEP}]
-		>=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
-		dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
-	')"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	doc? (
-		dev-python/sphinx
-	)
-	$(python_gen_cond_dep '
-		test? (
-			dev-db/sqlite[icu]
-			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
-			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
-			dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
-			dev-python/flask[${PYTHON_MULTI_USEDEP}]
-			dev-python/mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
-			dev-python/pylast[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-				media-gfx/imagemagick
-			)
-			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
-			dev-python/responses[${PYTHON_MULTI_USEDEP}]
-			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
-			media-libs/chromaprint[tools]
-			media-libs/flac
-			media-libs/gst-plugins-bad:1.0
-			media-libs/gst-plugins-good:1.0
-			media-sound/mp3val
-			media-sound/mp3gain
-			media-plugins/gst-plugins-libav:1.0
-			media-video/ffmpeg:0[encode]
-		)
-	')"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch"
-	"${FILESDIR}/${PV}-0002-Disable-test_completion.patch"
-	"${FILESDIR}/${PV}-0003-Try-to-work-around-a-Werkzeug-change.patch"
-)
-
-DOCS=( README.rst docs/changelog.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Tests that need network
-	rm test/test_art.py || die "Failed to remove test_art.py"
-	rm test/test_discogs.py || die "Failed to remove test_discogs.py"
-	rm test/test_embyupdate.py || die "Failed to remove test_embyupdate.py"
-	rm test/test_lastgenre.py || die "Failed to remove test_lastgenre.py"
-	rm test/test_spotify.py || die "Failed to remove test_spotify.py"
-	# Not working and dropped in master
-	rm test/test_mediafile.py || die "Failed to remove test_mediafile.py"
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman man/*
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	einstalldocs
-
-	${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
-	newbashcomp "${T}/beet.bash" beet
-	insinto /usr/share/zsh/site-functions
-	newins "${WORKDIR}/${P}/extra/_beet" _beet
-
-	optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
-	optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"
-	optfeature "discogs support" dev-python/discogs-client
-	optfeature "ffmpeg support" media-video/ffmpeg[encode]
-	optfeature "gstreamer support" "media-libs/gst-plugins-bad media-libs/gst-plugins-good"
-	optfeature "icu support" dev-db/sqlite[icu]
-	optfeature "lastfm support" dev-python/pylast
-	optfeature "mpd support" "dev-python/bluelet dev-python/python-mpd"
-	optfeature "replaygain with gstreamer support" "dev-python/pygobject media-plugins/gst-plugins-libav"
-	optfeature "replaygain without gstreamer support" media-sound/mp3gain
-	optfeature "thumbnail support" dev-python/pyxdg "dev-python/pillow media-gfx/imagemagick"
-	optfeature "webserver support" dev-python/flask
-	optfeature "webserver cors support" dev-python/flask-cors
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Sam James]

commit:     aafa76b32d8099c62e5ef874ef706d5d430d08f0
Author:     Arsen Arsenović <arsen <AT> aarsen <DOT> me>
AuthorDate: Sun Oct 24 07:22:50 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 02:57:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aafa76b3

media-sound/beets: update 9999

9999 builds now, with man pages, it likely doesn't pass tests.

it requires a slight tweak to it's build procedure compared to 1.5.0

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Arsen Arsenović <arsen <AT> aarsen.me>
Closes: https://github.com/gentoo/gentoo/pull/22663
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/beets/beets-9999.ebuild | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index e6e0f8dd5eb..7d299524043 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -6,7 +6,6 @@ EAPI=7
 DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 bash-completion-r1 optfeature
 
@@ -17,7 +16,7 @@ else
 	MY_PV=${PV/_beta/-beta.}
 	MY_P=${PN}-${MY_PV}
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -45,9 +44,7 @@ DEPEND="
 	${RDEPEND}
 "
 BDEPEND="
-	doc? (
-		dev-python/sphinx
-	)
+	dev-python/sphinx
 	$(python_gen_cond_dep '
 		test? (
 			dev-db/sqlite[icu]
@@ -76,40 +73,30 @@ BDEPEND="
 			media-sound/mp3gain
 			media-plugins/gst-plugins-libav:1.0
 			media-video/ffmpeg:0[encode]
+			app-shells/bash-completion
+			dev-python/reflink
+			dev-python/confuse
+			dev-python/mediafile
 		)
 	')"
 
-PATCHES=(
-	"${FILESDIR}/${PV}-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch"
-	"${FILESDIR}/${PV}-0002-Disable-test_completion.patch"
-	"${FILESDIR}/${PV}-0003-Try-to-work-around-a-Werkzeug-change.patch"
-)
-
 DOCS=( README.rst docs/changelog.rst )
 
 distutils_enable_tests pytest
 
 python_prepare_all() {
 	distutils-r1_python_prepare_all
-
-	# Tests that need network
-	rm test/test_art.py || die "Failed to remove test_art.py"
-	rm test/test_discogs.py || die "Failed to remove test_discogs.py"
-	rm test/test_embyupdate.py || die "Failed to remove test_embyupdate.py"
-	rm test/test_lastgenre.py || die "Failed to remove test_lastgenre.py"
-	rm test/test_spotify.py || die "Failed to remove test_spotify.py"
-	# Not working and dropped in master
-	rm test/test_mediafile.py || die "Failed to remove test_mediafile.py"
 }
 
 python_compile_all() {
+	emake -C docs man
 	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
 
-	doman man/*
+	doman docs/_build/man/*
 	use doc && local HTML_DOCS=( docs/build/html/. )
 	einstalldocs
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Sam James]

commit:     11c5753ba80a1fe7a362aece48c22a7593f8dafb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 31 08:45:54 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 08:45:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c5753b

media-sound/beets: fix dependencies

Closes: https://bugs.gentoo.org/820935
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../beets/{beets-1.5.0.ebuild => beets-1.5.0-r1.ebuild}     |  6 +++---
 media-sound/beets/beets-9999.ebuild                         | 13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/media-sound/beets/beets-1.5.0.ebuild b/media-sound/beets/beets-1.5.0-r1.ebuild
similarity index 96%
rename from media-sound/beets/beets-1.5.0.ebuild
rename to media-sound/beets/beets-1.5.0-r1.ebuild
index aa73a47719c..ae9ee9e9119 100644
--- a/media-sound/beets/beets-1.5.0.ebuild
+++ b/media-sound/beets/beets-1.5.0-r1.ebuild
@@ -67,6 +67,9 @@ BDEPEND="
 			dev-python/rarfile[${PYTHON_USEDEP}]
 			dev-python/responses[${PYTHON_USEDEP}]
 			dev-python/wheel[${PYTHON_USEDEP}]
+			dev-python/reflink[${PYTHON_USEDEP}]
+			dev-python/confuse[${PYTHON_USEDEP}]
+			dev-python/mediafile[${PYTHON_USEDEP}]
 			media-libs/chromaprint[tools]
 			media-libs/flac
 			media-libs/gst-plugins-bad:1.0
@@ -76,9 +79,6 @@ BDEPEND="
 			media-plugins/gst-plugins-libav:1.0
 			media-video/ffmpeg:0[encode]
 			app-shells/bash-completion
-			dev-python/reflink
-			dev-python/confuse
-			dev-python/mediafile
 		)
 	')"
 

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 7d299524043..9d0e8ddd174 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -44,7 +44,9 @@ DEPEND="
 	${RDEPEND}
 "
 BDEPEND="
-	dev-python/sphinx
+	doc? (
+		dev-python/sphinx
+	)
 	$(python_gen_cond_dep '
 		test? (
 			dev-db/sqlite[icu]
@@ -65,6 +67,9 @@ BDEPEND="
 			dev-python/rarfile[${PYTHON_USEDEP}]
 			dev-python/responses[${PYTHON_USEDEP}]
 			dev-python/wheel[${PYTHON_USEDEP}]
+			dev-python/reflink[${PYTHON_USEDEP}]
+			dev-python/confuse[${PYTHON_USEDEP}]
+			dev-python/mediafile[${PYTHON_USEDEP}]
 			media-libs/chromaprint[tools]
 			media-libs/flac
 			media-libs/gst-plugins-bad:1.0
@@ -74,9 +79,6 @@ BDEPEND="
 			media-plugins/gst-plugins-libav:1.0
 			media-video/ffmpeg:0[encode]
 			app-shells/bash-completion
-			dev-python/reflink
-			dev-python/confuse
-			dev-python/mediafile
 		)
 	')"
 
@@ -89,14 +91,13 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-	emake -C docs man
 	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
 
-	doman docs/_build/man/*
+	doman man/*
 	use doc && local HTML_DOCS=( docs/build/html/. )
 	einstalldocs
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Sam James]

commit:     28f4d7376b7681dad0933912d657d69ffe9deb95
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 31 18:29:02 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 18:29:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28f4d737

media-sound/beets: fix dependencies deux

Bug: https://bugs.gentoo.org/821064
Closes: https://bugs.gentoo.org/821109
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/beets/{beets-1.5.0-r1.ebuild => beets-1.5.0-r2.ebuild} | 6 +++---
 media-sound/beets/beets-9999.ebuild                                | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-sound/beets/beets-1.5.0-r1.ebuild b/media-sound/beets/beets-1.5.0-r2.ebuild
similarity index 96%
rename from media-sound/beets/beets-1.5.0-r1.ebuild
rename to media-sound/beets/beets-1.5.0-r2.ebuild
index ae9ee9e9119..f6df11983c6 100644
--- a/media-sound/beets/beets-1.5.0-r1.ebuild
+++ b/media-sound/beets/beets-1.5.0-r2.ebuild
@@ -39,6 +39,9 @@ RDEPEND="
 		dev-python/requests[${PYTHON_USEDEP}]
 		>=dev-python/six-1.9[${PYTHON_USEDEP}]
 		dev-python/unidecode[${PYTHON_USEDEP}]
+		dev-python/reflink[${PYTHON_USEDEP}]
+		dev-python/confuse[${PYTHON_USEDEP}]
+		dev-python/mediafile[${PYTHON_USEDEP}]
 	')"
 DEPEND="
 	${RDEPEND}
@@ -67,9 +70,6 @@ BDEPEND="
 			dev-python/rarfile[${PYTHON_USEDEP}]
 			dev-python/responses[${PYTHON_USEDEP}]
 			dev-python/wheel[${PYTHON_USEDEP}]
-			dev-python/reflink[${PYTHON_USEDEP}]
-			dev-python/confuse[${PYTHON_USEDEP}]
-			dev-python/mediafile[${PYTHON_USEDEP}]
 			media-libs/chromaprint[tools]
 			media-libs/flac
 			media-libs/gst-plugins-bad:1.0

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 9d0e8ddd174..d7df175f13f 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -39,6 +39,9 @@ RDEPEND="
 		dev-python/requests[${PYTHON_USEDEP}]
 		>=dev-python/six-1.9[${PYTHON_USEDEP}]
 		dev-python/unidecode[${PYTHON_USEDEP}]
+		dev-python/reflink[${PYTHON_USEDEP}]
+		dev-python/confuse[${PYTHON_USEDEP}]
+		dev-python/mediafile[${PYTHON_USEDEP}]
 	')"
 DEPEND="
 	${RDEPEND}
@@ -67,9 +70,6 @@ BDEPEND="
 			dev-python/rarfile[${PYTHON_USEDEP}]
 			dev-python/responses[${PYTHON_USEDEP}]
 			dev-python/wheel[${PYTHON_USEDEP}]
-			dev-python/reflink[${PYTHON_USEDEP}]
-			dev-python/confuse[${PYTHON_USEDEP}]
-			dev-python/mediafile[${PYTHON_USEDEP}]
 			media-libs/chromaprint[tools]
 			media-libs/flac
 			media-libs/gst-plugins-bad:1.0

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Jakov Smolić]

commit:     23b965c9bce2312a3fe587789d2c05e1056e20ea
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 22:59:37 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun Feb 13 22:59:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23b965c9

media-sound/beets: Keyword 1.6.0 x86, #820896

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 media-sound/beets/beets-1.6.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/beets/beets-1.6.0.ebuild b/media-sound/beets/beets-1.6.0.ebuild
index 77fc9c07cd2b..37b074a88990 100644
--- a/media-sound/beets/beets-1.6.0.ebuild
+++ b/media-sound/beets/beets-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ else
 	MY_PV=${PV/_beta/-beta.}
 	MY_P=${PN}-${MY_PV}
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Sam James]

commit:     11083bf1c402c8a804ec34188a35e6cca7d7e1cd
Author:     Andres Becerra <andres.becerra <AT> gmail <DOT> com>
AuthorDate: Tue Jun  7 14:21:01 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 21:09:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11083bf1

media-sound/beets: add python-3.10

Closes: https://bugs.gentoo.org/850250
Closes: https://github.com/gentoo/gentoo/pull/25792
Tested-by: Andrés Becerra <andres.becerra <AT> gmail.com>
Signed-off-by: Andrés Becerra <andres.becerra <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/beets/beets-1.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/beets/beets-1.6.0.ebuild b/media-sound/beets/beets-1.6.0.ebuild
index 37b074a88990..24d64828bfa2 100644
--- a/media-sound/beets/beets-1.6.0.ebuild
+++ b/media-sound/beets/beets-1.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1 bash-completion-r1 optfeature

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Sam James]

commit:     c7618189f49ee572f949b92be7481801ea7aae06
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 05:33:15 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 05:33:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7618189

media-sound/beets: add missing test dep

Closes: https://bugs.gentoo.org/850574
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/beets/beets-1.6.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-sound/beets/beets-1.6.0.ebuild b/media-sound/beets/beets-1.6.0.ebuild
index 24d64828bfa2..a61642447839 100644
--- a/media-sound/beets/beets-1.6.0.ebuild
+++ b/media-sound/beets/beets-1.6.0.ebuild
@@ -62,6 +62,7 @@ BDEPEND="
 			dev-python/pygobject:3[${PYTHON_USEDEP}]
 			dev-python/python-mpd[${PYTHON_USEDEP}]
 			dev-python/pyxdg[${PYTHON_USEDEP}]
+			dev-python/reflink[${PYTHON_USEDEP}]
 			|| (
 				dev-python/pillow[${PYTHON_USEDEP}]
 				media-gfx/imagemagick

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Sam James]

commit:     25495a30f974929150b44a651aa3a4f53eeef275
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 06:40:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 06:40:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25495a30

media-sound/beets: sync live

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/beets/beets-9999.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index d7df175f13f4..870844e4cb0a 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1 bash-completion-r1 optfeature
@@ -16,7 +16,7 @@ else
 	MY_PV=${PV/_beta/-beta.}
 	MY_P=${PN}-${MY_PV}
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -37,7 +37,6 @@ RDEPEND="
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9[${PYTHON_USEDEP}]
 		dev-python/unidecode[${PYTHON_USEDEP}]
 		dev-python/reflink[${PYTHON_USEDEP}]
 		dev-python/confuse[${PYTHON_USEDEP}]
@@ -63,6 +62,7 @@ BDEPEND="
 			dev-python/pygobject:3[${PYTHON_USEDEP}]
 			dev-python/python-mpd[${PYTHON_USEDEP}]
 			dev-python/pyxdg[${PYTHON_USEDEP}]
+			dev-python/reflink[${PYTHON_USEDEP}]
 			|| (
 				dev-python/pillow[${PYTHON_USEDEP}]
 				media-gfx/imagemagick

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Agostino Sarubbo]

commit:     ad66b4f7d6ce74a60d6efd3492fadd02baf68e95
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 13:21:57 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 13:22:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad66b4f7

media-sound/beets: amd64 stable wrt bug #826694

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-sound/beets/beets-1.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/beets/beets-1.6.0.ebuild b/media-sound/beets/beets-1.6.0.ebuild
index a61642447839..4550e6da0e11 100644
--- a/media-sound/beets/beets-1.6.0.ebuild
+++ b/media-sound/beets/beets-1.6.0.ebuild
@@ -16,7 +16,7 @@ else
 	MY_PV=${PV/_beta/-beta.}
 	MY_P=${PN}-${MY_PV}
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Sam James]

commit:     f8ed169a566253438f7dcff95aa6856546031189
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Wed Feb 22 15:20:53 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 15:59:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8ed169a

media-sound/beets: drop 1.4.9-r6, 1.5.0-r2

Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/beets/Manifest              |   2 -
 media-sound/beets/beets-1.4.9-r6.ebuild | 135 --------------------------------
 media-sound/beets/beets-1.5.0-r2.ebuild | 126 -----------------------------
 3 files changed, 263 deletions(-)

diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 50daf64c1bd6..27f6f1a84bbe 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,3 +1 @@
-DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
-DIST beets-1.5.0.tar.gz 1694845 BLAKE2B e4a4ad880edcc396170bca9e7d04548f22a55eac22481d2babca0d2ca71237ed0509bf9be9af12343b0d1b555e9726446e5d61e637312a4808eece5ce0302f33 SHA512 447b01dc750a69d0a33d271774f3bd3b997a203d80c220c1a961f9a8e30420d263b1e2a4682d25ff7b02e1e85155f42186cb0d3bf27ebc8c2777f68e197d4018
 DIST beets-1.6.0.tar.gz 1698333 BLAKE2B 7d3ded703524d5f8740a6adf3769a5752a1e47720ebf0653238f117e4ef6f97461abcd0c7a0d7f428c9848c95277070b5687f9007c04e47b07cdb22eca8c9cbf SHA512 b03759a2be7d3318b4f43cac09ada229cea6496774ba3dcdb1458427e41f6329a627241afc0bfaa9a91afb6818ba944ef6088e38c5635a3bfe730a6a8011a0dc

diff --git a/media-sound/beets/beets-1.4.9-r6.ebuild b/media-sound/beets/beets-1.4.9-r6.ebuild
deleted file mode 100644
index b394af784457..000000000000
--- a/media-sound/beets/beets-1.4.9-r6.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_9 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 bash-completion-r1 optfeature
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_beta/-beta.}
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
-HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
-		dev-python/munkres[${PYTHON_USEDEP}]
-		>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
-		>=dev-python/python-musicbrainzngs-0.4[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9[${PYTHON_USEDEP}]
-		dev-python/unidecode[${PYTHON_USEDEP}]
-	')"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	doc? (
-		dev-python/sphinx
-	)
-	$(python_gen_cond_dep '
-		test? (
-			dev-db/sqlite[icu]
-			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-			dev-python/bluelet[${PYTHON_USEDEP}]
-			dev-python/discogs-client[${PYTHON_USEDEP}]
-			dev-python/flask[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pyacoustid[${PYTHON_USEDEP}]
-			dev-python/pylast[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			dev-python/python-mpd[${PYTHON_USEDEP}]
-			dev-python/pyxdg[${PYTHON_USEDEP}]
-			|| (
-				dev-python/pillow[${PYTHON_USEDEP}]
-				media-gfx/imagemagick
-			)
-			dev-python/rarfile[${PYTHON_USEDEP}]
-			dev-python/responses[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			media-libs/chromaprint[tools]
-			media-libs/flac
-			media-libs/gst-plugins-bad:1.0
-			media-libs/gst-plugins-good:1.0
-			media-sound/mp3val
-			media-sound/mp3gain
-			media-plugins/gst-plugins-libav:1.0
-			media-video/ffmpeg:0[encode]
-		)
-	')"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch"
-	"${FILESDIR}/${PV}-0002-Disable-test_completion.patch"
-	"${FILESDIR}/${PV}-0003-Try-to-work-around-a-Werkzeug-change.patch"
-	"${FILESDIR}/${PV}-0004-Fix-3608-Replace-discogs-client-with-python3-discogs.patch"
-)
-
-DOCS=( README.rst docs/changelog.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Tests that need network
-	rm test/test_art.py || die "Failed to remove test_art.py"
-	rm test/test_discogs.py || die "Failed to remove test_discogs.py"
-	rm test/test_embyupdate.py || die "Failed to remove test_embyupdate.py"
-	rm test/test_lastgenre.py || die "Failed to remove test_lastgenre.py"
-	rm test/test_spotify.py || die "Failed to remove test_spotify.py"
-	# Not working and dropped in master
-	rm test/test_mediafile.py || die "Failed to remove test_mediafile.py"
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman man/*
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	einstalldocs
-
-	${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
-	newbashcomp "${T}/beet.bash" beet
-	insinto /usr/share/zsh/site-functions
-	newins "${WORKDIR}/${P}/extra/_beet" _beet
-
-	optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
-	optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"
-	optfeature "discogs support" dev-python/discogs-client
-	optfeature "ffmpeg support" media-video/ffmpeg[encode]
-	optfeature "gstreamer support" "media-libs/gst-plugins-bad media-libs/gst-plugins-good"
-	optfeature "icu support" dev-db/sqlite[icu]
-	optfeature "lastfm support" dev-python/pylast
-	optfeature "mpd support" "dev-python/bluelet dev-python/python-mpd"
-	optfeature "replaygain with gstreamer support" "dev-python/pygobject media-plugins/gst-plugins-libav"
-	optfeature "replaygain without gstreamer support" media-sound/mp3gain
-	optfeature "thumbnail support" dev-python/pyxdg "dev-python/pillow media-gfx/imagemagick"
-	optfeature "webserver support" dev-python/flask
-	optfeature "webserver cors support" dev-python/flask-cors
-}

diff --git a/media-sound/beets/beets-1.5.0-r2.ebuild b/media-sound/beets/beets-1.5.0-r2.ebuild
deleted file mode 100644
index 12588c081be1..000000000000
--- a/media-sound/beets/beets-1.5.0-r2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_9 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 bash-completion-r1 optfeature
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_beta/-beta.}
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
-HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
-		dev-python/munkres[${PYTHON_USEDEP}]
-		>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
-		>=dev-python/python-musicbrainzngs-0.4[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9[${PYTHON_USEDEP}]
-		dev-python/unidecode[${PYTHON_USEDEP}]
-		dev-python/reflink[${PYTHON_USEDEP}]
-		dev-python/confuse[${PYTHON_USEDEP}]
-		dev-python/mediafile[${PYTHON_USEDEP}]
-	')"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	doc? (
-		dev-python/sphinx
-	)
-	$(python_gen_cond_dep '
-		test? (
-			dev-db/sqlite[icu]
-			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-			dev-python/bluelet[${PYTHON_USEDEP}]
-			dev-python/discogs-client[${PYTHON_USEDEP}]
-			dev-python/flask[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pyacoustid[${PYTHON_USEDEP}]
-			dev-python/pylast[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			dev-python/python-mpd[${PYTHON_USEDEP}]
-			dev-python/pyxdg[${PYTHON_USEDEP}]
-			|| (
-				dev-python/pillow[${PYTHON_USEDEP}]
-				media-gfx/imagemagick
-			)
-			dev-python/rarfile[${PYTHON_USEDEP}]
-			dev-python/responses[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			media-libs/chromaprint[tools]
-			media-libs/flac
-			media-libs/gst-plugins-bad:1.0
-			media-libs/gst-plugins-good:1.0
-			media-sound/mp3val
-			media-sound/mp3gain
-			media-plugins/gst-plugins-libav:1.0
-			media-video/ffmpeg:0[encode]
-			app-shells/bash-completion
-		)
-	')"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-0001-Remove-test_completion.patch"
-)
-
-DOCS=( README.rst docs/changelog.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman man/*
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	einstalldocs
-
-	${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
-	newbashcomp "${T}/beet.bash" beet
-	insinto /usr/share/zsh/site-functions
-	newins "${WORKDIR}/${P}/extra/_beet" _beet
-
-	optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
-	optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"
-	optfeature "discogs support" dev-python/discogs-client
-	optfeature "ffmpeg support" media-video/ffmpeg[encode]
-	optfeature "gstreamer support" "media-libs/gst-plugins-bad media-libs/gst-plugins-good"
-	optfeature "icu support" dev-db/sqlite[icu]
-	optfeature "lastfm support" dev-python/pylast
-	optfeature "mpd support" "dev-python/bluelet dev-python/python-mpd"
-	optfeature "replaygain with gstreamer support" "dev-python/pygobject media-plugins/gst-plugins-libav"
-	optfeature "replaygain without gstreamer support" media-sound/mp3gain
-	optfeature "thumbnail support" dev-python/pyxdg "dev-python/pillow media-gfx/imagemagick"
-	optfeature "webserver support" dev-python/flask
-	optfeature "webserver cors support" dev-python/flask-cors
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Sam James]

commit:     c3170a5d7b7b045a01046c63b8b749d0a7f26041
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Wed Feb 22 15:23:50 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 15:59:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3170a5d

media-sound/beets: update EAPI 7 -> 8, enable py3.11

Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/29723
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/beets/beets-1.6.0-r1.ebuild | 129 ++++++++++++++++++++++++++++++++
 1 file changed, 129 insertions(+)

diff --git a/media-sound/beets/beets-1.6.0-r1.ebuild b/media-sound/beets/beets-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..dbc429fae351
--- /dev/null
+++ b/media-sound/beets/beets-1.6.0-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 bash-completion-r1 optfeature
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_beta/-beta.}
+	MY_P=${PN}-${MY_PV}
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
+HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
+		dev-python/munkres[${PYTHON_USEDEP}]
+		>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
+		>=dev-python/python-musicbrainzngs-0.4[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/unidecode[${PYTHON_USEDEP}]
+		dev-python/reflink[${PYTHON_USEDEP}]
+		dev-python/confuse[${PYTHON_USEDEP}]
+		dev-python/mediafile[${PYTHON_USEDEP}]
+	')"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	doc? (
+		dev-python/sphinx
+	)
+	$(python_gen_cond_dep '
+		test? (
+			dev-db/sqlite[icu]
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+			dev-python/bluelet[${PYTHON_USEDEP}]
+			dev-python/discogs-client[${PYTHON_USEDEP}]
+			dev-python/flask[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pyacoustid[${PYTHON_USEDEP}]
+			dev-python/pylast[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			dev-python/python-mpd[${PYTHON_USEDEP}]
+			dev-python/pyxdg[${PYTHON_USEDEP}]
+			dev-python/reflink[${PYTHON_USEDEP}]
+			|| (
+				dev-python/pillow[${PYTHON_USEDEP}]
+				media-gfx/imagemagick
+			)
+			dev-python/rarfile[${PYTHON_USEDEP}]
+			dev-python/responses[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			media-libs/chromaprint[tools]
+			media-libs/flac
+			media-libs/gst-plugins-bad:1.0
+			media-libs/gst-plugins-good:1.0
+			media-sound/mp3val
+			media-sound/mp3gain
+			media-plugins/gst-plugins-libav:1.0
+			media-video/ffmpeg:0[encode]
+			app-shells/bash-completion
+		)
+	')"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-0001-Remove-test_completion.patch"
+	"${FILESDIR}/${PV}-sphinx-6.patch"
+	"${FILESDIR}/${PV}-mediafile-test.patch"
+	"${FILESDIR}/${PV}-unicode-test.patch"
+)
+
+DOCS=( README.rst docs/changelog.rst )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman man/*
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	einstalldocs
+
+	${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
+	newbashcomp "${T}/beet.bash" beet
+	insinto /usr/share/zsh/site-functions
+	newins "${WORKDIR}/${P}/extra/_beet" _beet
+
+	optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
+	optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"
+	optfeature "discogs support" dev-python/discogs-client
+	optfeature "ffmpeg support" media-video/ffmpeg[encode]
+	optfeature "gstreamer support" "media-libs/gst-plugins-bad media-libs/gst-plugins-good"
+	optfeature "icu support" dev-db/sqlite[icu]
+	optfeature "lastfm support" dev-python/pylast
+	optfeature "mpd support" "dev-python/bluelet dev-python/python-mpd"
+	optfeature "replaygain with gstreamer support" "dev-python/pygobject media-plugins/gst-plugins-libav"
+	optfeature "replaygain without gstreamer support" media-sound/mp3gain
+	optfeature "thumbnail support" dev-python/pyxdg "dev-python/pillow media-gfx/imagemagick"
+	optfeature "webserver support" dev-python/flask
+	optfeature "webserver cors support" dev-python/flask-cors
+}

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Sam James]

commit:     b81ca38c34d5e22892971d3850903e9f4ba8aa06
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 16:02:09 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 16:02:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b81ca38c

media-sound/beets: use pypi.eclass

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/beets/beets-1.6.0-r1.ebuild | 2 +-
 media-sound/beets/beets-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/beets/beets-1.6.0-r1.ebuild b/media-sound/beets/beets-1.6.0-r1.ebuild
index dbc429fae351..b44ef5dfddaf 100644
--- a/media-sound/beets/beets-1.6.0-r1.ebuild
+++ b/media-sound/beets/beets-1.6.0-r1.ebuild
@@ -13,9 +13,9 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
 	inherit git-r3
 else
+	inherit pypi
 	MY_PV=${PV/_beta/-beta.}
 	MY_P=${PN}-${MY_PV}
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index e254cb752d66..4a287f4d8012 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -13,9 +13,9 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
 	inherit git-r3
 else
+	inherit pypi
 	MY_PV=${PV/_beta/-beta.}
 	MY_P=${PN}-${MY_PV}
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Sam James]

commit:     e41017d16f418f6296c4cf1804bef85fcf05fa87
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 16:02:40 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 16:02:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e41017d1

media-sound/beets: sync live

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/beets/beets-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 4a287f4d8012..56865ec32e82 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1 bash-completion-r1 optfeature

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Sam James]

commit:     0c1647e7a1c8ee478781bf11930b24dc46ce4553
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 00:19:31 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  1 00:19:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c1647e7

media-sound/beets: mark ALLARCHES

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/beets/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index 89b2967c010f..3ffd9212638c 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -31,6 +31,7 @@
         If beets doesn’t do what you want yet, writing your own plugin is
         shockingly simple if you know a little Python.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">beets</remote-id>
   </upstream>

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Sam James]

commit:     9aeeada847af3c7f90b39dc3140fc66f6e785b67
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 00:34:04 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  1 00:34:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aeeada8

media-sound/beets: Stabilize 1.6.0-r1 amd64, #904608

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/beets/beets-1.6.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/beets/beets-1.6.0-r1.ebuild b/media-sound/beets/beets-1.6.0-r1.ebuild
index bce597e6624d..ad37356ed27f 100644
--- a/media-sound/beets/beets-1.6.0-r1.ebuild
+++ b/media-sound/beets/beets-1.6.0-r1.ebuild
@@ -16,7 +16,7 @@ else
 	inherit pypi
 	MY_PV=${PV/_beta/-beta.}
 	MY_P=${PN}-${MY_PV}
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Michał Górny]

commit:     699a94cf8678c301bf0c2613f06222d3b1bade01
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 06:04:02 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 20 06:21:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=699a94cf

media-sound/beets: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-sound/beets/beets-1.6.0.ebuild | 129 -----------------------------------
 1 file changed, 129 deletions(-)

diff --git a/media-sound/beets/beets-1.6.0.ebuild b/media-sound/beets/beets-1.6.0.ebuild
deleted file mode 100644
index 3cefeff68ba4..000000000000
--- a/media-sound/beets/beets-1.6.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 bash-completion-r1 optfeature
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_beta/-beta.}
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
-HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
-		dev-python/munkres[${PYTHON_USEDEP}]
-		>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
-		>=dev-python/python-musicbrainzngs-0.4[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/unidecode[${PYTHON_USEDEP}]
-		dev-python/reflink[${PYTHON_USEDEP}]
-		dev-python/confuse[${PYTHON_USEDEP}]
-		dev-python/mediafile[${PYTHON_USEDEP}]
-	')"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	doc? (
-		dev-python/sphinx
-	)
-	$(python_gen_cond_dep '
-		test? (
-			dev-db/sqlite[icu]
-			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-			dev-python/bluelet[${PYTHON_USEDEP}]
-			dev-python/discogs-client[${PYTHON_USEDEP}]
-			dev-python/flask[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pyacoustid[${PYTHON_USEDEP}]
-			dev-python/pylast[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			dev-python/python-mpd2[${PYTHON_USEDEP}]
-			dev-python/pyxdg[${PYTHON_USEDEP}]
-			dev-python/reflink[${PYTHON_USEDEP}]
-			|| (
-				dev-python/pillow[${PYTHON_USEDEP}]
-				media-gfx/imagemagick
-			)
-			dev-python/rarfile[${PYTHON_USEDEP}]
-			dev-python/responses[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			media-libs/chromaprint[tools]
-			media-libs/flac
-			media-libs/gst-plugins-bad:1.0
-			media-libs/gst-plugins-good:1.0
-			media-sound/mp3val
-			media-sound/mp3gain
-			media-plugins/gst-plugins-libav:1.0
-			media-video/ffmpeg:0[encode]
-			app-shells/bash-completion
-		)
-	')"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-0001-Remove-test_completion.patch"
-	"${FILESDIR}/${PV}-sphinx-6.patch"
-	"${FILESDIR}/${PV}-mediafile-test.patch"
-	"${FILESDIR}/${PV}-unicode-test.patch"
-)
-
-DOCS=( README.rst docs/changelog.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman man/*
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	einstalldocs
-
-	${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
-	newbashcomp "${T}/beet.bash" beet
-	insinto /usr/share/zsh/site-functions
-	newins "${WORKDIR}/${P}/extra/_beet" _beet
-
-	optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
-	optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"
-	optfeature "discogs support" dev-python/discogs-client
-	optfeature "ffmpeg support" media-video/ffmpeg[encode]
-	optfeature "gstreamer support" "media-libs/gst-plugins-bad media-libs/gst-plugins-good"
-	optfeature "icu support" dev-db/sqlite[icu]
-	optfeature "lastfm support" dev-python/pylast
-	optfeature "mpd support" "dev-python/bluelet dev-python/python-mpd2"
-	optfeature "replaygain with gstreamer support" "dev-python/pygobject media-plugins/gst-plugins-libav"
-	optfeature "replaygain without gstreamer support" media-sound/mp3gain
-	optfeature "thumbnail support" dev-python/pyxdg "dev-python/pillow media-gfx/imagemagick"
-	optfeature "webserver support" dev-python/flask
-	optfeature "webserver cors support" dev-python/flask-cors
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Sam James]

commit:     ddc36e2719848e941859f0fe6a997993e15cc98b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 14 12:03:20 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 12:03:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddc36e27

media-sound/beets: add github upstream metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/beets/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index 3ffd9212638c..36c57a9de9b8 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -34,5 +34,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">beets</remote-id>
+    <remote-id type="github">beetbox/beets</remote-id>
   </upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Sam James]

commit:     3fc773111252f544e508d1dd27b5ff0ee659e98e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  8 21:32:38 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  8 21:32:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fc77311

media-sound/beets: fix build w/ USE=doc and >=sphinx-7

Closes: https://bugs.gentoo.org/927904
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/beets/beets-1.6.0-r1.ebuild | 6 ++++--
 media-sound/beets/beets-9999.ebuild     | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/media-sound/beets/beets-1.6.0-r1.ebuild b/media-sound/beets/beets-1.6.0-r1.ebuild
index cdc5158e3f60..5d407a5cc040 100644
--- a/media-sound/beets/beets-1.6.0-r1.ebuild
+++ b/media-sound/beets/beets-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -98,7 +98,9 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
+	if use doc ; then
+		sphinx-build -b html docs docs/build || die
+	fi
 }
 
 python_install_all() {

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 03d6d8352705..8c8520a503a4 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -91,7 +91,9 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
+	if use doc ; then
+		sphinx-build -b html docs docs/build || die
+	fi
 }
 
 python_install_all() {

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Matt Jolly]

commit:     ddb0475a2677d178669a9f6f53eb2bdf1ce77264
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 06:08:04 2024 +0000
Commit:     Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Wed May 22 13:17:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddb0475a

media-sound/beets: add 1.7.0_pre20240501; update 9999

- Update metadata.xml to remove "smart" quotes
- Skip failing bash completions test instead of patching it out.
- add `sed` to drop some `addopts` that break pytest due to disabled
  code coverage testing.
- Support py312
- Use PEP 517
- Add a proper VCS build path (any non-pypi build)
- add `EPYTEST_XDIST=1`

1.7.0_pre release has been added to support py312; there were too many
patches to sanely backport (and a lot of churn upstream). Upstream are
gearing up for an actual 1.7.0 release, hopefully soon:

https://github.com/beetbox/beets/discussions/4501#discussioncomment-9171769

Drop 'obsessive-compulsive' from the package description; upstream don't
(or no longer) use this phrase to describe their package and we don't
want or need phrasing like that in ::gentoo.

Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>

 media-sound/beets/Manifest                         |  1 +
 media-sound/beets/beets-1.6.0-r1.ebuild            |  2 +-
 ...-9999.ebuild => beets-1.7.0_pre20240501.ebuild} | 68 ++++++++++++++++++----
 media-sound/beets/beets-9999.ebuild                | 60 ++++++++++++++++---
 media-sound/beets/metadata.xml                     |  6 +-
 5 files changed, 116 insertions(+), 21 deletions(-)

diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 27f6f1a84bbe..7939d4065748 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1 +1,2 @@
 DIST beets-1.6.0.tar.gz 1698333 BLAKE2B 7d3ded703524d5f8740a6adf3769a5752a1e47720ebf0653238f117e4ef6f97461abcd0c7a0d7f428c9848c95277070b5687f9007c04e47b07cdb22eca8c9cbf SHA512 b03759a2be7d3318b4f43cac09ada229cea6496774ba3dcdb1458427e41f6329a627241afc0bfaa9a91afb6818ba944ef6088e38c5635a3bfe730a6a8011a0dc
+DIST beets-1.7.0_pre20240501.gh.tar.gz 2247319 BLAKE2B e215c8a2a30a44d298746351be4fa2de1cebb7d6aec2bc7dfc679b133ea5eddefec20d038aa1aa1d734b176c09163b93f917c6c29ea5115c4c2349e090c8c5df SHA512 f397c72b481d7d8822db598ab37c99d0b9063ae45455c0d34116fab7b5a4cc683a3357bdfe436181b1dea46ee05192cc37faf355b5e093d63c2e440e523b92bc

diff --git a/media-sound/beets/beets-1.6.0-r1.ebuild b/media-sound/beets/beets-1.6.0-r1.ebuild
index 5d407a5cc040..05075184f5f8 100644
--- a/media-sound/beets/beets-1.6.0-r1.ebuild
+++ b/media-sound/beets/beets-1.6.0-r1.ebuild
@@ -20,7 +20,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
+DESCRIPTION="Media library management system for obsessive music geeks"
 HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
 
 LICENSE="MIT"

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-1.7.0_pre20240501.ebuild
similarity index 55%
copy from media-sound/beets/beets-9999.ebuild
copy to media-sound/beets/beets-1.7.0_pre20240501.ebuild
index 8c8520a503a4..cd2e96c3b30f 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-1.7.0_pre20240501.ebuild
@@ -4,23 +4,31 @@
 EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="sqlite"
 
-inherit distutils-r1 bash-completion-r1 optfeature
+# These envvars are used to treat github tarball builds differently
+# from pypi sources. Enable where required
+: ${IS_VCS_SOURCE="no"}
+: ${UPDATE_VERSION="no"}
+
+inherit distutils-r1 bash-completion-r1 multiprocessing optfeature
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
 	inherit git-r3
 else
-	inherit pypi
-	MY_PV=${PV/_beta/-beta.}
-	MY_P=${PN}-${MY_PV}
+	MY_COMMIT=c75f07a0da6c622d3cd0f5aad0a08edaea360dad
+	# This should be set to 1 if we're not sourcing tarballs from pypi; we need to generate mans.
+	IS_VCS_SOURCE="yes"
+	UPDATE_VERSION="yes"
+	SRC_URI="https://github.com/beetbox/beets/archive/${MY_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
+	S="${WORKDIR}/${PN}-${MY_COMMIT}"
 fi
 
-DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
+DESCRIPTION="Media library management system for obsessive music geeks"
 HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
 
 LICENSE="MIT"
@@ -82,10 +90,33 @@ BDEPEND="
 		)
 	')"
 
+# Beets uses sphinx to generate manpages; these are not available
+# directly in VCS sources, only pypi tarballs, so handle the dependency
+# here automagically.
+if [[ ${PV} == "9999" ]] || [[ ${IS_VCS_SOURCE} == "yes" ]]; then
+	BDEPEND+="
+		dev-python/sphinx
+	"
+fi
+
 DOCS=( README.rst docs/changelog.rst )
 
+EPYTEST_XDIST=1
 distutils_enable_tests pytest
 
+src_prepare() {
+	# https://github.com/beetbox/beets/commit/8b4983fe7cae9397acd3e23602e419d8dc1041d4
+	# merged code coverage into standard test runs; since we disable coverage globally
+	# we need to sed out some 'addopts' for coverage in setup.cfg that cause tests to choke.
+	sed -i -e "/--cov=beets/,+9d" setup.cfg || die "Failed to disable code coverage options in setup.cfg"
+	# Update the version if we're not building from pypy; it's probably a _pre or live ebuild.
+	if  [[ ${PV} == "9999" ]] || [[ ${UPDATE_VERSION} == "yes" ]]; then
+		    sed -i -e "s/version=\".*\"/version=\"${PV}\"/" setup.py || die "Failed to update version in VCS sources"
+			sed -i -e "s/__version__ = \".*\"/__version__ = \"${PV}\"/" beets/__init__.py
+	fi
+	default
+}
+
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
@@ -94,6 +125,23 @@ python_compile_all() {
 	if use doc ; then
 		sphinx-build -b html docs docs/build || die
 	fi
+	# If building from VCS sources we need to generate manpages, then copy them to ${S}/man
+	# We could install mans from the sphinx build path, but to be consistent with pypi for src_install
+	# we'll instead generate them and copy to the same install location if building from VCS sources.
+	if [[ ${PV} == "9999" ]] || [[ ${IS_VCS_SOURCE} == "yes" ]]; then
+		einfo "Building man pages"
+		sphinx-build -b man docs docs/build/man || die "Failed to generate man pages"
+		mkdir ${S}/man || die
+		cp docs/build/man/{beet.1,beetsconfig.5} ${S}/man || die
+	fi
+}
+
+python_test() {
+	# https://github.com/beetbox/beets/issues/5243 testing bash completions is broken.
+	local EPYTEST_DESELECT=(
+		test/test_ui.py::CompletionTest::test_completion
+	)
+	epytest -n$(makeopts_jobs) -v
 }
 
 python_install_all() {
@@ -102,11 +150,11 @@ python_install_all() {
 	doman man/*
 	use doc && local HTML_DOCS=( docs/build/html/. )
 	einstalldocs
-
-	${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
+	# Generate the bash completions; we'll set PYTHONPATH for this invocation so that beets can start.
+	PYTHONPATH="${ED}/usr/lib/${PYTHON}:$PYTHONPATH" ${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
 	newbashcomp "${T}/beet.bash" beet
 	insinto /usr/share/zsh/site-functions
-	newins "${WORKDIR}/${P}/extra/_beet" _beet
+	newins "${S}/extra/_beet" _beet
 
 	optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
 	optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 8c8520a503a4..65e7d9973471 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -4,10 +4,16 @@
 EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="sqlite"
 
-inherit distutils-r1 bash-completion-r1 optfeature
+# These envvars are used to treat github tarball builds differently
+# from pypi sources. Enable where required
+: ${IS_VCS_SOURCE="no"}
+: ${UPDATE_VERSION="no"}
+
+inherit distutils-r1 bash-completion-r1 multiprocessing optfeature
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/beetbox/beets.git"
@@ -16,11 +22,11 @@ else
 	inherit pypi
 	MY_PV=${PV/_beta/-beta.}
 	MY_P=${PN}-${MY_PV}
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
-DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
+DESCRIPTION="Media library management system for obsessive music geeks"
 HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
 
 LICENSE="MIT"
@@ -82,10 +88,33 @@ BDEPEND="
 		)
 	')"
 
+# Beets uses sphinx to generate manpages; these are not available
+# directly in VCS sources, only pypi tarballs, so handle the dependency
+# here automagically.
+if [[ ${PV} == "9999" ]] || [[ ${IS_VCS_SOURCE} == "yes" ]]; then
+	BDEPEND+="
+		dev-python/sphinx
+	"
+fi
+
 DOCS=( README.rst docs/changelog.rst )
 
+EPYTEST_XDIST=1
 distutils_enable_tests pytest
 
+src_prepare() {
+	# https://github.com/beetbox/beets/commit/8b4983fe7cae9397acd3e23602e419d8dc1041d4
+	# merged code coverage into standard test runs; since we disable coverage globally
+	# we need to sed out some 'addopts' for coverage in setup.cfg that cause tests to choke.
+	sed -i -e "/--cov=beets/,+9d" setup.cfg || die "Failed to disable code coverage options in setup.cfg"
+	# Update the version if we're not building from pypy; it's probably a _pre or live ebuild.
+	if  [[ ${PV} == "9999" ]] || [[ ${UPDATE_VERSION} == "yes" ]]; then
+		    sed -i -e "s/version=\".*\"/version=\"${PV}\"/" setup.py || die "Failed to update version in VCS sources"
+			sed -i -e "s/__version__ = \".*\"/__version__ = \"${PV}\"/" beets/__init__.py
+	fi
+	default
+}
+
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
@@ -94,6 +123,23 @@ python_compile_all() {
 	if use doc ; then
 		sphinx-build -b html docs docs/build || die
 	fi
+	# If building from VCS sources we need to generate manpages, then copy them to ${S}/man
+	# We could install mans from the sphinx build path, but to be consistent with pypi for src_install
+	# we'll instead generate them and copy to the same install location if building from VCS sources.
+	if [[ ${PV} == "9999" ]] || [[ ${IS_VCS_SOURCE} == "yes" ]]; then
+		einfo "Building man pages"
+		sphinx-build -b man docs docs/build/man || die "Failed to generate man pages"
+		mkdir ${S}/man || die
+		cp docs/build/man/{beet.1,beetsconfig.5} ${S}/man || die
+	fi
+}
+
+python_test() {
+	# https://github.com/beetbox/beets/issues/5243 testing bash completions is broken.
+	local EPYTEST_DESELECT=(
+		test/test_ui.py::CompletionTest::test_completion
+	)
+	epytest -n$(makeopts_jobs) -v
 }
 
 python_install_all() {
@@ -102,11 +148,11 @@ python_install_all() {
 	doman man/*
 	use doc && local HTML_DOCS=( docs/build/html/. )
 	einstalldocs
-
-	${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
+	# Generate the bash completions; we'll set PYTHONPATH for this invocation so that beets can start.
+	PYTHONPATH="${ED}/usr/lib/${PYTHON}:$PYTHONPATH" ${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
 	newbashcomp "${T}/beet.bash" beet
 	insinto /usr/share/zsh/site-functions
-	newins "${WORKDIR}/${P}/extra/_beet" _beet
+	newins "${S}/extra/_beet" _beet
 
 	optfeature "badfiles support" "media-libs/flac media-sound/mp3val"
 	optfeature "chromaprint support" "dev-python/pyacoustid media-libs/chromaprint[tools]"

diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index 36c57a9de9b8..5de446482bcd 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -18,17 +18,17 @@
 
         Because beets is designed as a library, it can do almost anything you can
         imagine for your music collection. Via plugins, beets becomes a panacea:
-        * Embed and extract album art from files’ tags.
+        * Embed and extract album art from files' tags.
         * Listen to your library with a music player that speaks the MPD protocol
         and works with a staggering variety of interfaces.
         * Fetch lyrics for all your songs from databases on the Web.
         * Manage your MusicBrainz music collection.
-        * Analyze music files’ metadata from the command line.
+        * Analyze music files' metadata from the command line.
         * Clean up crufty tags left behind by other, less-awesome tools.
         * Browse your music library graphically through a Web browser and play it
         in any browser that supports HTML5 Audio.
 
-        If beets doesn’t do what you want yet, writing your own plugin is
+        If beets doesn't do what you want yet, writing your own plugin is
         shockingly simple if you know a little Python.
   </longdescription>
   <stabilize-allarches/>

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Matt Jolly]

commit:     4509b32d8a7c68252b4e24de187985867f7a6e5a
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Thu May 23 07:50:33 2024 +0000
Commit:     Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Thu May 23 07:50:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4509b32d

media-sound/beets: Quote instances of ${S}

Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>

 media-sound/beets/beets-1.7.0_pre20240501.ebuild | 4 ++--
 media-sound/beets/beets-9999.ebuild              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-sound/beets/beets-1.7.0_pre20240501.ebuild b/media-sound/beets/beets-1.7.0_pre20240501.ebuild
index cd2e96c3b30f..07eece0e631c 100644
--- a/media-sound/beets/beets-1.7.0_pre20240501.ebuild
+++ b/media-sound/beets/beets-1.7.0_pre20240501.ebuild
@@ -131,8 +131,8 @@ python_compile_all() {
 	if [[ ${PV} == "9999" ]] || [[ ${IS_VCS_SOURCE} == "yes" ]]; then
 		einfo "Building man pages"
 		sphinx-build -b man docs docs/build/man || die "Failed to generate man pages"
-		mkdir ${S}/man || die
-		cp docs/build/man/{beet.1,beetsconfig.5} ${S}/man || die
+		mkdir "${S}/man" || die
+		cp docs/build/man/{beet.1,beetsconfig.5} "${S}/man" || die
 	fi
 }
 

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 65e7d9973471..4bb022d375b0 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -129,8 +129,8 @@ python_compile_all() {
 	if [[ ${PV} == "9999" ]] || [[ ${IS_VCS_SOURCE} == "yes" ]]; then
 		einfo "Building man pages"
 		sphinx-build -b man docs docs/build/man || die "Failed to generate man pages"
-		mkdir ${S}/man || die
-		cp docs/build/man/{beet.1,beetsconfig.5} ${S}/man || die
+		mkdir "${S}/man" || die
+		cp docs/build/man/{beet.1,beetsconfig.5} "${S}/man" || die
 	fi
 }
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Sam James]

commit:     50e927fa2aa8228583e67b1d371803fb55afd06f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 22:00:43 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 28 22:00:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50e927fa

media-sound/beets: Stabilize 1.7.0_pre20240501 ALLARCHES, #932992

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/beets/beets-1.7.0_pre20240501.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/beets/beets-1.7.0_pre20240501.ebuild b/media-sound/beets/beets-1.7.0_pre20240501.ebuild
index 07eece0e631c..ae3fa77e2a88 100644
--- a/media-sound/beets/beets-1.7.0_pre20240501.ebuild
+++ b/media-sound/beets/beets-1.7.0_pre20240501.ebuild
@@ -24,7 +24,7 @@ else
 	IS_VCS_SOURCE="yes"
 	UPDATE_VERSION="yes"
 	SRC_URI="https://github.com/beetbox/beets/archive/${MY_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${PN}-${MY_COMMIT}"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Matt Jolly]

commit:     1cf2e193f9cc134876eb77153415d96b1b9bf6e9
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 04:48:04 2024 +0000
Commit:     Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 05:02:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cf2e193

media-sound/beets: add missing USE=doc dependencies

Closes: https://bugs.gentoo.org/932479
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>

 media-sound/beets/beets-1.7.0_pre20240501.ebuild | 3 ++-
 media-sound/beets/beets-9999.ebuild              | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/media-sound/beets/beets-1.7.0_pre20240501.ebuild b/media-sound/beets/beets-1.7.0_pre20240501.ebuild
index ea51e978cc1d..71c42d29cfe8 100644
--- a/media-sound/beets/beets-1.7.0_pre20240501.ebuild
+++ b/media-sound/beets/beets-1.7.0_pre20240501.ebuild
@@ -57,6 +57,7 @@ DEPEND="
 BDEPEND="
 	doc? (
 		dev-python/sphinx
+		dev-python/pydata-sphinx-theme
 	)
 	$(python_gen_cond_dep '
 		test? (
@@ -124,7 +125,7 @@ python_prepare_all() {
 
 python_compile_all() {
 	if use doc ; then
-		sphinx-build -b html docs docs/build || die
+		sphinx-build -b html docs docs/build/html || die
 	fi
 	# If building from VCS sources we need to generate manpages, then copy them to ${S}/man
 	# We could install mans from the sphinx build path, but to be consistent with pypi for src_install

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 5dbc70f0225d..00a1c997e652 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -55,6 +55,7 @@ DEPEND="
 BDEPEND="
 	doc? (
 		dev-python/sphinx
+		dev-python/pydata-sphinx-theme
 	)
 	$(python_gen_cond_dep '
 		test? (
@@ -110,7 +111,7 @@ src_prepare() {
 	sed -i -e "/--cov=beets/,+9d" setup.cfg || die "Failed to disable code coverage options in setup.cfg"
 	# Update the version if we're not building from pypy; it's probably a _pre or live ebuild.
 	if  [[ ${PV} == "9999" ]] || [[ ${UPDATE_VERSION} == "yes" ]]; then
-		    sed -i -e "s/version=\".*\"/version=\"${PV}\"/" setup.py || die "Failed to update version in VCS sources"
+		    sed -i -e "s/version='.*'/version='${PV}'/" setup.py || die "Failed to update version in VCS sources"
 			sed -i -e "s/__version__ = \".*\"/__version__ = \"${PV}\"/" beets/__init__.py
 	fi
 	default
@@ -122,7 +123,7 @@ python_prepare_all() {
 
 python_compile_all() {
 	if use doc ; then
-		sphinx-build -b html docs docs/build || die
+		sphinx-build -b html docs docs/build/html || die
 	fi
 	# If building from VCS sources we need to generate manpages, then copy them to ${S}/man
 	# We could install mans from the sphinx build path, but to be consistent with pypi for src_install

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Matt Jolly]

commit:     0d169d08379089f1e40a9054fc883e083b45e085
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 04:23:02 2024 +0000
Commit:     Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 05:02:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d169d08

media-sound/beets: add missing RDEPEND

Closes: https://bugs.gentoo.org/932478
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>

 media-sound/beets/beets-1.7.0_pre20240501.ebuild | 7 ++++---
 media-sound/beets/beets-9999.ebuild              | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/media-sound/beets/beets-1.7.0_pre20240501.ebuild b/media-sound/beets/beets-1.7.0_pre20240501.ebuild
index ae3fa77e2a88..ea51e978cc1d 100644
--- a/media-sound/beets/beets-1.7.0_pre20240501.ebuild
+++ b/media-sound/beets/beets-1.7.0_pre20240501.ebuild
@@ -43,12 +43,13 @@ RDEPEND="
 		>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
 		>=dev-python/musicbrainzngs-0.4[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/confuse[${PYTHON_USEDEP}]
+		dev-python/mediafile[${PYTHON_USEDEP}]
+		dev-python/reflink[${PYTHON_USEDEP}]
 		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
 		dev-python/unidecode[${PYTHON_USEDEP}]
-		dev-python/reflink[${PYTHON_USEDEP}]
-		dev-python/confuse[${PYTHON_USEDEP}]
-		dev-python/mediafile[${PYTHON_USEDEP}]
 	')"
 DEPEND="
 	${RDEPEND}

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 4bb022d375b0..5dbc70f0225d 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -40,13 +40,14 @@ RDEPEND="
 		dev-python/munkres[${PYTHON_USEDEP}]
 		>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
 		>=dev-python/musicbrainzngs-0.4[${PYTHON_USEDEP}]
+		dev-python/confuse[${PYTHON_USEDEP}]
+		dev-python/mediafile[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/reflink[${PYTHON_USEDEP}]
 		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
 		dev-python/unidecode[${PYTHON_USEDEP}]
-		dev-python/reflink[${PYTHON_USEDEP}]
-		dev-python/confuse[${PYTHON_USEDEP}]
-		dev-python/mediafile[${PYTHON_USEDEP}]
 	')"
 DEPEND="
 	${RDEPEND}

[gentoo-commits] repo/gentoo:master commit in: media-sound/beets/

[Matt Jolly]

commit:     929044e94493e46524f80364264ac781867d9631
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 04:19:19 2024 +0000
Commit:     Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 09:26:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=929044e9

media-sound/beets: update 9999; upstream moved to Poetry

Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>

 media-sound/beets/beets-9999.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 00a1c997e652..ed8336d62a74 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_PEP517=poetry
 PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="sqlite"
 
@@ -108,10 +108,10 @@ src_prepare() {
 	# https://github.com/beetbox/beets/commit/8b4983fe7cae9397acd3e23602e419d8dc1041d4
 	# merged code coverage into standard test runs; since we disable coverage globally
 	# we need to sed out some 'addopts' for coverage in setup.cfg that cause tests to choke.
-	sed -i -e "/--cov=beets/,+9d" setup.cfg || die "Failed to disable code coverage options in setup.cfg"
+	#sed -i -e "/--cov=beets/,+9d" setup.cfg || die "Failed to disable code coverage options in setup.cfg"
 	# Update the version if we're not building from pypy; it's probably a _pre or live ebuild.
 	if  [[ ${PV} == "9999" ]] || [[ ${UPDATE_VERSION} == "yes" ]]; then
-		    sed -i -e "s/version='.*'/version='${PV}'/" setup.py || die "Failed to update version in VCS sources"
+		    sed -i -e "s/^version = \".*\"$/version = \"${PV}\"/" pyproject.toml || die "Failed to update version in VCS sources"
 			sed -i -e "s/__version__ = \".*\"/__version__ = \"${PV}\"/" beets/__init__.py
 	fi
 	default
@@ -141,7 +141,7 @@ python_test() {
 	local EPYTEST_DESELECT=(
 		test/test_ui.py::CompletionTest::test_completion
 	)
-	epytest -n$(makeopts_jobs) -v
+	epytest -n$(makeopts_jobs) -v --no-cov
 }
 
 python_install_all() {