5 files changed, 28 insertions, 114 deletions
diff --git a/app-text/yodl/Manifest b/app-text/yodl/Manifest
index fea328b3ed94..dd9c75cf172d 100644
--- a/app-text/yodl/Manifest
+++ b/app-text/yodl/Manifest
@@ -1,3 +1 @@
-DIST yodl-4.01.00.tar.gz 288932 BLAKE2B 71491eaedae9cf0b6bc65f1da3065bc2a90e9ff5f527cbac66a714c761e679600635f7f10b0f20b7e1a15413c1930ee6e64e5ec083226058b6c8822e4a445437 SHA512 f195dec8e03b83561b47f9bd00fbb0fe711bbc254c32413d748587d8bf3848e050b90a2140977bec5a335021b2ef49ec5a6b0ca89f1649def495d81c3e7b437f
-DIST yodl-4.02.00.tar.gz 308567 BLAKE2B bf64ff7248ddcdc17dec23fe4407c28edf604b76746f13e97dfbb470421c15ca6235747c9ef349925a0293f8503d319a637a11352a2987f161fb2bcab60ddf7e SHA512 ca3a2490bf54a0ce4e800a62a3de9a5cf37df96f0f553de89623ef6d36f07b65b7c09168e77d267d7fb79d900a8e8a6c6d3c17c4b733345001213f5450c02b13
-DIST yodl-4.02.01.tar.gz 308670 BLAKE2B f94c094f17ec99e66f64a704e41814274f61128ff21b11077d772874dcbc9f15fbc878df8831e7f73d9b6c89a497462c694bc0bdb6cd5637c0db08303e3838d5 SHA512 59e23bb173786b8806f56bf302dee9d8d971d0d840c609e2b24d9783b5866fca2509be844616318f9a4f302117b3a41f620be5cba09181e7ccdcf0c141402be7
+DIST yodl-4.03.00.tar.gz 309212 BLAKE2B 9a89dfda5f4138f466bc2f871724087ff2c0084d06d81c32e1e865744e1c133b1073becac30e817f2f997c351b8f8192e942616174acb644dcab40d5d64c9d36 SHA512 ec5edaf932d94e9272a08867322e8fbfec65f612447fa412a7c19412569a6d811bbe5badd0af692837086a9ee8cdf8bb8f0c10a3e8333ef6096513b263c8d831
diff --git a/app-text/yodl/metadata.xml b/app-text/yodl/metadata.xml
index dbb763b1ee5a..ad9519f39929 100644
--- a/app-text/yodl/metadata.xml
+++ b/app-text/yodl/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="gitlab">fbb-git/yodl</remote-id>
 	</upstream>
diff --git a/app-text/yodl/yodl-4.01.00.ebuild b/app-text/yodl/yodl-4.01.00.ebuild
deleted file mode 100644
index 8c697af720a1..000000000000
--- a/app-text/yodl/yodl-4.01.00.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
-HOMEPAGE="https://fbb-git.github.io/yodl/ https://github.com/fbb-git/yodl"
-SRC_URI="https://github.com/fbb-git/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-util/icmake-8.00.00"
-
-S=${WORKDIR}/${P}/${PN}
-
-src_prepare() {
-	sed -e "/DOC.* =/s/yodl\(-doc\)\?/${PF}/" \
-		-e "/COMPILER =/s/gcc/$(tc-getCC)/" \
-		-e "/CXX =/s/g++/$(tc-getCXX)/" \
-		-i INSTALL.im || die
-
-	sed -e "s/ar r /$(tc-getAR) r /" \
-		-e "s/ranlib/$(tc-getRANLIB)/" \
-		-i icmake/stdcompile || die
-
-	default
-}
-
-src_compile() {
-	./build programs || die
-	./build macros || die
-	./build man || die
-	use doc && { ./build manual || die ; }
-}
-
-src_install() {
-	./build install programs "${ED}" || die
-	./build install macros "${ED}" || die
-	./build install man "${ED}" || die
-	./build install docs "${ED}" || die
-	use doc && { ./build install manual "${ED}" || die ; }
-}
diff --git a/app-text/yodl/yodl-4.02.00.ebuild b/app-text/yodl/yodl-4.02.00.ebuild
deleted file mode 100644
index b49b2b6193d4..000000000000
--- a/app-text/yodl/yodl-4.02.00.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
-HOMEPAGE="https://fbb-git.github.io/yodl/ https://github.com/fbb-git/yodl"
-SRC_URI="https://github.com/fbb-git/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-util/icmake-8.00.00"
-
-S=${WORKDIR}/${P}/${PN}
-
-src_prepare() {
-	sed -e "/DOC.* =/s/yodl\(-doc\)\?/${PF}/" \
-		-e "/COMPILER =/s/gcc/$(tc-getCC)/" \
-		-e "/CXX =/s/g++/$(tc-getCXX)/" \
-		-i INSTALL.im || die
-	sed -i "s/g++/$(tc-getCXX)/" verbinsert/icmconf || die
-
-	sed -e "s/ar r /$(tc-getAR) r /" \
-		-e "s/ranlib/$(tc-getRANLIB)/" \
-		-i icmake/stdcompile || die
-
-	default
-}
-
-src_compile() {
-	./build programs || die
-	./build macros || die
-	./build man || die
-	use doc && { ./build manual || die ; }
-}
-
-src_install() {
-	./build install programs "${ED}" || die
-	./build install macros "${ED}" || die
-	./build install man "${ED}" || die
-	./build install docs "${ED}" || die
-	use doc && { ./build install manual "${ED}" || die ; }
-}
diff --git a/app-text/yodl/yodl-4.02.01.ebuild b/app-text/yodl/yodl-4.03.00.ebuild
index 3ea825807fc1..2ff151fc083a 100644
--- a/app-text/yodl/yodl-4.02.01.ebuild
+++ b/app-text/yodl/yodl-4.03.00.ebuild
@@ -1,42 +1,56 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
 HOMEPAGE="https://fbb-git.gitlab.io/yodl/ https://gitlab.com/fbb-git/yodl"
 SRC_URI="https://gitlab.com/fbb-git/${PN}/-/archive/${PV}/${P}.tar.gz"
+S="${WORKDIR}/${P}/${PN}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-DEPEND=">=dev-util/icmake-8.00.00"
-
-S=${WORKDIR}/${P}/${PN}
+BDEPEND="
+	>=dev-build/icmake-8.00.00
+	doc? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-plaingeneric
+	)
+"
 
 src_prepare() {
 	sed -e "/DOC.* =/s/yodl\(-doc\)\?/${PF}/" \
 		-e "/COMPILER =/s/gcc/$(tc-getCC)/" \
 		-e "/CXX =/s/g++/$(tc-getCXX)/" \
 		-i INSTALL.im || die
-	sed -i "s/g++/$(tc-getCXX)/" verbinsert/icmconf || die
+
+	sed -e "s/g++/$(tc-getCXX)/" \
+		-e "s:#define CLS://\0:" \
+		-i verbinsert/icmconf || die
 
 	sed -e "s/ar r /$(tc-getAR) r /" \
 		-e "s/ranlib/$(tc-getRANLIB)/" \
 		-i icmake/stdcompile || die
 
+	sed -e '/strip/s|"-s"|""|g' \
+		-i icmake/program || die
+
+	# required for std::filesystem usage
+	append-cxxflags -std=c++17
+
 	default
 }
 
 src_compile() {
-	./build programs || die
-	./build macros || die
-	./build man || die
-	use doc && { ./build manual || die ; }
+	local target
+	for target in  programs macros man $(usex doc manual ''); do
+		./build ${target} || die "${target} failed"
+	done
 }
 
 src_install() {