11 files changed, 99 insertions, 3 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 2560b0159bc0..e9297a2908e3 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/js2-mode/Manifest b/app-emacs/js2-mode/Manifest
index 4e5224919c9a..af5e22505eb3 100644
--- a/app-emacs/js2-mode/Manifest
+++ b/app-emacs/js2-mode/Manifest
@@ -1,4 +1,6 @@
 AUX 50js2-mode-gentoo.el 587 BLAKE2B ad7f81b78d3b190c56980d3c57a937f6a9088d7af70363e8648c7e53c3f84c9cc4a2fc5a939970fd3f84a678a32f05d8a46889d0f3582bfc32c0753e913260bb SHA512 2c32fd76a21edbc2be01fafa1c77e4374eac03f0d7813faf41738ba3adaafb0953778db5c0382a4ee62312120c50853fb2ea3f56302269279e33e9d8a98361ed
 DIST js2-mode-20220710.tar.gz 166051 BLAKE2B f23f122f9002a38d1d6221f2f0f85efd9a9be92f7c5a242da3b3706abb9ec93e27e2f277e4cb1b7cd3ed616974add9f5ffd1abcf1ced6c7131d91b66320bd0e7 SHA512 7a30903114f81fe66bc76eecb01f8d96737f4be84c652f1083054ffdcda299d84c7d7fea387c87f719e2dc372459fcc180dde0513ed3006b8f12557e24002727
+DIST js2-mode-20230408.tar.gz 166178 BLAKE2B 6b567da9cd29c7aed40122a6b18af0c87e3197d00d1def663d700e260e8c83c83d07fb27e19e85a7fe0fa6487177a5191868d9caadf714d216e2ac01f9b95ddc SHA512 c3df3e88a627c7fbb3d7747760a4b27fd0da1a922a8e75f346ebdd00f5e682222c5a2cb636f7d19fc0f5c920892c77b8ed73c13ce6987d103366beb9e2b0b4b5
 EBUILD js2-mode-20220710.ebuild 445 BLAKE2B 9345e8906d929dde96968e9dbcc2b091509ef45baa6325ab5bde386c238543f8df3cfdc46b2e07a9e14ecf6bc08c16a707a33d09729c4e178f74312afe74a72d SHA512 5cb6122f2467d73f8731928768497508564cc35c3a294f45ff0704f962315abc434c22150e0a94d5d78063a009a9623aa8bb06b40291e46ee9ed230b7cb61719
+EBUILD js2-mode-20230408.ebuild 445 BLAKE2B 9345e8906d929dde96968e9dbcc2b091509ef45baa6325ab5bde386c238543f8df3cfdc46b2e07a9e14ecf6bc08c16a707a33d09729c4e178f74312afe74a72d SHA512 5cb6122f2467d73f8731928768497508564cc35c3a294f45ff0704f962315abc434c22150e0a94d5d78063a009a9623aa8bb06b40291e46ee9ed230b7cb61719
 MISC metadata.xml 1312 BLAKE2B 5307407d05ae0605644c4464af5ad60d2a2e6d329bf6887fcac942e165b941fa38c506047e92f34cd49852f0726f0e4c083f18975ea72afef7e186869ad22d42 SHA512 0100481ef0e97b6de436d65f9574b66d234475ca73e4b7f35a0a0b1e790683fd22528bb5f3e0596396aa7b9431a6b37776a98d2530072697988a1553a4478c91
diff --git a/app-emacs/js2-mode/js2-mode-20230408.ebuild b/app-emacs/js2-mode/js2-mode-20230408.ebuild
new file mode 100644
index 000000000000..0f171722ca2a
--- /dev/null
+++ b/app-emacs/js2-mode/js2-mode-20230408.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Improved JavaScript editing mode for GNU Emacs"
+HOMEPAGE="https://github.com/mooz/js2-mode/"
+SRC_URI="https://github.com/mooz/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( NEWS.md README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	emake test
+}
diff --git a/app-emacs/po-mode/Manifest b/app-emacs/po-mode/Manifest
index e1e9c86b8bba..57f6f1b9a90f 100644
--- a/app-emacs/po-mode/Manifest
+++ b/app-emacs/po-mode/Manifest
@@ -1,4 +1,6 @@
 AUX 50po-mode-gentoo.el 373 BLAKE2B dedf37969c42ac3dbeb4b4cb01af0f9ee79e40aad8586831503bebc1192a110fbecdc0bba339ebe6d7f89a8509e4f6df52f98f7563a90f31d73af279aad81e66 SHA512 48c371afe3f1a1f033ea20cb0a60bc700414108f7dc1f235e62423bda9b94373e49da9bdd3ab76e119b7b6c1b5f0a7601d36ce2710dd23b3de46557cf7d9cd8d
 DIST gettext-0.20.1.tar.xz 9346544 BLAKE2B 6541715b82399b7fac390ccbec82d2878228a19db9a37642b3eb65eb139cf4a5d74f17f876be4946771143b5897d5b4e4ca7948e06bb3edd79f125d1d3954a84 SHA512 82ffa5a28068272d0587262f8d9269f9629c601da5d122b6645c9c4cf98bfe4149df01bb58522ccf8fe25b931672e18551d7fb34de1cbf6a0463a87f9f8ee221
+DIST gettext-0.21.1.tar.xz 10054564 BLAKE2B e994924284b3fd5b3e3bf59d4bf43eb30c9b21cc213dc3b98616b4a9fc321c90911d94d314f323cfffd0d2c3e9371b5b8f7985b9a785adc61617dd042b6f4df5 SHA512 61e93bc9876effd3ca1c4e64ff6ba5bd84b24951ec2cc6f40a0e3248410e60f887552f29ca1f70541fb5524f6a4e8191fed288713c3e280e18922dd5bff1a2c9
 EBUILD po-mode-0.20.1.ebuild 526 BLAKE2B 62bbbd59d6b9dcbaf95cce70b52d7633ca9a12aaf12a702c628a92e8293ccb285b82ee1f9885c2f0a3a5973027ce9ef63bf4e0d188faa8a978f373fe905bf56a SHA512 39c058e3698739b9449a0bd5d041ed246b941bad3386cc8794e876bf3995ccac513f244972badb3cdb9b2135d453ad6e6530dc5bf486ffad8b42bb7fca055f81
+EBUILD po-mode-0.21.1.ebuild 533 BLAKE2B 9864e24f96d69aded9e01a1fdcee92b8fe09a0fea0270bf082df1257995abb9c03582f6d645a2c1e0328bf22f3a841bc97ed67d3e6a57a6cb615160fd080793e SHA512 755bc6ddc781e98b67f1552596b5f045bb3e1a68083e4ce139961838f14ea463dff99504c42e450f4f379d377d4171e1e730b1ac341e56dee2e604e99f512f40
 MISC metadata.xml 371 BLAKE2B edb991176f561047af6d5aae277d993f199521d510b2e27e9a546b17759a172835447237e4eac59fea544c91cec78db973641062406254fdda297455195a1b32 SHA512 72cd2fe3311ca48e6d02d5f96b093678304dd258ec0564e7a24a0b53fe29da1bff3f505333f30ea4698234fff5f26feea231fab1688bd79a72c2c0a0db9eb22f
diff --git a/app-emacs/po-mode/po-mode-0.21.1.ebuild b/app-emacs/po-mode/po-mode-0.21.1.ebuild
new file mode 100644
index 000000000000..c35419113057
--- /dev/null
+++ b/app-emacs/po-mode/po-mode-0.21.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Major mode for GNU gettext PO files"
+HOMEPAGE="https://www.gnu.org/software/gettext/"
+SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+S="${WORKDIR}/gettext-${PV}/gettext-tools/emacs"
+ELISP_REMOVE="start-po.el"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/treemacs-all-the-icons/Manifest b/app-emacs/treemacs-all-the-icons/Manifest
new file mode 100644
index 000000000000..2c3e76c218b6
--- /dev/null
+++ b/app-emacs/treemacs-all-the-icons/Manifest
@@ -0,0 +1,4 @@
+AUX 50treemacs-all-the-icons-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST treemacs-3.1.tar.gz 4562915 BLAKE2B b728c6ea795fe1159c2342b593cc4e6b3d06a1ba58dca876e5472e394b77a3a9930740aa9ecb65973f551322018920f08b0b49e897d5677b7a0f1da42cfad2d3 SHA512 e891cfa68916ecc250ab0446a4eb0149deea17a7f366870ce757e73f175bc823dae87080a584ea315d502c50559d030055f2f399cbd92d40af8c2dca5308604c
+EBUILD treemacs-all-the-icons-3.1.ebuild 708 BLAKE2B 7ded7f3d919944e80a5601917b3c5f6925900600c1449b68876b12472ab273e0a517c06e8419b4f1a7d0ef95c69c70aaf561304943f10b54be09dcb5729d27c7 SHA512 77c3caae95e40648a003f61e1aa68487fa7bbd36696b249560db88b9331ea9a9438ec10932bde6e5a4995d4b01acea2f662fd7681427574b7f0e56636c205867
+MISC metadata.xml 439 BLAKE2B a5536ef58177b5a4802017b81c68951ff5585a745ebc38f036bf2ee98bf6f51b0586ff5022cd1da55dbca13430b1811d8ac60e5b920caec7ea15f83f62ed3cad SHA512 cb6043bf4aa0e741f19630393ec1a25ab74e4ac2f17a41d932fce8d6f95663534cf28c277912c1800b252a98f1dc5ba13d6623f12251486e93dc33df1b77f443
diff --git a/app-emacs/treemacs-all-the-icons/files/50treemacs-all-the-icons-gentoo.el b/app-emacs/treemacs-all-the-icons/files/50treemacs-all-the-icons-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/treemacs-all-the-icons/files/50treemacs-all-the-icons-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/treemacs-all-the-icons/metadata.xml b/app-emacs/treemacs-all-the-icons/metadata.xml
new file mode 100644
index 000000000000..2b59c18813b9
--- /dev/null
+++ b/app-emacs/treemacs-all-the-icons/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/Alexander-Miller/treemacs/issues/</bugs-to>
+    <remote-id type="github">Alexander-Miller/treemacs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/treemacs-all-the-icons/treemacs-all-the-icons-3.1.ebuild b/app-emacs/treemacs-all-the-icons/treemacs-all-the-icons-3.1.ebuild
new file mode 100644
index 000000000000..be9aa60e9006
--- /dev/null
+++ b/app-emacs/treemacs-all-the-icons/treemacs-all-the-icons-3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="GNU Emacs all-the-icons integration for treemacs"
+HOMEPAGE="https://github.com/Alexander-Miller/treemacs/"
+SRC_URI="https://github.com/Alexander-Miller/treemacs/archive/${PV}.tar.gz
+	-> treemacs-${PV}.tar.gz"
+S="${WORKDIR}"/treemacs-${PV}/src/extra
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="
+	app-emacs/all-the-icons
+	app-emacs/treemacs
+"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp-compile ${PN}.el
+}
+
+src_install() {
+	elisp-install ${PN} ${PN}.el{,c}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/treemacs/Manifest b/app-emacs/treemacs/Manifest
index ea8bbda54e96..ddfc80b2b9bd 100644
--- a/app-emacs/treemacs/Manifest
+++ b/app-emacs/treemacs/Manifest
@@ -4,9 +4,9 @@ AUX treemacs-3.0-tests.patch 1186 BLAKE2B ec452399ef3e971f442050504725b17030ea56
 AUX treemacs-async-scripts.patch 1651 BLAKE2B bd6aecaff19f87e843c3feb17a7a6b63186779d259933a647c66fd9dd26884e729baf726e038aba13fbcc3c41f56d2159379c3001fe91b009f9c51f3728a54d7 SHA512 94094629d2b78fd88da344e0078ddc043c2edce18f1a373116da2db977a2f6d4141801b8d02c64e67ad41f6c9bec966a88ba3aea33a80021d171a3ae862146e0
 AUX treemacs-icons-icon-directory.patch 415 BLAKE2B d53b7bfcca7ab85953e1d98a71d58d273f625e095c72417d0c3e1bcfa65d4e5b9a34a60f1295f68a22f663643a6460adddfd2b03c38f7a10a0c3edfae232fb61 SHA512 c76ead6a99de0494769f35af8e3a5154fed728736e41d9cfe08c04f947959a972488e9d6e871e05b10763551fdcbda8e31e9b1bc308a043b5b315ea0a6e475f9
 DIST treemacs-2.10.tar.gz 4137468 BLAKE2B 0f832d02f8b0f96f7000c57b1842319155face5cb50c44ff4286f7f28dd74b38739079de9c387dbddbf93af37a5c750c45a598100ed5053674a565b4ec34f0c6 SHA512 9326a3f66c1b38eb7ef39e90900c2ef71d20c6c3478213f61c144ca4face562dccf00d6d400315c264627468a0c3319a24f0ec6cddb795b54e1b7f3c235d1c71
-DIST treemacs-2.9.5.tar.gz 4134227 BLAKE2B 1fbdb278e9524fdb14cbc7699bc787ab694b00d37a91ec3e91e106079bc02f6b8b39207608873d45c70fd6355a22553bf1a0636a948b79df77adfe0b4a3f799f SHA512 adc026d7ad459418fae531c5a1a7df7f9308e63dec82240c1c5e278eb00fdf8d6dff1ee2112ea73d5a05c4266efe24623bb84f8819a6f07fbb4fde6e644ca9ad
 DIST treemacs-3.0.tar.gz 4552082 BLAKE2B d12dff7aa667916ba586dcf47d642b36987ec1612a5dd276a513eef551c7b81a463d55531dacc48eac49ffc7390b1dd48a7e07285d188d4d40e779b9bc0b09f5 SHA512 981eb40973c86aec683ad6f0436c853e9254bfa10e77a60d3c36ef8b18d76dce358d68dee06355e63b4040c816e4f0064a3e722a414db0f9d3d007e5d252d753
+DIST treemacs-3.1.tar.gz 4562915 BLAKE2B b728c6ea795fe1159c2342b593cc4e6b3d06a1ba58dca876e5472e394b77a3a9930740aa9ecb65973f551322018920f08b0b49e897d5677b7a0f1da42cfad2d3 SHA512 e891cfa68916ecc250ab0446a4eb0149deea17a7f366870ce757e73f175bc823dae87080a584ea315d502c50559d030055f2f399cbd92d40af8c2dca5308604c
 EBUILD treemacs-2.10-r2.ebuild 1518 BLAKE2B 650f2f021f2bbe0075485ef7e49feae33b8b3eac9f31892e170c3f519fa09b10fb48e37b443e1a0689b859413c219ad826b305c3d311494161d9fd0d0a560558 SHA512 cb7ed4f629c9cdbce2029d57a54bd44f51e1a38e07cbde322fa7861a48ba86c2bd7a1daaa8b9ac016541eb33fabfc7bd6cd460e8e5feba77f33942f2e86346a7
-EBUILD treemacs-2.9.5-r2.ebuild 1511 BLAKE2B 0cd60b60fe963c89c1fc0ee7248c13261bec8f29ea5739607852f4daa46648aca80f656093002f45bd1e16d4be6d52abe8b08e2fc32840a7af5a77fb32382112 SHA512 1abe3628c3bbf1df8dbce6781e6b5fca44951be81bbdcd0f00d90df6686730430f77e10f4d746c227c6c83928db75b3e36b9553480a08cdf806fab21928cc91f
 EBUILD treemacs-3.0-r1.ebuild 1550 BLAKE2B 21f3809178a903f58c89a6bbe9147e0877093f44f32295e36f781f51138a67024468f5be0f5e12be8b50356e94239d76d7edf62c2f65d151179b6046b3718093 SHA512 a4f93ef410a97a7d7d102932d2536202033429bd98481079cc434b47c8197beb61f617038954114ee1a9ca8f1e8a307da51ad7ec3ad16dbc8c34259da09b66eb
+EBUILD treemacs-3.1.ebuild 1518 BLAKE2B 650f2f021f2bbe0075485ef7e49feae33b8b3eac9f31892e170c3f519fa09b10fb48e37b443e1a0689b859413c219ad826b305c3d311494161d9fd0d0a560558 SHA512 cb7ed4f629c9cdbce2029d57a54bd44f51e1a38e07cbde322fa7861a48ba86c2bd7a1daaa8b9ac016541eb33fabfc7bd6cd460e8e5feba77f33942f2e86346a7
 MISC metadata.xml 439 BLAKE2B a5536ef58177b5a4802017b81c68951ff5585a745ebc38f036bf2ee98bf6f51b0586ff5022cd1da55dbca13430b1811d8ac60e5b920caec7ea15f83f62ed3cad SHA512 cb6043bf4aa0e741f19630393ec1a25ab74e4ac2f17a41d932fce8d6f95663534cf28c277912c1800b252a98f1dc5ba13d6623f12251486e93dc33df1b77f443
diff --git a/app-emacs/treemacs/treemacs-2.9.5-r2.ebuild b/app-emacs/treemacs/treemacs-3.1.ebuild
index 1c2b01c56dc4..de552c5b30b2 100644
--- a/app-emacs/treemacs/treemacs-2.9.5-r2.ebuild
+++ b/app-emacs/treemacs/treemacs-3.1.ebuild
@@ -36,9 +36,9 @@ BDEPEND="
 
 BYTECOMPFLAGS="-L . -L src/elisp"
 PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.5-tests.patch
 	"${FILESDIR}"/${PN}-async-scripts.patch
 	"${FILESDIR}"/${PN}-icons-icon-directory.patch
-	"${FILESDIR}"/${P}-tests.patch
 )
 
 DOCS=( Changelog.org Extensions.org README.org screenshots )