gentoo auto-resync : 10:08:2024 - 11:05:14

6 files changed, 40 insertions, 89 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index e49d1560315c..d81da77932f8 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index 34dc9fc89577..3fd8375ce181 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,7 +1,5 @@
-DIST easyeffects-7.0.7.tar.gz 3359508 BLAKE2B 16c4fd322eefcd16bb8a83a5443e482689b2f4665556f306e11c072b869f9929d5c7b781f7adbba7faacb71a07c0bdd2b61efb6584131e61e2bfa6dedcdf3c8d SHA512 3ceadf6c8acff64a98cf6c0e2c5386aa7b6d4649d49a9879574415bb7959b9c7243870bc30ea38bb3de3ee5b4d9ab9892eb8809069c08b2a50ab7f2342f6a1e4
 DIST easyeffects-7.1.3.tar.gz 3426093 BLAKE2B 62ff40388df2a3452d23968881ab7d247c5504abc4524564e919cc520700e64978914248f00fb8b3ae251b895850d9a4dee763576baf2c43af3cd1105d2b62d5 SHA512 9e277b0c432f5015b33d4ac6961d5eec4cbf498dd2e947d231a9c13d8c7b7680f7ded7bf3d55d2c72ebf46de94308447a0b1e3b8cbbb13ce96c3a79bf027ffa3
 DIST easyeffects-7.1.6.tar.gz 3505689 BLAKE2B fbb1dd05b2e5f8e3224653ddebf49175af1d6b39d034d6446750e780ec0f8f8a4d58b085c019767a121641d8b5176f0a6a0d828c3537aa2c3803223015fe6826 SHA512 7c70aeb66fc2242011c96d44b4a007cdec4733c968195089ec62968ee1dcb96ec6460ac67a2eb8baa104120bc13798792236fb677ac3f56557bfb05109b43f02
-EBUILD easyeffects-7.0.7.ebuild 2046 BLAKE2B eee6f202ac140bb8a0235a9319a9c7c0b1554fd5750c4a672699abbaf0b4d02d40e491e99f22b237e424126869cece8763d95d1d29e41f88d289c8a8738c56df SHA512 c0acf5b74a42b5f8b229f52c110b35ae8bb6742bc77bb685e34291ebb55f35bb367e434f471b1a5b24845b304e70f9eeb43ad45d477bde9014c9f717217b5cb6
 EBUILD easyeffects-7.1.3-r1.ebuild 2065 BLAKE2B f71f3eb3955f62d1d65b96e8e7e7c4f7602e014a1e9e17edd69f17ea841276d3c4fd14aaeef80146b21442e4ededf7c6953e382476214965a80f81b59f63c525 SHA512 e87e42d3d0b3698ec2cbcd93d02ca9f615b9a9e54601a8f720bf90960ea2683c732cd07e873f062020d84a9f05752a968ee764b4b23197e42d3938d103db434a
 EBUILD easyeffects-7.1.6.ebuild 2065 BLAKE2B f71f3eb3955f62d1d65b96e8e7e7c4f7602e014a1e9e17edd69f17ea841276d3c4fd14aaeef80146b21442e4ededf7c6953e382476214965a80f81b59f63c525 SHA512 e87e42d3d0b3698ec2cbcd93d02ca9f615b9a9e54601a8f720bf90960ea2683c732cd07e873f062020d84a9f05752a968ee764b4b23197e42d3938d103db434a
 MISC metadata.xml 733 BLAKE2B cfc90445078df7e5abda40006ed83c0deb34f58dc1bf38fe51ece0436db623ca75d7d802997666d9a1aa15c08bb01d456c74e2c639c4ba5eb61511d8f98511cf SHA512 8c5badf73c406ed0b86ec19ad8d5363ddad4382ba5ca5778d6ba653f3f23d6e91d8d4e1eb85fff24e6f780ef43239550c054b8653b2e06b18aaf54c508b2260a
diff --git a/media-sound/easyeffects/easyeffects-7.0.7.ebuild b/media-sound/easyeffects/easyeffects-7.0.7.ebuild
deleted file mode 100644
index 0e8515fc94de..000000000000
--- a/media-sound/easyeffects/easyeffects-7.0.7.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2-utils meson toolchain-funcs
-
-DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
-HOMEPAGE="https://github.com/wwmm/easyeffects"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
-else
-	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="calf +doc mda-lv2 zamaudio"
-
-COMMON="dev-cpp/nlohmann_json
-	dev-cpp/tbb
-	>=dev-libs/glib-2.56:2
-	dev-libs/libfmt
-	>=dev-libs/libsigc++-3.0.6:3
-	>=gui-libs/gtk-4.10.0:4
-	>=gui-libs/libadwaita-1.2.0:1
-	media-libs/libbs2b
-	>=media-libs/libebur128-1.2.0
-	media-libs/libsndfile
-	media-libs/libsoundtouch
-	>=media-libs/lilv-0.22
-	>=media-libs/lv2-1.18.2
-	media-libs/rnnoise
-	media-libs/speexdsp
-	>=media-libs/zita-convolver-3.0.0
-	>=media-video/pipewire-0.3.41
-	sci-libs/gsl:=
-	sci-libs/fftw:3.0"
-# Only header files are used from libsamplerate
-DEPEND="${COMMON}
-	media-libs/libsamplerate"
-RDEPEND="${COMMON}
-	>=media-libs/lsp-plugins-1.1.24[lv2]
-	sys-apps/dbus
-	calf? ( >=media-plugins/calf-0.90.1[lv2] )
-	doc? ( gnome-extra/yelp )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	zamaudio? ( media-plugins/zam-plugins )"
-BDEPEND="dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if ! tc-is-gcc; then
-			if ! tc-is-clang || [[ $(clang-major-version) -lt 16 ]]; then
-				die "${PN} can only be built with GCC or >=Clang-16 due to required level of C++20 support"
-			fi
-		elif [[ $(gcc-major-version) -lt 11 ]] ; then
-			die "Since version 6.2.5 ${PN} requires GCC 11 or newer to build (Bug #848072)"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 3d372691a691..16ba800116be 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -5,6 +5,7 @@ AUX musescore-4.2.0-uncompressed-man-pages.patch 1556 BLAKE2B b2c032449faff89134
 AUX musescore-4.2.1-missing-headers.patch 1579 BLAKE2B d62776063fa580da011abee3461de770f7039d4e5f2633d2c4093896c7b46a45c2781997772394efaf050fa9a2555717ff2a25326a352f5a4f235b4ff111d9a7 SHA512 48f47706581fb57054fb5db6883218befcda45fdeda9ba894d62cef5a3b758df76f8994e23ca627feb0fbfcda4071b5cfae033f2cdb375737465ca5c60a9e9de
 AUX musescore-4.3.2-unbundle-deps.patch 1391 BLAKE2B 42d0d3d93080116f3351b6252532efd3d4d3968643847d2fc3b7495766c22a019dd373baa5dfbb69b50fc010b3ae846dc06654653d5420964272863ea1a165e2 SHA512 a9c314253138faeb6845dffc530fe521458f2169b3d93c7d48e7ea5d7e6d22a0475aba1f28e52ab78e3cce56c227c5c64dfdf22c4d6f80c3b27cf7ff85e1ec00
 AUX musescore-4.4.0-unbundle-deps.patch 713 BLAKE2B e400b26901dcb435ab0b5f382de57ed0183cc16e94cb5656764355998d80ae33e40410fa4ffbaaec06b3fcac8da656e025bfd6e751ba67756dca1f7d10d77f36 SHA512 87b9976f6a470632fc52b2c01d81ae36e57bc545223c67ecbdedace4b8953ca6417986d2c3cdccf8f37306a48678e6e7c0ff1db1d2e59e9f4e7c19a7796ed5de
+AUX musescore-4.4.0-unbundle-harfbuzz.patch 937 BLAKE2B 219c5041fb5021801cb543fccbc9cc7e741dfa891e16f208380c17324d533613b6c89f429ee7d17d64a17a141e38b1da6576841dcef8402d41a5a66cb3926f84 SHA512 ee140c3733ca846139db199ec4498c70a99d8f6542075130d9cd372a990f191e18a74942b73089f0d51fe5849e91fbc1b9dfcfd4f250bb1045b3ac2098640c5c
 AUX musescore-4.4.0-uncompressed-man-pages.patch 1598 BLAKE2B 79b4c6c2a84f1a02db2664b358cd54716979684ebcb7f335c56f0fe64f82850e83fea9916f20a547452ff44dac45d2bd1600a4b75785882ef90c72f31e2ea2d0 SHA512 30eb90e083d87a304d55942e3de2252fe890fc30c08cd0f5b2d64b8969323a1c7f098791d70f8c61ff90cfb9277576e2b957db0876f443b040edf9525acfb858
 AUX musescore-9999-unbundle-deps.patch 3559 BLAKE2B 3037cae81b80360135ee78a3cfd320cdb3a0e1c4904c0a342ef72506acdac2fc10a5b22dd0e28199a13f251b84e63b75d2968f032e053627b934b3ae76f57c75 SHA512 0abf3a8eeca2f01b87c396600f4c386908b6241d54d5d30d4b3d65edbcce6d6dbab9d40f0c798248f8882f3df5fd6574260f1506f341b03676be9667cd2147f2
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
@@ -12,5 +13,5 @@ DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c26800
 DIST musescore-4.3.2.tar.gz 138083648 BLAKE2B 02c1fe9de387fd7783ecb26643f76694d7b4c29541318799c9c35f0f222d7a89ccd3164ec6109bb265245d836a2eb73f29ef687bebc2fb189eacf30c7e5ca970 SHA512 9cffbc25c748970980ec6013c4489178b143ec9ac78fbfcb995b1fbc02512cb6ff3ce912224ded9b526811c6b86a1810307c888e354d9ef09febdffa525f94c5
 EBUILD musescore-3.6.2-r1.ebuild 3193 BLAKE2B dc44dcc6cb9d6003efcdb1174ccf7f2a66527e4ce5db525780560aa9b3731b908414c369e6384048758663ce14beff11544b32a9675ea970ede394b48da207eb SHA512 041af2ab74dfdefe5714eb92f30bd90340b47af39fbde2a5c95bb993c0c32e8b6d0cc79e704836d55cc10511c0fc8f9f7f8b0a4f0f38dcb2dffc02d695644e17
 EBUILD musescore-4.3.2.ebuild 3512 BLAKE2B 26f40f19afce67c6a110ba22a188cd28a9bded91ced5aa73805b9a73480e449e0d2f93e824b50d28f20790131a40c7a383aaabe65e0f9ea1675045151d53acb2 SHA512 e3eec4cf8bc414b585ac9cd9232f1776060baee02f9e7dfbc9e78fc39f8f5c76d6ee60eb59f8964952458a8f7e42c19618c3d4da9fc16787ac3ef7ab9d32d4ba
-EBUILD musescore-9999.ebuild 2944 BLAKE2B 0c26b6f4a2f0e82354aec2dc66de6b5ff573f745eebeb6ffd187f2e37a3804adba7e569ff78d75c18ef5ac77af21fee50c5ee4b328b15a2bfdabd00490204654 SHA512 f61cdbd0cb60735324b4fe3fb2f84d1c911f1c887d6ce9195b7a2d2a6120cdcd90f4a57183981d89212f8925138ce8137a93c06ecb27493a1f95d264e263f6e5
+EBUILD musescore-9999.ebuild 3231 BLAKE2B eccb265a160bf159e2b18d5d4a216114a639368e797a63fa9c8120cc5b93c657e68df1abb00d671e3b2811b67ee2cc4dadeb07ceb398c15a923fc5ce2fc255ec SHA512 be978c5f26daa363924859256bba3caed7e03b8a40629d6a52414e44aad970689f83048c9ad1168c13b22ce7f3685b738d7f32650bf10c1bacfcab62a36e6ee8
 MISC metadata.xml 968 BLAKE2B 40353ff933140a132cf852f6131123d9817b8f5918efcf66c9ee0f6eb79f3945972dc26428d324c05307e9889aaf6ffcab5ea96cafd5c0b019188924165e49a9 SHA512 11cb6ef3bbfde4b84b8cd6a3620360c981feddb93cfe6f5fc3c73a371bd31ed61564b8a8a4b7489fa9dd87616c2e29e87d1a48a7151464dcd6da20d936ae5d34
diff --git a/media-sound/musescore/files/musescore-4.4.0-unbundle-harfbuzz.patch b/media-sound/musescore/files/musescore-4.4.0-unbundle-harfbuzz.patch
new file mode 100644
index 000000000000..b9a1247a78c1
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.4.0-unbundle-harfbuzz.patch
@@ -0,0 +1,25 @@
+--- a/src/framework/draw/CMakeLists.txt
++++ b/src/framework/draw/CMakeLists.txt
+@@ -123,20 +123,14 @@ else()
+     include(${local_path}/harfbuzz.cmake)
+ 
+     # func from ${name}.cmake)
+-    cmake_language(CALL harfbuzz_Populate ${remote_url} ${local_path} "source" "" "")
+ 
+-    add_subdirectory(_deps/harfbuzz/harfbuzz)
+-    target_no_warning(harfbuzz -Wno-conversion)
+-    target_no_warning(harfbuzz -Wno-unused-parameter)
+-    target_no_warning(harfbuzz -Wno-unused-variable)
+-    target_no_warning(harfbuzz -WMSVC-no-hides-previous)
+-    target_no_warning(harfbuzz -WMSVC-no-unreachable)
++    pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz)
+ 
+     #add_subdirectory(thirdparty/msdfgen)
+ 
+     set(MODULE_INCLUDE
+         ${FREETYPE_INCLUDE_DIRS}
+-        ${CMAKE_CURRENT_LIST_DIR}/_deps/harfbuzz/harfbuzz/harfbuzz/src
++	/usr/include/harfbuzz
+         #${CMAKE_CURRENT_LIST_DIR}/thirdparty/msdfgen/msdfgen-1.4
+     )
+ 
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 5e65d317f42e..06e97196028f 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -59,6 +59,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-uncompressed-man-pages.patch"
 	"${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch"
+	"${FILESDIR}/${PN}-4.4.0-unbundle-harfbuzz.patch"
 	"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
 )
 
@@ -86,13 +87,11 @@ src_configure() {
 	export PATH="$(qt5_get_bindir):${PATH}"
 
 	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE="release"
 		-DCMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}"
 		-DCMAKE_C_FLAGS_RELEASE="${CFLAGS}"
 		-DCMAKE_INSTALL_PREFIX=/usr
 		-DCMAKE_SKIP_RPATH=TRUE
-		-DMUE_BUILD_CRASHPAD_CLIENT=OFF
-		-DMUE_BUILD_UNIT_TESTS="$(usex test)"
-		-DMUE_BUILD_UPDATE_MODULE=OFF
 		-DMUE_BUILD_VIDEOEXPORT_MODULE="$(usex video)"
 		-DMUE_COMPILE_USE_CCACHE=OFF
 		-DMUE_COMPILE_USE_SYSTEM_FLAC=ON
@@ -100,15 +99,23 @@ src_configure() {
 		-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON
 		-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON
 		-DMUE_DOWNLOAD_SOUNDFONT=OFF
-		-DMUE_ENABLE_AUDIO_JACK=$(usex jack)
-		-DMUSESCORE_BUILD_MODE=release
+		-DMUSE_APP_BUILD_MODE="release"
+		-DMUSE_MODULE_AUDIO_JACK="$(usex jack)"
+		-DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF
+		# tests
+		-DMUE_BUILD_BRAILLE_TESTS="$(usex test)"
+		-DMUE_BUILD_ENGRAVING_TESTS="$(usex test)"
+		-DMUE_BUILD_IMPORTEXPORT_TESTS="$(usex test)"
+		-DMUE_BUILD_NOTATION_TESTS="$(usex test)"
+		-DMUE_BUILD_PLAYBACK_TESTS="$(usex test)"
+		-DMUE_BUILD_PROJECT_TESTS="$(usex test)"
 	)
 	cmake_src_configure
 }
 
 src_compile() {
 	cd "${BUILD_DIR}" || die
-	cmake_build lrelease manpages
+	cmake_build
 	cmake_src_compile
 }