dev-tex/lgrind: patch for newer texlive and gcc, eapi8, cleanup

Closes: https://bugs.gentoo.org/935435
Signed-off-by: Florian Schmaus <flow@gentoo.org>

3 files changed, 51 insertions, 9 deletions

diff --git a/dev-tex/lgrind/Manifest b/dev-tex/lgrind/Manifest
index c465a2635ef7..096a17ca18f8 100644
--- a/dev-tex/lgrind/Manifest
+++ b/dev-tex/lgrind/Manifest
@@ -1 +1,3 @@
+DIST lgrind-3.67-fix-begin-document.patch 547 BLAKE2B 8e9af9c73724809d3d312cf7b63df24067d6afb6ebc34c4c7baffa32a0548929991f4ed4dc8fe2ead7127de81f44d19356133149aa219f19153ac1702f458799 SHA512 0837866dc17691bec0867e60f7ae60fd7a76dc6f200e0d5926195c94b1da2c6f888146762a1df17381340def1b28558d8d0639db08f914873a50d437bf243f05
+DIST lgrind-3.67-texlive-2022.patch 551 BLAKE2B 88293027c8bfac609e46e0e873498b4635a42b87a2fa53197d54dac1df256fbcd618e370b348e01f3a0d2d4ccf940ddfe741881fbe93a3688079267ba48e34cb SHA512 8efa78f2792c8ee5bc05a69a46d9c22243f1ff88c1b643e97858e342b6cf8356022ba1155a05d3a9c081fe8b62541720d02a72583ffe9f3117ace4ccb7d1cb64
 DIST lgrind-3.67.tgz 73205 BLAKE2B f19c5ed96251a4c9e5b8ec2cc2115a2b3581c067c26468dc80bfbeece1cb40f72964d60115221c52ab6c0067d670d6497c26eabc3743573248c77e63df24d416 SHA512 89dffec60b6cbac82e9633690412961cb619d6d86d39bea2fb6f3026e1317eb00494d7ed68865a943b1872346eaecdc1b8502de41517023a47309e1e803da2c6
diff --git a/dev-tex/lgrind/files/lgrind-3.67-fix-return-with-no-value.patch b/dev-tex/lgrind/files/lgrind-3.67-fix-return-with-no-value.patch
new file mode 100644
index 000000000000..b96018143112
--- /dev/null
+++ b/dev-tex/lgrind/files/lgrind-3.67-fix-return-with-no-value.patch
@@ -0,0 +1,30 @@
+From d9fb07f81dd3a6f3e97d251095dc3d0254c265e6 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Sat, 6 Jul 2024 12:20:56 +0200
+Subject: [PATCH] Fix 'return' with no value in lgutil.c:parsevartab()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In file included from lgrind.c:1767:
+lgutil.c: In function ‘parsevartab’:
+lgutil.c:280:22: error: ‘return’ with no value, in function returning non-void [-Wreturn-mismatch]
+  280 |         if (f==NULL) return;
+      |                      ^~~~~~
+lgutil.c:274:11: note: declared here
+  274 | varsubst *parsevartab(char* fname)
+      |           ^~~~~~~~~~~
+--- a/source/lgutil.c
++++ b/source/lgutil.c
+@@ -277,7 +277,7 @@ varsubst *parsevartab(char* fname)
+ 	char linebuf[201], *cp;
+ 	varsubst *varsubsts=NULL, *substitem, *substlistpos;
+ 
+-	if (f==NULL) return;
++	if (f==NULL) return varsubsts;
+ 	while (!feof(f))
+ 	{
+ 		fscanf(f, "%200[^\n]", linebuf);
+-- 
+2.44.2
+
diff --git a/dev-tex/lgrind/lgrind-3.67-r3.ebuild b/dev-tex/lgrind/lgrind-3.67-r4.ebuild
index ad2f61a9c676..e6dd54f267f3 100644
--- a/dev-tex/lgrind/lgrind-3.67-r3.ebuild
+++ b/dev-tex/lgrind/lgrind-3.67-r4.ebuild
@@ -1,21 +1,32 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit latex-package toolchain-funcs
 
 DESCRIPTION="A pretty printer for various programming languages with tex output"
-SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tgz"
+SRC_URI="
+	https://dev.gentoo.org/~dilfridge/distfiles/${P}.tgz
+	https://salsa.debian.org/debian/lgrind/-/raw/dbf049621a61720c8350c37659cf6537ac3893a9/debian/patches/texlive-2022.patch
+		-> lgrind-3.67-texlive-2022.patch
+	https://salsa.debian.org/debian/lgrind/-/raw/dbf049621a61720c8350c37659cf6537ac3893a9/debian/patches/texlive-2020.patch
+		-> lgrind-3.67-fix-begin-document.patch
+"
 
 LICENSE="BSD LGrind-Jacobson"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="examples"
+S="${WORKDIR}/${PN}"
 
-S=${WORKDIR}/${PN}
+IUSE="examples"
 
-PATCHES=( "${FILESDIR}/${P}-fgets.patch" )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.67-fgets.patch
+	"${FILESDIR}"/${PN}-3.67-fix-return-with-no-value.patch
+	"${DISTDIR}"/${PN}-3.67-texlive-2022.patch
+	"${DISTDIR}"/${PN}-3.67-fix-begin-document.patch
+)
 
 src_prepare() {
 	echo 'CFLAGS+=-DDEFSFILE=\"$(DEFSFILE)\" -DVERSION=\"$(VERSION)\"' > source/Makefile || die "Fixing Makefile failed"
@@ -27,8 +38,7 @@ src_compile() {
 	tc-export CC
 
 	latex-package_src_compile
-	cd "${S}"/source
-	emake DEFSFILE="/usr/share/texmf/tex/latex/${PN}/lgrindef" VERSION="${PV}"
+	emake -C source DEFSFILE="/usr/share/texmf/tex/latex/${PN}/lgrindef" VERSION="${PV}"
 }
 
 src_install() {
@@ -48,6 +58,6 @@ src_install() {
 		dodoc example/*
 	fi
 
-	cd "${S}"/source
+	cd source || die
 	doman lgrind.1 lgrindef.5
 }