3 files changed, 80 insertions, 3 deletions
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index dd5cee1666ce..358c2e26f59a 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -1,8 +1,10 @@
 AUX st-0.8.4-locale-musl-segfault.patch 513 BLAKE2B 2c2ee2aee8c7a19f11f00d89254e1679cc0278da09b64b469b296c0a81e6afecd67216b70f6244aad086ee1fd5f3729472376968f5247e6891ba39242a8ec9ae SHA512 367b8019ecec058eff0fc499baaea2e29abbf60df6b944eb9b5389336d4e6156fbbc2773326643978eff7cbf15810232f7d30587b0d951ee41ce34114e8277a5
 DIST st-0.8.4.tar.gz 47330 BLAKE2B 709278a669414d7d44beba02ebb606853dbaa9cfe71650e40a11d3691d6bee2c0b2e8db57ca2df52776ca564a20f64f3ef7acec8dbad6d66408d314fe26fb794 SHA512 f6f95081f9d09d442228bac1149d75d36a9f4f049b5504cf5ce00b353563ff92c62a2628ce728663fec107a14bea0eeb22b7a72804c37090de33819243d7512a
 DIST st-0.8.5.tar.gz 47829 BLAKE2B 9c036b39605dcc69c03fd5a67e911545eb41e3e748efbcf4761770b2a9bf9f158fc1da1fc140b84fb9939fcb35ce126de444cd567806c350e8e2905907bdf645 SHA512 45cc51f9fc343bd80a48f23f5b00e41e0cc01a538474e0578dd02f02ce92cb560e0e7464ec47fd7de4d39483b23fda212c3e7c64233e8a3f4ab6862144d76323
+DIST st-0.9.tar.gz 48171 BLAKE2B f6713b565b785549a571b3775346351c6db79dfbb1a93e29aadd722f30e957e9f77d1644b150cd11f0993dec5accad9d825e6d6b380b4c84c5f526b6589d1b15 SHA512 8d996a68d55c63d84da9962911b076ef437842e8cd83d74672d95531dfbaea91e049430886459a99e859ec760bb3754e94bbe1f646410998725e5a8997fb70ea
 EBUILD st-0.8.4-r1.ebuild 1466 BLAKE2B 6a12c7a52c2e626eefe0fcea85f655e54c247596e0ed2400f1e546d7f93012384620dd5717b85d30d6817e8b4623c6bb48ad1b61238c51c38c0427f5bfd3492e SHA512 869a37fed185091df0f48d306245738eb54bc7bcd8392b1582d077f3c389cde296cec2df43f01ee449ad9f159218c45a58717e3d86ec5148e94f1426e1700cc3
 EBUILD st-0.8.4.ebuild 1401 BLAKE2B 6400f8c79f9f20ea5c129aa2088dde5c7c554598eeedbec0beaa56ff31251723a7943974374cd70ba0dbe8c78f797f83ffb4283d1193b5c9f24c41798337a261 SHA512 870cbb53c3eef4f634d028750dee56262725d42e7f9c7902f2ae3e7c87ca40fa0626dbec7c58d86a9a8f5fba5703cd8c01c0da8624310180fd8bf36efd43419e
 EBUILD st-0.8.5.ebuild 1530 BLAKE2B 68fc5e465b2f19bfa5ee95602f9b3ba0a7a09d3bcb82bb49c576bf0fe38f87abd3a15611aa7f9e4f08a43448879229a6b9d51b87c2eea534d642ec69f1503872 SHA512 cad355a70cb0942672cb8eaab106fd89c0850bd1f4afba6f6b98c80f31e89a683be9c8da79c0ddfbb77c38b5e48f200fa97ba252286b5e53cc51d52a1a40b0a1
-EBUILD st-9999.ebuild 1524 BLAKE2B c4d60cd20119173a35ab7c9e4d8a1aa40f7a12c148adf5cb30807421ac808c700b1ce371af6563d19ff7f8bb1beb96b66b9a9b2d12bf47011202074713c6b04c SHA512 26c9ea44a3d848bc3fd0078e2c960370c5b012e8055c09c56df050c185703295457f3aa1c4d31f12dfb269fc7be14196fee9cc1ec3cf3a8bbd12904fef1413a9
+EBUILD st-0.9.ebuild 1530 BLAKE2B fa9e874260da3f1e0ea4c578ddf823da4c882c5594106f6ac0a09695cc15d28673a324e024c7731fe4e6859ab69d21a757285d94a65cc5c75abf4e452b0acf9f SHA512 53f68d59a5d0e12064f5aa998ff640adf48de8ddd5ee0d4d755776a88edca91a0a70c9892f5a717ad93ce523160605ecbd64d8f06bda14425ff24d0bd0032fde
+EBUILD st-9999.ebuild 1530 BLAKE2B fa9e874260da3f1e0ea4c578ddf823da4c882c5594106f6ac0a09695cc15d28673a324e024c7731fe4e6859ab69d21a757285d94a65cc5c75abf4e452b0acf9f SHA512 53f68d59a5d0e12064f5aa998ff640adf48de8ddd5ee0d4d755776a88edca91a0a70c9892f5a717ad93ce523160605ecbd64d8f06bda14425ff24d0bd0032fde
 MISC metadata.xml 374 BLAKE2B 2180b96781e3327022f8c34a0f7d44b0af121a976cb4c8dcf2750150ee780a2d1c307d1c92a74abc618be437e12232956df0c3716521bc7e2b863547ecd49cd3 SHA512 86f9db1699905b6e3e1f9607a7cbda32d75e2ed8e87924b69a0ed22cb33afc90a65c7eb02a8345e0ba6483dd2469aeef9c8888b9534538c074ea94d9b7f201da
diff --git a/x11-terms/st/st-0.9.ebuild b/x11-terms/st/st-0.9.ebuild
new file mode 100644
index 000000000000..a54b97850eb9
--- /dev/null
+++ b/x11-terms/st/st-0.9.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop savedconfig toolchain-funcs
+
+DESCRIPTION="Simple terminal implementation for X"
+HOMEPAGE="https://st.suckless.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.suckless.org/${PN}"
+else
+	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+
+RDEPEND="
+	>=sys-libs/ncurses-6.0:0=
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXft
+	~x11-terms/st-terminfo-${PV}
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
+		-e '/^STLDFLAGS/s|= .*|= $(LDFLAGS) $(LIBS)|g' \
+		-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
+		config.mk || die
+	sed -i \
+		-e '/tic/d' \
+		Makefile || die
+
+	restore_config config.h
+}
+
+src_configure() {
+	sed -i \
+		-e "s|pkg-config|$(tc-getPKG_CONFIG)|g" \
+		config.mk || die
+
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+
+	dodoc TODO
+
+	make_desktop_entry ${PN} simpleterm utilities-terminal 'System;TerminalEmulator;' ''
+
+	save_config config.h
+}
+
+pkg_postinst() {
+	if ! [[ "${REPLACING_VERSIONS}" ]]; then
+		elog "Please ensure a usable font is installed, like"
+		elog "    media-fonts/corefonts"
+		elog "    media-fonts/dejavu"
+		elog "    media-fonts/urw-fonts"
+	fi
+}
diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
index defaa3e758e2..a54b97850eb9 100644
--- a/x11-terms/st/st-9999.ebuild
+++ b/x11-terms/st/st-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop savedconfig toolchain-funcs
 
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.suckless.org/${PN}"
 else
 	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT-with-advertising"