gentoo auto-resync : 03:01:2024 - 13:56:25

12 files changed, 219 insertions, 23 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 7b74269a56ab..bc04072eb682 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index 487932f48857..ecc7a2fca97d 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -1,4 +1,4 @@
 AUX abcde-2.9.3-Makefile.patch 528 BLAKE2B 7568595d6f67b47bbe6dd84cb829ac2b5f37c32a1a4c275cb073f0e6c03d78868b18821bd5ebc87aa8428708b94477c53e674ea9bfd051852a34ff866bad5815 SHA512 1438f8654f41e8681f0f2887d403ba6c2f85a70dc813f19c93c51aeea2e481dc80cde4d73807aad2e5f01f479224f4f9f4eec85bf6ed81ce442d873386b63d12
 DIST abcde-2.9.3.tar.gz 160876 BLAKE2B cb3ebc372b4bfcf002beda567c2aa91dba11e77fdaeee8ec0d351fe907d6209ccb9013135db2a3ea0f85148eeaaa91f06243c607ac732a1b13f7a0a54d721fb0 SHA512 51a1dfa1f1d2dab6b8dad7d9f70d0139938151bc2dae0e9fc80da5385b4bba4d71c89a4d1b2dec5bd24787a542cb0caeacbef423cf32b8014cf6320c391b4236
-EBUILD abcde-2.9.3-r4.ebuild 1817 BLAKE2B 1be35fcd89d98c2bbca06923ae7029ef7ae15a40be45a5d57bb0382e0a3224733b30d198cd413b5779db6e94f2341951d5f5fa557125bcb30a231b3e22c9ce31 SHA512 760f92dcd01e182f67262f7a271e437fb33640441ac61f9fa40a8a256d3bafff92eb03e56df8fda58c4eb7942e9c6cc99aa9d39927152151e737cd9511d5f864
+EBUILD abcde-2.9.3-r4.ebuild 1834 BLAKE2B 81b3a38bc48d48b6513253d67bd823f830f58d060db63cca43cdd4bb776b591b098d1f56c47b5fc2bd90f7a014709b8bc78cef567c11539baf6b595006ac4c4a SHA512 d26f1fefda3b5725dbb99da3810a6e4f527e4b37c3b16a5e98224e12440aaf98dbd35e3ffdc0073a9594679ae3e6b174d8d4c2634f679d93d9952fa8c812f8d8
 MISC metadata.xml 688 BLAKE2B 1b7fa0f469d0875c859efba67704f3f879a4aacdf1265e4e420ac9061d90233f60720fe9ff7c8af1d192c7c164225388db4ceaefec047c309cbe319f54d33ca4 SHA512 494ec16cb838014916286f73e1fe215afbf35ee420bd5b5451f4e53e6a0b71a168cfee109c489752ae2a39668fca07ceb2b8127f5fdfe17a141472d7f2187ada
diff --git a/media-sound/abcde/abcde-2.9.3-r4.ebuild b/media-sound/abcde/abcde-2.9.3-r4.ebuild
index 3e81ffb65f15..fce3ba2901e2 100644
--- a/media-sound/abcde/abcde-2.9.3-r4.ebuild
+++ b/media-sound/abcde/abcde-2.9.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,6 +15,7 @@ IUSE="aac aiff cdr flac +id3tag +lame mac musepack musicbrainz normalize opus re
 
 # See `grep :: abcde-musicbrainz-tool` output for USE musicbrainz dependencies
 RDEPEND="
+	media-libs/glyr
 	media-sound/cd-discid
 	net-misc/wget
 	sys-apps/util-linux
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 2aa3e24bd3f2..ebcbacc0e73d 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -3,6 +3,6 @@ AUX guitarix-0.41.0-py3.11.patch 625 BLAKE2B cc4e06902b893a67b9a3297d15cd71cf520
 AUX guitarix-0.44.1-gcc-13.patch 762 BLAKE2B 33679e1a80ed0f094d71d7525574368a816ec723c5b81974ae600360045a7d748e88a6a08e7f6b15f0b2d7441b6fc431f1ca0cd2bc71fb1abbf51798be949789 SHA512 02c49c0a87f788b781a54c7ff2d0429130dcd93a86fa7fe27f8e55ea444eb31b768b9716de1be28bd59f3f2e4055ec11da5d9d310bdba2ba3b266b013725cff0
 AUX guitarix-0.44.1-zita-resampler-1.10.patch 824 BLAKE2B 89a0c980a9f7fa03e4e3de9e34cc6cd4cd07f91bb1702a57e443dfcebf6262213e7da8147c36dec93536f59201d4cf77a8c7f48ae0ca0b5a9bfa023cd9b66d1f SHA512 f889f9a97bd41b9a03a0b9fda4ddabfb7ba36aa847636a1361273ec59d9ad2829ba652f841d2c7dd387545df630ec6b697d0428e7e7da14d2c4d03f7ad292a70
 DIST guitarix2-0.44.1.tar.xz 71754176 BLAKE2B 57a1ad0be133fe2851ff7539d5c467a649774a1de90569e83feeb3ba2b05324ce0ee6d4388122cdb3fdcb36afac4cb7cfd2d6ab0216ff2f56d8e7c2886d14152 SHA512 d2c0e40762d97ed7ce61c3115fc3800cc569a2bb4f66e09147507a9eaa815fb9d1363444353a5854035755bd1b1e247ccb341aed60ca0ecf6a77019da73064c1
-EBUILD guitarix-0.44.1.ebuild 1934 BLAKE2B 67661cb9c0d96465cb41a4be60a19b10060caa9aa4d1d19f652f28b822465b31c254702afad0729ad32e22d2eaa5ca996afb9b9703c46e756fc76bbf6f320c7d SHA512 4d89a2320f84fb81950a0dc7c7f90a1ce047f484c6ac7e5c87cf80d6cc14a6a9a7045edf6adb98d3cee17d234922a0aa3b85e3fd450e612ef461b43b54a74a48
-EBUILD guitarix-9999.ebuild 1867 BLAKE2B 638655f7f0187d725978f139d0bff282dc698ba49f275e34cde06b4951cf00d25d289a800ad06131e50646a10a53a9ff6a088fd6d53f6f3469ae36ab9d8604cd SHA512 6eaf0cc3020f54cfc4a7473fcb1006f46f67c5366bbab9c1e1014aed5825189853d99da6327a8d017498a2a592f24778c344ef72ed9e795cfa5cc499b620ec2b
+EBUILD guitarix-0.44.1.ebuild 1987 BLAKE2B 9d56946501916190788e76393b9476f3a6e29ead006aa74f5170fe79dc96017bfdddff93cac6254fc393f231eba5c4b8179bf820e5457434aa5cf9ee64a45d75 SHA512 6a5eb65d945c6ecb1114891d74555fc6bfeec73f5da5bcfa14381ff457a3bf6f795befdd23394c6dc8994f15de6cc5a68144cee98ccb914bad8551acef786c7b
+EBUILD guitarix-9999.ebuild 1920 BLAKE2B 1c4fedba09c20ee9ac4f3754bf6c7158ad5dd5dd8d028823d8ee53b398bf560c1bd5ec7c67c2922c3912ab3da848349f516d6599c27a2496d131e6f56723669b SHA512 8e90a60e2dad35663d4fec682b067a818c1766ee22a36d295f4352df26d916cda83df0b5d1c686eab5ba4aea6bbf9d5972d321e9128ce3113fce12f3c950a7f4
 MISC metadata.xml 775 BLAKE2B 9d259fec3163a9b8150ed287c8ed803314620ba60c60dd479051ae980d5c25a007b38b2d6712720af834b90ff91c72962d55bb539983001f98bb4ed549511c35 SHA512 6ad0963c139caaffa1b58a60fa30a797b69a7ed74a8924606e60c75b2ae6751954c179ab0ff40a83288c0ad7655c9ed499e38c7bf0a88928e2dcddf5ab6a5826
diff --git a/media-sound/guitarix/guitarix-0.44.1.ebuild b/media-sound/guitarix/guitarix-0.44.1.ebuild
index 14885014cd74..60b76beb379f 100644
--- a/media-sound/guitarix/guitarix-0.44.1.ebuild
+++ b/media-sound/guitarix/guitarix-0.44.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -69,7 +69,10 @@ PATCHES=(
 )
 
 src_configure() {
+	export -n {CXX,LD}FLAGS
+
 	local myconf=(
+		--cxxflags="${CXXFLAGS}"
 		--cxxflags-debug=""
 		--cxxflags-release="-DNDEBUG"
 		--ldflags="${LDFLAGS}"
diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild
index 0f1305ac3816..ed2429d53f6d 100644
--- a/media-sound/guitarix/guitarix-9999.ebuild
+++ b/media-sound/guitarix/guitarix-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -66,7 +66,10 @@ BDEPEND="
 DOCS=( changelog README )
 
 src_configure() {
+	export -n {CXX,LD}FLAGS
+
 	local myconf=(
+		--cxxflags="${CXXFLAGS}"
 		--cxxflags-debug=""
 		--cxxflags-release="-DNDEBUG"
 		--ldflags="${LDFLAGS}"
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 00bcf25e4b32..c3c376be8f68 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -8,10 +8,12 @@ DIST lilypond-2.22.1.tar.gz 18033161 BLAKE2B 41bd0159e8e851a3582c35285d301113e6a
 DIST lilypond-2.23.0.tar.gz 17047610 BLAKE2B 5d19a9936893a37db3ff6de269978d586012b7546fe5f3147e86966f1d521731dd2cf074c90de5b49feff6ee6f5057c90fe6485d7ae9126a8a5810b55d2dc5b2 SHA512 0138338e9e650f1d0d96504cd31d8b191307ae3fcec839162c80b8d233b27a9ff94f5b107aa2318278a874ed14e5e47747211ac4b44839d6749337f06dc12a6d
 DIST lilypond-2.23.2.tar.gz 17080861 BLAKE2B e27bde3625454dc070e4aeaa8c857c5e62b3e73fd197ba014805f657210942b3d1ef03d2d75594f63e7cc1838fbcbd40e2b42d14707b6b6eeec02cdd3f346754 SHA512 f5713394d7e79dad585e21690d8ac3c057eebe77113f1f307e8e1e117bccc26bdc5370a144505ebd887e653cee114cb9efcf75ec56b9d0320bbdf79e32498269
 DIST lilypond-2.24.0.tar.gz 19430807 BLAKE2B 2915d44e0e61a5756f515d31d11d29c657d763b7d7d84701ba67cb67c8e84faad74b8743a9703c4fe64ea4ef5f7c4ff76ed9675d62bd670aa6ea81b15385d348 SHA512 fc00736ae899519408781a7f1bf83065e493a857073d6f56cdadabc5817d4f41092dad12bfe210ec8a866f454b70f87ede6c7f1ba7aedc901134913b22c1431b
+DIST lilypond-2.24.3.tar.gz 19441299 BLAKE2B 6be6ca1f090869a8d545befe3d1f54122514e7dcf9aff1bcc2d78819820da8cef908c5033039eb231b48ae914c1ebd6d766566862a40721580747f017f1445ad SHA512 5153f6cbe5e68e4b3dfcc03a8299ef6b82fbfb487eb3e4f9d631b9dc5a07a972168c3f141d6d50eac936f5c7aeeacd19837c0c9ab70f11dfd5c7efe085d5b56e
 EBUILD lilypond-2.22.0-r1.ebuild 3259 BLAKE2B c8709c461436475455a836636c8bcdf54b8cf553824b7784c7d4551bbd260ca4daa1278e0209b5eba636d3973c1d895821aca83866a5497bdc2a930089fd9db2 SHA512 42a3fa63ab641558c453957a52f163738d3c72d4f8c1c1ad3ca121905813a549f4f3e4fbc14e9086c7e2a21acc854d7f46b6bada21f1f4024f9a445e2a805138
 EBUILD lilypond-2.22.1-r1.ebuild 3290 BLAKE2B 01d01846137ce0dceaf18f48111e017a54daf3206cd5dbd0ae0de7e2ffa93b00b4a7ddcfda9652d532ff4be45409eff60c60c883cf7d142dc825227ead8e3ae9 SHA512 96a1abf83d5a2d72f01b3b3eb85494dfe4b7b85d3150c3a83efdda5f69e4f388820be5324a9f1f47210255eb9c0754f8df7e851cf0a36400581b31f28540fbb7
 EBUILD lilypond-2.23.0-r1.ebuild 3169 BLAKE2B 045cac5a2d298d354ce29bc3c8fcbff0d2f823bda6ae8adf343769b3fa56d48d67d458b98cdd3bd1913e57c32a7473bf9d52efab3a19ef13d259904e193e34cc SHA512 be484e2cd71f4d50b124d9f07bf392e9d8bd81cd16f7591d297458d26ddc8885d6634943725b4729bbf1217fa2bfe89769ed4286e30936d4a3ff3c88ec668b2f
 EBUILD lilypond-2.23.2-r1.ebuild 3184 BLAKE2B 5e6eed86581df8a3c82ef0fff2e3ba8b5217a3c3521c376674e0e0511d287a0ba9f46bd6faa80a2c1c72002e6a31b0b94ed5d036652d766065067616e0390abc SHA512 9090401ac88a635445adeb1dd75f006aa3da92ab023eb8a810aeabe55f528d703f9e188e512ccfcc1e95af736a82c2e75521adcd0417d1797eb9a1cf88ce8461
-EBUILD lilypond-2.24.0.ebuild 2962 BLAKE2B 1079f054e38b500db87f42f68c3621c3e5496fb9471fb9bdae081733a9a13497546539f12615a59ccc150ce93f23439525a78e999ec9bb7cbb17c1d23c73c209 SHA512 a27184adfb49b65d87a6fdd6f8d90cda84231f7828a5410ea5a960227459fabd860c9cec1ec7053946d72a31a7bfb4f77b4e2dbabbf7ab94811e7fc1149bdd11
-EBUILD lilypond-9999.ebuild 3143 BLAKE2B 68754245d21139e75a4638996f678860d3ec787e2140bcc73ddb5bb8e94e9f621cb1e1581dafe236ed5f57d334d6a106922f788cee74d7a62285043235e85180 SHA512 3538857063127913029e53ac786578306b0c9041bcfca71ab94a52982b58b1bdb95da5037a4ab6f7b311f6a8d4e7cff05187a894ec96041d9e9569fa78606ef4
+EBUILD lilypond-2.24.0.ebuild 2968 BLAKE2B c6d82afcd6057649f5b2f53f1f3b8af3c4f45edd589da04a757126c28a699868cd38db56b7aeb10cd399dd0967db734f2c43f73c2c870f21afb5705d129618d7 SHA512 240a82b52ba82cd604371baf9b717419aa53dc3bc1d53eeb51efe0b0ef306ca93b40f8a486612864d8ee5647467fd58467fb65b4140bc1d048cd6c475d9a07d5
+EBUILD lilypond-2.24.3.ebuild 3240 BLAKE2B 6af61570e6c5711324a761ee8ea4e934743ada450b47ddde418942dd7a9aef977c2b456d3f583938841b646aaf8797616961a17ccccb81b4b5a0af5cbecad857 SHA512 a2ef3c667ba2683e3b20500565baabb0f66d896d9b5de69a9974943c47fe0059fe705a36a98df35d2566a833f17e79238501cee3a7da504d5f0ba56674e25aca
+EBUILD lilypond-9999.ebuild 3240 BLAKE2B 6af61570e6c5711324a761ee8ea4e934743ada450b47ddde418942dd7a9aef977c2b456d3f583938841b646aaf8797616961a17ccccb81b4b5a0af5cbecad857 SHA512 a2ef3c667ba2683e3b20500565baabb0f66d896d9b5de69a9974943c47fe0059fe705a36a98df35d2566a833f17e79238501cee3a7da504d5f0ba56674e25aca
 MISC metadata.xml 527 BLAKE2B b110a46a24ff9f9f8b93e28a17c40ff7d0674e9162e7804b476e9568fc4ddd1afd9c7386a129e9b2c3adf2010221e463cf0a32c720edda7fa31feb8ce806f5d0 SHA512 1f5cb81806c3155895a5a3a2b773c3ebbbfb35d7cafdb37b96961a46f6db11762a25444a868af975183b386bcc8dd8bf665e082a65d1c8423b224ea3185b31cd
diff --git a/media-sound/lilypond/lilypond-2.24.0.ebuild b/media-sound/lilypond/lilypond-2.24.0.ebuild
index f703d97eea69..f5eac9e3e7ee 100644
--- a/media-sound/lilypond/lilypond-2.24.0.ebuild
+++ b/media-sound/lilypond/lilypond-2.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,7 +35,7 @@ BDEPEND="
 	doc? ( app-text/texi2html )
 "
 RDEPEND="app-text/ghostscript-gpl
-	dev-scheme/guile:12=[deprecated,regex]
+	>=dev-scheme/guile-2.2:12=[deprecated,regex]
 	media-fonts/tex-gyre
 	media-libs/fontconfig
 	media-libs/freetype:2
diff --git a/media-sound/lilypond/lilypond-2.24.3.ebuild b/media-sound/lilypond/lilypond-2.24.3.ebuild
new file mode 100644
index 000000000000..67c1d3818dfc
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.24.3.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
+else
+	MAIN_VER=$(ver_cut 1-2)
+	SRC_URI="https://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86"
+fi
+
+DESCRIPTION="GNU Music Typesetter"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh"
+IUSE="debug doc emacs profile ${LANG_USE}"
+unset LANG_USE
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-texlive/texlive-metapost
+	sys-apps/texinfo
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? ( app-text/texi2html )
+"
+RDEPEND="app-text/ghostscript-gpl
+	>=dev-scheme/guile-2.2:12=[deprecated,regex]
+	media-fonts/tex-gyre
+	media-libs/fontconfig
+	media-libs/freetype:2
+	x11-libs/pango
+	emacs? ( >=app-editors/emacs-23.1:* )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/t1utils
+	dev-lang/perl
+	dev-libs/kpathsea
+	media-gfx/fontforge[png,python]
+	sys-devel/gettext
+	doc? (
+		dev-texlive/texlive-langcyrillic
+		l10n_cs? ( dev-texlive/texlive-xetex )
+		l10n_ja? ( dev-texlive/texlive-langjapanese )
+		l10n_zh? ( dev-texlive/texlive-langchinese )
+	)
+"
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.23.0-fix-font-size.patch
+	"${FILESDIR}"/${PN}-2.22.1-free_font.patch
+)
+
+DOCS=( DEDICATION README.md ROADMAP )
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
+src_prepare() {
+	default
+
+	# respect CFLAGS
+	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
+
+	eautoreconf
+
+	xdg_environment_reset #586592
+}
+
+src_configure() {
+	# fix hardcoded `ar`
+	sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command"
+
+	local myeconfargs=(
+		--disable-optimising
+		--disable-pipe
+		$(use_enable debug debugging)
+		$(use_enable doc documentation)
+		$(use_enable profile profiling)
+	)
+
+	export VARTEXFONTS="${T}/fonts"  # https://bugs.gentoo.org/692010
+
+	econf "${myeconfargs[@]}" AR="$(tc-getAR)"
+}
+
+src_compile() {
+	default
+
+	# http://lilypond.org/doc/v2.24/Documentation/changes/index#notes-for-source-compilation-and-packagers
+	emake bytecode
+
+	use doc && emake LANGS="${L10N}" doc info
+
+	if use emacs ; then
+		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+			|| die "elisp-compile failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install install-bytecode
+
+	use doc && emake DESTDIR="${D}" install-doc
+
+	# remove elisp files since they are in the wrong directory
+	rm -r "${ED}"/usr/share/emacs || die
+
+	if use emacs ; then
+		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+
+	python_fix_shebang "${ED}"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 50b935febd44..67c1d3818dfc 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 PYTHON_COMPAT=( python3_{9..11} )
 
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
-if [[ "${PV}" = "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
 else
 	MAIN_VER=$(ver_cut 1-2)
-	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
+	SRC_URI="https://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86"
 fi
 
@@ -21,7 +22,7 @@ HOMEPAGE="http://lilypond.org/"
 LICENSE="GPL-3 FDL-1.3"
 SLOT="0"
 LANG_USE="l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh"
-IUSE="debug doc emacs profile vim-syntax ${LANG_USE}"
+IUSE="debug doc emacs profile ${LANG_USE}"
 unset LANG_USE
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -34,7 +35,7 @@ BDEPEND="
 	doc? ( app-text/texi2html )
 "
 RDEPEND="app-text/ghostscript-gpl
-	dev-scheme/guile:12=[deprecated,regex]
+	>=dev-scheme/guile-2.2:12=[deprecated,regex]
 	media-fonts/tex-gyre
 	media-libs/fontconfig
 	media-libs/freetype:2
@@ -64,19 +65,16 @@ PATCHES=(
 
 DOCS=( DEDICATION README.md ROADMAP )
 
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
 src_prepare() {
 	default
 
-	if ! use vim-syntax ; then
-		sed -i 's/vim//' GNUmakefile.in || die
-	fi
-
 	# respect CFLAGS
 	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
 
-	# remove bundled texinfo file (fixes bug #448560)
-	rm Documentation/tex/texinfo.tex || die
-
 	eautoreconf
 
 	xdg_environment_reset #586592
@@ -102,6 +100,9 @@ src_configure() {
 src_compile() {
 	default
 
+	# http://lilypond.org/doc/v2.24/Documentation/changes/index#notes-for-source-compilation-and-packagers
+	emake bytecode
+
 	use doc && emake LANGS="${L10N}" doc info
 
 	if use emacs ; then
@@ -111,7 +112,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install install-bytecode
 
 	use doc && emake DESTDIR="${D}" install-doc
 
diff --git a/media-sound/sidplayfp/Manifest b/media-sound/sidplayfp/Manifest
index aa69ac3fe314..af7761de6aa9 100644
--- a/media-sound/sidplayfp/Manifest
+++ b/media-sound/sidplayfp/Manifest
@@ -1,6 +1,8 @@
 AUX sidplayfp-1.4.4-musl-limits.patch 263 BLAKE2B bd9c7d93bb0743d94451d4379baa598265ea95bb5717a31770d85b91a3ef8e0fa222fb4c506b6d36c41354b0ddc821ed531e394e6a4db8e52eeeebd7a17168d6 SHA512 2fe65a56bca1e6f1b898ccc6a2ad0c0d2c38fcfb0a9e5a781e515214f616cee1380b4f80c0df54986d43f30fb85f62c88b73706e5db5e1f89bc0f054d805283e
 DIST sidplayfp-2.5.0.tar.gz 249111 BLAKE2B 6ac126ee1f26e2dafe649d1bc64fd053ac6762277996dcbc6704dbda788bd2b3d3d2810aba48a8d9fd62ae92f70773cc93a657198c414327ea18fc074da35c96 SHA512 271d1ef216ace5294084997dc902f74411679b24dd3426248c70004468c0525077f0d6cf187f24715d1b6465abf82236b328904b7c06d4e0f87e159594be6427
 DIST sidplayfp-2.5.1.tar.gz 244863 BLAKE2B 463a8716f0a1f310780aec559ebb1128749cc0cc97da254d422552859450cf1e721510b1706a59181e2ca1bf1575a68cfec96f688b164c289ae06a1b045b46dd SHA512 f7c13171d163cf49a2e2b1c485255bd80a3ebdd157343489ac5915e2190c325da327dd1c9413fc9daf6c7d8183c01473d2fc35ca38bfe516515780c464187199
+DIST sidplayfp-2.6.0.tar.gz 246784 BLAKE2B fab38131225650aae8cf653b6098fef20a9232d18a6b33f2e831b6dafc545081d0abb2519565da8cc802fb994695d8105f9db5df207711317342d5492a4f70d4 SHA512 1411600f72fafe9c3534c6e82b90f21f21a0efb8a24786376b388add3b40498109dbe25e06977563c595ea16cc1c0074aa3f9f1740c3d8f625f26384f174ae44
 EBUILD sidplayfp-2.5.0.ebuild 930 BLAKE2B 5a2bfd999467d6cb62472aa7254479e1a0122840d360d6145c7cf44f1178feeb5e6b81ece987b009156d06483003ef928520b786c52b9d6f391186d881c67002 SHA512 bf9fee7ba07cc070b31eea6db9de4f2e6875bb3fc3328e9716998e147fb8ca2568cd0e94601e16b14fda97d8534936ed30fb5bfef6d6aca4a6dd24fa55adc2ba
 EBUILD sidplayfp-2.5.1.ebuild 930 BLAKE2B 5a2bfd999467d6cb62472aa7254479e1a0122840d360d6145c7cf44f1178feeb5e6b81ece987b009156d06483003ef928520b786c52b9d6f391186d881c67002 SHA512 bf9fee7ba07cc070b31eea6db9de4f2e6875bb3fc3328e9716998e147fb8ca2568cd0e94601e16b14fda97d8534936ed30fb5bfef6d6aca4a6dd24fa55adc2ba
+EBUILD sidplayfp-2.6.0.ebuild 930 BLAKE2B 8df6a3575318c0e2db8f79b140606a22b8f0256d92c911d5b4aa8a33a49212c08a3aa52ba83af993baf7ef7295216219fe7cdd3a01a7e07009db1e85200fd747 SHA512 11d04eb06ffff6f53df04f1607e87bee5ae969a918eb3373b462a67b3cefe174eb4c9bcc5fca651db90efd4846912d7742a23f17b9ad4d638a48776f8f0f47b0
 MISC metadata.xml 339 BLAKE2B 79d766f101909c202affb7cc72bbefdfb8d5b44fcbf74f17f98e665351384a8110aec7ddec0c685fb328198d29ae4953ce341cda3dd4abd2a67f157d90628175 SHA512 172879da9ed0be1ff48d75d23d3b23e3070247b4ef1decb291b020f7bc1522dd033e78f92d38511eedaae7c1944edc5bb05ff763f4d20a6b7015198ebd38f16f
diff --git a/media-sound/sidplayfp/sidplayfp-2.6.0.ebuild b/media-sound/sidplayfp/sidplayfp-2.6.0.ebuild
new file mode 100644
index 000000000000..622dd37d0372
--- /dev/null
+++ b/media-sound/sidplayfp/sidplayfp-2.6.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Sidplay2 fork with resid-fp"
+HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
+SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa oss pulseaudio"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	media-libs/libsidplayfp
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-libs/libpulse )"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )"
+
+DOCS=( AUTHORS README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.4-musl-limits.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use alsa; then
+		sed -i -e 's:alsa >= 1.0:dIsAbLe&:' configure || die
+	fi
+
+	if ! use pulseaudio; then
+		sed -i -e 's:libpulse-simple >= 1.0:dIsAbLe&:' configure || die
+	fi
+}
+
+src_configure() {
+	export ac_cv_header_linux_soundcard_h=$(usex oss)
+
+	econf
+}