7 files changed, 66 insertions, 98 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index bbe43200aa8e..e3a926265bbe 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index b58f336f51df..306638706d86 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,4 +1,6 @@
 DIST picard-2.8.3.tar.gz 5098160 BLAKE2B 5f7290de8faee502f3a4984e0080409a31f9971428da635fb79a9f2ec540d71a256584010d747de77c86e85cd58df929e8ddaa09840ebc2c17e5cdbb035c5d68 SHA512 b87e768f0f13e1e306279f71004b5ffaebb2cfc44be23f041d9193432bdc631c4a2b893d72b47109b06c450d6ff4e2b0a70c2a4b0cc5d1608a4481d26526b0e3
+DIST picard-2.8.4.tar.gz 5108177 BLAKE2B 948eea724d725150ccf906c1e375e04be59f762fd6ebdb4660b6b036c87eaab803c8caebfa258efb0931e1610b8b75e9e3b00c0015e5520feca3dceec71683c2 SHA512 c024cf5706fe75648f0d3f9ef9ed3437f632454ab848c463135516d8c819cab52c42e1e9d4e050aeb254f6e08ae8345fbe0f95c0ab35fdc2f79e0c01c56b291c
 EBUILD picard-2.8.3.ebuild 1448 BLAKE2B 4f552c10b87ec6f0b2de583fb47310f134cc312f05dc0b3a3906aad7891d017be4cb175e9bb9bd24278fffd0ec98b6e2a086fb037fec9458b797e775476cdc51 SHA512 2fd18689766a347a81d488e90f8212174e51fe3bd6463349c70c5ea9b8304fc806fc156e10cb6aecc9ea11f851997bdc2a0ff0ed4009feb41604e9ea92b2f12f
+EBUILD picard-2.8.4.ebuild 1450 BLAKE2B 80a78442f2b442fb7998d31b4799c995b12f0a504174f3c2dad9f8ca4a17b86a71cf1ab668c7a65cf3e995b1c67db4bb58095ab01eb42addd49939f911e20884 SHA512 b58c87fa1f4f971ac5ca759abb8c67b441f9df4fc492e69dc64920c4c09c0d2b12ec93cb7cf644a3444a36823e177b37bf3019e87af144a01c61281d689f0d5f
 EBUILD picard-9999.ebuild 1450 BLAKE2B 80a78442f2b442fb7998d31b4799c995b12f0a504174f3c2dad9f8ca4a17b86a71cf1ab668c7a65cf3e995b1c67db4bb58095ab01eb42addd49939f911e20884 SHA512 b58c87fa1f4f971ac5ca759abb8c67b441f9df4fc492e69dc64920c4c09c0d2b12ec93cb7cf644a3444a36823e177b37bf3019e87af144a01c61281d689f0d5f
 MISC metadata.xml 740 BLAKE2B cc09a7bf012e0b85ff55531ace5d8b187cd68fdae7d274cb640a7ae446296c2ac70bb599955d6ab2570b3eb879c28cad0cf2e70fe7339c2c0c58fd8b0dcdcac7 SHA512 321188fd4887593a3683b2c507673baa9e2faf2b46b0158338a67e72dbf5267b93c1e358ceadeacd707d6a6bb234a4fae8ef681779463c4ab5bd3b79dbd47c43
diff --git a/media-sound/picard/picard-2.8.4.ebuild b/media-sound/picard/picard-2.8.4.ebuild
new file mode 100644
index 000000000000..e50d604072d8
--- /dev/null
+++ b/media-sound/picard/picard-2.8.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/metabrainz/picard"
+	inherit git-r3
+else
+	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-release-${PV}"
+fi
+
+DESCRIPTION="Cross-platform music tagger"
+HOMEPAGE="https://picard.musicbrainz.org"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="discid fingerprints nls"
+
+BDEPEND="
+	nls? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/fasteners[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		media-libs/mutagen[${PYTHON_USEDEP}]
+		discid? ( dev-python/python-discid[${PYTHON_USEDEP}] )
+	')
+	fingerprints? ( media-libs/chromaprint[tools] )
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	local build_args=(
+		--disable-autoupdate
+	)
+	if ! use nls; then
+		build_args+=( --disable-locales )
+	fi
+	distutils-r1_python_compile ${build_args[@]}
+}
+
+python_install() {
+	local install_args=(
+		--disable-autoupdate
+		--skip-build
+	)
+	if ! use nls; then
+		install_args+=( --disable-locales )
+	fi
+	distutils-r1_python_install ${install_args[@]}
+}
diff --git a/media-sound/rplay/Manifest b/media-sound/rplay/Manifest
deleted file mode 100644
index 9ea109f66a39..000000000000
--- a/media-sound/rplay/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX rplay-3.3.2-built-in_function_exit-r1.patch 366 BLAKE2B 104e722c7da8a97b5fc8abe58a9efe8b6cb7fbfbebe3493eaa094ac9580ac982eb32dcdfedd1ed11a972a665514788db6c2c29ac51839fa979692aaa56eb3f60 SHA512 6c5f358a6ef89b7338ae5bf2e485a3996e143fdab0c73455d97bdb2e07729464323992d72424d29c954f2537acef2c45ebd744db6a2e26b99ffd97be2f44957d
-DIST rplay-3.3.2.tar.gz 480015 BLAKE2B 5f506e81a5c9bad175c8906cb3104564ec9c8c6f4496382a428d77dff6264d0f39d3ab9af7cb83b0ef34bccc14f15978e399d428c62f6dafe46ee8ad70d32d37 SHA512 b0683de0f5dc1483d22ac68c0502fe66e89ba1c25300fdca9486df1cb6ea96393b18b783f918f18dba0ba0fbfd20410448e3e03df06fc4afba1b63024d82a713
-DIST rplay_3.3.2-16.debian.tar.xz 25456 BLAKE2B 34c69d95c964465a04681d7cb4c1a66b34d486e540486d1b47d9590fb893e574381405c15a48bfec272f3b566f5b3ab6ce88806497f8d1533f441cbf9481a3a8 SHA512 8d5db7862267fd0ec7f27896b6a76708304e54b9f2c8a52621c0a92c4688511e07a7820b2468c93032dab15f27f5dda1f8931e35d95e724501e2586a5851486b
-EBUILD rplay-3.3.2_p16-r4.ebuild 1311 BLAKE2B 760e96517ff4b6149f1da37c184a64e203b13d7fbe5c65dd611b0f62c0ae59f408c7f674016fe901d405932bdf162554f6cc4e14a8543ee5d59184a7ae990825 SHA512 8570df5f34b986a20b3239759c1797108ab5abaefe9ec656c170d834a5885ee4c42a8406e7a9a639ffb9aa21ed68abcd80f760b3e881e85b0e56d0af3b051fba
-MISC metadata.xml 603 BLAKE2B fe0c2b4c56d15c934cd432b739ed11f6e69aa6fdc39c591cc8b5fe1d7eaa122d756f796754d0f093e22a8bc89024c4e5bbe85c8159f184f8e590d1ee676a2539 SHA512 addbc1a2be33ee6f93530c86d22376586830a04d2d52c3e673e6c4a88d0aad8b579700faa2829dfdd3f5fb153519a5bcd5f7592eb28574089c86c4e8b9654788
diff --git a/media-sound/rplay/files/rplay-3.3.2-built-in_function_exit-r1.patch b/media-sound/rplay/files/rplay-3.3.2-built-in_function_exit-r1.patch
deleted file mode 100644
index 79d9a128806e..000000000000
--- a/media-sound/rplay/files/rplay-3.3.2-built-in_function_exit-r1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/adpcm/decode.c
-+++ b/adpcm/decode.c
-@@ -6,6 +6,7 @@
-  * Usage : decode [-3|4|5] [-a|u|l] < infile > outfile
-  */
- #include <stdio.h>
-+#include <stdlib.h>
- #include "g72x.h"
- 
- 
---- a/adpcm/encode.c
-+++ b/adpcm/encode.c
-@@ -6,6 +6,7 @@
-  * Usage : encode [-3|4|5] [-a|u|l] < infile > outfile
-  */
- #include <stdio.h>
-+#include <stdlib.h>
- #include "g72x.h"
- 
- 
diff --git a/media-sound/rplay/metadata.xml b/media-sound/rplay/metadata.xml
deleted file mode 100644
index f5e71e7a7e35..000000000000
--- a/media-sound/rplay/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<longdescription lang="en">
-		rplay is a flexible network audio system that allows sounds to be played
-		to and from local and remote Unix systems. Sounds can be played with or
-		without sending audio data over the network using either UDP or TCP.
-		rplay audio servers can be configured to share sound files with each
-		other.
-	</longdescription>
-</pkgmetadata>
diff --git a/media-sound/rplay/rplay-3.3.2_p16-r4.ebuild b/media-sound/rplay/rplay-3.3.2_p16-r4.ebuild
deleted file mode 100644
index 054c31b7c782..000000000000
--- a/media-sound/rplay/rplay-3.3.2_p16-r4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Play sounds on remote Unix systems without data transfer"
-HOMEPAGE="http://rplay.doit.org/"
-SRC_URI="
-	http://rplay.doit.org/dist/${PN}-$(ver_cut 1-3).tar.gz
-	mirror://debian/pool/main/r/${PN}/${PN}_$(ver_cut 1-3)-$(ver_cut 5).debian.tar.xz
-"
-S="${WORKDIR}"/${PN}-$(ver_cut 1-3)
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	acct-group/rplayd
-	acct-user/rplayd
-	media-sound/gsm
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${WORKDIR}"/debian/patches
-	"${FILESDIR}"/${PN}-$(ver_cut 1-3)-built-in_function_exit-r1.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	mv rx/configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-rplayd-user=rplayd \
-		--enable-rplayd-group=rplayd
-}
-
-src_install() {
-	# This is borrowed from the old einstall helper, and is necessary
-	# (at least some of variables).
-	emake prefix="${ED}/usr" \
-		libdir="${ED}/usr/$(get_libdir)" \
-		datadir="${ED}/usr/share" \
-		infodir="${ED}/usr/share/info" \
-		localstatedir="${ED}/var/lib" \
-		mandir="${ED}/usr/share/man" \
-		sysconfdir="${ED}/etc" \
-		install
-
-	find "${ED}" -name '*.la' -delete || die
-}