6 files changed, 233 insertions, 2 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index b021fd2a53b5..fbe7d04d33b8 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/helm/Manifest b/media-sound/helm/Manifest
index 4d8775a4b58e..e252e5af75b4 100644
--- a/media-sound/helm/Manifest
+++ b/media-sound/helm/Manifest
@@ -1,5 +1,6 @@
 AUX helm-0.9.0-fix-gcc91.patch 6514 BLAKE2B 54c3c5baf336ee1c2739922be6040d69309db94394967be335103fe325c96afe69f05fbdde0516c153bc47763fc3686c9e0461c6b12dbec59476c85a003e4397 SHA512 4c12575c6a58c6a03644b9c7d560e3a794fa3575ac10eb9301ca911a58a86eb5c721f0e4c8c1c5bfcf81b6efba25ed7bdba2a12fe68ec49eb18581067cec06bb
+AUX helm-0.9.0-musl.patch 4733 BLAKE2B 2b53b447329916a79f7c3efd3e0d9fac5900d657d1e57ff4d75f7cd65c8f45f914e5f5ab79cad05047c46ebc0c6a04a23675416148d1b9251b42a8494d7c8f49 SHA512 4434dbdaefae36198c2102c7b837e32c0be5ad858fe2791bd6cdd730d1c3a24a9cfab9adbc1d1bea4a84ad5cea2a14055c37ecbf85946a2d11ab1e11945d1d1b
 AUX helm-0.9.0-nomancompress.patch 698 BLAKE2B 3b68312c117fb8c1e8496ae02145a66466849de77d51159064b65e51b208b503530ac5b92c1a50e4e8fdc6113121bd26ca20e491adde72f1f1b5b626258c92ec SHA512 e2b0143be141e26a093369c151a87d002508442543482d81e4b67f67475232ec53bc80e11ecad096952e4941efc82889b8cf267a0bfebb13104204b02a50aaed
 DIST helm-0.9.0.tar.gz 15544141 BLAKE2B 1b6811f32cf36a1c1f954cc071cd64f3dca656ee0bd420c01d0be3db516210a92adc3694ac49731cf2d7cf057a9eccf2c2dcefc14d24cf8582a3eb69efe1d0e1 SHA512 241c6bf3aec422e9ccaf7c7113eec7e30a11baadd30fe8f05f0abfac9c41d0c8a9fb284f0cae49bcaf0d3d08aa952737f6ff3eb7d48c2b2e22c60932738aeaa4
-EBUILD helm-0.9.0-r1.ebuild 1082 BLAKE2B 369e46465cebda9688ce332d36cbeb42a5f1c21d1b90a43bf0853744fd7e64618b58d40825a94755794e9fcf98b4278bfac4595ead361b35070aff1625a6a3a1 SHA512 674efef8d4fc8d579093d551f7df10b4d0227f89e2595bd53931ddadd837fc9106f98322887ec6ba976350f352916ff3f315ee2a31a5247d040b3346a32098b1
+EBUILD helm-0.9.0-r2.ebuild 1113 BLAKE2B c12b89e76c0897cc5ddf3a925fd412eabc735eceffb5d6107d7f55ad04fff19b9401c1edfb69db3d43b832307db8b044c917efeac7f8519327c7dc5872f13980 SHA512 f0676a26c5ddee72e3e205f86c59aa0c03189bb967201931d1bc2114998b11642cd6141852db1367610026596371356a8f5a52bae9127b5666834774b1e471de
 MISC metadata.xml 346 BLAKE2B fc26a0eab6a4cf03acaeffbff89155cf20791424374d5443bc82c80820019f0b40b98fa872da40d1012a4a403c25cd93843932f4da53aedef933a974f5a36d38 SHA512 00c7608c5dfd76ec27e8677a2191d4cf78181cf8befbb0799cace3ce7a0361f14121869171e18e3d40db0b593bc2a37949981eb82368411291da0a21c7cdae2d
diff --git a/media-sound/helm/files/helm-0.9.0-musl.patch b/media-sound/helm/files/helm-0.9.0-musl.patch
new file mode 100644
index 000000000000..f089041c1da7
--- /dev/null
+++ b/media-sound/helm/files/helm-0.9.0-musl.patch
@@ -0,0 +1,129 @@
+Upstream (JUCE, bundled): https://github.com/juce-framework/JUCE/pull/1239
+
+From 393de14d3fb55e462eeae24a4e64978a8a30cd4f Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Thu, 15 Jun 2023 19:01:32 +0000
+Subject: [PATCH] JUCE: Add support for musl
+
+---
+ JUCE/modules/juce_core/juce_core.cpp          |  2 +-
+ .../native/juce_linux_SystemStats.cpp         | 34 +++++++++++++++++--
+ .../juce_core/native/juce_posix_SharedCode.h  |  2 +-
+ .../juce_core/system/juce_SystemStats.cpp     |  2 +-
+ .../juce_core/system/juce_TargetPlatform.h    |  9 +++++
+ 5 files changed, 43 insertions(+), 6 deletions(-)
+
+diff --git a/JUCE/modules/juce_core/juce_core.cpp b/JUCE/modules/juce_core/juce_core.cpp
+index 9f87047..c6f28ce 100644
+--- a/JUCE/modules/juce_core/juce_core.cpp
++++ b/JUCE/modules/juce_core/juce_core.cpp
+@@ -93,7 +93,7 @@
+  #include <net/if.h>
+  #include <sys/ioctl.h>
+ 
+- #if ! JUCE_ANDROID
++ #if ! (JUCE_ANDROID || JUCE_MUSL)
+   #include <execinfo.h>
+  #endif
+ #endif
+diff --git a/JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp b/JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp
+index 4b8f4bd..55906eb 100644
+--- a/JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp
++++ b/JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp
+@@ -126,9 +126,37 @@ static String getLocaleValue (nl_item key)
+     return result;
+ }
+ 
+-String SystemStats::getUserLanguage()    { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); }
+-String SystemStats::getUserRegion()      { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); }
+-String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); }
++String SystemStats::getUserLanguage()
++{
++   #if JUCE_GLIBC
++    return getLocaleValue (_NL_ADDRESS_LANG_AB);
++   #else
++    if (auto langEnv = getenv ("LANG"))
++        return String::fromUTF8 (langEnv).upToLastOccurrenceOf (".UTF-8", false, true);
++
++    return {};
++   #endif
++}
++
++String SystemStats::getUserRegion()
++{
++   #if JUCE_GLIBC
++    return getLocaleValue (_NL_ADDRESS_COUNTRY_AB2);
++   #else
++    return {};
++   #endif
++}
++
++String SystemStats::getDisplayLanguage()
++{
++    auto result = getUserLanguage();
++    auto region = getUserRegion();
++
++    if (region.isNotEmpty())
++        result << "-" << region;
++
++    return result;
++}
+ 
+ //==============================================================================
+ void CPUInformation::initialise() noexcept
+diff --git a/JUCE/modules/juce_core/native/juce_posix_SharedCode.h b/JUCE/modules/juce_core/native/juce_posix_SharedCode.h
+index 876e681..59c49ba 100644
+--- a/JUCE/modules/juce_core/native/juce_posix_SharedCode.h
++++ b/JUCE/modules/juce_core/native/juce_posix_SharedCode.h
+@@ -235,7 +235,7 @@ int juce_siginterrupt (int sig, int flag)
+ //==============================================================================
+ namespace
+ {
+-   #if JUCE_LINUX || (JUCE_IOS && ! __DARWIN_ONLY_64_BIT_INO_T) // (this iOS stuff is to avoid a simulator bug)
++   #if JUCE_GLIBC || (JUCE_IOS && ! __DARWIN_ONLY_64_BIT_INO_T) // (this iOS stuff is to avoid a simulator bug)
+     typedef struct stat64 juce_statStruct;
+     #define JUCE_STAT     stat64
+    #else
+diff --git a/JUCE/modules/juce_core/system/juce_SystemStats.cpp b/JUCE/modules/juce_core/system/juce_SystemStats.cpp
+index 7e05277..cac9a14 100644
+--- a/JUCE/modules/juce_core/system/juce_SystemStats.cpp
++++ b/JUCE/modules/juce_core/system/juce_SystemStats.cpp
+@@ -120,7 +120,7 @@ String SystemStats::getStackBacktrace()
+ {
+     String result;
+ 
+-   #if JUCE_ANDROID || JUCE_MINGW
++   #if JUCE_ANDROID || JUCE_MINGW || JUCE_MUSL
+     jassertfalse; // sorry, not implemented yet!
+ 
+    #elif JUCE_WINDOWS
+diff --git a/JUCE/modules/juce_core/system/juce_TargetPlatform.h b/JUCE/modules/juce_core/system/juce_TargetPlatform.h
+index ae9d7e1..9dca4bc 100644
+--- a/JUCE/modules/juce_core/system/juce_TargetPlatform.h
++++ b/JUCE/modules/juce_core/system/juce_TargetPlatform.h
+@@ -33,6 +33,7 @@
+     - Either JUCE_LITTLE_ENDIAN or JUCE_BIG_ENDIAN.
+     - Either JUCE_INTEL or JUCE_ARM
+     - Either JUCE_GCC or JUCE_CLANG or JUCE_MSVC
++    - Either JUCE_GLIBC or JUCE_MUSL will be defined on Linux depending on the system's libc implementation.
+ */
+ 
+ //==============================================================================
+@@ -177,6 +178,14 @@
+   #elif __MMX__ || __SSE__ || __amd64__
+     #define JUCE_INTEL 1
+   #endif
++
++  #if JUCE_LINUX
++    #ifdef __GLIBC__
++      #define JUCE_GLIBC 1
++    #else
++      #define JUCE_MUSL 1
++    #endif
++  #endif
+ #endif
+ 
+ //==============================================================================
+-- 
+2.41.0
+
diff --git a/media-sound/helm/helm-0.9.0-r1.ebuild b/media-sound/helm/helm-0.9.0-r2.ebuild
index eb8bb1120649..46ef109dc534 100644
--- a/media-sound/helm/helm-0.9.0-r1.ebuild
+++ b/media-sound/helm/helm-0.9.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,6 +34,7 @@ DOCS=( changelog README.md )
 PATCHES=(
 	"${FILESDIR}/${P}-nomancompress.patch"
 	"${FILESDIR}/${P}-fix-gcc91.patch"
+	"${FILESDIR}/${P}-musl.patch"
 )
 
 src_prepare() {
diff --git a/media-sound/playerctl/Manifest b/media-sound/playerctl/Manifest
index b98670f4d56c..2af1be06f5c2 100644
--- a/media-sound/playerctl/Manifest
+++ b/media-sound/playerctl/Manifest
@@ -1,5 +1,6 @@
 DIST playerctl-2.3.1.tar.gz 73595 BLAKE2B d6d60d82fb0a8951fba4a3de91ff1e3f4bdba7177563b65b2da53525af4ca40f42755c577f652aaa24d2de308f56a495c8f87840ad67d6cda840cba1411abdb0 SHA512 06a10d193c83f60a9a9c50dddfb0a74e00be8cde34ddaa9d75582b7ce487ac564d1ff0675f6cb0c27d968e7d435b6a427818ac14e0cdd94b86af8f5d89661a93
 DIST playerctl-2.4.1.tar.gz 77371 BLAKE2B ae9f691d714d6235bd7dc3e3d9a2ed21190482bd2aa8642c108ade0c09902ccb20196d0180ed3b1ffe680ca4e6a4ee293de1a6f10d54878589e3d8c81ca81c53 SHA512 2d84f657b07c948cd6990d9e79c4eb6e83f97c387ac53c2322fc0adbeb853950fa935332233329e7555db7d157f3ced6498cc102edaffd78849ca1f7d4c49bdc
 EBUILD playerctl-2.3.1.ebuild 1202 BLAKE2B a6aa753d25f13e67f3c07ad2c84eb5a8cfca681fdf79b104697e775495fdcd79834a0f455bf9975713768e15b37c3d895468f897dc58dcb5cb6501f9fc1d7542 SHA512 d542fecca06ef234072c715be3ccca5771864eeb05112750ac30376e95655e4833d6fe1d44f060a4f556b853f1d27f7cfdc956f1179ac1a0f3639a8eba33b418
+EBUILD playerctl-2.4.1-r1.ebuild 2361 BLAKE2B 8af9d735a9d2e7d818dea55fdeff55816bada0ee1e9476a8a5e6b0db18eacf271de759bc85cc9c99c467f2b1e821570d3da6f0c83c2581ea12555fca38fcbc34 SHA512 bb586f4b92f0f084844fc6ba23e5056553109e34ffb53462fa34d1532245ad57f5825462d626f3ba27457fa0a5c4aa41d298e6623b6f653117f29da9b14179e6
 EBUILD playerctl-2.4.1.ebuild 1212 BLAKE2B a4e2c1675096a87e8c44b3d9bd48a71f5f5da1fb9a2ddc8205b97cc4b4c463017d7639c99a5a7e0f688ac493e05dbf0dca3f3fa8a1dcaae62ffe35d820872c65 SHA512 fdaea7744cac060bc85b341f738a16c8ec5d5fb5681f96bd9a38f106f8c1e994f176e41b1ed56fea547a3d6f5973521ce1e2c74a5b8d6aec09f3ffa77bfbc9eb
 MISC metadata.xml 344 BLAKE2B 291e21642ebc0aed630579a079c007dc54669960a8b2e68f8a62f199a1cf308f0d020118fedfbd5693010d2de61f1c7b6488acf720508422493cf3e83f1ac466 SHA512 d7df9fd6e2a27888c608dd8a39461145489bbaef13fe83d0bde941adba3a496106b62ae33562a89bbb0dfa718785104f57a11fba3cc73a18edbeb5990a7c6a5f
diff --git a/media-sound/playerctl/playerctl-2.4.1-r1.ebuild b/media-sound/playerctl/playerctl-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..e1337e2c4146
--- /dev/null
+++ b/media-sound/playerctl/playerctl-2.4.1-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit bash-completion-r1 meson python-any-r1 virtualx xdg-utils
+
+DESCRIPTION="A CLI utility to control media players over MPRIS"
+HOMEPAGE="https://github.com/acrisci/playerctl"
+SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc introspection test"
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+	test? (
+		${PYTHON_DEPS}
+		sys-apps/dbus
+		$(python_gen_any_dep '
+			dev-python/dbus-next[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+			dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Requires a lenient dbus config systemwide
+	# See test/data/dbus-system.conf and how its used in Dockerfile
+	"test/test_basics.py::test_system_list_players"
+	# Daemon tests are inconsistent, occasional failure occurs in upstream CI as well.
+	"test/test_daemon.py"
+)
+
+python_check_deps() {
+	python_has_version \
+		"dev-python/dbus-next[${PYTHON_USEDEP}]" \
+		"dev-python/pytest[${PYTHON_USEDEP}]" \
+		"dev-python/pytest-asyncio[${PYTHON_USEDEP}]" \
+		"dev-python/pytest-timeout[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddatadir=share
+		-Dbindir=bin
+		-Dbash-completions=false
+		-Dzsh-completions=false
+		$(meson_use doc gtk-doc)
+		$(meson_use introspection)
+	)
+
+	xdg_environment_reset # bug #596166
+	meson_src_configure
+}
+
+src_test() {
+	local dbus_params=(
+		$(dbus-daemon --session --print-address --fork --print-pid)
+	)
+	local -x DBUS_SESSION_BUS_ADDRESS=${dbus_params[0]}
+
+	export PATH="${BUILD_DIR}/playerctl/:${PATH}"
+
+	virtx epytest
+
+	kill "${dbus_params[1]}" || die
+}
+
+src_install() {
+	meson_src_install
+
+	docinto examples
+	dodoc -r "${S}"/examples/.
+	docompress -x "/usr/share/doc/${PF}/examples"
+
+	newbashcomp data/playerctl.bash "${PN}"
+	insinto /usr/share/zsh/site-functions
+	newins data/playerctl.zsh _playerctl
+}