4 files changed, 22 insertions, 0 deletions
diff --git a/www-apps/cgit/cgit-1.2.3_p20240802-r1.ebuild b/www-apps/cgit/cgit-1.2.3_p20240802-r2.ebuild
index 61771360c86c..8e2b9cf6a89a 100644
--- a/www-apps/cgit/cgit-1.2.3_p20240802-r1.ebuild
+++ b/www-apps/cgit/cgit-1.2.3_p20240802-r2.ebuild
@@ -58,6 +58,8 @@ BDEPEND="
 	)
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-highlight.patch )
+
 pkg_setup() {
 	python_setup
 	webapp_pkg_setup
diff --git a/www-apps/cgit/cgit-9999-r1.ebuild b/www-apps/cgit/cgit-9999-r1.ebuild
index 55d6a0ffb4b2..bb7ceed18ce1 100644
--- a/www-apps/cgit/cgit-9999-r1.ebuild
+++ b/www-apps/cgit/cgit-9999-r1.ebuild
@@ -61,6 +61,8 @@ BDEPEND="
 	)
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-highlight.patch )
+
 pkg_setup() {
 	python_setup
 	webapp_pkg_setup
diff --git a/www-apps/cgit/cgit-9999.ebuild b/www-apps/cgit/cgit-9999.ebuild
index 9b256c764f81..8ddebf68c9c2 100644
--- a/www-apps/cgit/cgit-9999.ebuild
+++ b/www-apps/cgit/cgit-9999.ebuild
@@ -58,6 +58,8 @@ BDEPEND="
 	)
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-highlight.patch )
+
 pkg_setup() {
 	python_setup
 	webapp_pkg_setup
diff --git a/www-apps/cgit/files/cgit-highlight.patch b/www-apps/cgit/files/cgit-highlight.patch
new file mode 100644
index 000000000000..9d03f2b0df70
--- /dev/null
+++ b/www-apps/cgit/files/cgit-highlight.patch
@@ -0,0 +1,16 @@
+cgit's highlighter script supports newer highlight versions, but the config has
+to be patched to enable that instead of the legacy version, which does not ship
+with Gentoo any more. See: https://bugs.gentoo.org/962035
+
+--- a/filters/syntax-highlighting.sh
++++ b/filters/syntax-highlighting.sh
+@@ -115,7 +115,7 @@
+ # found (for example) on EPEL 6.
+ #
+ # This is for version 2
+-exec highlight --force -f -I -X -S "$EXTENSION" 2>/dev/null
++#exec highlight --force -f -I -X -S "$EXTENSION" 2>/dev/null
+ 
+ # This is for version 3
+-#exec highlight --force -f -I -O xhtml -S "$EXTENSION" 2>/dev/null
++exec highlight --force -f -I -O xhtml -S "$EXTENSION" 2>/dev/null