gentoo auto-resync : 15:03:2024 - 06:47:25

13 files changed, 98 insertions, 177 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 348fce95ae54..f2ffc74fdcf3 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libnsgif/Manifest b/media-libs/libnsgif/Manifest
index 5335889655c7..bc4bf1ef5b85 100644
--- a/media-libs/libnsgif/Manifest
+++ b/media-libs/libnsgif/Manifest
@@ -1,6 +1,7 @@
+AUX libnsgif-1.0.0-make-test-failures-fatal.patch 811 BLAKE2B e9903cb713d2c8739742f7bac5459992569494c5c304914814fabd2712d4e0c22ce0b4e035911546b355fae9d299874e54bfe7f8d6150c6c87544b46dc19186c SHA512 73a17081ac8a7c5242caffe20cae128a382910bbe053c5332a8cf156c3ad2931306adf332a65a8e772755009082e5d27cc0e35260d8a30538509fa35c1b05716
 DIST libnsgif-0.2.1-src.tar.gz 268328 BLAKE2B ccebd1830db1caa016ebc0c1f2c421523963df16e38cdf85c5300d2a9a325dc9c52c89c79ccbddbc315535a20607458bbfedcde8df02b5e2977d383cd6603220 SHA512 29affce6de38574103a9777e741a44b448145d96ef63e4b86056f268c5d1389f6c5f25240a9f3ef2208fab229eabef2542f3d7ce7b37a0137071f204fbd736af
 DIST libnsgif-1.0.0-src.tar.gz 282568 BLAKE2B bc104972b94b6b7b62fa9740f8d742fc5124d4cc55240b3483cbe72ce0ac3972fc0917397f0cfade6abdb579084f454bd8919c5391281b738dfb3dcb0d9d28e9 SHA512 e87d5faaa4f586a098357a23bed58a8a7a79c94549b21c3338dd04bd5e074e93a7719d93d79515287b15514a2cf39aaa2abd88fd9aec8785a27594ee5cc2ddc0
 EBUILD libnsgif-0.2.1-r3.ebuild 821 BLAKE2B fb63e53047da67e4c825e5c8bb9f8cdbd20f0a532f68a9782e8b3ac6a0a869083dba39e1802e814e0af7b0c88ffcd0cc2f17e95e9d0e8cbd22885e9fe8b11c9f SHA512 80c05c5c1162a7710fd3f1fd3b59668ce7fbc82dc1387eb357e61d50285e76947d917dc109e7e0a3caf6040d01b7affd036eee27f5262b65ef2abf84f512ead8
-EBUILD libnsgif-1.0.0-r1.ebuild 931 BLAKE2B fe0392c71bec6fcfdb395f1c2240de2d5c1edda50112217f3d095326ca3c3529f8ceceb21d70f3bf6edd3966f314bc36fbeb0025669870eb07f8436029b8f73c SHA512 2d2466b89223014c6160e04e2642ee8696ea3d838afaf36ae0da18478bfc41f2fff74c3a08bd10af174ab2388a81edac9543ef90280ebb6b983b7d499a379aae
-EBUILD libnsgif-9999.ebuild 624 BLAKE2B 278096f43f7ac5d75636974681a791e1f949cd46c125468e1d8fd36cd5868bbfd4dcf189b750687763bb85d5ee0011b233ef5aa7fc2ecd314b0e3564507e43c2 SHA512 918031e1d39997059a45c1e44e41a3601bde608da37221ecd3895ebc153c2183394b381c4b6fb656b191bc22d641dbab71eedbe86aa061f21745fa5d8949798b
+EBUILD libnsgif-1.0.0-r1.ebuild 1030 BLAKE2B 3eb73396c687059d22d9eaa74971ef7dbb7af647c8b9eeef0d7dde9c47993f259f5e82c1674f1ce1a818c3fcb00ae94880e7601e9f53d6326882a4077a12c4fc SHA512 19c3c5b9a3734768d511a68ccdce66f7563a01cf20e52d1f61bccbf540980be265af267a332beb3601517974f99a43f8106a29abcf3c296a4344c5cd32124683
+EBUILD libnsgif-9999.ebuild 723 BLAKE2B 39aec309904d722fd77a3a41f9990342fbfb847fd85ff9da1faace60b806f6b5a36b6409b5441d889e8ea41e43b9a7f78b530509f4f28742a3f050cf6dca2aee SHA512 4ed4612dcad44cabed288227b9af1d2c6d1339f5db041fbc53f149f74cc00276de01f8490b4134f2b29c577785b0853d99881b8e1d7a545024cae2ae2a6b3000
 MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/media-libs/libnsgif/files/libnsgif-1.0.0-make-test-failures-fatal.patch b/media-libs/libnsgif/files/libnsgif-1.0.0-make-test-failures-fatal.patch
new file mode 100644
index 000000000000..3225587da399
--- /dev/null
+++ b/media-libs/libnsgif/files/libnsgif-1.0.0-make-test-failures-fatal.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/918642
+https://github.com/gentoo/gentoo/pull/35142
+
+commit 6537507d754ad049dbdc324ec6bdea8b30416d48
+Author: matoro <matoro@users.noreply.github.com>
+Date:   Fri Feb 16 12:44:14 2024 -0500
+
+    test: nsgif: make failing tests fatal
+    
+    Right now, failing or erroring tests is not currently considered fatal.
+    This makes any instance of either fatal.
+    
+    See: https://github.com/gentoo/gentoo/pull/35142
+
+diff --git a/test/runtest.sh b/test/runtest.sh
+index fd84847..ef7274c 100755
+--- a/test/runtest.sh
++++ b/test/runtest.sh
+@@ -68,7 +68,7 @@ done
+ echo "Tests:${GIFTESTTOTC} Pass:${GIFTESTPASSC} Fail:${GIFTESTFAILC} Error:${GIFTESTERRC}"
+ 
+ # exit code
+-if [ "${GIFTESTERRC}" -gt 0 ]; then
++if [ "${GIFTESTERRC}" -gt 0 ] || [ "${GIFTESTFAILC}" -gt 0 ]; then
+ 	exit 1
+ fi
+ 
diff --git a/media-libs/libnsgif/libnsgif-1.0.0-r1.ebuild b/media-libs/libnsgif/libnsgif-1.0.0-r1.ebuild
index f088e76b8618..0b43eedea1c8 100644
--- a/media-libs/libnsgif/libnsgif-1.0.0-r1.ebuild
+++ b/media-libs/libnsgif/libnsgif-1.0.0-r1.ebuild
@@ -20,6 +20,8 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}/${PN}-1.0.0-make-test-failures-fatal.patch" )
+
 src_prepare() {
 	default
 	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
@@ -35,6 +37,10 @@ src_compile() {
 	_emake
 }
 
+src_test() {
+	_emake test
+}
+
 src_install() {
 	_emake DESTDIR="${D}" install
 }
diff --git a/media-libs/libnsgif/libnsgif-9999.ebuild b/media-libs/libnsgif/libnsgif-9999.ebuild
index cd94d79787e7..e6c6693cccc1 100644
--- a/media-libs/libnsgif/libnsgif-9999.ebuild
+++ b/media-libs/libnsgif/libnsgif-9999.ebuild
@@ -17,6 +17,8 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}/${PN}-1.0.0-make-test-failures-fatal.patch" )
+
 src_prepare() {
 	default
 }
@@ -30,6 +32,10 @@ src_compile() {
 	_emake
 }
 
+src_test() {
+	_emake test
+}
+
 src_install() {
 	_emake DESTDIR="${D}" install
 }
diff --git a/media-libs/lsp-plugins/Manifest b/media-libs/lsp-plugins/Manifest
index 99056e376db2..330c7638c5ca 100644
--- a/media-libs/lsp-plugins/Manifest
+++ b/media-libs/lsp-plugins/Manifest
@@ -1,13 +1,9 @@
-AUX lsp-plugins-1.1.29_armv8a-dsp.patch 358 BLAKE2B 6c5ab9dfd52ff56d123f0684bb4a6d8f8c20e6919da6d07a95e1ad7eb419e53e16ad7231fa486b5f2a56a494f812eeba5bd92d2a57c71973c72f9045f48d39c0 SHA512 3ad935da3c1cc9d753a7f35d878c36cdbeb5bc922684547056a853b121b06ec2034bd63b45339f69ced1fd9b6c0da2fd22cb1bef77c4af1b79763d688b63fdee
 AUX lsp-plugins-1.2.3-fix-double-buffering.patch 1084 BLAKE2B 20d6ae4c97a8adda2b15fd07c250190d1e2fce3cbe2e2546a9f9dced969ac169b603fd28f0168865c94fe01c38b213b9afacbdd2c24486ed450131a0102cf0d7 SHA512 2bd185f1f303fa0bc64c134c85fe7733e5fe9f281924ac6e33019efacc16d8c34e211b0a7a8b11777f0865a38937f8ef6ccf7d702583a692e474154fe8f08f38
-DIST lsp-plugins-1.1.29.tar.gz 66143142 BLAKE2B 6fa6943d8cdf3aedc9f671c64b433ffd5c4f6c7ca14f6a75578300240971e7c9e8546b9a7df7a13b8cd6e0844724c064daa7e249aba70636f47a622e73ed264a SHA512 b8c3804ad583322bce414d6beb079afa5b98a111126bb4507642376fcf1f82b31525b4959c6388b02cc1d14e0ec25de3596794895f2860f492a5fbf87f6e88b7
 DIST lsp-plugins-1.2.14.tar.gz 46476007 BLAKE2B 3807a373e0c6d57f72cec2babc939810d208dca8791ebb2bd0abfdd6779253b2ee0a3163d97224cbcd3eb49a1fd4f059512e620ee96a61f072e3659b01a189ff SHA512 2a53111289d764b91e9a463a748415730cdb16d62b8250a082ae2cb3423dbe41bd4072c2256d07a15b89b9cf548ce27d1f7578514c6f0b99230aeddfbcc4eadb
 DIST lsp-plugins-1.2.3.tar.gz 38760829 BLAKE2B c28a4b5cfdbbe5fe42c3f4821ce323cb097b84eddc850f43adcc14e8a9edb2e313236ce44e4eca17dd226c578113a5749d06754deb45a6c2e7c2ff37bfed4fc2 SHA512 1db849ebceffb24540879fcd0971ddd8bffe9a0ecaaebf4b69bf8633a267562bb3eb5cd55dce8b804868d880efdec95b19a312ee017c2a9334b5e764eebbbb30
 DIST lsp-plugins-1.2.6.tar.gz 40450212 BLAKE2B 02364391f4edc894c566b0038f0340be1f923c3de6dfc48ed90460df7a6ba452720e63bb1e510e5ff580e38066915f1761bcd2ca72cdba429163cf24b20ed09e SHA512 d76cee24e976022594eac4830987921ff18c0622bae1ac2fb4744d45ee89dccd1211247f9f7d6df1083c8629f66cd443bce701864a85ff10e66abcf2fae749ce
-EBUILD lsp-plugins-1.1.29.ebuild 1194 BLAKE2B 83b56149fdd0986128dd133068e0c4d231ed301f225528950099df6755505537b1315cb52289ff10b2c3a1defe6dc689d8b3222182e8f251e127871c8f48cc89 SHA512 184fa4511d7e62c81688d448a38ae51acc6220972afeab046ad2e671cff8aa113cd59d3c88d944d89f09a97c20cd3592d91cae5880bc798b5a4f641e622745f1
-EBUILD lsp-plugins-1.2.14.ebuild 2243 BLAKE2B 83ed16b45fe9cc790affda2b747aab0020a63cd820fbb9cb789b55e2d04f7aeda129d86dafac4940b8632cb1922b1222c1f3a8988a440b1e05e96deed22cc80c SHA512 6867a430990da8e991d14ed95b466541435449164f89b76d51c78ca60eead91c6a430f4ecfe40993223c3112ce6c032c7caf8969cc8073cdfa2ec4465da0fd9a
-EBUILD lsp-plugins-1.2.3-r1.ebuild 1881 BLAKE2B 1eb256ea40af48bf10f476bb1d4f424539b9ff1ecc5b46330b38ca34f3fec93a35524db0f6c80c540705ed0516c0a4f850bafb139ff62a43afb4f59ef257cd7e SHA512 6eab6ad05632c6c83c8328d28726c445947d9bf67a0a66afc5bbd6291160272fe8eab1abab032e5f95953fd1f745fdb32341e669ad688711c1bbfd780afec185
-EBUILD lsp-plugins-1.2.3.ebuild 1823 BLAKE2B 7f16d2bae0c9d6c27795f7468fb0add9e433f549547f60753bebe7dd095c7dc051f5c0958b8f06d9f176935b1e3df133adf08de6c5e7bc51543ddf1f6501b13f SHA512 5da14f1090cac1f52287dd427fd2c7a159ec22a3a8694f61a0457c2b7929d49c4658f538b7cafc0e710689fad0bbe68364015d36869974791f360b38e974b939
-EBUILD lsp-plugins-1.2.6.ebuild 1823 BLAKE2B 25b936011b22718ac3d35d92e26505a8e044e5df20fd93c94c67ebadb66377d8943f7a70faa4b6a2b4cd46df49efae09c6d9db6b11be3f48b6975cdce990e6f1 SHA512 7e0a65751db21e1446f2b0034dd33fc59c92c5eb295090d52fbf884baa73bf717f3f0c201fb70fe71c830aab231fe489b577abf7cf9ef1126b835399bb43f129
-EBUILD lsp-plugins-9999.ebuild 2249 BLAKE2B 4fcd6401f5b954e58cc1cf9caba1dfd7b9c7aecc7ab3bef7af28000a660e5188542daa248fb3d78a3abaa062a9add7c23ae9c314852e344d8ee9cfe85e4818c8 SHA512 3a6dd4ddea2d3922e4531fe671ce87d984003a0b7367df88f53ced3ae31dc157916013c7bc19ffa45aac1c43b4802aae77ea087de0b76b98e5e2421d501661e2
+EBUILD lsp-plugins-1.2.14.ebuild 2389 BLAKE2B 27371fb3d1fd9326179f5e6e837e19158f88f978c841b7c4c61a67a56acd84551d51325397d90ecd18d73239195e149c7da775b12b0081fb17eafb2bc02c3180 SHA512 a66302d6582eeda8c5a9b94054b8480243c3e66b0ff28aa4b63818678fd87d913cd9ed7e02796c8d5c7527a586d0a808871a1c776fd3c68fed9c5ca0027e10c6
+EBUILD lsp-plugins-1.2.3-r1.ebuild 2439 BLAKE2B 789e32830d293e89c66bb65a820ad22cfa28e6b53c631f159eade9dd9c9875839d5dd454a2996b12fcaa32c2603abb973e3181c8fac4440f85775d6ead0a2cfa SHA512 23dfd95b343f6ceb326ea1eac8d842b26bc38062055340b3f7438cd1b1f4fd1e82f70b0e904d8709a1e63ae0c393886814f7707663a6db815b6942e447fed420
+EBUILD lsp-plugins-1.2.6.ebuild 2381 BLAKE2B 68dcce975955633c7c410dbb9b9f8081645dfb945f28624d321b30f15d5290188e58ae32fc324681cad889f222a6d5b92ac22e8ce9d9763f8e385b8ab289873a SHA512 dc5b61ea4570d06afd5c1381a14f1c015b3e2615221c38f90c84223991be275f4c878105067913320eedd4a4a0ca10cb78af8c883759f8fdce3800da1d0979e0
+EBUILD lsp-plugins-9999.ebuild 2395 BLAKE2B 700e7e9b027af827fe211410403abf4d70cc342b01f017fb06ad2cf2e92c49c8451141b04929a83cea93c1b749b9eb201868a9fff31605e7f41bbf05add91e5e SHA512 9256e8de60c626d1cfcfe0f3c810c968971dcb0e08eff5064a4be61cbf0b95a1c3e89db6187e2a038fe6fb420a08ee4a9c274de663e1f987c9c05a46ca82a062
 MISC metadata.xml 628 BLAKE2B 97c20f35374a91ac8a5400a0f2e6c9bf651234bc5e5aa691aa8d7fac670c2736ca71309f7e7b45c7b0d1609756981327fabba716bd37b593c640c17d3c791a8c SHA512 2b72e330292c4f1218184d5d55dbd2e1fc54bff10075fd19bd13e77fe191ad65e5eb1878e19b596c541b33b32bc6c7816d8d7d5f5756f8d07c4da3cf381fc77d
diff --git a/media-libs/lsp-plugins/files/lsp-plugins-1.1.29_armv8a-dsp.patch b/media-libs/lsp-plugins/files/lsp-plugins-1.1.29_armv8a-dsp.patch
deleted file mode 100644
index 2603b4c8a4c7..000000000000
--- a/media-libs/lsp-plugins/files/lsp-plugins-1.1.29_armv8a-dsp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/dsp/Makefile
-+++ b/src/dsp/Makefile
-@@ -44,6 +44,9 @@ endif
- ifeq ($(BUILD_PROFILE), armv7ve)
- LINK_OBJECTS           += $(ARM_IMPL) $(NEON_D32_IMPL)
- endif
-+ifeq ($(BUILD_PROFILE), armv8a)
-+LINK_OBJECTS           += $(ARM_IMPL) $(NEON_D32_IMPL)
-+endif
- ifeq ($(BUILD_PROFILE), arm32)
- LINK_OBJECTS           += $(ARM_IMPL) $(NEON_D32_IMPL)
- endif
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
deleted file mode 100644
index 739dcd9932ed..000000000000
--- a/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="Linux Studio Plugins"
-HOMEPAGE="https://lsp-plug.in"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/sadko4u/lsp-plugins"
-	EGIT_BRANCH="devel"
-else
-	SRC_URI="https://github.com/sadko4u/lsp-plugins/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="doc jack ladspa +lv2 test"
-REQUIRED_USE="|| ( jack ladspa lv2 )
-	test? ( jack )"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/expat
-	media-libs/libsndfile
-	media-libs/libglvnd[X]
-	doc? ( dev-lang/php:* )
-	jack? (
-		virtual/jack
-		x11-libs/cairo[X]
-	)
-	ladspa? ( media-libs/ladspa-sdk )
-	lv2? (
-		media-libs/lv2
-		x11-libs/cairo[X]
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.29_armv8a-dsp.patch
-)
-
-src_compile() {
-	use doc && MODULES+="doc"
-	use jack && MODULES+=" jack"
-	use ladspa && MODULES+=" ladspa"
-	use lv2 && MODULES+=" lv2"
-	emake BUILD_MODULES="${MODULES}"
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${ED}" LIB_PATH="/usr/$(get_libdir)" install
-}
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.2.14.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.2.14.ebuild
index d8569e54fdd7..81216eb110f3 100644
--- a/media-libs/lsp-plugins/lsp-plugins-1.2.14.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-1.2.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic xdg
+inherit flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="Linux Studio Plugins"
 HOMEPAGE="https://lsp-plug.in"
@@ -76,6 +76,9 @@ src_configure() {
 		FEATURES="${MODULES}" \
 		PREFIX="/usr" \
 		LIBDIR="/usr/$(get_libdir)" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
 		CFLAGS_EXT="${CFLAGS}" \
 		CXXFLAGS_EXT="${CXXFLAGS}" \
 		LDFLAGS_EXT="$(raw-ldflags)" \
@@ -88,6 +91,9 @@ src_compile() {
 		FEATURES="${MODULES}" \
 		PREFIX="/usr" \
 		LIBDIR="/usr/$(get_libdir)" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
 		CFLAGS_EXT="${CFLAGS}" \
 		CXXFLAGS_EXT="${CXXFLAGS}" \
 		LDFLAGS_EXT="$(raw-ldflags)" \
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.2.3-r1.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.2.3-r1.ebuild
index 9feca0f69cea..cb0430405e9a 100644
--- a/media-libs/lsp-plugins/lsp-plugins-1.2.3-r1.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-1.2.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit flag-o-matic xdg
+inherit flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="Linux Studio Plugins"
 HOMEPAGE="https://lsp-plug.in"
@@ -59,6 +59,17 @@ PATCHES=(
 )
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/875833
+	#
+	# Actually the whole thing is kind of a waste of time. It looks like
+	# programs use LDFLAGS, but libraries do not! So some things don't
+	# build with LTO, while other things don't build when LTO is enabled.
+	# Attempting to build with LTO is just a waste of time and cycles.
+	#
+	# This was reported upstream but the ticket closed. Abandon hope.
+	filter-lto
+
 	use doc && MODULES+="doc"
 	use jack && MODULES+=" jack"
 	use ladspa && MODULES+=" ladspa"
@@ -69,6 +80,9 @@ src_configure() {
 		FEATURES="${MODULES}" \
 		PREFIX="/usr" \
 		LIBDIR="/usr/$(get_libdir)" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
 		CFLAGS_EXT="${CFLAGS}" \
 		CXXFLAGS_EXT="${CXXFLAGS}" \
 		LDFLAGS_EXT="$(raw-ldflags)" \
@@ -81,6 +95,9 @@ src_compile() {
 		FEATURES="${MODULES}" \
 		PREFIX="/usr" \
 		LIBDIR="/usr/$(get_libdir)" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
 		CFLAGS_EXT="${CFLAGS}" \
 		CXXFLAGS_EXT="${CXXFLAGS}" \
 		LDFLAGS_EXT="$(raw-ldflags)" \
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.2.3.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.2.3.ebuild
deleted file mode 100644
index 23a2db54192f..000000000000
--- a/media-libs/lsp-plugins/lsp-plugins-1.2.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic xdg
-
-DESCRIPTION="Linux Studio Plugins"
-HOMEPAGE="https://lsp-plug.in"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/sadko4u/lsp-plugins"
-	EGIT_BRANCH="devel"
-else
-	SRC_URI="https://github.com/sadko4u/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-	S="${WORKDIR}/${PN}"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="doc jack ladspa +lv2 test vst X"
-REQUIRED_USE="|| ( jack ladspa lv2 )
-	test? ( jack )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? ( dev-lang/php:* )"
-DEPEND="
-	media-libs/libglvnd[X]
-	media-libs/libsndfile
-	jack? (
-		media-libs/freetype
-		virtual/jack
-		x11-libs/cairo[X]
-		x11-libs/libX11
-		x11-libs/libXrandr
-	)
-	ladspa? ( media-libs/ladspa-sdk )
-	lv2? (
-		media-libs/freetype
-		media-libs/lv2
-		x11-libs/cairo[X]
-		x11-libs/libX11
-		x11-libs/libXrandr
-	)
-	vst? (
-		media-libs/freetype
-		x11-libs/cairo[X]
-		x11-libs/libX11
-		x11-libs/libXrandr
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	use doc && MODULES+="doc"
-	use jack && MODULES+=" jack"
-	use ladspa && MODULES+=" ladspa"
-	use lv2 && MODULES+=" lv2"
-	use vst && MODULES+=" vst2"
-	use X && MODULES+=" xdg"
-	emake \
-		FEATURES="${MODULES}" \
-		PREFIX="/usr" \
-		LIBDIR="/usr/$(get_libdir)" \
-		CFLAGS_EXT="${CFLAGS}" \
-		CXXFLAGS_EXT="${CXXFLAGS}" \
-		LDFLAGS_EXT="$(raw-ldflags)" \
-		VERBOSE=1 \
-		config
-}
-
-src_compile() {
-	emake \
-		FEATURES="${MODULES}" \
-		PREFIX="/usr" \
-		LIBDIR="/usr/$(get_libdir)" \
-		CFLAGS_EXT="${CFLAGS}" \
-		CXXFLAGS_EXT="${CXXFLAGS}" \
-		LDFLAGS_EXT="$(raw-ldflags)" \
-		VERBOSE=1
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${ED}" LIB_PATH="/usr/$(get_libdir)" VERBOSE=1 install
-}
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.2.6.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.2.6.ebuild
index 0cfd8b1be10f..564fb4512fb9 100644
--- a/media-libs/lsp-plugins/lsp-plugins-1.2.6.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-1.2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit flag-o-matic xdg
+inherit flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="Linux Studio Plugins"
 HOMEPAGE="https://lsp-plug.in"
@@ -55,6 +55,17 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/875833
+	#
+	# Actually the whole thing is kind of a waste of time. It looks like
+	# programs use LDFLAGS, but libraries do not! So some things don't
+	# build with LTO, while other things don't build when LTO is enabled.
+	# Attempting to build with LTO is just a waste of time and cycles.
+	#
+	# This was reported upstream but the ticket closed. Abandon hope.
+	filter-lto
+
 	use doc && MODULES+="doc"
 	use jack && MODULES+=" jack"
 	use ladspa && MODULES+=" ladspa"
@@ -65,6 +76,9 @@ src_configure() {
 		FEATURES="${MODULES}" \
 		PREFIX="/usr" \
 		LIBDIR="/usr/$(get_libdir)" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
 		CFLAGS_EXT="${CFLAGS}" \
 		CXXFLAGS_EXT="${CXXFLAGS}" \
 		LDFLAGS_EXT="$(raw-ldflags)" \
@@ -77,6 +91,9 @@ src_compile() {
 		FEATURES="${MODULES}" \
 		PREFIX="/usr" \
 		LIBDIR="/usr/$(get_libdir)" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
 		CFLAGS_EXT="${CFLAGS}" \
 		CXXFLAGS_EXT="${CXXFLAGS}" \
 		LDFLAGS_EXT="$(raw-ldflags)" \
diff --git a/media-libs/lsp-plugins/lsp-plugins-9999.ebuild b/media-libs/lsp-plugins/lsp-plugins-9999.ebuild
index 0292665b83a8..85b4e1069169 100644
--- a/media-libs/lsp-plugins/lsp-plugins-9999.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic xdg
+inherit flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="Linux Studio Plugins"
 HOMEPAGE="https://lsp-plug.in"
@@ -77,6 +77,9 @@ src_configure() {
 		FEATURES="${MODULES}" \
 		PREFIX="/usr" \
 		LIBDIR="/usr/$(get_libdir)" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
 		CFLAGS_EXT="${CFLAGS}" \
 		CXXFLAGS_EXT="${CXXFLAGS}" \
 		LDFLAGS_EXT="$(raw-ldflags)" \
@@ -89,6 +92,9 @@ src_compile() {
 		FEATURES="${MODULES}" \
 		PREFIX="/usr" \
 		LIBDIR="/usr/$(get_libdir)" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
 		CFLAGS_EXT="${CFLAGS}" \
 		CXXFLAGS_EXT="${CXXFLAGS}" \
 		LDFLAGS_EXT="$(raw-ldflags)" \