gentoo auto-resync : 19:09:2024 - 12:11:50

10 files changed, 427 insertions, 8 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 2e298c225c19..9a9827454be5 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index 213dac88f8fa..aec27eb5e643 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -1,5 +1,8 @@
+AUX denemo-2.6.0-fix-c99.patch 1134 BLAKE2B 6d385480782909c3a927f5c9bd1dfa539f331ac3ad923d5b82e63e58f4f52817a0ab5f51e9a6be4d86f5a5630cb4d1692465647f67e4cd515f4901590c8d8ffd SHA512 a598386ecac69307c5ae26431c38d9977d77ca2c5c1a8bce2a0601dd95b86416c89496c94b17b28534585a3e85b81f377bbf693a9a64d6a5597f77e94ef01dcd
+AUX denemo-2.6.0-incompatible-pointers.patch 1986 BLAKE2B fde324075064ce06d2e3cf13990472727eac34ed31bbd3305e6f96224d4d20d5aa1631ac7202fbc9e01498d226f0501e4b6c24319c9d72e7f2677641d2cf4d4d SHA512 ad5ebc22e96759b2d4d01c49101ee56a71fa6831fd5cdaf0252039d5c4a14c53aeb9eab1de0ee6402076317663e90d15c8c11556eeb2d11e700757adffe5b09c
 AUX denemo-2.6.0-respect-user-CFLAGS.patch 797 BLAKE2B 9ef79afe9fdda59e80e0a01e200408f97bf126ce2288807ae0f6e15ff80e31f2dee9bb973a0b1e8530df12acb1bedbe87b2fb1115b5920954f6144b880e1b1b8 SHA512 ae83ef7376618e411717b924247e907da4618b1b7cb56172ed17db1087b89295c4717c9dacc38fd3a9c482c2de9b54d8a54e9f6cb562a86296b8310ba6d56f01
 DIST denemo-2.6.0.tar.gz 17620623 BLAKE2B 55d142954834332a4bd5ca89125411181521d53f1a552b1397b16bbc51803cac3bc4eb0ffb309ababe2ad1b554e293d23102383aba95cde1cbb18cc96f9c6203 SHA512 9069c973624f05b53c62e5d8a9db5c2b4835ce3465402544d6a9f2a7d3bd617d79ac35c83940b37842a7a147bc2ee44ef33202bf7c107e739bfa303ffcf19738
+EBUILD denemo-2.6.0-r100.ebuild 3410 BLAKE2B 24e01cd7c8cf8d741de93a06f1345761a1f41c1f647fbc1fee7776b14a89d3a7955dc139b1d94dcee88b7c08e717dd4f0cf4eec80b6135c0b7ef51b89dcde22b SHA512 21e141b042777d51aa02c346d8cec0c61d65cb23580aa6110c8dc20b932dde81885d093c0df8318286109bb0b52d9df9588c722ee39a32071460817c2478e14b
 EBUILD denemo-2.6.0-r2.ebuild 3161 BLAKE2B 94ec6a21d7447a22e1476d4ecadb67746765a728e6ad1ab40d11247140b8da91eb3c3f79793d68d4290a3e66ce89c0d9eb8476a65faef2462c780e1c5e8a1d23 SHA512 abde1643178582f7644dd423363f2f56f03c7b167e6d8c709281f400a4babb4ef3abf3f600e1b64e8f850bc03144c752fd6dec62611fce56466c9452c4fa6ef7
 EBUILD denemo-2.6.0-r3.ebuild 3212 BLAKE2B 9e6bb848259e46fcc7d43dc0b036a237f2e112539a96fe39584971573369b030ee25fd11a487644373371d8074563037d009ddfc2d39ec086274e6632369e86e SHA512 c09f9246a3e39587d04d47fd5cfbb83fe9c1a33e915a9bc448a74362785ad4342dcd401cb08225f7cb858f6f9833f6fab54e406454b92a198fa62c74c1214748
 MISC metadata.xml 1331 BLAKE2B a6a5a632746ef42c5dd74c118aa78d602b20e476fc1ac3b432ddea1f4cd611c2874466786b2cae755a03cd9ac8bc4b0c24eb56a81473a8dd04cdb25fa9ce9d80 SHA512 394384a789b4c972d45785af5e5c28c0dc41b1e4af8de087ea4d4ff43e37cd44f96509157fb8172d1e8a849fcdf45366597101784b1264e4271565da0a1695df
diff --git a/media-sound/denemo/denemo-2.6.0-r100.ebuild b/media-sound/denemo/denemo-2.6.0-r100.ebuild
new file mode 100644
index 000000000000..5b89d259294e
--- /dev/null
+++ b/media-sound/denemo/denemo-2.6.0-r100.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GUILE_COMPAT=( 2-2 )
+inherit autotools font guile-single xdg
+
+DESCRIPTION="A music notation editor"
+HOMEPAGE="http://www.denemo.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# configure options currently not used:
+# --enable-mem(no) memory debugging: needs Electric fence (efence), which
+#		is not available in portage. See https://github.com/boundarydevices/efence
+# --enable-gtk-doc-pdf(no) doesn't work
+# fluidsynth currently broken. See https://savannah.gnu.org/bugs/index.php?62202
+IUSE="alsa +aubio debug jack gtk-doc nls +portaudio +portmidi
+	+rubberband test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${GUILE_REQUIRED_USE}"
+
+RDEPEND="
+	${GUILE_DEPS}
+	>=app-text/evince-3.22.1-r1:=
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	gnome-base/librsvg:2
+	media-libs/fontconfig:1.0
+	>=media-libs/libsmf-1.3
+	>=media-libs/libsndfile-1.0.28-r1
+	>=media-sound/fluidsynth-1.1.6-r1:=
+	>=media-sound/lilypond-2.24.4-r100
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/gtksourceview:3.0=
+	x11-libs/pango
+	alsa? ( >=media-libs/alsa-lib-1.1.2 )
+	aubio? ( >=media-libs/aubio-0.4.1-r1:= )
+	jack? ( virtual/jack )
+	portaudio? (
+		>=media-libs/portaudio-19_pre20140130
+		sci-libs/fftw:3.0=
+	)
+	portmidi? ( media-libs/portmidi )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-build/gtk-doc-am-1.25-r1
+	>=dev-util/intltool-0.51.0-r1
+	app-alternatives/lex
+	virtual/pkgconfig
+	app-alternatives/yacc
+	gtk-doc? ( >=dev-util/gtk-doc-1.25-r1 )
+	nls? ( >=sys-devel/gettext-0.19.8.1 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.0-respect-user-CFLAGS.patch
+	"${FILESDIR}"/${PN}-2.6.0-fix-c99.patch
+	"${FILESDIR}"/${PN}-2.6.0-incompatible-pointers.patch
+)
+DOCS=( AUTHORS ChangeLog docs/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
+
+src_prepare() {
+	sed -e '/^Categories=/s/GNOME\;/GNOME\;GTK\;/' -i pixmaps/org.denemo.Denemo.desktop || die
+	sed -e 's|appdatadir = \$(datarootdir)/appdata|appdatadir = \$(datarootdir)/metainfo|' \
+		-i Makefile.am || die
+	guile-single_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	myeconfargs=(
+		--disable-gtk-doc-pdf
+		--disable-gtk2
+		--disable-installed-tests
+		--disable-mem
+		--disable-rpath
+		--disable-static
+		--enable-evince
+		--enable-fluidsynth
+		--enable-gtk3
+		--enable-x11
+		$(use_enable alsa)
+		$(use_enable aubio)
+		$(use_enable debug)
+		# --enable-doc does nothing for itself
+		# basic html documentation is always being installed in the
+		# /usr/share/denemo/manual directory
+		$(use_enable gtk-doc doc)
+		$(use_enable gtk-doc gtk-doc)
+		$(use_enable gtk-doc gtk-doc-html)
+		$(use_enable jack)
+		$(use_enable nls)
+		$(use_enable portaudio)
+		$(use_enable portmidi)
+		$(use_enable rubberband)
+		$(use_enable test always-build-tests)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# make check fails if used with parallel builds
+	emake -j1 check
+}
+
+src_install() {
+	guile-single_src_install
+
+	# link html documentation installed in /usr/share/denemo/manual
+	dodir /usr/share/doc/${PF}/html
+	local f
+	for f in denemo-manual.html denemo.css images; do
+		dosym -r /usr/share/denemo/manual/"${f}" /usr/share/doc/${PF}/html/"${f}"
+	done
+}
+
+pkg_postinst() {
+	font_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	font_pkg_postrm
+	xdg_desktop_database_update
+}
diff --git a/media-sound/denemo/files/denemo-2.6.0-fix-c99.patch b/media-sound/denemo/files/denemo-2.6.0-fix-c99.patch
new file mode 100644
index 000000000000..8d1c30c895f2
--- /dev/null
+++ b/media-sound/denemo/files/denemo-2.6.0-fix-c99.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/927336
+https://savannah.gnu.org/bugs/?63720
+
+From 509906e7cc4669b525cbcb05022e7e10c6663627 Mon Sep 17 00:00:00 2001
+From: Nikita Popov <npopov@redhat.com>
+Date: Fri, 27 Jan 2023 12:13:10 +0100
+Subject: [PATCH] Fix C99 support in sffile.c
+
+This fixes one -Wimplicit-function-declaration and one
+-Wimplicit-int warning, which will become errors in future
+compiler versions.
+
+Related to:
+
+  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
+  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
+--- a/libs/libsffile/sffile.c
++++ b/libs/libsffile/sffile.c
+@@ -20,6 +20,7 @@
+  *================================================================*/
+ //Interface to Denemo License:  FSF GPL version 3 or later
+ 
++#include <ctype.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+@@ -51,7 +52,7 @@ static void ConvertIllegalChar(char *name){
+ int  ParseSoundfont(char *soundfont, int index, char **name, int *preset, int *bank) {
+   FILE *fp;
+   static SFInfo sf;
+-  static initialized = FALSE;
++  static int initialized = FALSE;
+   int i;
+   int number = 0;
+   if(soundfont) {
+-- 
+2.39.1
+
diff --git a/media-sound/denemo/files/denemo-2.6.0-incompatible-pointers.patch b/media-sound/denemo/files/denemo-2.6.0-incompatible-pointers.patch
new file mode 100644
index 000000000000..28274e810eb9
--- /dev/null
+++ b/media-sound/denemo/files/denemo-2.6.0-incompatible-pointers.patch
@@ -0,0 +1,36 @@
+diff --git a/src/source/proof.c b/src/source/proof.c
+index f9a02bf0e..3b8f5fc82 100644
+--- a/src/source/proof.c
++++ b/src/source/proof.c
+@@ -280,7 +280,7 @@ press (EvView * view,  GdkEventButton  *event, EvDocumentModel *model)
+         infodialog (help_text);
+     nearest_annotation_text = NULL;
+     extern EvMappingList * ev_document_annotations_get_annotations();
+-    EvMappingList *mapping_list = ev_document_annotations_get_annotations (doc, ev_document_get_page(doc, i));
++    EvMappingList *mapping_list = ev_document_annotations_get_annotations (EV_DOCUMENT_ANNOTATIONS (doc), ev_document_get_page(doc, i));
+     if(mapping_list)
+     {
+     gdouble nearest = G_MAXDOUBLE;
+@@ -313,7 +313,7 @@ find_annotated_pages (EvDocumentModel *model)
+     for (i=0; i< ev_document_get_n_pages(doc);i++)
+         {
+             extern EvMappingList * ev_document_annotations_get_annotations();
+-            EvMappingList *mapping_list = ev_document_annotations_get_annotations (doc, ev_document_get_page(doc, i));
++            EvMappingList *mapping_list = ev_document_annotations_get_annotations (EV_DOCUMENT_ANNOTATIONS (doc), ev_document_get_page(doc, i));
+             if(mapping_list)
+             {
+              annotated_pages = g_list_append (annotated_pages, GINT_TO_POINTER(i));
+diff --git a/tests/integration.c b/tests/integration.c
+index f3aad7a1f..5910425e6 100644
+--- a/tests/integration.c
++++ b/tests/integration.c
+@@ -248,7 +248,7 @@ parse_dir_and_run_complex_test(gchar* path, const gchar* extension)
+   while(files){
+     filename = g_build_filename(path, files->data, NULL);
+     gchar* test_case_path = g_strdup_printf("%s-%d", test_case_path_fragment, test_case_path_counter);
+-    g_test_add (test_case_path, gchar*, filename, setup, test_open_save_complex_file, teardown);
++    g_test_add (test_case_path, void, filename, setup, test_open_save_complex_file, teardown);
+     g_free(test_case_path);
+     test_case_path_counter ++;
+     files = g_list_next(files);
+
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 2b3ebf610470..4beae000a00e 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -4,6 +4,7 @@ AUX lilypond-2.23.0-fix-font-size.patch 573 BLAKE2B a9b9fe5249b76a92aa6c0f8e4c00
 DIST lilypond-2.24.3.tar.gz 19441299 BLAKE2B 6be6ca1f090869a8d545befe3d1f54122514e7dcf9aff1bcc2d78819820da8cef908c5033039eb231b48ae914c1ebd6d766566862a40721580747f017f1445ad SHA512 5153f6cbe5e68e4b3dfcc03a8299ef6b82fbfb487eb3e4f9d631b9dc5a07a972168c3f141d6d50eac936f5c7aeeacd19837c0c9ab70f11dfd5c7efe085d5b56e
 DIST lilypond-2.24.4.tar.gz 19442316 BLAKE2B 12e05f4f9831b9e0eb589b970b16dfde9fe8d4a82d93990e77a8c57cc696bb851e444c65c7f050a457973f5594bfe3e1847bde4adcce82618fd6f5a926eefebb SHA512 f350d1bf6d653c3af9e0b6b12457bbc5f6f3b27d4116ef25d8809e515cef3a28f569f00845a1144f3b4dd8b2fff5265de8f5b338506db4aca2a2928d0ecca726
 EBUILD lilypond-2.24.3.ebuild 3249 BLAKE2B 85e46059a325bc75259783bf6692e0827fb58ddbbdf5c6380af3ac8924a1f45f24fe697801cd9360f825704868074a26a105ff38e0d8d48de80182893d0abcba SHA512 74add15014a58d2a18a304305a72fdc953f7bec96ee12befc0c48a39a854c1dc94bcead79df71c53a9fc4d00b3cf7e57d0138185e53627cd494252c5b89de36b
+EBUILD lilypond-2.24.4-r100.ebuild 3319 BLAKE2B b561668afd9396191229b764a829f97b46d3886478d2559e39da6592f9d3695dfda04d3da281cdf93045f0fde210325e052aa62881cb0f32dc9734cc14de3cf5 SHA512 315bfdb0d18ac9b7094390407a95df2fb78433e046c4bf05996c063b71ba4dcf465012f43cfb793fd6c3a17aa78f1d74843257efa26e5a56e657eb31454ec528
 EBUILD lilypond-2.24.4.ebuild 3155 BLAKE2B f4c453435b0e174a0a4298885d1d11e555c66ced5ff97466abcec6c2660f384a677d228ee78004cf8e2dac752152f2e7ff846df57f5fbc1e0dc3aff7e5bcd5d3 SHA512 91666d903bd85aad7c7bfdc8675651dbbf9849a150ee9e2682ae0878e3eb2ed0773850cf0cb712a3b2db87440696ed8365715e7b0d7cf7e87e0cdeecd5a1db70
-EBUILD lilypond-9999.ebuild 3157 BLAKE2B 202683830714058d8b97a48319b696c2170ba7dc38ef10a64463c21527658824a1a8951a3ff080e7e15bf4089d6ee801648f497d2012fceee9803dc5adaac474 SHA512 d92ac5dc23e988e7358136ea0f792e63ba46c889e41cdf6ac2afc58120b0be47c9a9d555ce6f3208571f3022dba99ee97534f2a85619019fa8cbadc45a7372e3
+EBUILD lilypond-9999.ebuild 3319 BLAKE2B b561668afd9396191229b764a829f97b46d3886478d2559e39da6592f9d3695dfda04d3da281cdf93045f0fde210325e052aa62881cb0f32dc9734cc14de3cf5 SHA512 315bfdb0d18ac9b7094390407a95df2fb78433e046c4bf05996c063b71ba4dcf465012f43cfb793fd6c3a17aa78f1d74843257efa26e5a56e657eb31454ec528
 MISC metadata.xml 443 BLAKE2B a90a4f1d4685d5ca26c5948f10a2a84fc28abf22c89adcc477fab0bb465d2f257007bb22a74c0ebad4e5f2941e43063ff39fe8ae0a9e246f194aef318b7f5668 SHA512 24d3c93b4cceaa00138977e8e6137c1649baee08e96c9cd617b4ed489dfd093219dcb80419ba41c2ee84ad5989528c76c1e5b1203ef0d215e77b441c1d72db7a
diff --git a/media-sound/lilypond/lilypond-2.24.4-r100.ebuild b/media-sound/lilypond/lilypond-2.24.4-r100.ebuild
new file mode 100644
index 000000000000..63d46dcb3e06
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.24.4-r100.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GUILE_REQ_USE="deprecated,regex"
+GUILE_COMPAT=( 2-2 3-0 )
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit elisp-common autotools guile-single 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="${GUILE_REQUIRED_USE} ${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-texlive/texlive-metapost
+	sys-apps/texinfo
+	app-alternatives/yacc
+	app-alternatives/lex
+	virtual/pkgconfig
+	doc? ( app-text/texi2html )
+"
+RDEPEND="app-text/ghostscript-gpl
+	dev-libs/boehm-gc
+	dev-libs/glib:2
+	dev-libs/libatomic_ops
+	media-fonts/tex-gyre
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/harfbuzz
+	>=x11-libs/pango-1.40
+	emacs? ( >=app-editors/emacs-23.1:* )
+	${GUILE_DEPS}
+	${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"
+
+DOCS=( DEDICATION README.md ROADMAP )
+
+QA_PREBUILT="usr/*/${PN}/${PV}/ccache/*"
+
+pkg_setup() {
+	guile-single_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	guile-single_src_prepare
+
+	# 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
+
+	guile_unstrip_ccache
+
+	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 ae3457cd2655..63d46dcb3e06 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -3,9 +3,11 @@
 
 EAPI=8
 
+GUILE_REQ_USE="deprecated,regex"
+GUILE_COMPAT=( 2-2 3-0 )
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
+inherit elisp-common autotools guile-single python-single-r1 toolchain-funcs xdg-utils
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -24,7 +26,7 @@ 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}"
+REQUIRED_USE="${GUILE_REQUIRED_USE} ${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
 	dev-texlive/texlive-metapost
@@ -35,12 +37,16 @@ BDEPEND="
 	doc? ( app-text/texi2html )
 "
 RDEPEND="app-text/ghostscript-gpl
-	>=dev-scheme/guile-3.0.7:12=[deprecated,regex]
+	dev-libs/boehm-gc
+	dev-libs/glib:2
+	dev-libs/libatomic_ops
 	media-fonts/tex-gyre
 	media-libs/fontconfig
 	media-libs/freetype:2
+	media-libs/harfbuzz
 	>=x11-libs/pango-1.40
 	emacs? ( >=app-editors/emacs-23.1:* )
+	${GUILE_DEPS}
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	app-text/t1utils
@@ -60,12 +66,15 @@ RESTRICT="test"
 
 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'
+QA_PREBUILT="usr/*/${PN}/${PV}/ccache/*"
+
+pkg_setup() {
+	guile-single_pkg_setup
+	python-single-r1_pkg_setup
+}
 
 src_prepare() {
-	default
+	guile-single_src_prepare
 
 	# respect CFLAGS
 	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
@@ -120,6 +129,8 @@ src_install() {
 		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
 	fi
 
+	guile_unstrip_ccache
+
 	python_fix_shebang "${ED}"
 
 	einstalldocs
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 868a228bd1ce..b62e4b5038e8 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,5 +1,7 @@
 AUX qjackctl-0.9.13-disable-git.patch 503 BLAKE2B d46a307dd6fcf62b51b4172a7e88ff71cf632646e28fd26857cb0bc4b9cdcd5c11260a197b10ffc4362d77bd319524bac2985bef2faf03e97d0c899dd24fcd16 SHA512 0bdc675bd9c82a45f3633342a1669bfa4d545e31122c915ff21256e7653bb1b5f33fc77341c1a9ca568912327e7f5380b27278f63914e123484d80935a27f3d9
 DIST qjackctl-1.0.1.tar.gz 1318578 BLAKE2B c2741cfed5244e9c0b837b7bb7ac31dd6fad74226cad9401014565928e59c6fc448fda6e4e335e4acdc92d55b05f330a2101b1f9cbbce6918b7749c62f0e9379 SHA512 ac0442c0fe8f29ca27dfe149db3bc20a968ff7b2abb764bbb7b7cd1f57e26edac70b834c4f6fa6578fa07afad9de3e8f846d131517e9b5862333634715933b08
+DIST qjackctl-1.0.2.tar.gz 1319207 BLAKE2B f5af834b39d48dd5a10b970bc90cfd25470c91210b295727fb03bf6a277361bd67f54c3a841ee9aa7d419020500906ad41cbea490d6b223a7fc4c6357a523f0e SHA512 617760310eed763c813bf2ff95b72bd7c76bdc68bf2f997333eb9769e55eec6c02ff0e0813f576b5f06cdb856756cbf36017a6d1c578d493ceed7aa082470f25
 EBUILD qjackctl-1.0.1.ebuild 1008 BLAKE2B 1ec2ffb41f8547db96bb48b4d76b852d1113f1412a6da07f97caf2dce6087999ad51e4b369716362c98cbcb506e5c16b5c9853b06d0df8cacfdd48fa83739ead SHA512 462f339e40a8302f9838e51d8f1241ca6d8d82185d8f0f2171fb73d87822b852f25dafd3f26deaff618ae2d5682565ee274d0d158552eff44f46b39304200d2e
+EBUILD qjackctl-1.0.2.ebuild 1010 BLAKE2B 48dcbd5d6e79b3515afb7ff0d45f2d1e91d403440b7c58a7515a6764658ea84466c2c3449195ac28793715de78e98047b05d67305160e02fa33ade6bd3d0cb83 SHA512 071f43972f2991ca0a371e1e56e8d77c0ecdc61c90a99b5a7380b69eb70ce27dbfbcdb1eb5c3ca6c01be6014635f6c1d96ef72a781172c259ee184fe29b1eeec
 EBUILD qjackctl-9999.ebuild 926 BLAKE2B e7d605b036d205a43319d6559c0a918e347436e3e932d8002f3dffe6e56ef8563ca32efb6bd731802e8c1c066716f3e21a0896ac8b107f6c9361656f7ac3b556 SHA512 eceec774ffc46b565ad7398844febfee6c6c3ba65bc523072d81de91f84065f9507c93b4b18f9e63abc794a2814aa0f2bfab2a70f48afbaec07484d9530892e9
 MISC metadata.xml 338 BLAKE2B 74efc1853779388695ea14b6ccbe8e22d88941b8fcb845f553c02bd9e052f5638b2f4629dd238272a20b76db17f0d1f30a454a4b9a27333eb1e80b8d826c0dfd SHA512 bf18f336710191bc34b33b34f3f39435a9f3c9d7c45cef4e5b0ad39c19f4a9b27ee032dd2dbf6c57daaa90ad5f9adce40c49230850b6c1d746d0691eaf5ebb10
diff --git a/media-sound/qjackctl/qjackctl-1.0.2.ebuild b/media-sound/qjackctl/qjackctl-1.0.2.ebuild
new file mode 100644
index 000000000000..29b887562b75
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-1.0.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg cmake
+
+DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
+HOMEPAGE="https://qjackctl.sourceforge.io/"
+SRC_URI="https://downloads.sourceforge.net/qjackctl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa dbus debug portaudio"
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	virtual/jack
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.13-disable-git.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_ALSA_SEQ=$(usex alsa 1 0)
+		-DCONFIG_DBUS=$(usex dbus 1 0)
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_PORTAUDIO=$(usex portaudio 1 0)
+		-DCONFIG_QT6=no
+	)
+	cmake_src_configure
+}