9 files changed, 396 insertions, 1 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index b6b2f0c88ce5..28d7c4e061f9 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 3c0d1ec15e07..d3dc3d80a5d4 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -6,6 +6,7 @@ AUX mupdf-1.19.0-cross-fixes.patch 5740 BLAKE2B dcc38e628e1c0ddde9647d06ea8c5812
 AUX mupdf-1.19.0-darwin.patch 1056 BLAKE2B ae532c2d68842c3a1bb424c707a51a5ed56a72e7557e89b3830ac55bc713982065d1ec7055b84b91589c8b98a690d037c0fb6c90480fd89989e0f90cc49f9b97 SHA512 24cb6885c174bbfbe5ddc2e8f9a15c5154aa5699a19b5931d60ebb761a7587d717dbb65fba45070f963c0c3f432f8f58c00537d10b050546173a48f5c729a7c4
 AUX mupdf-1.20.0-lcms2.patch 2512 BLAKE2B b641519f069c43ef2e9efdf0e18418e663e3fa39d1fb2a0a4b759f8af0412e3a63f212961d80430de86a8ea3d8228ece07e2a04cbe08ccbe330afcbad18e3527 SHA512 d25a843286f9376f17cc73dd974835eaa7be7a0a7b26fab338ae5b3cf54588f476538c73e3053edc2367bd5856eb1af0ebbffce426f7da287784dcb0ee3fc684
 AUX mupdf-1.21.0-add-desktop-pc-files.patch 845 BLAKE2B 8fa08810dd0b797af517c7932a2b81c080721155f607970664ca68a8eb4ec53bcfdda417790bf002aff1b1e1e8257d67c3a2e6bf6d500ee50cc03a7f440b60c6 SHA512 96835698141898a9509321c6125d5bfce1b31d3a0329d3c2be55d9026cff65204112a8ac0774ece1ac1ca7a1ce3dc534437aca1a76eb7716317b2c7e648e549f
+AUX mupdf-1.21.1-fix-aliasing-violation.patch 2651 BLAKE2B 649b9cde7eefdf16ba5a57e40128dc57710d63a04281bae4f26f2ee9dc19933628826d52ff4aee95fd7e6141b35c59efe883439b852758bc5075e30a89507564 SHA512 deccc9193d9266a9add6e1d80eb289f4576e12703d8a0af640ebdbfc698cbb3a15ac9da3b752b1f6beb4ad901aa3bfd43d08d34738b5c7545182bf20200ecaac
 AUX mupdf-1.21.1-no-drm.patch 586 BLAKE2B dad2f0544153830cd8fff32a667edc229e5f149f4a474af065bb3e4b47d0508125077810a652b63837cafa5c441223eb2993a51c8be25809793aa2c098018947 SHA512 6149a8527a3025cb3b9ddc97db8d2638a4f0653b55fd78a86a97aefd2bf44d8b35c42e31c79558d8e8ec396427577ddb792e85e4055b4e4c8d704ba510378579
 DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7
 DIST mupdf-1.20.0-source.tar.gz 88455853 BLAKE2B 686d8b02972fc6cb7fa4541e4f0561c11e616f800decd20a79f23b577977785633bd3e17e2007f621db97dab6db1fcf500ac8e283984fbe675a25e7a4301b75b SHA512 6837299c589ece9cc443b027433fa3eee545f5155aeb6359b7a43da239d2e99195e9ae3950ddec6cb6ebae77bc877573c6f89a90754c58723d7e87d9739ed1f4
@@ -16,5 +17,5 @@ EBUILD mupdf-1.19.1.ebuild 4490 BLAKE2B cf556d6ba654118ccd0316fb75f2f970cb96990f
 EBUILD mupdf-1.20.0.ebuild 4750 BLAKE2B 9675a86e5f8bbf05933f49d422adb3d3d246953c7abe80eab58d75946265b4e5b4b17ed3e64098bc4fa5b1b0537884263ce50a084bf4f9109bd8f217212a2541 SHA512 591df3401dee953bb51499fb754e13127e32737dcbde3d924b02d713b1de8a7736e2c1bc123c24e5fb31a530a49c7a7eab0fc47ae8b9a22aea1206bb8df07989
 EBUILD mupdf-1.20.3.ebuild 4780 BLAKE2B 399303c48befa35538363af41b5b0a888715cb152dba91f6de31ea96b03bcc0e312f287f005483a9ba3d09096ebc55cbf1ce56a9848ad68de496a9eec90cbf00 SHA512 386d319b390e90920d877ff68bc62594e7e99ad5b8aa2218f7b8b058559b9cff81dcb75aa0c7651fe15992e8dfc7cbe44d594d39f7399643a371aa5b9e551f23
 EBUILD mupdf-1.21.0.ebuild 4750 BLAKE2B c41d5e0bdae99e855c69e176d93612826bff39179ccabdd0b78b4da1882e014ed1a2aaf17db10fe2d520c162e939203ac61583db0b9cc2159b7a1c143dee2206 SHA512 e20aff284df761a4293577027826a2fcea65d6771849e5867ef9c5c675ebdde5d3ca667ba23439c3def33617ddeb44a70fb9c74c708ae51dbc674067978388d3
-EBUILD mupdf-1.21.1.ebuild 4840 BLAKE2B b3a7598c17b1034db02348f844d78c940c57d8d521b3db7054b44c46afa120f164ad27db770ba0da8913cdd03a58b428e5143dfa64e940e5e96e924db0a2dca8 SHA512 14c5c17fb0f188e94c4cd5eae39c475dd553b7384008adb37b78ac98ffcb03a0b3bf92671ed2238bf68bfbfca949391de94520a50aaee8600e36f0798aba6108
+EBUILD mupdf-1.21.1.ebuild 4887 BLAKE2B fab61049f71ea61c072a60c0c6d9d55bab01f0de30efb53913346ed06beaba0d337dead8928154e72186d18d9d8bdf2c7f9da3f0c6ac228e28a65f52363c9d47 SHA512 c76090534581bf43221845dbd67c6626c315d8337c098b993defc53c1bcebb0c5bc590e59e443287a3d0b559ff614394c7147ba90c2d4d3093377b035bce916c
 MISC metadata.xml 497 BLAKE2B 35e16ef688aa8b046f3e8ceaa7399da31379ba50b2cbc36d842696d1589aeea5a55eede13d79188f08ae8ff411c16385128633a1fbdaba04ee115158ac7e529b SHA512 225727e22fe2756480f3d502f49a62abbd0fe09d6266c1e00c09b04c2b5da181fc46bb06b19020290fa857b1feb0d557e6a77084f6269b5e0fdfec593cd46709
diff --git a/app-text/mupdf/files/mupdf-1.21.1-fix-aliasing-violation.patch b/app-text/mupdf/files/mupdf-1.21.1-fix-aliasing-violation.patch
new file mode 100644
index 000000000000..4f51f72deb1e
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.21.1-fix-aliasing-violation.patch
@@ -0,0 +1,63 @@
+https://bugs.gentoo.org/859847
+
+From 8c6f6bf3ad2fd33d15de6ee96175cd29bf804d9f Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Tue, 26 Jul 2022 15:47:02 -0400
+Subject: [PATCH] Fix aliasing violation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Noticed when compiling with link-time optimizations.
+
+include/GL/freeglut_std.h:240:18: error: type of `glutBitmapHelvetica18` does not match original declaration [-Werror=lto-type-mismatch]
+  240 |     extern void* glutBitmapHelvetica18;
+      |                  ^
+src/x11/fg_glutfont_definitions_x11.c:103:27: note: `glutBitmapHelvetica18` was previously declared here
+  103 | struct freeglutBitmapFont glutBitmapHelvetica18 ;
+      |                           ^
+src/x11/fg_glutfont_definitions_x11.c:103:27: note: code may be misoptimized unless `-fno-strict-aliasing` is used
+---
+ src/x11/fg_glutfont_definitions_x11.c | 29 ++++++++++++++++++---------
+ 1 file changed, 20 insertions(+), 9 deletions(-)
+
+--- a/thirdparty/freeglut/src/x11/fg_glutfont_definitions_x11.c
++++ b/thirdparty/freeglut/src/x11/fg_glutfont_definitions_x11.c
+@@ -91,14 +91,25 @@ struct freeglutBitmapFont
+ };
+ 
+ 
+-struct freeglutStrokeFont glutStrokeRoman ;
+-struct freeglutStrokeFont glutStrokeMonoRoman ;
++static struct freeglutStrokeFont glutStrokeRoman_ ;
++static struct freeglutStrokeFont glutStrokeMonoRoman_ ;
+ 
+-struct freeglutBitmapFont glutBitmap9By15 ;
+-struct freeglutBitmapFont glutBitmap8By13 ;
+-struct freeglutBitmapFont glutBitmapTimesRoman10 ;
+-struct freeglutBitmapFont glutBitmapTimesRoman24 ;
+-struct freeglutBitmapFont glutBitmapHelvetica10 ;
+-struct freeglutBitmapFont glutBitmapHelvetica12 ;
+-struct freeglutBitmapFont glutBitmapHelvetica18 ;
++static struct freeglutBitmapFont glutBitmap9By15_ ;
++static struct freeglutBitmapFont glutBitmap8By13_ ;
++static struct freeglutBitmapFont glutBitmapTimesRoman10_ ;
++static struct freeglutBitmapFont glutBitmapTimesRoman24_ ;
++static struct freeglutBitmapFont glutBitmapHelvetica10_ ;
++static struct freeglutBitmapFont glutBitmapHelvetica12_ ;
++static struct freeglutBitmapFont glutBitmapHelvetica18_ ;
+ 
++
++void *glutStrokeRoman = &glutStrokeRoman_ ;
++void *glutStrokeMonoRoman = &glutStrokeMonoRoman_ ;
++
++void *glutBitmap9By15 = &glutBitmap9By15_ ;
++void *glutBitmap8By13 = &glutBitmap8By13_ ;
++void *glutBitmapTimesRoman10 = &glutBitmapTimesRoman10_ ;
++void *glutBitmapTimesRoman24 = &glutBitmapTimesRoman24_ ;
++void *glutBitmapHelvetica10 = &glutBitmapHelvetica10_ ;
++void *glutBitmapHelvetica12 = &glutBitmapHelvetica12_ ;
++void *glutBitmapHelvetica18 = &glutBitmapHelvetica18_ ;
+-- 
+2.35.1
+
diff --git a/app-text/mupdf/mupdf-1.21.1.ebuild b/app-text/mupdf/mupdf-1.21.1.ebuild
index ac2702bc5da4..718ebd6ed15a 100644
--- a/app-text/mupdf/mupdf-1.21.1.ebuild
+++ b/app-text/mupdf/mupdf-1.21.1.ebuild
@@ -53,6 +53,7 @@ PATCHES=(
 	# General cross fixes from Debian (refreshed)
 	"${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
 	"${FILESDIR}"/$P-no-drm.patch
+	"${FILESDIR}"/$P-fix-aliasing-violation.patch
 )
 
 src_prepare() {
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index 33b3809d01f4..5a1087aa7663 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -1,5 +1,7 @@
 AUX opensp-1.5.2-c11-using.patch 2626 BLAKE2B 16ff8ba1701831fa0c87e0788f8b420f1d96bf5b2f645d2d6706e82ae1767a99fed8f6ca4bd4f1abbc24bf80c4fa00d848f03056b01ac98f5b8a74d3a78c4467 SHA512 dea5fe17ea2662150b201ab6011bb01ba0f0c07689d267ec4086a914cefef3e91967f8db4be0258bac87d3cd73a9b05eb1f879415860552d9853e66e98e16e11
+AUX opensp-1.5.2-configure-clang16.patch 4027 BLAKE2B 089c16ecbe47dc7e69b42e6be91db548e6cd785f8c96de6f9ef3fb675fc2ce2ccdf435fbec26276a9d0c124ff0f776541ce33101e28bbddf949b48834074fad0 SHA512 191d5c61eeb73b4040be06b7de197f25a0599286dcd6077e942bc2cc1d4400e70e8af69a08563713036c1225e41adf6ee2f4dba3d264ffcf3ca6a35b7c37e087
 AUX opensp-1.5.2-fix-segfault.patch 747 BLAKE2B 544dbb8a638d2fc8fed5c7426e828d1524f4756e6882ac837b4cf3deab4e039a0b66564431b1849d9067f6071955f82b8057cde5168094da70b1419844b000fe SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf
 DIST OpenSP-1.5.2.tar.gz 1521390 BLAKE2B 2c6f8dfc721c77ab223aa67e90c8dfb45855b74fdd382ac98303c6fb23af08019ca96b5430bcdb87b9e86fc333114bd8b2e5f243c87f2cf84ee04c880c8c309b SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e
+EBUILD opensp-1.5.2-r10.ebuild 2213 BLAKE2B fba33dad53760b1870a17e642670b92eb4c3e66419171e3beb0508e5747b35af838c4dc28293f5add3022880e6b8462458b7852fadf25bf5c27ba7a2c74e431b SHA512 eba835db45305c760f7e392cc5e53e3492473f78a16c0ae74371d78312a448731e13d47c01b255b77a2f047a618a2f8e79dd761867a0ebdcf1b047cebb80be8e
 EBUILD opensp-1.5.2-r9.ebuild 2161 BLAKE2B c74553892ab3339340bd07124a3a2cf90d9e7df6e0cb0d8f2e4f5f49aa6d55d260ad8f23ff043f2dc3713cb3411be2f5794baf84d6017ceaf40f471d5afd7ffb SHA512 4e30775bcc7c6a940702e20bd8784c8f60b604f6ea0381de9057726ae9717182047cc4a57c3ac06b91bf4ea2a850b9faf4296b37700eafa261042dda5f6c6858
 MISC metadata.xml 321 BLAKE2B 5571226bba817c3d5cc47e0bd7d67e82399403e24e7773104f33b13bf40d95113da9613db2bd77408557e6793b9efb6d435402a7b680d07e1e3e6952614bdedd SHA512 95c0d6759a91874b81b707e479eee48bf67ba762584587b4027b583e42d63a83018a3243fe81b6649090d1e0167ab825b591dfccbd3a8db9078b1a80f729de15
diff --git a/app-text/opensp/files/opensp-1.5.2-configure-clang16.patch b/app-text/opensp/files/opensp-1.5.2-configure-clang16.patch
new file mode 100644
index 000000000000..6e6832957679
--- /dev/null
+++ b/app-text/opensp/files/opensp-1.5.2-configure-clang16.patch
@@ -0,0 +1,198 @@
+https://bugs.gentoo.org/889600
+https://src.fedoraproject.org/rpms/opensp/blob/ad3afd1f07f600aa21cd6a3f1960db5570682e47/f/opensp-configure-c99.patch
+
+Avoid implicit function declarations because they have been removed
+from C in 1999.  Future compilers are likely to reject them by
+default.
+
+No need to upstream this because the aclocal.m4 file is not checked
+into the repository since:
+
+------------------------------------------------------------------------
+r412 | clasen | 1999-11-06 14:10:34 +0100 (Sat, 06 Nov 1999) | 3 lines
+Changed paths:
+   M /trunk/sp/Makefile.in
+   D /trunk/sp/config/aclocal.m4
+   D /trunk/sp/config/configure.in
+   M /trunk/sp/configure
+   A /trunk/sp/configure.in
+
+Install headers in $(includedir)/OpenSP, move configure.in to toplevel,
+remove generated file aclocal.m4.
+
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -833,10 +833,6 @@ else
+ #  endif
+ #endif
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -850,7 +846,7 @@ int main ()
+       /* dlclose (self); */
+     }
+ 
+-    exit (status);
++    return status;
+ }]
+ EOF
+   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+--- a/configure
++++ b/configure
+@@ -2917,7 +2917,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+-   '' \
++   '#include <stdlib.h>' \
+    'extern "C" void std::exit (int) throw (); using std::exit;' \
+    'extern "C" void std::exit (int); using std::exit;' \
+    'extern "C" void exit (int) throw ();' \
+@@ -5186,8 +5186,8 @@ main ()
+   for (i = 0; i < 256; i++)
+     if (XOR (islower (i), ISLOWER (i))
+ 	|| toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
++      return 2;
++  return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -9508,10 +9508,6 @@ else
+ #  endif
+ #endif
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -9525,7 +9521,7 @@ int main ()
+       /* dlclose (self); */
+     }
+ 
+-    exit (status);
++    return status;
+ }
+ EOF
+   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -9606,10 +9602,6 @@ else
+ #  endif
+ #endif
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -9623,7 +9615,7 @@ int main ()
+       /* dlclose (self); */
+     }
+ 
+-    exit (status);
++    return status;
+ }
+ EOF
+   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -13321,10 +13313,6 @@ else
+ #  endif
+ #endif
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -13338,7 +13326,7 @@ int main ()
+       /* dlclose (self); */
+     }
+ 
+-    exit (status);
++    return status;
+ }
+ EOF
+   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -13419,10 +13407,6 @@ else
+ #  endif
+ #endif
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -13436,7 +13420,7 @@ int main ()
+       /* dlclose (self); */
+     }
+ 
+-    exit (status);
++    return status;
+ }
+ EOF
+   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -19110,10 +19094,6 @@ else
+ #  endif
+ #endif
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -19127,7 +19107,7 @@ int main ()
+       /* dlclose (self); */
+     }
+ 
+-    exit (status);
++    return status;
+ }
+ EOF
+   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -19208,10 +19188,6 @@ else
+ #  endif
+ #endif
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -19225,7 +19201,7 @@ int main ()
+       /* dlclose (self); */
+     }
+ 
+-    exit (status);
++    return status;
+ }
+ EOF
+   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -27450,8 +27426,8 @@ main ()
+   for (i = 0; i < 256; i++)
+     if (XOR (islower (i), ISLOWER (i))
+ 	|| toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
++      return 2;
++  return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+
diff --git a/app-text/opensp/opensp-1.5.2-r10.ebuild b/app-text/opensp/opensp-1.5.2-r10.ebuild
new file mode 100644
index 000000000000..de279d310010
--- /dev/null
+++ b/app-text/opensp/opensp-1.5.2-r10.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+MY_P=${P/opensp/OpenSP}
+DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management"
+HOMEPAGE="https://openjade.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/openjade/opensp/${PV}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc nls static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="elibc_glibc? ( net-libs/libnsl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	test? (
+		app-text/docbook-xml-dtd:4.5
+		app-text/openjade
+		app-text/sgml-common
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-segfault.patch
+	"${FILESDIR}"/${P}-c11-using.patch
+	"${FILESDIR}"/${P}-configure-clang16.patch
+)
+
+src_prepare() {
+	default
+	use prefix && eautoreconf
+}
+
+src_configure() {
+	export CONFIG_SHELL=${BASH}  # configure needs bash
+
+	# The following filters are taken from openjade's ebuild. See bug #100828.
+	# Please note!  Opts are disabled.  If you know what you're doing
+	# feel free to remove this line.  It may cause problems with
+	# docbook-sgml-utils among other things.
+	#ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
+	strip-flags
+
+	append-cxxflags -std=gnu++11
+
+	econf \
+		--enable-http \
+		--enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
+		--enable-default-search-path="${EPREFIX}"/usr/share/sgml \
+		--datadir="${EPREFIX}"/usr/share/sgml/${P} \
+		$(use_enable nls) \
+		$(use_enable doc doc-build) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_test() {
+	# Skipping tests known not to work
+	emake SHOWSTOPPERS= check
+	SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
+		install
+
+	find "${ED}" -name '*.la' -delete || die
+
+	dodoc AUTHORS BUGS ChangeLog NEWS README
+}
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index 45854394f6fe..29a77f26009c 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -1,4 +1,6 @@
 AUX tree.bashcomp 847 BLAKE2B de05dacd7b54426e89e4afbbb6fba74376212a8f02995ff9babec369244bdb57fcb46989a437a100bf1415f7ecb8b0e142d729bae27f7fef6319de9e4cb06d54 SHA512 8df777721a7974015b5e717d89a4ff8701a2598e227d6cf71077fe498a5bb2a578c96c4667ab80e34b1064e109d38665fb6a4de8f52bb6401445088d5cdca922
 DIST unix-tree-2.0.4.tar.gz 59497 BLAKE2B c55f8f64f2dfc6364ce3ab5ec26e59860f958eacbf681d1d53848172d474605f71864c1eb7db27be15f3df2fc2979787685e80de76ff817c5cdfafb9c52af203 SHA512 59f391de5792ce9990153c2de06bc545813f9e7aea635c574ef21f1603203146cdad4dbed821266715d716241d7153276aa220626ce8354446dd85df47e75fa6
+DIST unix-tree-2.1.0.tar.bz2 51401 BLAKE2B 89b15df0268c03ba66827c7e6d234d1f5c4f6a5d9788e30bf6859d477b340393acbeec9ad7afc1909fdc7beb81ef7934917206066e0875d9f1662fca170f4127 SHA512 0f3a6ecb450bb3d683804667d4f15aecf9c9765578d47a62e39a8ff69cbe1c2a0a4a922fef3728359060338f4f9cd2de7ab8eb0f992a4c32949278bb47d17edc
 EBUILD tree-2.0.4.ebuild 1066 BLAKE2B 7e363d98dbcbc72d49371171712f8291e241bb4c4e7f1dbb165e7a6ebdcbe3df65d3bf655b03158626cc9048bb1d4cc4432722e604d74a2eae8f7b6a674e3132 SHA512 3787d1b9b82d11ef358b6ce507dcd247d306b1d699da583381eb0133cb0bb1804fe2c8234e4937d2bd2da703a1efd82832f14fb3e6dfb5f87cf01a9e85e666eb
+EBUILD tree-2.1.0.ebuild 1076 BLAKE2B 6a0d8ec18e99dc3d6ad25fa6184331c015f59f2da648a7e1b9b83a576cc016ea95fd882910e31e084d2a8009a781c0389c77316b3b77386d07bdaa2b98153c8f SHA512 3e5168dedfad8f053f4370f4f2df33842dd8c163d545aba88e45377b18bf8697003f1305abbeefc3a13d323f1772c787aa7889314804c5ac480a502a411b7526
 MISC metadata.xml 726 BLAKE2B d4e2e3176f82eb4577dbac312756eaee7e50da883c80b0e22a2cf86e75493eb4791ffdef9387a48d5a486cf968526aa483e05b213dc172839f04c528701be69f SHA512 ff609ba8c9839744088c1d77159d039ff46aae920f570842d4dbda9b4b4b4a6956f49815571d5e2d837deac2128bf71fb42316d5520c5a0dfe74f9bec798b56c
diff --git a/app-text/tree/tree-2.1.0.ebuild b/app-text/tree/tree-2.1.0.ebuild
new file mode 100644
index 000000000000..fbad3d309fd4
--- /dev/null
+++ b/app-text/tree/tree-2.1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic bash-completion-r1
+
+DESCRIPTION="Lists directories recursively, and produces an indented listing of files"
+HOMEPAGE="https://mama.indstate.edu/users/ice/tree/ https://gitlab.com/OldManProgrammer/unix-tree"
+SRC_URI="https://gitlab.com/OldManProgrammer/unix-${PN}/-/archive/${PV}/unix-${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+S=${WORKDIR}/unix-${P}
+
+RDEPEND=""
+DEPEND=""
+
+src_prepare() {
+	if use !elibc_glibc ; then
+		# 433972, also previously done only for elibc_uclibc
+		sed -i -e '/^OBJS=/s/$/ strverscmp.o/' Makefile || die
+	fi
+	default
+}
+
+src_compile() {
+	append-lfs-flags
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin tree
+	doman doc/tree*.1
+	einstalldocs
+	newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN}
+}