6 files changed, 2 insertions, 214 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 3b187d6ca6c3..a422511e28e5 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index 07148beef218..f24ebf3f0b86 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -3,9 +3,6 @@ AUX aspell-0.60.5-solaris.patch 538 BLAKE2B bafba6f85217bca2f27382ce6f25d511e2db
 AUX aspell-0.60.6-darwin-bundles.patch 967 BLAKE2B 2b159dbac972ad9a246723fd7fbbdd34d611ac1647828fc9ee7afdc70bef326bb11794e80ecfc1b14166fcedc199d880fbc83e54824d333cd2590873a14ae03e SHA512 d1725c48b0fcb77131ad7d8804afd87fc9552993552bbee52164ad9d8b49e9e3ddd6d78b1a519ab242462e4f66f32b375e995aca1feb88faaddb5c036f6cf6eb
 AUX aspell-0.60.6.1-clang.patch 1288 BLAKE2B fa2da2471f3ec3c6d5c9a98c0afd000bd86cd116b8380ea7ef2acdd1ffb1bf4f241fa60222b2228c60cfd643bb5f310c5671a649e71850ec830ec6d5fcc44cf8 SHA512 453e46b6057dc9fba5e80aa9a3c569f5aa2bc04deeebc4951539e6f251babfba0f6ea2e4f51c59d6e870bf69b1ef7d03b76816d7557a6b673ed0d276f0b3244f
 AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d2517a20dafeb5847963b6d8e3dbd4ab7fb00fe0d13fd26d3381edeb4e68b2feefb2c8b44186336bdfe197d483920dd509 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98
-AUX aspell-0.60.8-cve-2019-25051.patch 2880 BLAKE2B b181caf27feae7eae908c92496a5f05f7e7f1f1a089c460b757c2f745b97f5339d4c8e13cf851e704cff7952c5dcd5ad0a8496ec1ae45c1e83fb1fa577134c63 SHA512 529f3f4737d2e19f7571f4c8666b1cd089cc4e9dfdaa52dc468919f01ce9f8f8112d8fe8afda295b3dfb92f5e0c2bbd79bf1ec69f06c163c32eb28f0168ab263
 DIST aspell-0.60.8.1.tar.gz 3567205 BLAKE2B b7e2045658d9553beef9a7fb69264fdd5be22b5b8abce93baf08111ca5bb3e0bfedb9f351d0e4cde9d41e20960b584d8f02c0df02268cf282c925edc8ffbab8d SHA512 80fa9d7f5f4b8bf66388825ae28403713a2e3eda81fc31f2f452c3e2fe8349cd0fa8f0e4d0d3f8cffe215817229af25aa7be2dba358cb9cdc97e9d2834ba5ca7
-DIST aspell-0.60.8.tar.gz 3486448 BLAKE2B a72e70af65749059a576740377f93b20ab283f73fa7919894f6af189b5aa73581fa0410800851c9396e7d13f4cbc2f7edc23c53d46874d0389ffdb2432ff08c2 SHA512 8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29
-EBUILD aspell-0.60.8-r4.ebuild 2799 BLAKE2B 0cbea13ad1dd829a4a5cf835e9fb65f569b7a25f41bba9cf73daa7e31f7be64d958bc9a2a2a92e85576f7a544941789e8716968796e08b21c4c81f2ce6905745 SHA512 2259b54a31df54db9bc75c1e124c68b5b104629898ec2387cfac6b9a84186649cdd1efc7af53099fad8762cc9a19a1f0d08f7d8deeb3c7a3071566e27bc9073a
 EBUILD aspell-0.60.8.1.ebuild 2750 BLAKE2B ce187cf0893da0140e49f8e440b19fd5f022777e6cb7f1f089795b179227e2b0f81894983301dda3ffd1eb5c03b5b78c9dc73be38a7fd80ae472b313721a9ff2 SHA512 3a2ee75e8d0b4c78d5c56a111e1c46fdc9552a8ef66a0ab31d6c97dfa5079cbadde78d0dd6b7530007b401ac839cd726d6aeebec01dd6c3efc37bb0f0b3ac304
 MISC metadata.xml 334 BLAKE2B 21076177b3c8b9885a962e3b809ac5dbd0499a32cd9dd8c2a656fc2f98a2ee17dd605890dd36b4567e9adda542762f4031cd53e4b72c67f712a8a8a015541504 SHA512 698c5fc0cb978c79d99db139581aad79016445eb0edae71b604792127d0a7c1e6c40f614df0afbad154ff0402cbf5685a1949ebf7fc5163b2298b05430c9d0ac
diff --git a/app-text/aspell/aspell-0.60.8-r4.ebuild b/app-text/aspell/aspell-0.60.8-r4.ebuild
deleted file mode 100644
index 157c31ef3058..000000000000
--- a/app-text/aspell/aspell-0.60.8-r4.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic libtool
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Free and Open Source spell checker designed to replace Ispell"
-HOMEPAGE="http://aspell.net/"
-SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="nls unicode"
-
-# All available language app-dicts/aspell-* packages.
-LANGUAGES=( af am ar ast az be bg bn br ca cs csb cy da de de-1901 el en eo es et fa
-	fi fo fr fy ga gd gl grc gu gv he hi hil hr hsb hu hus hy ia id is it kn ku
-	ky la lt lv mg mi mk ml mn mr ms mt nb nds nl nn no ny or pa pl pt-PT pt-BR
-	qu ro ru rw sc sk sl sr sv sw ta te tet tk tl tn tr uk uz vi wa yi zu
-)
-
-for LANG in ${LANGUAGES[@]}; do
-	IUSE+=" l10n_${LANG}"
-
-	case ${LANG} in
-		de-1901)
-			DICT="de-alt"
-			;;
-		pt-BR)
-			DICT="pt-br"
-			;;
-		pt-PT)
-			DICT="pt"
-			;;
-		*)
-			DICT="${LANG}"
-			;;
-	esac
-
-	PDEPEND+=" l10n_${LANG}? ( app-dicts/aspell-${DICT} )"
-done
-unset DICT LANG LANGUAGES
-
-RDEPEND="
-	sys-libs/ncurses:=[unicode(+)?]
-	nls? ( virtual/libintl )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-HTML_DOCS=( manual/aspell{,-dev}.html )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.60.5-nls.patch"
-	"${FILESDIR}/${PN}-0.60.5-solaris.patch"
-	"${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
-	"${FILESDIR}/${PN}-0.60.6.1-clang.patch"
-	"${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
-	"${FILESDIR}/${PN}-0.60.8-cve-2019-25051.patch"
-)
-
-src_prepare() {
-	default
-
-	rm m4/lt* m4/libtool.m4 || die
-	eautoreconf
-	elibtoolize --reverse-deps
-
-	# Parallel install of libtool libraries doesn't always work.
-	# https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
-	# This has to be after automake has run so that we don't clobber
-	# the default target that automake creates for us.
-	echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
-
-	# The unicode patch breaks on Darwin as NCURSES_WIDECHAR won't get set any more.
-	[[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode && append-cppflags -DNCURSES_WIDECHAR=1
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable nls)
-		$(use_enable unicode)
-		--sysconfdir="${EPREFIX}"/etc/aspell
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docinto examples
-	dodoc "${S}"/examples/*.c
-
-	# Install Aspell/Ispell compatibility scripts.
-	newbin scripts/ispell ispell-aspell
-	newbin scripts/spell spell-aspell
-
-	# As static build has been disabled,
-	# all .la files can be deleted unconditionally.
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/aspell/files/aspell-0.60.8-cve-2019-25051.patch b/app-text/aspell/files/aspell-0.60.8-cve-2019-25051.patch
deleted file mode 100644
index 2f15d380ec0b..000000000000
--- a/app-text/aspell/files/aspell-0.60.8-cve-2019-25051.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 0718b375425aad8e54e1150313b862e4c6fd324a Mon Sep 17 00:00:00 2001
-From: Kevin Atkinson <kevina@gnu.org>
-Date: Sat, 21 Dec 2019 20:32:47 +0000
-Subject: [PATCH] objstack: assert that the alloc size will fit within a chunk
- to prevent a buffer overflow
-
-Bug found using OSS-Fuze.
----
- common/objstack.hpp | 18 ++++++++++++++----
- 1 file changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/common/objstack.hpp b/common/objstack.hpp
-index 3997bf7..bd97ccd 100644
---- a/common/objstack.hpp
-+++ b/common/objstack.hpp
-@@ -5,6 +5,7 @@
- #include "parm_string.hpp"
- #include <stdlib.h>
- #include <assert.h>
-+#include <stddef.h>
- 
- namespace acommon {
- 
-@@ -26,6 +27,12 @@ class ObjStack
-   byte * temp_end;
-   void setup_chunk();
-   void new_chunk();
-+  bool will_overflow(size_t sz) const {
-+    return offsetof(Node,data) + sz > chunk_size;
-+  }
-+  void check_size(size_t sz) {
-+    assert(!will_overflow(sz));
-+  }
- 
-   ObjStack(const ObjStack &);
-   void operator=(const ObjStack &);
-@@ -56,7 +63,7 @@ class ObjStack
-   void * alloc_bottom(size_t size)  {
-     byte * tmp = bottom;
-     bottom += size;
--    if (bottom > top) {new_chunk(); tmp = bottom; bottom += size;}
-+    if (bottom > top) {check_size(size); new_chunk(); tmp = bottom; bottom += size;}
-     return tmp;
-   }
-   // This alloc_bottom will insure that the object is aligned based on the
-@@ -66,7 +73,7 @@ class ObjStack
-     align_bottom(align);
-     byte * tmp = bottom;
-     bottom += size;
--    if (bottom > top) {new_chunk(); goto loop;}
-+    if (bottom > top) {check_size(size); new_chunk(); goto loop;}
-     return tmp;
-   }
-   char * dup_bottom(ParmString str) {
-@@ -79,7 +86,7 @@ class ObjStack
-   // always be aligned as such.
-   void * alloc_top(size_t size) {
-     top -= size;
--    if (top < bottom) {new_chunk(); top -= size;}
-+    if (top < bottom) {check_size(size); new_chunk(); top -= size;}
-     return top;
-   }
-   // This alloc_top will insure that the object is aligned based on
-@@ -88,7 +95,7 @@ class ObjStack
-   {loop:
-     top -= size;
-     align_top(align);
--    if (top < bottom) {new_chunk(); goto loop;}
-+    if (top < bottom) {check_size(size); new_chunk(); goto loop;}
-     return top;
-   }
-   char * dup_top(ParmString str) {
-@@ -117,6 +124,7 @@ class ObjStack
-   void * alloc_temp(size_t size) {
-     temp_end = bottom + size;
-     if (temp_end > top) {
-+      check_size(size);
-       new_chunk();
-       temp_end = bottom + size;
-     }
-@@ -131,6 +139,7 @@ class ObjStack
-     } else {
-       size_t s = temp_end - bottom;
-       byte * p = bottom;
-+      check_size(size);
-       new_chunk();
-       memcpy(bottom, p, s);
-       temp_end = bottom + size;
-@@ -150,6 +159,7 @@ class ObjStack
-     } else {
-       size_t s = temp_end - bottom;
-       byte * p = bottom;
-+      check_size(size);
-       new_chunk();
-       memcpy(bottom, p, s);
-       temp_end = bottom + size;
diff --git a/app-text/mdbook/Manifest b/app-text/mdbook/Manifest
index 3d5954a5a8cf..80c1d8a282f1 100644
--- a/app-text/mdbook/Manifest
+++ b/app-text/mdbook/Manifest
@@ -324,5 +324,5 @@ DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7
 DIST xml5ever-0.17.0.crate 41208 BLAKE2B 42be2b72566bf44d3cf70b365aee45a6c8034c20e4e18c5f71ed51be3a02dc63ccd2545bd41cdb9c019ea34e8419dbb93888ee41bd9b38f2a41c7bf63e27c323 SHA512 0c67244411811a3e82fe58d341b371b938ce6e45ec1af2bd8615c0f0a9628fa662ec0eb130de2ae199d32c7778f0c2d2b80221812dc33831b93333dcde5a682e
 DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
 EBUILD mdbook-0.4.36.ebuild 5644 BLAKE2B 190cca8bd661026da55735746d74c02a1645e8b1a8701e51d2ef58b38770fe530ca1f3b5e47b0055fe0ed7b96f0d62284b54609682db6b32f7dbfe82bb9a4062 SHA512 9ede94842a619e22379d1ecd2d8f15eb8ae73bc09843d0144483a1b722c25bf6f16815284ca85d2dabc748037f0e8bd62a78f4d4ec331b293c4cf68d49331dfb
-EBUILD mdbook-0.4.37.ebuild 5585 BLAKE2B 76a3c655c82f6d97e1e7f7b70b366fc7dfbd86dffd91571518a784abd6bb0afde42dca36876a8e38857edf9d3ecccbe91071b1cbe8c054277f96ee3c4457b669 SHA512 a8117a1d086e0d1758ea89c72c7646522cc34de55a7441e70dbba0d0115b856db879df3e54fe6f017551eb852905533825c3f6a0538c077349f0f00686e1c8b7
+EBUILD mdbook-0.4.37.ebuild 5579 BLAKE2B dbe3e0c91079e476f4b70839acae656c641405603a8d73648de5861264cfbaaf0d3f239c672aaf2d04c7ce295c966daa455624ec7c0c8c5391961bd6371d0b47 SHA512 e9334f3c0d4de240b75bb5099d0b3b0a741ae1d8fc0012a1cadab673faa10c5f9991e6d7c8fd3cb0229f3792e83e2407f85325d86e5ba1995d1759686b25fece
 MISC metadata.xml 327 BLAKE2B bb56613ec49f3b00a39b3131534cb064154ca05d46fda58d4e1d0c601e49561b4d73bc3d075e378e7ab2df720560d169fbe9fd39b40171184aa8e88d8f7291a4 SHA512 e678a70558e83d27e5c0146174d9e740f3ec2e6bdbbb17e61b71fdea6879d61b7babbd9437ee9928dc0322e65a0863b3909bffc7b3ad9313566c5de5baa17f62
diff --git a/app-text/mdbook/mdbook-0.4.37.ebuild b/app-text/mdbook/mdbook-0.4.37.ebuild
index 23a03fce7959..a796c91cf903 100644
--- a/app-text/mdbook/mdbook-0.4.37.ebuild
+++ b/app-text/mdbook/mdbook-0.4.37.ebuild
@@ -257,7 +257,7 @@ S="${WORKDIR}/${P/b/B}"
 LICENSE="MPL-2.0 CC-BY-4.0 OFL-1.1"
 LICENSE+=" Apache-2.0 CC0-1.0 ISC MIT Unicode-DFS-2016" # crates
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc"
 
 QA_FLAGS_IGNORED="usr/bin/${PN}"