5 files changed, 106 insertions, 34 deletions
diff --git a/dev-util/makeheaders/Manifest b/dev-util/makeheaders/Manifest
index e79f670e983d..894ef931ac8b 100644
--- a/dev-util/makeheaders/Manifest
+++ b/dev-util/makeheaders/Manifest
@@ -1,2 +1,4 @@
-DIST makeheaders-0_p4.c 99253 BLAKE2B 103d4b1d75fb3cb38fdf97dcf051f263c1ee7c08f8d2b4b791994948f0323cbf69fc66840464591ea8596c7ab6857eaf9ddd56bb69f2f035f57d99fbf5444992 SHA512 d46a23a4ee1436f1bad2f0d26e7de9be47a84b0c163430bdaf360c4c6a94b84949f2a427683265898312e56e9dda316992857e488202aa74afcc3939fa712a35
-DIST makeheaders-0_p4.html 35481 BLAKE2B a5e4e4804b612eb164f46cb8ef664952b3f1819a2915e2e905b58e6719cbc7480e4fd2f81f1d1d91b2029b15ed0c9b2c799ae99538b8ad77d49d3606d91b50d5 SHA512 903437c9d4b280af1cb9d5e29df150fb347ef9c62ec146daecfb5c4093554531c206bc73885cc7aacea1b7c24fb473e240a03a31c139caf6bc0e42901b518597
+DIST makeheaders-0_p20220411.c 100587 BLAKE2B eeed8554a444573ae66c479460c3491d1f23d1982c8b5656eefe78084d3a550a85285cc58fd3374af30f5e8803bbf7690d643346a3fdf1c98dbb7d2b5224bd65 SHA512 1add4012f1307b6273cd46f7a6ef10d1d003f6ce214521e05ffc232d90991e6596481110aa582e104c09be67cfdc94776ed85458b6b9bcf9bf6c5d633371d6a4
+DIST makeheaders-0_p20220411.html 40335 BLAKE2B 6eec5080226d7759e8bdf97b2238fb33e85700d29b0b539fcb797fa219d9d00461aafdabf2642e2cf1a622cf633cf889d71381bb3342113736ddfdafca3582de SHA512 6cccd5388e8af6f814d735c643abb231dab21a16799fba080858b15885a77b99bf37a5c7bac72958bbfcacea2ed54635ccc6323f5c7d47e2a1a73fffa8952504
+DIST makeheaders-262696252dc50250c896c90cc240dcd946614b9c7727902aa7606640507e9231.html 40335 BLAKE2B 6eec5080226d7759e8bdf97b2238fb33e85700d29b0b539fcb797fa219d9d00461aafdabf2642e2cf1a622cf633cf889d71381bb3342113736ddfdafca3582de SHA512 6cccd5388e8af6f814d735c643abb231dab21a16799fba080858b15885a77b99bf37a5c7bac72958bbfcacea2ed54635ccc6323f5c7d47e2a1a73fffa8952504
+DIST makeheaders-cae894dc3611ee6e0fba4100c0e377fcd3bbc6d8ddb91c997939ce439c50cee2.c 101039 BLAKE2B bff701e0230351b268591c24b3ae255916c0ffcb740375f9029d706b41a4c2a091330d74eee9ff687ff2237b53ebd94913a2e43213315fb01ec862c158b01b63 SHA512 0673648b1d3bb0e665edf05dd8c3075e4e4fa52acd1a051caa1018680d4969d5189c4750d7c36d59ddaa79646432cb75fcfec8181eabca804c56d81b4d8f6600
diff --git a/dev-util/makeheaders/makeheaders-0_p20220411.ebuild b/dev-util/makeheaders/makeheaders-0_p20220411.ebuild
new file mode 100644
index 000000000000..83211402e0ec
--- /dev/null
+++ b/dev-util/makeheaders/makeheaders-0_p20220411.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+# https://fossil-scm.org/home/finfo?name=tools/makeheaders.c
+ARTIFACT_C="ca90c1e2460d79e48f97c2aac60a39bcb8024e394de7cff5164c9dcbc96ce529"
+# https://fossil-scm.org/home/finfo?name=tools/makeheaders.html
+ARTIFACT_HTML="262696252dc50250c896c90cc240dcd946614b9c7727902aa7606640507e9231"
+
+DESCRIPTION="Tool that automatically generates .h files for a C or C++ programming project"
+HOMEPAGE="https://www.hwaci.com/sw/mkhdr/"
+
+SRC_URI="
+	https://fossil-scm.org/home/raw/${ARTIFACT_C}?at=makeheaders.c -> makeheaders-${PV}.c
+	https://fossil-scm.org/home/raw/${ARTIFACT_HTML}?at=makeheaders.html  -> makeheaders-${PV}.html
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+
+HTML_DOCS=( "makeheaders.html" )
+
+src_unpack() {
+	mkdir "${S}" || die
+	cp "${DISTDIR}"/makeheaders-${PV}.c "${S}/makeheaders.c" || die
+	cp "${DISTDIR}"/makeheaders-${PV}.html "${S}/makeheaders.html" || die
+}
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o makeheaders makeheaders.c || die
+}
+
+src_install() {
+	dobin makeheaders
+
+	einstalldocs
+}
diff --git a/dev-util/makeheaders/makeheaders-0_p20240202.ebuild b/dev-util/makeheaders/makeheaders-0_p20240202.ebuild
new file mode 100644
index 000000000000..5af574ab1fca
--- /dev/null
+++ b/dev-util/makeheaders/makeheaders-0_p20240202.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+# https://fossil-scm.org/home/finfo?name=tools/makeheaders.c
+# 2024-02-02
+ARTIFACT_C="cae894dc3611ee6e0fba4100c0e377fcd3bbc6d8ddb91c997939ce439c50cee2"
+# https://fossil-scm.org/home/finfo?name=tools/makeheaders.html
+# 2022-03-21
+ARTIFACT_HTML="262696252dc50250c896c90cc240dcd946614b9c7727902aa7606640507e9231"
+
+DESCRIPTION="Tool that automatically generates .h files for a C or C++ programming project"
+HOMEPAGE="https://www.hwaci.com/sw/mkhdr/"
+
+SRC_URI="
+	https://fossil-scm.org/home/raw/${ARTIFACT_C}?at=makeheaders.c -> makeheaders-${ARTIFACT_C}.c
+	https://fossil-scm.org/home/raw/${ARTIFACT_HTML}?at=makeheaders.html  -> makeheaders-${ARTIFACT_HTML}.html
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+HTML_DOCS=( "makeheaders.html" )
+
+src_unpack() {
+	mkdir "${S}" || die
+	cp "${DISTDIR}"/makeheaders-${ARTIFACT_C}.c "${S}/makeheaders.c" || die
+	cp "${DISTDIR}"/makeheaders-${ARTIFACT_HTML}.html "${S}/makeheaders.html" || die
+}
+
+src_compile() {
+	edo $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o makeheaders makeheaders.c
+}
+
+src_install() {
+	dobin makeheaders
+
+	einstalldocs
+}
diff --git a/dev-util/makeheaders/makeheaders-0_p4.ebuild b/dev-util/makeheaders/makeheaders-0_p4.ebuild
deleted file mode 100644
index 0d4b0aa383c8..000000000000
--- a/dev-util/makeheaders/makeheaders-0_p4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="simple utility that will automatically generate header files"
-HOMEPAGE="http://www.hwaci.com/sw/mkhdr/"
-SRC_URI="
-	http://www.hwaci.com/sw/mkhdr/makeheaders.c -> ${P}.c
-	http://www.hwaci.com/sw/mkhdr/makeheaders.html -> ${P}.html"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-S=${WORKDIR}
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o ${PN} "${DISTDIR}"/${P}.c || die
-}
-
-src_install() {
-	dobin ${PN}
-
-	local HTML_DOCS=( "${DISTDIR}"/${P}.html )
-	einstalldocs
-}
diff --git a/dev-util/makeheaders/metadata.xml b/dev-util/makeheaders/metadata.xml
index 6f49eba8f496..4f8c9752c452 100644
--- a/dev-util/makeheaders/metadata.xml
+++ b/dev-util/makeheaders/metadata.xml
@@ -1,5 +1,22 @@
 <?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-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>bratishkaerik@landless-city.net</email>
+		<name>Eric Joldasov</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		The makeheaders program is a simple utility that will automatically generate
+		all ".h" files for large programming project based on information gleaned from
+		the ".c" and/or ".cpp" source files. It operates by scanning the C and/or C++
+		source code, extracting appropriate macros, structure and subroutine declarations
+		and writing this declarations, in the correct order, into the generated header files. 
+	</longdescription>
+	<upstream>
+		<doc>https://fossil-scm.org/home/doc/trunk/tools/makeheaders.html</doc>
+	</upstream>
 </pkgmetadata>