12 files changed, 36 insertions, 136 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 58e806124af6..6d931fbbf6b5 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/dav/Manifest b/app-editors/dav/Manifest
index 4f998ec4ce95..b1555f3b232e 100644
--- a/app-editors/dav/Manifest
+++ b/app-editors/dav/Manifest
@@ -1,10 +1,4 @@
-AUX dav-0.8.5-asneeded.patch 213 BLAKE2B 84dc034ab97c82106ba90887a66dcb29870a25f6fc3b6ec029d0b177383c226b101b54e65400e182236250644bc441b242cd52ee5c8c7c85e6d4e5ec284a3137 SHA512 ce029cd410eb9c0669e6cd822ca529eadd23d30dce94b2c2fddf10dd4f7637d3bdd58fd041bfdf7d1d750b4d7ed848fa77dd98c64885f8cc848016fbeb96f534
-AUX dav-0.8.5-davrc-buffer-overflow.patch 153 BLAKE2B bc27b0346dc69646b9fe44796f65c7ec399af56f0df278e1579927d05ef643cebbb8f7ce3aa294ba6b7340601088da05c0eb18e78548872babbf6b12d942184a SHA512 0eeb7c6a167a6fbcc60195f93d58ca28f7d98e7e24e93a9c314fb00a035ec83fb1176f52e6676d88ab1ad56e4608869f91ace672ab77a4291c94677f5e028e7c
 AUX dav-0.8.5-fno-common.patch 804 BLAKE2B 11e367e6870e1da6e0932ba933c09ae92b879f93a67830068c9766bff8c783891c5cc7cdaff8a01f4eded3fdd59a2d161cb5591084f172317eee03d1ee6fceb4 SHA512 c1255b35a7765716112bcab43f24cc6db1c47162633fb46365031823ae94f2afc29a9ec547467b360766a26651563b0f60813136350d52ed4fb3c6e90770a71f
-AUX dav-0.8.5-makefile.patch 413 BLAKE2B 4d700f345f144178c63bc382f5a443047225bd3d47ea453496107008fa7ced9a0853b1a80a348eac62d2200f20f2924777a97ee568b31dcbc0be6ed4417b621a SHA512 76a4b50795cc133d5fc3e5499bb143cf3c64d5c68d6060f5d081ab3b4a55f4a2ee43b3ecfd1e0e2b7a54140dd68458f96f5b9872f4cc64039d8bdf6990fefe16
-AUX fix-Wformat-security-warnings.patch 1179 BLAKE2B 524644da22ea8623c3bbdaa9c83ca74a87124cc896dec0f90221cf854d14744d1bc1a86e76a5ff3543fb2e2fc743d76db70bb7be3fe30e22508a374f6f122b83 SHA512 c5665be995e718a460b6c75ae3843104721a58c2d4a5321659d8527034f413d433fdd1140b14d6a8587f298a2e4935f8a07579071e5aa5d6fa49e125da5e4895
-DIST dav-0.8.5.tar.gz 22824 BLAKE2B 969458aa6b914f9cd624554690a88f4c2999dcc6e89db38d13d9ba98db7881a34ce1575ccbdf74b3ecca34345f2ec639cfc805a350e31f856f7d086cf23752de SHA512 cdedff875df392e8525399b40d45cdf4e984b1b014f03d9f5cd5be270eebe0003fcf48e9738f6ac2789138973970bb9fe6d0b8babd20c1df61e193f84ee066b3
 DIST dav-text-0.9.0.tar.gz 23882 BLAKE2B 6845b40bbb74d57438625c2736758c52fbe4cff3e020fd451dee540f06fb893d71e11469f828845c193e9fbbd8a8e0b31dcb9a6fa29383053b61dd9a9d7b0ce4 SHA512 8bb9d111c25e7e41c7d75ee559aeae47494ff68f19f40d2ba3e2ebca23577538b94ba72b58ccf4e64ef92d9e740ee843fa249ef0e4148971b3037259b4f280c5
-EBUILD dav-0.8.5-r2.ebuild 1074 BLAKE2B e85f80cc4638c2f4b4a6167d34f2987a5fc2fcb9186c1cc39f44c89b63dfb8664407f4849a0d4e51d69e00c1fd06e85aad048a95b25b0e32ef64ea20bf413088 SHA512 a45fc5e0ddf66a9a7e6f97faf1c7da91b8f3d270e2c16cdef67d02e3559caba45c148cf59d00afb0f8baf07defa8fb552b58242a6ade015b088f380f6fbc7e41
 EBUILD dav-0.9.0.ebuild 840 BLAKE2B bc5cb71a752798674ef671043176760043feb368f74eff24cb1b2956fdb5ad53352eff5a41de569ea84f9c7f920dab7e91bb36b965188b92e96dd8bcd08fb0f7 SHA512 6a35bcd239662a4060ef64077156cc59968d2688f1a4e39700d3179a7ec31c52c730ecf15ec1344cdaf242420ad0258c737f0dc8d7866dfd12c56d3ee81927e2
 MISC metadata.xml 246 BLAKE2B 9448c3dc2d58fbe2ff94a207c8d54b845c81fe55a19d096f3350df6361979b9c0fb10e61fa177bcd0a2837ba123344d4cba691ceb53e74ae3bb728defb69bc4c SHA512 47351b37f28ea69cd19c983e3b369cfd500f916a1a57977c942aea10cfc9267ada21d474624c7c524f0d50fbaead62d04eb5e6d46b84933f543699ca167445e4
diff --git a/app-editors/dav/dav-0.8.5-r2.ebuild b/app-editors/dav/dav-0.8.5-r2.ebuild
deleted file mode 100644
index 7ca8b35cdd7e..000000000000
--- a/app-editors/dav/dav-0.8.5-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Minimal console text editor"
-HOMEPAGE="https://dav-text.sourceforge.net/"
-# The maintainer does not keep sourceforge's mirrors up-to-date,
-# so we point to the website's store of files.
-SRC_URI="https://dav-text.sourceforge.net/files/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-asneeded.patch"
-	"${FILESDIR}/${P}-davrc-buffer-overflow.patch"
-	"${FILESDIR}/fix-Wformat-security-warnings.patch"
-	"${FILESDIR}/${PN}-0.8.5-fno-common.patch"
-	"${FILESDIR}/${PN}-0.8.5-makefile.patch"
-)
-
-DOCS=( README )
-
-# Makefile only
-src_configure() { :; }
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS} $( $(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-src_install() {
-	default
-	docompress -x /usr/share/man/man1/dav.1.gz
-}
diff --git a/app-editors/dav/files/dav-0.8.5-asneeded.patch b/app-editors/dav/files/dav-0.8.5-asneeded.patch
deleted file mode 100644
index 92bc6ebfdacc..000000000000
--- a/app-editors/dav/files/dav-0.8.5-asneeded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -12,7 +12,7 @@
- LDFLAGS=-lncurses -O3 -Wall
- 
- dav: $(OBJECTS) 
--	$(CC) $(LDFLAGS) $(OBJECTS) -o dav
-+	$(CC) $(OBJECTS) $(LDFLAGS) -o dav
- 
- install:
- 	mkdir -p $(DESTDIR)/usr/bin
diff --git a/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch b/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch
deleted file mode 100644
index 7287d36cc604..000000000000
--- a/app-editors/dav/files/dav-0.8.5-davrc-buffer-overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/main.c
-+++ b/main.c
-@@ -327,7 +327,7 @@
- void loadSettings()
- {
-   int l;
--  char s[80];
-+  char s[200];
-   char home[80];
-   char *r;
-   char *c;
diff --git a/app-editors/dav/files/dav-0.8.5-makefile.patch b/app-editors/dav/files/dav-0.8.5-makefile.patch
deleted file mode 100644
index 8ff62de305ee..000000000000
--- a/app-editors/dav/files/dav-0.8.5-makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 8b1ff0a..7a57840 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,4 @@
--CC=gcc
-+CC?=gcc
- OBJECTS=main.o \
-         buffers.o \
-         fileIO.o \
-@@ -8,8 +8,8 @@ OBJECTS=main.o \
-         undo.o \
-         move.o
-         
--CFLAGS=-O3 -Wall
--LDFLAGS=-lncurses -O3 -Wall
-+CFLAGS?=O3 -Wall
-+LDFLAGS?=lncurses -O3 -Wall
- 
- dav: $(OBJECTS) 
- 	$(CC) $(OBJECTS) $(LDFLAGS) -o dav
diff --git a/app-editors/dav/files/fix-Wformat-security-warnings.patch b/app-editors/dav/files/fix-Wformat-security-warnings.patch
deleted file mode 100644
index fe1733360551..000000000000
--- a/app-editors/dav/files/fix-Wformat-security-warnings.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8e57c21b3b707c2a81695384688c46faa1d51da8 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 10 Aug 2016 15:52:30 -0400
-Subject: [PATCH 1/1] fileIO.c: add format strings to sprintf calls.
-
-Two calls to sprintf() in fileIO.c were missing the trivial format
-string "%s". This caused warnings with -Wformat-security, and build
-failures with -Werror=format-security. Those two calls are now fixed.
-
-Gentoo-Bug: 521016
----
- fileIO.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fileIO.c b/fileIO.c
-index a6c535a..1916a46 100644
---- a/fileIO.c
-+++ b/fileIO.c
-@@ -92,7 +92,7 @@ char *doSave(char *filename) {
-         n++;
-         choices = realloc(choices, n*sizeof(char *));
-         choices[n-1] = malloc(256);
--        sprintf(choices[n-1], d->d_name);
-+        sprintf(choices[n-1], "%s", d->d_name);
-       }
-       closedir(dir);
-       
-@@ -178,7 +178,7 @@ void load(char *filename)
-       n++;
-       choices = realloc(choices, n*sizeof(char *));
-       choices[n-1] = malloc(256);
--      sprintf(choices[n-1], d->d_name);
-+      sprintf(choices[n-1], "%s", d->d_name);
-     }
-     closedir(dir);
-     
--- 
-2.7.3
-
diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
index 1b5b66df133f..907b2ef2ce97 100644
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@@ -1,3 +1,5 @@
+DIST focuswriter-1.8.10.tar.bz2 10477907 BLAKE2B 9f20133c1e33d68a1829850fc0b4851f6f9251fc931275615c7bff59a1e84704d77607bb872f371ead163379017e2afb3bc55899cbb04eeded7c2baf76e7da65 SHA512 77db0ca6c13dc2b1b6bfe7e557266a83098943318a1bea76025995ce53da91975d2451b144f715d824b5338bc44af70bb30aa6369ceb40c1fad7e551cb9a8959
 DIST focuswriter-1.8.8.tar.bz2 10640138 BLAKE2B 78abf8e67cafd4d46fd4628f229d2030b4840b066e4b3d04768ad7df3d6a99f1c03bc7f0a15daef3e9c807e1da7ef6f309ce65e8128a3b77ac0c9a8ff6f2a695 SHA512 f41cb82f4d7d3e397fcbc7e1010e379cb410ac67dd35f1b38e7ae7ac791670e29fe5cc710627ffe196a02f23edd423b53fafa2ff4697e560f28c7cf6e1aba388
+EBUILD focuswriter-1.8.10.ebuild 592 BLAKE2B 7e98725d622ff0b4c295298a915ac7d1d555fbf416c832be57c0a0f90dfcd577298cc121abd39d066f9e9d908e65bc78da47235597dca687153c30268def45df SHA512 90b46028ad28fe0fc4ab0c8c2b71fedf4a376ef7fbd4bb1c9c4812dd24d90cbf0d918ecc9b3ffd517f9406a58225d5d6d33ef7d032432102e30c6384764c4c56
 EBUILD focuswriter-1.8.8.ebuild 590 BLAKE2B 1981a22b75b88ea69dff5b243ec52c34e36c6cb098f32ab6055ad25bab034383e1d27d6341777888a3bc65119f185a4bfe71856fc93467fef23ec4b711447f8c SHA512 8514c30cd6cb7e80e3bb09be69dc3189b1909d79d261d1380ad57cfe4b3b0fdc8becc1fb5860976c74dcc50e2df5269736f9fd5a6f0597f78f60a833409a755c
-MISC metadata.xml 313 BLAKE2B 45aa7b68c4e4df98f87084c5d62494d5ece6c4cd71d6e8912b003de7d97a57cef72742e827656d1d7dbc5f1e923d89ce01f946f310f40bbcf76ff3aec0afd9ea SHA512 0a603b26467c39a49061f7474462d39ef4d9f3c6c94a27374a69f4beed54ab4ca23df347bc6cfc744e902e1a1d4c7d003b059a68e46b7fe97421a8cf9df8e7eb
+MISC metadata.xml 426 BLAKE2B 2ae5541e68f3f99c55f6f60b9ba1192f3c4ce9266bec9a9c85998607285703d9cf1154bef0965ce9d9d1dc093d70daffba24cca6073ebed0531fda01ddc9297d SHA512 d1892b92a1846c2bf5fce62f6035cc58ac459a82ae6bc9b4b17a11f5752160ca52171f83488396ac2a6f709ee5bae4789bb36ad6b1a3907be6779904a9d8eba2
diff --git a/app-editors/focuswriter/focuswriter-1.8.10.ebuild b/app-editors/focuswriter/focuswriter-1.8.10.ebuild
new file mode 100644
index 000000000000..87959902cfba
--- /dev/null
+++ b/app-editors/focuswriter/focuswriter-1.8.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Fullscreen and distraction-free word processor"
+HOMEPAGE="https://gottcode.org/focuswriter/
+	https://github.com/gottcode/focuswriter"
+SRC_URI="https://gottcode.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3+ LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	virtual/pkgconfig
+"
+RDEPEND="
+	app-text/hunspell:=
+	dev-qt/qtbase:6[concurrent,gui,widgets]
+	dev-qt/qtmultimedia:6
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
diff --git a/app-editors/focuswriter/metadata.xml b/app-editors/focuswriter/metadata.xml
index d47d80ec0e2c..597448d927d9 100644
--- a/app-editors/focuswriter/metadata.xml
+++ b/app-editors/focuswriter/metadata.xml
@@ -3,6 +3,10 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
+		<maintainer status="active">
+			<email>graeme@gottcode.org</email>
+			<name>Graeme Gott</name>
+		</maintainer>
 		<bugs-to>https://gottcode.org/focuswriter/bugs/</bugs-to>
 		<remote-id type="github">gottcode/focuswriter</remote-id>
 	</upstream>
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index fb5f074f1284..0d52b627e9a8 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -2,5 +2,5 @@ AUX okteta-0.26.13-doctools-optional.patch 1002 BLAKE2B c56d0c5de30895f2de11b09a
 DIST okteta-0.26.18.tar.xz 1099416 BLAKE2B 1cde103b33a8aedae9c3792c581c2ae65bbe6a1c63ba98e0332c59635c1156ab46ae596b7577a014e0b8ca65f28694d95cc20db573025dcde62eb5d03c451657 SHA512 7f6cc128642f07fb87faa733f8912e2acc033fd7f5be5743f7cb4d6e60db069713c93bd41a52966a8b97d6d2be716a5722c2d6da5a2b6f5f3a7d55c82d3198fd
 DIST okteta-0.26.19.tar.xz 1101800 BLAKE2B dbd87270d5244f55ce0eb6fb49e75fb76212bf8d0b59449cb89adc9c9040870b57aa24c4a207c417afa2c1119fdf9752ba4b3a2e280b9a30cb2e25e8025c9b97 SHA512 acdc30a7fe2a996600b18c71db3b7771f25816e200128bd604314db4c2f3f2fe6e0a5ac06ae3b81db600030b18db98d750ce556eb5118079aa5e1f8857b00bc0
 EBUILD okteta-0.26.18.ebuild 1783 BLAKE2B a7f3dda462ca1c6662d35ab4dfd475b97aea7d760612dd42f67cb50b96b83020c1dd0937da17f918514e4f43e145a5aa7275d07b799751f6ab1bed7dfab0a65d SHA512 c0d79c40165def0fcf35fa8bbc47f3672c7bcaf969f77eeea8f6896badfc0343a2416475a4bcf85785dc8e3aca53c80758f94c735dcffc53c58bf76abcf9032c
-EBUILD okteta-0.26.19.ebuild 1785 BLAKE2B 4d376ebe4d99d286efe747726d59e3987040df12d5f7629b9d40ffd306bbb637447db5121f945bc09c134e290a2cd48896b4a5a96275d6150cf42e54aa6e5ca1 SHA512 a0127e23d99b0bf7b96644903d674400915a7379f5335a146f164f8fa71eded44268c836b83d63ad3da4cae85db5ab4c33124c421b8acbed5ef611d89ce92294
+EBUILD okteta-0.26.19.ebuild 1784 BLAKE2B b7f7fa15256de30fe01eb56416d78532efdc3f2ae1fe8cf4f03c9b7a84a9af36e0e990c54013f6cd2efcd3771e5e3b7619d4c8ec670851a400073022524cd47c SHA512 47e6d339bf40f1effcbeee674e527d421abb360046cfaf01fc35120c16d64eb66b2c7dca2629a858629b2725da1562f48996fc3d12e4ee9027d1ad1f63fc4bf1
 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b
diff --git a/app-editors/okteta/okteta-0.26.19.ebuild b/app-editors/okteta/okteta-0.26.19.ebuild
index 97fd0097bcff..50757ab3b49a 100644
--- a/app-editors/okteta/okteta-0.26.19.ebuild
+++ b/app-editors/okteta/okteta-0.26.19.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/okteta/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2 handbook? ( FDL-1.2 )"