Merge updates from master

2026-09-24 04:59:14 -07:00 · 2025-10-26 01:18:39 +00:00
parent 6cee67a873 faad3f4ef3
commit 077547e0f4
22 changed files with 225 additions and 39 deletions
--- a/app-antivirus/clamav/clamav-1.4.3.ebuild
+++ b/app-antivirus/clamav/clamav-1.4.3.ebuild
@@ -166,7 +166,7 @@ LICENSE="Apache-2.0 BSD GPL-2 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB"
 # 0/sts (short term support) if not an LTS release
 SLOT="0/sts"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi

 IUSE="doc clamonacc +clamapp experimental libclamav-only milter rar selinux +system-mspack systemd test"
--- a/app-text/ebook-tools/ebook-tools-0.2.2-r4.ebuild
+++ b/app-text/ebook-tools/ebook-tools-0.2.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="+lit2epub"

 DEPEND="
--- a/dev-java/guice/guice-7.0.0.ebuild
+++ b/dev-java/guice/guice-7.0.0.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${P}/core"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"

 CP_DEPEND="
 	dev-java/aopalliance:1
--- a/dev-java/jakarta-inject-tck/jakarta-inject-tck-2.0.1.ebuild
+++ b/dev-java/jakarta-inject-tck/jakarta-inject-tck-2.0.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/inject-tck-${MY_COMMIT}"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"

 CP_DEPEND="
 	dev-java/injection-api:0
--- a/dev-lang/fpc/fpc-3.2.2.ebuild
+++ b/dev-lang/fpc/fpc-3.2.2.ebuild
@@ -1,19 +1,22 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

 inherit prefix toolchain-funcs

-HOMEPAGE="https://www.freepascal.org/"
 DESCRIPTION="Free Pascal Compiler"
-SRC_URI="https://downloads.sourceforge.net/freepascal/fpcbuild-${PV}.tar.gz
-	https://downloads.sourceforge.net/freepascal/fpc-${PV}.source.tar.gz
-	amd64? ( https://downloads.sourceforge.net/freepascal/${P}.x86_64-linux.tar )
-	arm64? ( https://downloads.sourceforge.net/freepascal/${P}.aarch64-linux.tar )
-	sparc? ( https://downloads.sourceforge.net/freepascal/${P}.sparc64-linux.tar )
-	x86? ( https://downloads.sourceforge.net/freepascal/${P}.i386-linux.tar )
-	doc? ( https://downloads.sourceforge.net/freepascal/Documentation/${PV}/doc-html.tar.gz -> ${P}-doc-html.tar.gz )"
+HOMEPAGE="https://www.freepascal.org/"
+SRC_URI="
+	https://downloads.freepascal.org/fpc/dist/${PV}/source/fpcbuild-${PV}.tar.gz
+	https://downloads.freepascal.org/fpc/dist/${PV}/source/fpc-${PV}.source.tar.gz
+	doc? ( https://downloads.freepascal.org/fpc/dist/${PV}/docs/doc-html.tar.gz -> ${P}-doc-html.tar.gz )
+
+	amd64? ( https://downloads.freepascal.org/fpc/dist/${PV}/x86_64-linux/${P}.x86_64-linux.tar )
+	arm64? ( https://downloads.freepascal.org/fpc/dist/${PV}/aarch64-linux/${P}.aarch64-linux.tar )
+	sparc? ( https://downloads.freepascal.org/fpc/dist/${PV}/sparc64-linux/${P}.sparc64-linux.tar )
+	x86? ( https://downloads.freepascal.org/fpc/dist/${PV}/i386-linux/${P}.i386-linux.tar )
+"
 S="${WORKDIR}/fpcbuild-${PV}/fpcsrc"

 LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
--- a/dev-lang/mrustc/mrustc-0.11.2-r1.ebuild
+++ b/dev-lang/mrustc/mrustc-0.11.2-r1.ebuild
@@ -50,17 +50,17 @@ QA_FLAGS_IGNORED="
 	usr/lib/rust/${P}/lib/rustlib/$(rust_abi)/lib/*.rlib
 "

-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && ! tc-is-gcc; then
-		die "mrustc needs to be built using GCC."
-	fi
-}
-
 src_configure() {
 	:
 }

 src_compile() {
+	if ! tc-is-gcc ; then
+		# mrustc needs to be built using GCC
+		export CC=${CHOST}-gcc
+		export CXX=${CHOST}-g++
+		tc-is-gcc || die "tc-is-gcc failed in spite of CC=${CC}"
+	fi
 	export PARLEVEL=$(makeopts_jobs)
 	export RUSTC_VERSION=${MRUSTC_RUST_VER} # Pretend that we're using upstream-supported Rust
 	export MRUSTC_TARGET_VER=${RUSTC_VERSION%.*}
--- a/dev-lang/mrustc/mrustc-9999.ebuild
+++ b/dev-lang/mrustc/mrustc-9999.ebuild
@@ -47,17 +47,17 @@ QA_FLAGS_IGNORED="
 	usr/lib/rust/${P}/lib/rustlib/$(rust_abi)/lib/*.rlib
 "

-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && ! tc-is-gcc; then
-		die "mrustc needs to be built using GCC."
-	fi
-}
-
 src_configure() {
 	:
 }

 src_compile() {
+	if ! tc-is-gcc ; then
+		# mrustc needs to be built using GCC
+		export CC=${CHOST}-gcc
+		export CXX=${CHOST}-g++
+		tc-is-gcc || die "tc-is-gcc failed in spite of CC=${CC}"
+	fi
 	export PARLEVEL=$(makeopts_jobs)
 	export RUSTC_VERSION=${MRUSTC_RUST_VER} # Pretend that we're using upstream-supported Rust
 	export MRUSTC_TARGET_VER=${RUSTC_VERSION%.*}
--- a/dev-lang/rust/rust-1.74.1-r101.ebuild
+++ b/dev-lang/rust/rust-1.74.1-r101.ebuild
@@ -237,7 +237,10 @@ pkg_setup() {

 		if use mrustc-bootstrap; then
 			if ! tc-is-gcc; then
-				die "USE=mrustc-bootstrap reqires that the build environment use GCC"
+				# USE="mrustc-bootstrap" reqires that the build environment use GCC
+				export CC=${CHOST}-gcc
+				export CXX=${CHOST}-g++
+				tc-is-gcc || die "tc-is-gcc failed in spite of CC=${CC}"
 			fi
 		else
 			rust_pkg_setup
@@ -459,7 +462,11 @@ src_configure() {
 			ranlib = "$(tc-getRANLIB)"
 			llvm-libunwind = "$(usex llvm-libunwind $(usex system-llvm system in-tree) no)"
 		_EOF_
-		if use system-llvm; then
+		if use mrustc-bootstrap; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				llvm-config = "${WORKDIR}/llvm-config"
+			_EOF_
+		elif use system-llvm; then
 			cat <<- _EOF_ >> "${S}"/config.toml
 				llvm-config = "$(get_llvm_prefix)/bin/llvm-config"
 			_EOF_
@@ -648,13 +655,64 @@ mrustc_bootstrap() {
 	# These flags are used in every invocation of our bootstrap `cargo`.
 	local cargo_flags="--target ${CFG_COMPILER_HOST_TRIPLE} -j $(makeopts_jobs) --release --verbose"

+	# for bootstrap, let's using the built-in stdlib of compiler (could be the bundled one)
+	filter-flags '-stdlib=*'
+
+	# mrustc requires gcc, so disable libcxx to avoid linker failure on w/o '-lstdc++'
+	[[ "${LLVM_USE_LIBCXX}" == "1" ]] && unset LLVM_USE_LIBCXX
+
+	local llvm_config_wrapper_cxxflags=0
+
 	if use system-llvm; then
 		export LLVM_CONFIG="$(get_llvm_prefix)/bin/llvm-config"
+
+		local llvm_config_cxxflags=$(${LLVM_CONFIG} --cxxflags)
+		elog "Checking llvm-config --cxxflags: '${llvm_config_cxxflags}'"
+		[[ "${llvm_config_cxxflags}" =~ (^|[[:space:]])-stdlib=libc\+\+([[:space:]]|$) ]] && {
+			elog "Found LLVM CXXFLAGS has \"--stdlib=libc++\""
+			llvm_config_wrapper_cxxflags=1
+		}
 	else
 		llvm_bootstrap
 		export LLVM_CONFIG="${WORKDIR}/bootstrap/llvm/bin/llvm-config"
 	fi

+	elog "LLVM_CONFIG before wrappers: ${LLVM_CONFIG}"
+
+	# workaround for gcc bug 122409 on musl by wrapping llvm-config
+	# to append libc++ header if has "-stdlib=libc++"
+	elog "Preparing wrapper of llvm-config (${WORKDIR}/llvm-config)"
+	cat > ${WORKDIR}/llvm-config <<-EOF || die
+	#!/bin/bash
+
+	RULES=()
+	for flag in "\$@"; do
+	    case "\${flag}" in
+	$([[ "${llvm_config_wrapper_cxxflags}" == 1 ]] && {
+		echo "        --cxxflags) RULES+=( \"-E\" \"s@(^|[[:space:]]+)(-stdlib=libc\\+\\+)(\\$|[[:space:]])@\\1-I${EPREFIX}/usr/include/c++/v1 \\2\\3@g\" ) ;;"
+	})
+	        *)
+	            ;;
+	    esac
+	done
+
+	[[ -z "\${RULES}" ]] && {
+	    ${LLVM_CONFIG} "\$@"
+	} || {
+	    ${LLVM_CONFIG} "\$@" | \\
+	        tee -a ${T}/llvm-config.0.log | \\
+	        sed "\${RULES[@]}" | \\
+	        tee -a ${T}/llvm-config.1.log
+	    exit \${PIPESTATUS[0]}
+	}
+	EOF
+	export LLVM_CONFIG="${WORKDIR}/llvm-config"
+	chmod +x ${WORKDIR}/llvm-config || die
+
+	einfo "llvm-config wrapper contents:"
+	cat "${LLVM_CONFIG}" || die
+	echo
+
 	# define the mrustc sysroot and common minicargo arguments.
 	local mrustc_sysroot="${BROOT}/usr/lib/rust/mrustc-${MRUSTC_VERSION}/lib/rustlib/${CFG_COMPILER_HOST_TRIPLE}/lib"
 	local minicargo_common_args=(
--- a/dev-python/aiohttp/aiohttp-3.13.1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.13.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="+native-extensions test-rust"

 DEPEND="
--- a/dev-python/backports-zstd/backports-zstd-1.0.0-r1.ebuild
+++ b/dev-python/backports-zstd/backports-zstd-1.0.0-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="

 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"

 DEPEND="
 	app-arch/zstd:=
--- a/dev-python/grpcio/grpcio-1.75.0.ebuild
+++ b/dev-python/grpcio/grpcio-1.75.0.ebuild
@@ -28,7 +28,7 @@ SRC_URI+="

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"

 DEPEND="
 	dev-libs/openssl:=
--- a/dev-python/mypy/mypy-1.18.1.ebuild
+++ b/dev-python/mypy/mypy-1.18.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+native-extensions"

 # stubgen collides with this package: https://bugs.gentoo.org/585594
--- a/dev-python/numexpr/numexpr-2.12.1.ebuild
+++ b/dev-python/numexpr/numexpr-2.12.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"

 DEPEND="
 	>=dev-python/numpy-2.0.0_rc:=[${PYTHON_USEDEP}]
--- a/dev-python/pynacl/pynacl-1.6.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.6.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"

 DEPEND="
 	dev-libs/libsodium:=
--- a/dev-python/pyqt5-sip/pyqt5-sip-12.17.1.ebuild
+++ b/dev-python/pyqt5-sip/pyqt5-sip-12.17.1.ebuild
@@ -14,4 +14,4 @@ HOMEPAGE="https://pypi.org/project/PyQt5-sip/"

 LICENSE="BSD-2"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
--- a/dev-python/python-json-logger/python-json-logger-4.0.0_rc1.ebuild
+++ b/dev-python/python-json-logger/python-json-logger-4.0.0_rc1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"

 BDEPEND="
 	test? (
--- a/dev-python/setproctitle/setproctitle-1.3.7.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.3.7.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"

 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
--- a/dev-util/selenium-manager/selenium-manager-4.35.0.ebuild
+++ b/dev-util/selenium-manager/selenium-manager-4.35.0.ebuild
@@ -34,7 +34,7 @@ LICENSE+="
 	Unicode-DFS-2016 ZLIB BZIP2
 "
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="telemetry test"
 RESTRICT="!test? ( test )"

--- a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r5.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r5.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/graphite-${COMMIT}"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="perl test ${GENTOO_PERL_USESTRING}"
 RESTRICT="!test? ( test )"

--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,2 +1,3 @@
 DIST strawberry-1.2.11.tar.xz 11458100 BLAKE2B b455eebf0aac6559aadd0515ef3a57953f3f1fc8c377f6640ef3faaed44c1cbeedb0b52ad992fbcad4293be0ba01bc393d192c96231156d697c269dc3382d039 SHA512 22e351e9ce6504120495465224e27295a093c09b747cd97b8e00062ca987d9400ad39514bae4aca96a851c68d1e5c354491f7efe65561a970e4a32da4e40920c
 DIST strawberry-1.2.13.tar.xz 11560576 BLAKE2B 109d98bc1bf360244bc63e7ac698996c49de0657e6c5bfefa1908ffae33b5c70806f916547f3c02973d6ab85c43fdf1fccf9a91eb836dcdc4939e509a05054b3 SHA512 473028337b7f0a90da967e5ca997907214b27f60725d305286fc56b3635b6efe2db043891d97474d25e73b81ca0059adcb69f04418524ef3f87ba2db0233d8b3
+DIST strawberry-1.2.14.tar.xz 11478532 BLAKE2B dab3d971fe687264d14d432100a3fdd36157c4d00e90a28243ab6ee9c5eb70ae8cb8d729bf691a576193d6caa244eeba7026bf7f970079089818bd13d7c32389 SHA512 6ba7af9a9e3818a54ac2c340e358b90a6906f03945db1b068e7d236ec256a412d2c41a73db5c0f5d32aeb987b15f752440941b77cf3ad15ccf75c0756a584abf
--- a/media-sound/strawberry/strawberry-1.2.14.ebuild
+++ b/media-sound/strawberry/strawberry-1.2.14.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake optfeature xdg
+
+DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
+HOMEPAGE="https://www.strawberrymusicplayer.org/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3 discord? ( MIT )"
+SLOT="0"
+IUSE="alsa cdda chromaprint +dbus debug discord kde +loudness ipod moodbar mtp +pulseaudio streaming test X"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="kde? ( dbus )"
+
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/icu:=
+	dev-libs/kdsingleapplication[qt6(+)]
+	dev-qt/qtbase:6[concurrent,dbus?,gui,network,ssl,sql,sqlite,widgets,X?]
+	media-libs/taglib:=
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0[alsa?]
+	alsa? ( media-libs/alsa-lib )
+	cdda? ( dev-libs/libcdio:= )
+	chromaprint? ( media-libs/chromaprint:= )
+	ipod? (
+		media-libs/libgpod
+		x11-libs/gdk-pixbuf:2
+	)
+	loudness? ( media-libs/libebur128:= )
+	moodbar? ( sci-libs/fftw:3.0= )
+	mtp? ( media-libs/libmtp:= )
+	pulseaudio? ( media-libs/libpulse )
+	X? ( x11-libs/libX11 )
+"
+# gst-plugins-good provides spectrum plugin for moodbar
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0
+	moodbar? ( media-libs/gst-plugins-good:1.0 )
+	pulseaudio? ( media-plugins/gst-plugins-pulse:1.0 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/sparsehash
+	dev-libs/boost
+	discord? ( dev-libs/rapidjson )
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.11-unforce_alsa.patch
+)
+
+DOCS=( Changelog README.md )
+
+src_configure() {
+	# spotify is not in portage (gst-plugins-rs)
+	local mycmakeargs=(
+		$(cmake_use_find_package test GTest)
+		$(cmake_use_find_package X X11)
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_GIO=ON
+		-DENABLE_GIO_UNIX=ON
+		# depends on sparsehash and taglib
+		# enabled by default because stream reading is not optional
+		-DENABLE_STREAMTAGREADER=ON
+		-DENABLE_ALSA="$(usex alsa)"
+		-DENABLE_PULSE="$(usex pulseaudio)"
+		-DENABLE_DBUS="$(usex dbus)"
+		-DENABLE_MPRIS2="$(usex dbus)"
+		-DENABLE_UDISKS2="$(usex dbus)"
+		-DENABLE_DEBUG_OUTPUT="$(usex debug)"
+		-DENABLE_DISCORD_RPC="$(usex discord)"
+		-DENABLE_KGLOBALACCEL_GLOBALSHORTCUTS=$(usex kde)
+		-DENABLE_SONGFINGERPRINTING="$(usex chromaprint)"
+		-DENABLE_MUSICBRAINZ="$(usex chromaprint)"
+		-DENABLE_X11_GLOBALSHORTCUTS="$(usex X)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_MTP="$(usex mtp)"
+		-DENABLE_GPOD="$(usex ipod)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_EBUR128="$(usex loudness)"
+		-DENABLE_SUBSONIC="$(usex streaming)"
+		-DENABLE_TIDAL="$(usex streaming)"
+		-DENABLE_QOBUZ="$(usex streaming)"
+		-DENABLE_SPOTIFY="$(usex streaming)"
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use test && cmake_build build_tests
+}
+
+src_test() {
+	QT_QPA_PLATFORM=offscreen cmake_build run_strawberry_tests
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	use dbus && optfeature "removable device detection" sys-fs/udisks
+
+	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+	elog "depending on your preferences"
+}
--- a/x11-libs/tslib/tslib-1.23-r1.ebuild
+++ b/x11-libs/tslib/tslib-1.23-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libts/tslib/releases/download/${PV}/${P}.tar.xz"

 LICENSE="LGPL-2 uinput? ( GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="evdev sdl uinput"

 DEPEND="