gentoo auto-resync : 07:08:2024 - 12:37:20

3 files changed, 52 insertions, 5 deletions

diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 1ac6fa500094..ecaf3b8a0e1b 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -4,6 +4,6 @@ AUX lmms-1.2.2-plugin-path.patch 850 BLAKE2B acc62a4400438df292fcf78633ba1bcf672
 AUX lmms-9999-no_compress_man.patch 1708 BLAKE2B d84d15049ffd13e21c5b7bde4ea9e5f342ae5a36399edc60546ec8d27d560a73fb8b8ad9ae8ff4153af76829ef41aa5b953244f2cd381d3ed9e98fdd47f283ef SHA512 9d92bf9ff4a8de50cd8bbb944bab16b2806922594a9ef645495bc9e9691f414088b764426e5833d16c1229842e2064ae3b2ff27c6a6e116134284d5eaca9e134
 AUX lmms-9999-plugin-path.patch 866 BLAKE2B b083ed330c42738b5040488939418075c0d6ddf960a1cf79afb38dfdda86a223362c1325fc02cdbc27a61a2799c05173dc1250aa56ccbaac46b857a4ccdc07e1 SHA512 93865b80f76c4ae2feab91f99261e05626654ce7db82a15fdc9386e93a395ea701bc2558ae04bb8411d9bc1877c38794f5302a3312d6f020b6a5109353f648b7
 DIST lmms_1.2.2.tar.xz 22733960 BLAKE2B 8b561068194e9a4af8260675e784c25a92b6b2f731c29b677cbc16581306bbadcf27ea529adbcd735ff4adffedf3dd98ec7b2d89428a63ea600d022ecdae58e4 SHA512 df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028
-EBUILD lmms-1.2.2-r2.ebuild 2264 BLAKE2B ac1f149a8e44e27cef4e6b1e5286edf3c742e4c151757b0dd1eaef30fc3c2c097eb347cae4117b6a1956cefc6f9a3070d1ae5c59899cc1c906ffa46beae6483a SHA512 e91dd34a12a42a28de1a5065a5948c739daa408f98c74e93371d21b66feab0593fdaa482e691adbeb0146f732cf7ea9faffd8799708e3a368b7a1fa450c0a629
-EBUILD lmms-9999.ebuild 2173 BLAKE2B 6b4812e705e581bd1840511560ae6e99dd4516876ef283178770fcd8aeb0b8da0808c59d3d039c7daf640976224ed0a19c6230c1bbb625a122cb5109c4d8040d SHA512 295ba09a648e459d234e92e327992936b431ea1743f4d0f83746758e360a5a16bfd7bab670a8bea88a1e02fa14267c311714e8cc96bc3e4afbc7481c168607e7
+EBUILD lmms-1.2.2-r2.ebuild 2901 BLAKE2B f90550a65d2753d7ae76ac85495bea8da42e614d2d0960a538f8ed9821d2150ee806ccaa34a00ada2427dc81e1842facb973ff8857cb3e271ca4181652ae28e2 SHA512 87ac6d90d9e158b6bf8d74f87367361501b19e54539f7c010201ca131c92a2e58d89fa392d909dca5d1e3a476579af3c3128a3f89201c54e5b91d84209c72333
+EBUILD lmms-9999.ebuild 2531 BLAKE2B 5cb08558f020537f9bb1d3ca3004f211e7a0e8a5347362501c983c676384c847f599ec97d9897b7f4541d05a382fecd9af450ec86d626992e1f55955a0ba2336 SHA512 86efca2ba1e90a01e9733b8346e5740d25f4c38c649ab2623cee0e4c764ab06da7100b71373bfe8b36b77aef66c86eb9b566204a2ccf47cb6b9df1a10902b449
 MISC metadata.xml 845 BLAKE2B 4b6d93d9fe8a7d26b145e949955cde9e7c09abc08737f69417e94fdd5bf36b35ab4ed5f4339203106af18b7b2b7f874fc8a6cc8873c50bdc89ce4e764211b5ba SHA512 6a84127fb0cd31d11bd8c82a4e92c94eccec4bab30726a16e4740663a520a0ac0e5778adfd29dc5012fbc0ac58fba532d9c6e7abaf71568682650c553ba8e4ae
diff --git a/media-sound/lmms/lmms-1.2.2-r2.ebuild b/media-sound/lmms/lmms-1.2.2-r2.ebuild
index 15bb77c03a9d..775db25c1d67 100644
--- a/media-sound/lmms/lmms-1.2.2-r2.ebuild
+++ b/media-sound/lmms/lmms-1.2.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="Cross-platform music production software"
 HOMEPAGE="https://lmms.io"
@@ -21,7 +21,13 @@ S="${WORKDIR}/${PN}"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 
-IUSE="alsa debug fluidsynth jack libgig mp3 ogg portaudio pulseaudio sdl soundio stk vst"
+IUSE="alsa debug fluidsynth jack libgig mp3 ogg portaudio pulseaudio sdl soundio stk test vst"
+
+# FAIL!  : AutomatableModelTest::LinkTests() 'm1Changed' returned FALSE. ()
+#
+# Did not previously pass, did not previously run. Maintain status quo.
+# Fixed upstream in git.
+RESTRICT="test"
 
 COMMON_DEPEND="
 	dev-qt/qtcore:5
@@ -54,6 +60,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-qt/qtx11extras:5
+	test? ( dev-qt/qttest:5 )
 "
 BDEPEND="
 	dev-qt/linguist-tools:5
@@ -74,7 +81,22 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.2.2-kwidgetsaddons.patch"
 )
 
+src_prepare() {
+	cmake_src_prepare
+
+	if use !test; then
+		sed -i '/ADD_SUBDIRECTORY(tests)/d' CMakeLists.txt || die
+	fi
+}
+
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/860867
+	# https://github.com/LMMS/lmms/pull/6174
+	#
+	# Fixed upstream, remove whenever they finally release a new version.
+	filter-lto
+
 	local mycmakeargs=(
 		-DUSE_WERROR=FALSE
 		-DWANT_CAPS=FALSE
@@ -99,3 +121,10 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+src_test() {
+	# does not use ctest
+	cmake_build tests/tests
+	"${BUILD_DIR}"/tests/tests || die
+
+}
diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
index ec73afb24dd9..f003402e4f33 100644
--- a/media-sound/lmms/lmms-9999.ebuild
+++ b/media-sound/lmms/lmms-9999.ebuild
@@ -19,7 +19,9 @@ fi
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 
-IUSE="alsa debug fluidsynth jack libgig mp3 ogg portaudio pulseaudio sdl soundio stk vst"
+IUSE="alsa debug fluidsynth jack libgig mp3 ogg portaudio pulseaudio sdl soundio stk test vst"
+
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-qt/qtcore:5
@@ -52,6 +54,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-qt/qtx11extras:5
+	test? ( dev-qt/qttest:5 )
 "
 BDEPEND="
 	dev-qt/linguist-tools:5
@@ -71,6 +74,14 @@ PATCHES=(
 	"${FILESDIR}/${PN}-9999-plugin-path.patch" #907285
 )
 
+src_prepare() {
+	cmake_src_prepare
+
+	if use !test; then
+		sed -i '/ADD_SUBDIRECTORY(tests)/d' CMakeLists.txt || die
+	fi
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_WERROR=FALSE
@@ -95,3 +106,10 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+src_test() {
+	# tests are hidden inside a subdir and ctest does not detect them without
+	# running inside that subdir
+	local BUILD_DIR="${BUILD_DIR}/tests"
+	cmake_src_test
+}