gentoo auto-resync : 23:05:2024 - 00:06:39

8 files changed, 237 insertions, 18 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 754e0bfead55..5b123943dce4 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 675867302102..03021eef381b 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -3,6 +3,8 @@ AUX 1.6.0-mediafile-test.patch 1613 BLAKE2B 488d8bdf7950d03bc37584c6ff64f3ea6329
 AUX 1.6.0-sphinx-6.patch 1114 BLAKE2B f37fe23ea86e47ed6eaf5705ae569103d3ae3b5141b9c80c22b30c650a499f915951e5db3e420e36d2829e3508d3e75729391a5de90cfa809271361692c4f485 SHA512 fe2290aec4d6356d4bd2690bd716370e45ae45f98845fb42adda9fab160f306c076f31fd30971f69431b7507917e201d82b494a49d34bf4549024b4df701a83a
 AUX 1.6.0-unicode-test.patch 1703 BLAKE2B efcdba4db1a7377954b768770d41ce8377d391bb4507bc099aae96469ac0eb250b7458c92013703b6b9d0498a62379a5fb9973b467418b8f6c8af4aed94b0829 SHA512 102d154b30617ab64511ad04ec92e33b58603da04caa7812324cc4a10e0caafeaa1e3c286bfbc712e5c09fc23f250d5a4b10ea5ab5112dea316269d80971e20a
 DIST beets-1.6.0.tar.gz 1698333 BLAKE2B 7d3ded703524d5f8740a6adf3769a5752a1e47720ebf0653238f117e4ef6f97461abcd0c7a0d7f428c9848c95277070b5687f9007c04e47b07cdb22eca8c9cbf SHA512 b03759a2be7d3318b4f43cac09ada229cea6496774ba3dcdb1458427e41f6329a627241afc0bfaa9a91afb6818ba944ef6088e38c5635a3bfe730a6a8011a0dc
-EBUILD beets-1.6.0-r1.ebuild 3889 BLAKE2B 2485471aef9f8de01da210a0df8c3bf200fe3da07678b042fab9e71da07dde762a04853e3649bc5da6f8e37e5af172287b9765bb83397eb5392a66f779eba298 SHA512 b5438fce4e06c93271e3dab141526529386c9ba1ee1f1850137f5fb8f40363bda69499af4206f4f46d5728c26368ebca57f664b99ead09dba4a06e3a6991853f
-EBUILD beets-9999.ebuild 3704 BLAKE2B 5344c966331f65a40c373625cbf93db68120b9f5e8e2903c33ac268aadc325406a36c17262f679d37327f977beb9c749e00eeb905b263ce8a546b45fde1e8a3b SHA512 faaf963be227dbb3443fef02fe40547c5e6007e8a0628c4fb8b66edb7104e5e82b666c92d506231ca96f79b6e295a08eb44f7ec32e12e0f947dde232b4049ccb
-MISC metadata.xml 1862 BLAKE2B d2a1ec84e18bf236467d19d90ad7917a4b9f3846f61d9e4ddd1cf8b9e50c93afe834a13e3421f9873f8a63b590727a7e73d4a0edbe5bcfd986aed7fb04c11621 SHA512 79eaa60bc64cdea05a2197946dd1ee9d08aafac92eab5ad9236833d1dd5d0bb21476dae86e15b086a1ee8946833b44ccde472ee729a694c398497663416913f0
+DIST beets-1.7.0_pre20240501.gh.tar.gz 2247319 BLAKE2B e215c8a2a30a44d298746351be4fa2de1cebb7d6aec2bc7dfc679b133ea5eddefec20d038aa1aa1d734b176c09163b93f917c6c29ea5115c4c2349e090c8c5df SHA512 f397c72b481d7d8822db598ab37c99d0b9063ae45455c0d34116fab7b5a4cc683a3357bdfe436181b1dea46ee05192cc37faf355b5e093d63c2e440e523b92bc
+EBUILD beets-1.6.0-r1.ebuild 3878 BLAKE2B c8617f3921066507dc8c9e3f953fc9c76a6e24ef74796da98dfba677116b093a0a429fd9563dbccda08624e12bbc9c7125402c5a3e93a12dc87cf1fa2987865e SHA512 c4b14351c8a5c82f6fdcaf3fe9afcfa90e7ee4654acb76bd815adfee1f6990aab4206077411317b37fb6dc6a10e8771201ae593de1e6b066a5a3252077b7a25a
+EBUILD beets-1.7.0_pre20240501.ebuild 6063 BLAKE2B 8b0acbbeafa2accf216a35fec129f5434e87dcceb814a6c665e445e3ef3ca708c6678db8e59644e336947b3b1af37fd38230bf13edca489a792c60f04928fc08 SHA512 fa8f293472a0b866cc958ae330c5e1623f9baa65905649db5350f6ebdf4ae1f2204cdc8bebe9cfee770f041783a279c687b03913df9d2a914d2d5e849b7e7c5f
+EBUILD beets-9999.ebuild 5832 BLAKE2B 83ab0c2dca148fd731824d6301827ea8ec286d427930acd79590a40cfaf221217dfd7e2e6b3a10565d31a785ae0329d414b99f91b4dda79c3b80d531146d0e8f SHA512 1f35ecf3bd78c07b76098a7ac8cdaa5fc936479357d24d6adc0f5ac92ce301eeda97d85cc169677109689dc5f685a9b9c587714d801ae30b7c336aa7493bdd47
+MISC metadata.xml 1856 BLAKE2B 0c3482123a1452fbd45e94c83d7eaba9c9548f781f87b7981c3df694eb09e0078f2de68a1e12b5ecd8ee0d69e6eb0f3189472b8c09bee17dfdd5494e9ecd3af7 SHA512 37369b9bb3a5607694bc5b40ba4f59bb33a41d6ac716ccb75f55f93ae35c71187d681a305e4fb6e03f6bf045867b3def2413342cb89784ac4b44a80d36760f73
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-1.7.0_pre20240501.ebuild b/media-sound/beets/beets-1.7.0_pre20240501.ebuild
new file mode 100644
index 000000000000..cd2e96c3b30f
--- /dev/null
+++ b/media-sound/beets/beets-1.7.0_pre20240501.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite"
+
+# 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
+	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}/${PN}-${MY_COMMIT}"
+fi
+
+DESCRIPTION="Media library management system for obsessive 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/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/python3-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
+		)
+	')"
+
+# 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
+}
+
+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() {
+	distutils-r1_python_install_all
+
+	doman man/*
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	einstalldocs
+	# 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 "${S}/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/python3-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
+}
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/>
diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest
index 9710d3e3fcbf..e0074dc2734a 100644
--- a/media-sound/openmpt123/Manifest
+++ b/media-sound/openmpt123/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.7.6+release.autotools.tar.gz 1652544 BLAKE2B 022686bbb13728da134017b16c70cb9f3b47d64b0b6a889f473b5b72b5aa5cb66b84953b414075b6e9842fea947eb67b6cff2ae1130618bd0c0840f90ce88e70 SHA512 9665d3e301bab06f363bc4376fc488ca5befcf05f580deeb01a035167f02f8d47cda0d940239d5f29a91f97da6f31a2f6f20836b4f8ef6a248c7e39e49a7aa66
-EBUILD openmpt123-0.7.6.ebuild 1725 BLAKE2B 8477dfd22bf434d2cc5ba240cfda10789cf5c8f70829fe949b75a09aa1c78808e668c99e383121251aa6e11b1d3904deb02c7a0b73d46c8c9efdca6637f25135 SHA512 0eddb54a5fd007fe3faa06987053b5530e58d6a446f56acc9333c19817a75f0067ed45df42166d813202e5c7f7574915c9c49815ef5687a86a0207b584b3462d
+DIST libopenmpt-0.7.7+release.autotools.tar.gz 1660204 BLAKE2B 4b6ee75036c97ac2dce7e66776b36df09847db2c482cb22b052569385c06eb954d1cfae5cb00d415a6b18fd11663b2af43c94361dc9c0c84595c0d530e2bb355 SHA512 88d68bd32e696c01c070abd7156645c2969d389d6fb660f4f45d9e5e16ff9c25c3084d30cef208578080ee8a2da5c6045e5b1d93db7e2c456d42b91daaa02199
+EBUILD openmpt123-0.7.7.ebuild 1724 BLAKE2B e7e3b7d6803e0c6029ff3ca53b89013a391f67524d1bcbc39b98d57624dc3f5b1d87287247e6dbb230ac2b81bd5b6ac521dc02b893504ee4de9057b30322df1f SHA512 7dcc2bef9561e1029a3d6cedb800fb1bf85ee153811548ca4dfab3e26a19d41831e28da6d26830759d2b02763a5a81fa00a98c7681462e37e0a4cf95c7c7591c
 MISC metadata.xml 328 BLAKE2B 25f8b37a7e7885a50e5b7305c9090033c78b1154214e05060c3407f0d27ac436aa3f0da1dff3a5ba1685bef390f1fe99416893aaf59e002921cc3464ce0d2167 SHA512 6686c75dbfcd5a5f9d6ef4d667916f54388180045471f8eb585c7b0d6e03f5d56c3fc892c97851f7453318309a456bbfd877eb240cbf008b71984009d08a8181
diff --git a/media-sound/openmpt123/openmpt123-0.7.6.ebuild b/media-sound/openmpt123/openmpt123-0.7.7.ebuild
index 7a9a61c20138..d3819b92551d 100644
--- a/media-sound/openmpt123/openmpt123-0.7.6.ebuild
+++ b/media-sound/openmpt123/openmpt123-0.7.7.ebuild
@@ -9,6 +9,7 @@ MY_P="libopenmpt-${PV}+release.autotools"
 DESCRIPTION="libopenmpt-based command line player for tracked music files (modules)"
 HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
 SRC_URI="https://lib.openmpt.org/files/libopenmpt/src/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
@@ -25,8 +26,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
 	default