7 files changed, 69 insertions, 3 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 56d542657ac1..8c9181a6ad09 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index ee4427423a65..7cbf67f5b20b 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -22,7 +22,7 @@ EBUILD emacs-28.2-r10.ebuild 17262 BLAKE2B f1a6545b7cb2aadc1da57afb9931ad1c5ea63
 EBUILD emacs-29.1-r1.ebuild 18598 BLAKE2B e0429ade850c0e57003a47bd4a95d8e7beec118e86de2289f0242d75ce1179f7f08fcf57a0d972a0806960cc9438c73dfc85d0dcc4bfb589a52892567ed4fcfe SHA512 3b793984093324960ba79db7b2a27e6f7fc1cdbf0d3d3246d6d3317ed5e043f1dab7d18016e9b0fc6b28fbba78f9dc03d3f47cc2994bd81f43e76f4c016c8f23
 EBUILD emacs-29.1-r5.ebuild 19165 BLAKE2B 78ed428d657db6490d7a09e0494cd43881f3eed419a1f3679f5bca807f763cdf351fb5df7ee30981c89691b030bbef0b34477513b2b668a3d08fc1802d7a862b SHA512 63178f7cc76d7091982d5c9ee77a525438c7cab6772d980aeb05c3fc4834e9fefdc8b341ff8e919d9b4a2006c60ae6a9eb3ca50158a6181ccfc8b77d4c81e813
 EBUILD emacs-29.1-r6.ebuild 19239 BLAKE2B d73f4b117cbf4a18240ee23b7fcb8af0e350e0208933be5c6e3f33c6ca26e254bda7dab717bb3a333e441a7fa29b4715b9e749ce9d1b5bedc2d51ec048f46d65 SHA512 031a022f4978e2827a7ad55590430ec4c77d628a886c10d8e4ff6e04c0c1fcf0ca8c047db719c8df097c9d2862c57c5a607eb95b05136a7b0cdc8aab78964704
-EBUILD emacs-29.2.9999.ebuild 19106 BLAKE2B 7746d86de508caeaf7f366924cb0bc963a9977b135b3caa0ebcdb8f832c80bcd500175d98c31450e7ced7df36bfd891aa1b45b32cc5a09f8796a702fa2930d1b SHA512 b71d4f113d2b41a4971ea798115977462c8b99b9f247c31ee08c293be578d014d60f9a0eac1850f804934f44089b9227decc1d7e280eb6bcd9d181a2409f77e0
-EBUILD emacs-29.2.ebuild 19245 BLAKE2B a93ff75adba20a9b761b2ab3f3b1abaea969803bc210e9f080d19369dc0a7237603c2ee968010a1f3818e8c2a4fbe0bbba7ac255be5cc6ee22181d935df321c5 SHA512 d602c88bfd6e8f898558db04b90f06a2eb4b44c3a065ea44c849a32f80ce6b2547d53d5ce58e27251ef74eb16d285e14d778d61e788151a2d27c8cd79b6c2817
-EBUILD emacs-30.0.9999.ebuild 19160 BLAKE2B f493fd94946ee63ba42dd6d6fcc882ec8d3ca890974800ab655b29e33f6dbc2f6e54e95bb70b61d8ab34c7bcc6056edfaff3424ca14b4fccbb2cc937b7e9b08a SHA512 3c76f9fac8fe133db1ccf6f587df6e77f3b8f6835d9de933f1992506ab55ad09be670c69f9dfc69366f64eaff476510c1ee62510316d9ac977cfa58e98814c52
+EBUILD emacs-29.2.9999.ebuild 19357 BLAKE2B 04609508b7d1c7d6cecccca806e913d0d804a04004db7daf36d8b249a7af0828835abf437794d478d8daab6a571bffd7e33e7216704ca8cd241a0f729b35115e SHA512 a8cf1c0a0e9dff51e52fcfa027d1145495f5f5cae49ca44d5dfdd15dfa4bac59bef4956551c7da7fd2ecb58b826a84b47ce48e2f951ea14c4c6077a11686e117
+EBUILD emacs-29.2.ebuild 19496 BLAKE2B 4d1fabbbc4e77d50144c027c45d9d90b068b14f4495024171816472d54f8a9cd679bafc715602aa28cce296dd982b1f58bc7fe8fe84bab84d9168c00ecf3e0d9 SHA512 4b2293b18071b03e9498905ea09c5c959070f5892632fa8385aaba85c8729eca4f2e28327a8c9c276d4868f1776ff8566b7b2ef8836084097e0d8d0762141adf
+EBUILD emacs-30.0.9999.ebuild 19411 BLAKE2B b5327f2369494ac540952e78d23eea0b169cf4e100edb242d3174a7b0f660ecf88f326adf659059da0ad4d531f9f592ff4c43c5e250ed746977dfcef67708681 SHA512 f330454b7aed07be1d6c4c6c65a0417e98c1444d57bdc58b04e5f9bd84e718b63e8c04f1194bfcbd88776c8c6f5c4a69427a62267e7371f9bc5146555090b80e
 MISC metadata.xml 3389 BLAKE2B 83d648a1e68be02a802e42c19ca7353c3739e10a516b02c09869ce337297926f472ec988a7aee84950eff40e3d40b1399db628e9b20db5e7c4e9a69cf7db9faa SHA512 38bc87ab7efeff1deca382b29ba1f3e961b81e6628cd4b3394753222ca8c0ae6719e1ea54834f72e03af4fc8d2528dc12cef10ac3951956832c40b5e5e52735f
diff --git a/app-editors/emacs/emacs-29.2.9999.ebuild b/app-editors/emacs/emacs-29.2.9999.ebuild
index e1e4debdc81e..1919adfa22cc 100644
--- a/app-editors/emacs/emacs-29.2.9999.ebuild
+++ b/app-editors/emacs/emacs-29.2.9999.ebuild
@@ -425,6 +425,14 @@ src_test() {
 		# Reason: tries to access network
 		# internet-is-working
 		%src/process-tests.el
+
+		# Reason: fails with stable version of tree-sitter-json due to
+		# ast changes. Bug #922525
+		%src/treesit-tests.log
+
+		# Reason: test is not skipped if tree-sitter-tsx is not installed
+		# Bug #922525
+		%lisp/progmodes/typescript-ts-mode-tests.el
 	)
 	use threads || exclude_tests+=(
 			%lisp/server-tests.el
diff --git a/app-editors/emacs/emacs-29.2.ebuild b/app-editors/emacs/emacs-29.2.ebuild
index 876631c7e678..1d369b00aca6 100644
--- a/app-editors/emacs/emacs-29.2.ebuild
+++ b/app-editors/emacs/emacs-29.2.ebuild
@@ -428,6 +428,14 @@ src_test() {
 		# Reason: tries to access network
 		# internet-is-working
 		%src/process-tests.el
+
+		# Reason: fails with stable version of tree-sitter-json due to
+		# ast changes. Bug #922525
+		%src/treesit-tests.log
+
+		# Reason: test is not skipped if tree-sitter-tsx is not installed
+		# Bug #922525
+		%lisp/progmodes/typescript-ts-mode-tests.el
 	)
 	use threads || exclude_tests+=(
 			%lisp/server-tests.el
diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild
index d0bc42272a6f..73f31fed6ec7 100644
--- a/app-editors/emacs/emacs-30.0.9999.ebuild
+++ b/app-editors/emacs/emacs-30.0.9999.ebuild
@@ -427,6 +427,14 @@ src_test() {
 		# Reason: tries to access network
 		# internet-is-working
 		%src/process-tests.el
+
+		# Reason: fails with stable version of tree-sitter-json due to
+		# ast changes. Bug #922525
+		%src/treesit-tests.log
+
+		# Reason: test is not skipped if tree-sitter-tsx is not installed
+		# Bug #922525
+		%lisp/progmodes/typescript-ts-mode-tests.el
 	)
 	use threads || exclude_tests+=(
 			%lisp/server-tests.el
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index c40743a683ce..34b509f4e4ab 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,4 +1,6 @@
 AUX kakoune-2022.10.31-gcc13.patch 540 BLAKE2B 0ecced3f85c3e4dfeb62b302e72047e8ef877b275ab806cd6a42181a3e614f9b6b384feac286c3dfcc1d61b8a72183729783de885b778cf290e11dffc7308b98 SHA512 a4a1aaa7e206f0fca042d3956965ffb2c8a2d765c1abcfc27cecf0960b7a7ef73eabf48974050b0f29e87ef7c190a110c1efc291111e9543606855de68355388
 DIST kakoune-2022.10.31.tar.bz2 556473 BLAKE2B 36489de5e4fa4406a847f43bf0f966c082e5c4a97e3c31d04c61fb8c4137fed4b6d1ce96ac921a85dc03fe7b90d8de172b6720ac32846507a3d0c996fe01191c SHA512 9a02a1a6bbb0b71a579b0286b4dfb6359b856183862b3e17354d2685b8215fa24c196b570a21dfd627e3d5a5b91e20ce0b74caff19e5772ab911cc42677bf720
+DIST kakoune-2023.08.05.tar.bz2 568612 BLAKE2B bbedc16f361a242c4319a852c3b688186e1e2b204990aff8434ad8a169d4c62171d2d3424e3bf65a4b5b6b17e21205e84077198091687094f88235e27c544bbd SHA512 f29b787ab6f04bc5a1a3ab31d189128745c967b5eec15fce07ae7dbaf29247f7413499d9925cf0561173feb0fe634f3423ac43da0d6c1ba5d679ee38b80ac679
 EBUILD kakoune-2022.10.31.ebuild 814 BLAKE2B d4f6d3e2037bbb70c064a40c7be8fad2961fae0096c87f4351bd639d92b3acc3541948ece1a84689c70af73b02dbe1d3c98515fbb67e5b0c10eea05544adc084 SHA512 9cc5654d529c8cc0164952e1ac3914116114205f00a777d189473192f409f839b6ca627f0b67b279f1537a6f1d28420855cc5fda4cb67c3b4276270f21533ca8
+EBUILD kakoune-2023.08.05.ebuild 769 BLAKE2B 9e83f6cfb398e2a0daa1eed2f1141123b5012f893fa9e36f777a9f29bde003936e934d6ce0b94233daf2dc23d29bdeb8dda846b8e43f0b59ac237d2d7b265840 SHA512 5b326d997f367bc4f3892fb73eb9a2ffb599fa3297003eee4edaf05823cb0cf9f3fedeab1466048b426cb00e7cfaee3365031809097875fc9f7d022023312f83
 MISC metadata.xml 512 BLAKE2B afa8631f092bca6c3307dcd610340b39e41da979781f0f1ac391e873ae063088599cfc96c99bc81cca0c1244905ced51e3736b1fc387d0d9fdb8233be2810427 SHA512 a7e4da11480bc3f8bd09253901d9528235ce9a4f00a418cd5f58c898244850cafe944d6a828e1b871a2d98faba179fd9f4ddab99695a6762a4a7a290f1311a2f
diff --git a/app-editors/kakoune/kakoune-2023.08.05.ebuild b/app-editors/kakoune/kakoune-2023.08.05.ebuild
new file mode 100644
index 000000000000..ea2fb090fb4a
--- /dev/null
+++ b/app-editors/kakoune/kakoune-2023.08.05.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Modal editor inspired by vim"
+HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune"
+SRC_URI="https://github.com/mawww/kakoune/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	sed -i '/CXXFLAGS += -O3/d' src/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export CXX
+}
+
+src_compile() {
+	emake -C src all
+}
+
+src_test() {
+	emake -C src test
+}
+
+src_install() {
+	emake PREFIX="${D}"/usr docdir="${ED}/usr/share/doc/${PF}" install
+
+	rm "${ED}/usr/share/man/man1/kak.1.gz" || die
+	doman doc/kak.1
+}