diff --git a/dev-python/jinjanator-plugins/Manifest b/dev-python/jinjanator-plugins/Manifest
new file mode 100644
index 0000000..013928b
--- /dev/null
+++ b/dev-python/jinjanator-plugins/Manifest
@@ -0,0 +1,3 @@
+DIST jinjanator-plugins-24.1.0.tar.gz 19323 BLAKE2B 9d8e35863bbac860e08c66dd3e79e6a70161335d3f44c7cabdc17e3a2b44a71ae5c84326507055367f08b14e0effb1752a64773f299a5b3a5d00222f181235aa SHA512 c968f33b4356620010fbc9e5e5a2111c34bc865a3f1d982028c022678e2601819a2a87f5e50f8f17130a5f5c47975c18561e1a6013a6490361f24bedc8c03a35
+EBUILD jinjanator-plugins-24.1.0.ebuild 956 BLAKE2B 15a2f9039be9bf152553f7ae537dc9bad112d62608caab841262684293ae0023c3943cf9eaaa1fdfb1ea73dc4388a25f55f8834394f579a467920056ec8d8203 SHA512 04c4c3da2af4fb7c567c20fe2d92183d8359d17d668b3e7624acafa5f8a1936bb8568ff1276beda12e73ee1f76bad7f4a41fe88a1948023fc7b22ae46d5bb03c
+MISC metadata.xml 224 BLAKE2B fd073fae08746c97afe87f42c9aad6f7d91d5ef91864e221bed58f716a6f9cf263b8f350e2b39cb268c8f2a005d349da9f2fbec2ffe50b0cd72fc03cf7799a56 SHA512 47f701e96cc4819a1c64d2f26a9e2a523bc4d916fdeec7bda5c22fbb58b949102cae6f01de7b73ff339d0aec666ef9ebd58f25454ec149ea86d1b4caf2d4acd3
diff --git a/dev-python/jinjanator-plugins/jinjanator-plugins-24.1.0.ebuild b/dev-python/jinjanator-plugins/jinjanator-plugins-24.1.0.ebuild
new file mode 100644
index 0000000..8be0380
--- /dev/null
+++ b/dev-python/jinjanator-plugins/jinjanator-plugins-24.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{11,12} )
+DISTUTILS_USE_PEP517=hatchling
+#DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Package which provides the plugin API for the Jinjanator tool"
+HOMEPAGE="https://pypi.org/project/jinjanator-plugins/"
+SRC_URI="https://github.com/kpfleming/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE="test"
+
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	dev-python/hatchling[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	test? (
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	nosetests tests || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/jinjanator-plugins/metadata.xml b/dev-python/jinjanator-plugins/metadata.xml
new file mode 100644
index 0000000..f33817e
--- /dev/null
+++ b/dev-python/jinjanator-plugins/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">kpfleming/jinjanator</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jinjanator/Manifest b/dev-python/jinjanator/Manifest
new file mode 100644
index 0000000..eacfa0d
--- /dev/null
+++ b/dev-python/jinjanator/Manifest
@@ -0,0 +1,3 @@
+DIST jinjanator-24.3.0.tar.gz 26923 BLAKE2B 2b9c48ad558908b4a690ad44332b7cc0c7e419aad462781770a0c12a0589e7586caad7408b64580536b20769bd1e93f75319c8e16c2a3f5d9e86834195de9b6f SHA512 5fd357cbc158aee7084125e943201d366597a368613df834c8b19f8109e1811566c422e31c12587ccc00c3c5d046d4515f3cec98dd94fcdebc9b338be78032ef
+EBUILD jinjanator-24.3.0.ebuild 1165 BLAKE2B 3f20e495dac6eb34d5b3b3e17a34a86714f2c83d5e05af68d16911f824935e56c7c5860b90609eb18cbae539166b5da7a246d188288359a8000a49a288bd84ec SHA512 a31ca8f951a2652b8e4172260b39d63558c19b19d44da8f96a4dd310ab1d509322fc635a08c7a3c8cb1300987ea0b41ea9b511a433ae8fbaeffe94b8413e5ee6
+MISC metadata.xml 224 BLAKE2B fd073fae08746c97afe87f42c9aad6f7d91d5ef91864e221bed58f716a6f9cf263b8f350e2b39cb268c8f2a005d349da9f2fbec2ffe50b0cd72fc03cf7799a56 SHA512 47f701e96cc4819a1c64d2f26a9e2a523bc4d916fdeec7bda5c22fbb58b949102cae6f01de7b73ff339d0aec666ef9ebd58f25454ec149ea86d1b4caf2d4acd3
diff --git a/dev-python/jinjanator/jinjanator-24.3.0.ebuild b/dev-python/jinjanator/jinjanator-24.3.0.ebuild
new file mode 100644
index 0000000..d12add4
--- /dev/null
+++ b/dev-python/jinjanator/jinjanator-24.3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{11,12} )
+DISTUTILS_USE_PEP517=hatchling
+#DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Jinja2 Command-Line Tool, reworked, again"
+HOMEPAGE="https://pypi.org/project/jinjanator/"
+SRC_URI="https://github.com/kpfleming/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE="test"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	dev-python/hatchling[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	test? (
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7.2[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/python-dotenv-1[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	=dev-python/jinjanator-plugins-24.1*[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	nosetests tests || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/jinjanator/metadata.xml b/dev-python/jinjanator/metadata.xml
new file mode 100644
index 0000000..f33817e
--- /dev/null
+++ b/dev-python/jinjanator/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">kpfleming/jinjanator</remote-id>
+	</upstream>
+</pkgmetadata>