diff --git a/trinity-apps/chalk/chalk-9999.ebuild b/trinity-apps/chalk/chalk-9999.ebuild
new file mode 100644
index 00000000..c09d3d73
--- /dev/null
+++ b/trinity-apps/chalk/chalk-9999.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 The Trinity Desktop Project
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+TRINITY_MODULE_NAME="koffice"
+TRINITY_BUILD_ADMIN="yes"
+TRINITY_SUBMODULE="chalk filters/chalk"
+TSM_EXTRACT_ALSO="lib interfaces"
+
+inherit trinity-meta-2
+
+DESCRIPTION="KOffice image manipulation program for TDE [Trinity]"
+HOMEPAGE="http://trinitydesktop.org/"
+
+SLOT="${TRINITY_VER}"
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE=""
+
+DEPEND="~dev-tqt/tqt-${PV}[opengl]
+	media-libs/lcms:0=
+	media-libs/libexif
+	media-libs/libpng
+	media-libs/openexr
+	media-libs/tiff
+	~trinity-apps/koffice-libs-${PV}
+	~trinity-base/tdelibs-${PV}
+	virtual/jpeg
+	virtual/imagemagick-tools[tiff]
+"
+
+RDEPEND="$DEPEND"
+
+KMCOPYLIB="
+	libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkopalette lib/kopalette
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store
+	libkrossapi lib/kross/api
+	libkrossmain lib/kross/main"
+
+src_prepare() {
+	# FIXME - disable broken tests for now
+	sed -i -e "s:TESTSDIR =.*:TESTSDIR=:" "${S}"/chalk/core/Makefile.am \
+		`ls "${S}"/chalk/colorspaces/*/Makefile.am`
+
+	local search_path="${TDEDIR}/${get_libdir}"
+	local libname dirname dirlist x
+	libname=""
+	for x in $KMCOPYLIB; do
+		if [ "${libname}" == "" ] ; then
+			libname="${x}"
+		else
+			dirname=$x
+			mkdir -p ${dirname}
+			pushd ${dirname}
+			if [ ! "$(find ${search_path} -maxdepth 1 -name ${libname}*) 2>/dev/null" == "" ]; then
+				ln -s ${TDEDIR}/$(get_libdir)/${libname}* .
+			fi
+			if [[ ! ${dirname} =~ "kross"* ]]
+			then
+				dirlist="${dirlist} ${dirname/lib\/}"
+			fi
+			popd
+			libname=""
+		fi
+	done
+
+	echo "SUBDIRS=$dirlist kross" > ${S}/lib/Makefile.am
+	echo "SUBDIRS= api main" > ${S}/lib/kross/Makefile.am
+	echo "SUBDIRS= chalk" >${S}/filters/Makefile.am
+
+	trinity-meta-2_src_prepare
+
+	echo 'all:' > ${S}/Makefile.am
+	echo 'install:' >> ${S}/Makefile.am
+	echo '.PHONY: all' >> ${S}/Makefile.am
+}
+
+src_configure() {
+	append-cxxflags "-std=c++11"
+	myconf=(--enable-scripting=no)
+	trinity-econf ${myconf}
+}
+
+src_compile() {
+	for i in $(find "${S}"/lib -iname "*\.ui"); do
+		uic-tqt ${i} > ${i%.ui}.h
+	done
+	trinity-meta-2_src_compile
+}
diff --git a/trinity-apps/chalk/metadata.xml b/trinity-apps/chalk/metadata.xml
new file mode 100644
index 00000000..7a38bb90
--- /dev/null
+++ b/trinity-apps/chalk/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/trinity-apps/kchart/kchart-9999.ebuild b/trinity-apps/kchart/kchart-9999.ebuild
new file mode 100644
index 00000000..d9c71ec8
--- /dev/null
+++ b/trinity-apps/kchart/kchart-9999.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 The Trinity Desktop Project
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+TRINITY_MODULE_NAME="koffice"
+TRINITY_BUILD_ADMIN="yes"
+TRINITY_SUBMODULE="kchart filters/kchart"
+TSM_EXTRACT_ALSO="lib interfaces filters/libdialogfilter"
+
+inherit trinity-meta-2
+
+DESCRIPTION="KOffice integrated graph and chart drawing tool for TDE [Trinity]"
+HOMEPAGE="http://trinitydesktop.org/"
+
+SLOT="${TRINITY_VER}"
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE=""
+
+DEPEND="~trinity-base/tdelibs-${PV}
+	~trinity-apps/koffice-libs-${PV}
+"
+
+RDEPEND="$DEPEND"
+
+KMCOPYLIB="libkformula lib/kformula
+	libkofficecore lib/kofficecore
+	libkofficeui lib/kofficeui
+	libkopainter lib/kopainter
+	libkotext lib/kotext
+	libkwmf lib/kwmf
+	libkowmf lib/kwmf
+	libkstore lib/store
+	libkochart interfaces"
+
+src_unpack() {
+	trinity-meta-2_src_unpack
+	echo "SUBDIRS = kchart" > ${S}/filters/Makefile.am
+}
+
+src_prepare() {
+	local search_path="${TDEDIR}/${get_libdir}"
+	local libname dirname dirlist x
+	libname=""
+	for x in $KMCOPYLIB; do
+		if [ "${libname}" == "" ] ; then
+			libname="${x}"
+		else
+			dirname=$x
+			mkdir -p ${dirname}
+			pushd ${dirname}
+			if [ ! "$(find ${search_path} -maxdepth 1 -name ${libname}*) 2>/dev/null" == "" ]; then
+				ln -s ${TDEDIR}/$(get_libdir)/${libname}* .
+				if [[ ! ${dirname} =~ "interfaces" ]] ; then
+					dirlist="${dirlist} ${dirname/lib\/}"
+				fi
+			fi
+			popd
+			libname=""
+		fi
+	done
+	echo "SUBDIRS=$dirlist" > ${S}/lib/Makefile.am
+	trinity-meta-2_src_prepare
+
+	echo 'all:' > ${S}/Makefile.am
+	echo 'install:' >> ${S}/Makefile.am
+	echo '.PHONY: all' >> ${S}/Makefile.am
+}
+
+src_configure() {
+	append-cxxflags "-std=c++11"
+	trinity-meta-2_src_configure
+}
+
+src_compile() {
+	pushd filters/libdialogfilter
+		emake
+	popd
+	trinity-meta-2_src_compile
+}
diff --git a/trinity-apps/kchart/metadata.xml b/trinity-apps/kchart/metadata.xml
new file mode 100644
index 00000000..7a38bb90
--- /dev/null
+++ b/trinity-apps/kchart/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/trinity-apps/koffice-libs/koffice-libs-9999.ebuild b/trinity-apps/koffice-libs/koffice-libs-9999.ebuild
new file mode 100644
index 00000000..a769257f
--- /dev/null
+++ b/trinity-apps/koffice-libs/koffice-libs-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 The Trinity Desktop Project
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+TRINITY_MODULE_NAME="koffice"
+TRINITY_BUILD_ADMIN="yes"
+TRINITY_SUBMODULE="lib lib/kwmf lib/store lib/kofficecore
+		lib/kofficeui lib/kopainter
+		lib/kopalette lib/kotext lib/kformula
+		lib/koproperty lib/kross filters/olefilters
+		filters/xsltfilter filters/generic_wrapper
+		kounavail servicetypes mimetypes pics
+		templates autocorrect interfaces plugins tools"
+TSM_EXTRACT_ALSO="filters doc kchart"
+
+inherit flag-o-matic trinity-meta-2
+
+DESCRIPTION="Shared KOffice libraries for TDE [Trinity]"
+HOMEPAGE="http://trinitydesktop.org/"
+
+SLOT="${TRINITY_VER}"
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE=""
+
+DEPEND="
+	~trinity-base/tdelibs-${PV}
+"
+
+RDEPEND="$DEPEND"
+
+src_prepare() {
+	trinity-meta-2_src_prepare
+}
+
+src_configure() {
+	append-cxxflags "-std=c++11"
+	export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${TDEDIR}/$(get_libdir)/pkgconfig
+	myconf=(--with-extra-libs=${TDEDIR}/$(get_libdir)
+		--with-extra-includes=${TDEDIR}/include/arts
+		--disable-scripting)
+
+	trinity-econf ${myconf[@]}
+}
diff --git a/trinity-apps/koffice-libs/metadata.xml b/trinity-apps/koffice-libs/metadata.xml
new file mode 100644
index 00000000..7a38bb90
--- /dev/null
+++ b/trinity-apps/koffice-libs/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>