gentoo auto-resync : 02:11:2024 - 03:04:23

13 files changed, 3 insertions, 1051 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index b185f67f3122..d6225b551267 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 3c4dc202cf32..dce1b58b2b72 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,9 +1,3 @@
-AUX README.Gentoo 1426 BLAKE2B 00dbdbd388a01ad8288ac99eeab1d59dcdfd2309a43ef30008f5ac35fcd93855409c03c801f5c0b48455414e489f7f7c603d73efc6c618e820e8ff4fc7d67ed4 SHA512 0576235fb09ea9ad5fbe5b1bbaa41dd37913603ab40773f2c476b72e147eac9b8de62f600717d06d5366184deadb55e0002e79b9987ba215bad5ebee41fdfbb1
-AUX xemacs-21.4.19-db.patch 3157 BLAKE2B f5615179665395f36df25eedd51c1f351aaefa8afe21506ec3f096c661c1ad00602b9128de6556220835bfca1769a6a45036df6fc6970be06590008621d01fac SHA512 b4987784295c5d2335440dccca4e157d5ccece510d97fc131e33f701fc2dc48bd01080df577c6e588d926703f7b461a347d0d3e3f99931e10cdb8b11592b35be
-AUX xemacs-21.4.24-gcc5.patch 1132 BLAKE2B 2a494b756f94112ba91a9d918fa540a645dfb7cabf05b5957cafb95c890e9fd4e106c20de97edac0ea7959053eb5cd20a26698713670b3957b097e101e818207 SHA512 1b3e56804594b82209ddb6318c2bff13b8e63f189d98e5ff313022eb66267eb45683841599dadd8a4d97e5e221dd85195121246fba5c91eade905e1d7b593749
-AUX xemacs-21.4.24-glibc-macro.patch 1081 BLAKE2B 2b2aa4898e9a02402418a71abe4138f085e9177c90ee87ede767c682ec185f59cfa308284622d88c432b3e4eae9e20a05df075f7e48f73ac27e53d9f15a8d5ec SHA512 6802260f60cd8ad14f9f7f4dc156e1914cbefd7efae38837426f54f141bec6241c210c28120badfdf46d0cd2866014cf31b05ee228c407cdb0f387ea5cf56e3b
-AUX xemacs-21.4.24-ncurses-tinfo.patch 538 BLAKE2B ef09bb366ebb79cd9bd3e089098ae985568cd1b25e2d46a2149e5d712338cf8d3f69b825410d448a2dd81fe4069e3f320a3dac13a9046651d526d4b9272772b4 SHA512 61af7d1090f160802a6a5ff2ba28ff2d9d2a39ac615c692748a76f60c4f93b6d09a66fbf797467257efe1a269aa90033f5384423521b1e403defb6cbd8709bb3
-AUX xemacs-21.4.24-strsignal.patch 4452 BLAKE2B f5f8d35a15f6c1aa59d6d31a8c4ed46b057f6af01ed8bb42cada466c6b95ba9633dbe8f0af5aa7a4779cc2c98bab42c629f4f16eb38aa558913a630a961110c5 SHA512 2858c5937f0a9f80f72f7f78f38ebd6abe9d65b79d44a817579c6346a46f20c42756291f399d464b4cc994dfc3ec9e2e1a32613d915f92f3c79ebf0f90cd7c64
 AUX xemacs-21.5.35-configure-libc-version.patch 2169 BLAKE2B c3c6e7717971217f5a141ea6904193761a943d0656158f863c054f09858518f96975782dcb67a3bf0f4ef2bc29cc0b656198a28623043a1cbeb78bea0c6d2c1c SHA512 b386a92a474012e5583bc4fff7a958e1ae81aee90fc4c095c49e637bf4e35e8dfb90ea2ab1cd91190739ac975f5994f4465db56b150d0017dedff3ab3dd84a66
 AUX xemacs-21.5.35-configure.patch 1305 BLAKE2B 3625857381ed9113dcf92cfc89f70fb70d0a64267b7b2e006f3c3c495995ef1d5edd3c8ba63863b9ca678a83bebfe49febb0d6a67ad8e770bfa07feece0a598a SHA512 5556a8e8e9940177aa674e9d47f1bc00f8af90467c2d7bcdbd8820f0723de3b945eb9491961c041bbd7c66b39228e1996f3212931e8e2823c5f83e125ceb2fc9
 AUX xemacs-21.5.35-linker-flags.patch 1078 BLAKE2B 32678544c488c2b272503d79f0fed1783c1674b8fe5fd3e9ff6a25a782db561e9a59b1adc9adf2a627894b9b09458c087e670609c88f76d9927bfe1af68a963c SHA512 58b3b055fe1915ef72041832ec930edf7d365a7907d7603ba627379f0736ad7119e8c8ff1fa6b5d46b770760325ea5fd3484e5decb0d47f42ba5095571d46cfb
@@ -13,11 +7,7 @@ AUX xemacs-21.5.35-va_args.patch 6881 BLAKE2B b618059e55889aa06e0cb125aef0d95d1e
 AUX xemacs-21.5.35-which.patch 751 BLAKE2B 4235c084089e391c7b7a3447f0252f98686796065c04a5a993f898f6c97c95c2253a0f89e9c069e2c011e391fd8293277e05c2e7c3690e02d6c6277dcb0d6383 SHA512 210bfb3bc763f544b04d09f35b6735aefb8ebeb4ddadbdb75ad3fae0de4f8ae9fff0c0b99a1b3d57fc159db8898f6490585c8c8dfb651c70691a2ba811f32914
 AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4eaa23c301b5d25a8c334971a1d89f8cfa551dce909891edaac6a7df956c912396fc8cfb88a720a6b SHA512 6542fc7777af888ae711d386918e712e1d106635f70e65af77d1e809156baba9831fc4c8bd2cb7e7c6f9ab0ab18ddfb92709ac2909aa613471101454599bdb69
 DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
-DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 DIST xemacs-21.5.35.tar.gz 16403617 BLAKE2B efab8d3d984ec2223913b09ff1abc9f2df187fb5b8c2ccf99fcfc60c86369f4411cffd48b03532d53329bd5b3d3149271a445da4c0a3cd7bdc2834021b1297b3 SHA512 e592af6ffbb6f95299039de28f59ee770bf62f54a15b1358b9d1059ed25dcb410c01dcf6e88c1d2196d54f0c6902f309d709fe003accee82e516023fa4363019
-EBUILD xemacs-21.4.24-r10.ebuild 6951 BLAKE2B e7d0bda0f6b5e6531dfc565488487af3e1ac32b248b59bf1b93583edaeaa0ec0d9b9ef98b731d7e94a117fb2ccd138d96f607864a6b4bcc396e26570162d43e7 SHA512 061948f75a2be2b72472956d5801974db916c78938ae3b13a9840368c886c3e433fe327cfae46dd3082cf7190c738a446697a7efedd8f31e9cd15a725fc2ffb2
-EBUILD xemacs-21.4.24-r9.ebuild 6923 BLAKE2B bc99795d5ace91260f2d26e1e16b2aa16cf9f9f33996e9a9c0d49a172bec5c40816c09b7ebbc6cc013c4276d57bf8dc3c7c099097b3307f2731154cdb3f8c9e6 SHA512 ac3cbdc9087d4bdcfa0ecb591729ea0f5fa084f350d93a37f5283dba5ed56d77555e9bc706f3d43b2abc21e5020e4b8564657c92f36730c073e283ef1288ef5e
-EBUILD xemacs-21.5.35-r4.ebuild 7332 BLAKE2B 4a5a79718ea8c81706fd7c8267f3bb81afb1acd83fcd13c64fc7bdbbf34840548fd672cdbba47c80c162f67daa73ec7e45ac02bec4c892fa46456cac2a0f8c55 SHA512 178850dc0b9f4949071447dcff60bd3c88bcdf85b24bb3824407c624b7824bb86c7482f13dfc2e1202aeb86efec824e6022a3bc51f81b694df295fcf146d10da
-EBUILD xemacs-21.5.35.ebuild 7025 BLAKE2B 695f2221402c2461116746c81f07811929274b53892fe87f6200d2c93ba4f9209cbd77e702eb7ad922c8115a96ee8afffbd657d6698dc0b452aa854041a22bf6 SHA512 d4a51870a73d2c9dcbb73f69e3dcb982443442e0be66c0a35bd2c0730e8813b8ebd2dfcffdb68221d2f24d078f47d6fe7e593157a4b1cda32887f1c88259f206
+EBUILD xemacs-21.5.35-r4.ebuild 7331 BLAKE2B 2bc9214122d11f5d0ce53b1d82c331db8f74b453a9fc76a8500114b43e97f7064c03d990c91cdf9dc4ae524b97cdd92a07dcdb7dc623203375288a4ebc094021 SHA512 77b4a153cfd77bc899227f33767c385aa1c4a341a1ae694428268a1ecaaad623cf124a1524be0b5c4f6f1916d2af025acf3719aba5ad8767b5e90f454405be25
 EBUILD xemacs-21.5.9999.ebuild 7118 BLAKE2B f95ce674de0c7db7342615467dd3d6c48ae65c4fd17a8f9307678df413c561f7229e4250e6b4c44989bb52530f4410f7ccc1a34c237ed75b968caa9a9171947d SHA512 9c407c07bb357455a043dad3bf3f269720b33f4960f799a95f055b6adc20cf3c823f1b2c6c1fdc12af9f66d315481ca34603e5814c6138b228000d78e06db983
-MISC metadata.xml 756 BLAKE2B 1237bb18a737c4473990bd73a4a1fdd5788c743867b1f7c6d963f6acd21a7133fbe5b1c0921556a5152ab7f3116e635a6c6087dad15b5d2430a2d742c63a1a05 SHA512 65c0a9a02a9d11bde55cae161344803177203f4868f508c970d87fc7ea7b4f552f63d2e70ad2b1829efb8ff2ca641e1717672976f681ec56ad51dec2eebc8464
+MISC metadata.xml 595 BLAKE2B 4fa756c7f689dea03bc705403e7b9364c002b3193e85f76359da86f8286920cd746145f97d7bc31df57753f2cdc5be9546507601683223c9d662cf15460305d4 SHA512 776bb6127cb34bd65356c47839860b29b71ee8ccd5f29c100c1ebe0aa9b59c169d9bc825bad150483643123ee2ebd2a26b765f9ecf925176a2bbb95754843af5
diff --git a/app-editors/xemacs/files/README.Gentoo b/app-editors/xemacs/files/README.Gentoo
deleted file mode 100644
index abb71cc90988..000000000000
--- a/app-editors/xemacs/files/README.Gentoo
+++ /dev/null
@@ -1,45 +0,0 @@
-README.Gentoo
--------------
-
-This is a quick tutorial on how to configure the XEmacs package user
-interface (package-ui). After you configure package-ui, you will be
-able to download and install XEmacs packages and dependencies while in
-XEmacs. For the complete documentation, see
-/usr/share/doc/xemacs-21.4.*/README.packages.gz
-
-Once XEmacs is emerged onto a Gentoo Linux system, you will only have
-the following elisp modules installed: xemacs-base, efs and
-(optionally if you had mule in USE) mule-base. This guide will show
-how to use package-ui to download and install your own preference in
-elisp modules to ~/.xemacs/xemacs-packages.
-
-First, start XEmacs and load the package-ui elisp module.
-
-  M-x load-library RET package-ui RET
-
-The first thing to set is the download site (package-ui installs via
-network).
-
-  M-x customize-variable RET package-get-remote RET
-
-Insert a new value, then:
-
-  Choice: Remote
-  Host: ibiblio.org
-  Directory: /pub/packages/editors/xemacs/packages/
-
-Make sure you set and save the change. Note, other host/directories
-are possible. The the documentation for package-ui for more
-information. Hint: ibiblio.org is *fast*.
-
-Then set the location package-ui should install to:
-
-  M-x customize-variable RET pui-package-install-dest-dir RET
-
-  Directory: ~/.xemacs/xemacs-packages
-
-Make sure you set and save the change.
-
-At this point you can install your modules:
-
-  M-x pui-list-packages
diff --git a/app-editors/xemacs/files/xemacs-21.4.19-db.patch b/app-editors/xemacs/files/xemacs-21.4.19-db.patch
deleted file mode 100644
index cf87d60e628a..000000000000
--- a/app-editors/xemacs/files/xemacs-21.4.19-db.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-This patch fixes several database-related problems.
-
-dbm_open has been moved into gdbm_compat, so we check for that and include it.
-
-ndbm.h is located in /usr/include/gdbm on Gentoo, so we only check
-there, given that we don't support normal dbm installations, and we
-patch database.c as well. Not portable beyond Gentoo, but will work
-for us.
-
-The checks for Berkeley DB only took into account up to version
-3. Added checks to deal with several versions 4 as well.
-
---- xemacs-21.4.19/configure.in	2005-12-24 01:48:14.000000000 +0100
-+++ xemacs-21.4.19-db/configure.in	2006-06-11 22:43:52.000000000 +0200
-@@ -4502,7 +4502,7 @@
- 
- dnl Check for ndbm.h, required for either kind of DBM support.
- if test "$with_database_gdbm $with_database_dbm" != "no no"; then
--  AC_CHECK_HEADER(ndbm.h, [:], [
-+  AC_CHECK_HEADER(gdbm/ndbm.h, [:], [
-     test "$with_database_gdbm" = "yes" -o \
-          "$with_database_dbm"  = "yes" && \
-       XE_DIE("Required DBM support cannot be provided.")
-@@ -4513,10 +4513,13 @@
- if test "$with_database_gdbm" != "no"; then
-   AC_CHECK_LIB(gdbm, dbm_open, [
-    with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm], [
-+	AC_CHECK_LIB(gdbm_compat, dbm_open, [
-+	with_database_gdbm=yes with_database_dbm=no libdbm="-lgdbm_compat -lgdbm"], [
-    if test "$with_database_gdbm" = "yes"; then
-      XE_DIE("Required GNU DBM support cannot be provided.")
-    fi
--   with_database_gdbm=no])
-+   with_database_gdbm=no], -lgdbm)
-+  ])
- fi
- 
- dnl Check for DBM support in libc and libdbm.
-@@ -4614,11 +4617,30 @@
- #if DB_VERSION_MAJOR > 2
- yes
- #endif
--], [AC_MSG_RESULT(3); dbfunc=db_create],[
--    AC_MSG_RESULT(2); dbfunc=db_open])],[
--    AC_MSG_RESULT(1); dbfunc=dbopen])
-+], [AC_EGREP_CPP(yes,
-+[#include <$db_h_file>
-+#if DB_VERSION_MAJOR > 3
-+yes
-+#endif
-+], [AC_MSG_RESULT(4); dbfunc=db_create; dbver=4],[
-+    AC_MSG_RESULT(3); dbfunc=db_create; dbver=3])],[
-+    AC_MSG_RESULT(2); dbfunc=db_open; dbver=2])],[
-+    AC_MSG_RESULT(1); dbfunc=dbopen; dbver=1])
-     AC_CHECK_FUNC($dbfunc,     with_database_berkdb=yes need_libdb=no, [
--    AC_CHECK_LIB(db, $dbfunc,  with_database_berkdb=yes need_libdb=yes)])
-+    AC_CHECK_LIB(db, db_create_4002,  with_database_berkdb=yes need_libdb=yes)])
-+  fi
-+
-+  dnl Berk db 4.1 decorates public functions with version information
-+  if test "$have_database_berkdb" != "yes" -a "$dbver" = "4"; then
-+    rm -f $tempcname
-+    echo "#include <$db_h_file>" > $tempcname
-+    echo "configure___ dbfunc=db_create" >> $tempcname
-+    define(TAB, [       ])dnl
-+    eval `$CPP -Isrc $tempcname \
-+        | sed -n -e "s/[[ TAB]]*=[[ TAB\"]]*/='/" -e "s/[[ TAB\"]]*\$/'/" -e "s/^configure___//p"`
-+    rm -f $tempcname
-+    AC_MSG_WARN("db_create is really $dbfunc")
-+    AC_CHECK_LIB(db, $dbfunc,  have_database_berkdb=yes need_libdb=yes)
-   fi
- 
-   if test "$with_database_berkdb" = "yes"; then
---- xemacs-21.4.19/src/database.c	2005-12-24 01:52:35.000000000 +0100
-+++ xemacs-21.4.19-db/src/database.c	2006-06-13 21:00:01.000000000 +0200
-@@ -82,7 +82,7 @@
- #endif /* HAVE_BERKELEY_DB */
- 
- #ifdef HAVE_DBM
--#include <ndbm.h>
-+#include <gdbm/ndbm.h>
- Lisp_Object Qdbm;
- #endif /* HAVE_DBM */
- 
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch b/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch
deleted file mode 100644
index 494fc51c3b88..000000000000
--- a/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -r e2da872593c0 configure.in
---- a/configure.in	Tue Mar 24 22:15:53 2015 -0400
-+++ b/configure.in	Sun Mar 13 13:48:24 2016 +0100
-@@ -1939,6 +1939,8 @@
-     CFLAGS="-g -O3 -Wall -Wno-switch -Winline -Wmissing-prototypes"
-     dnl Yuck, bad compares have been worth at least 3 crashes!
-     CFLAGS="$CFLAGS -Wsign-compare"
-+    dnl Use old gnu inline semantics until we fix the source
-+    CFLAGS="$CFLAGS -fgnu89-inline"
-     dnl XEmacs is known not to be strict-aliasing-safe.
-     case "`gcc -v --help 2>&1`" in
-       *-fstrict-aliasing* ) CFLAGS="$CFLAGS -fno-strict-aliasing" ;;
-diff -r e2da872593c0 src/lisp.h
---- a/src/lisp.h	Tue Mar 24 22:15:53 2015 -0400
-+++ b/src/lisp.h	Sun Mar 13 13:48:24 2016 +0100
-@@ -193,6 +193,8 @@
- # endif /* GNUC */
- #endif
- 
-+#ifndef _GCC_MAX_ALIGN_T
-+#define _GCC_MAX_ALIGN_T
- /* No type has a greater alignment requirement than max_align_t.
-    (except perhaps for types we don't use, like long double) */
- typedef union
-@@ -202,6 +204,7 @@
-   struct { void (*f)(void); } f;
-   struct { double d; } d;
- } max_align_t;
-+#endif
- 
- #ifndef ALIGNOF
- # if defined (__GNUC__) && (__GNUC__ >= 2)
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch b/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch
deleted file mode 100644
index 62d26ccc053c..000000000000
--- a/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Don't define deprecated glibc symbol
-
-Avoid defining the deprecated symbols _BSD_SOURCE and _SVID_SOURCE
-that xmkmf thinks are needed to compile X programs.
-
-diff -r 09d56098ea2c -r 32a8151f8af7 configure.in
---- a/configure.in	Sat Feb 11 01:24:06 2017 +0100
-+++ b/configure.in	Sat Feb 11 01:59:40 2017 +0100
-@@ -2868,10 +2868,15 @@
- 	  *     ) val=1 ;;
- 	esac
- dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above.
--	if grep "^#define $sym " confdefs.h >/dev/null; then :; else
--	  if test "$val" = "1"
--	    then AC_DEFINE_UNQUOTED($sym)
--	    else AC_DEFINE_UNQUOTED($sym,$val)
-+dnl Also, glibc doesn't like two of the traditional POSIX macros that xmkmf
-+dnl likes us to define; ignore them if appropriate.
-+	if grep "^#define $sym " confdefs.h >/dev/null          || \
-+           test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
-+           test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
-+        then :; else
-+ 	  if test "$val" = "1"
-+ 	    then AC_DEFINE_UNQUOTED($sym)
-+ 	    else AC_DEFINE_UNQUOTED($sym,$val)
- 	  fi
- 	fi  ;;
-       esac
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch b/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch
deleted file mode 100644
index 19b8984db2d0..000000000000
--- a/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r e2da872593c0 configure.in
---- a/configure.in	Tue Mar 24 22:15:53 2015 -0400
-+++ b/configure.in	Mon Apr 17 10:13:05 2017 +0200
-@@ -4449,7 +4449,7 @@
-     AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h)
-     AC_CHECK_HEADER(ncurses/term.h, term_h_file=ncurses/term.h)
-     XE_ADD_OBJS(terminfo.o)
--    XE_PREPEND(-lncurses, LIBS)
-+    XE_PREPEND($(pkg-config ncurses --libs), LIBS)
- 
-     if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
-       dnl Try again, and check for the bogus ncurses/ include bug.
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-strsignal.patch b/app-editors/xemacs/files/xemacs-21.4.24-strsignal.patch
deleted file mode 100644
index a44b925ccdd5..000000000000
--- a/app-editors/xemacs/files/xemacs-21.4.24-strsignal.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -r ab1558b934ff configure
---- a/configure	Sun Aug 30 22:05:05 2020 +0200
-+++ b/configure	Sun Aug 30 22:38:03 2020 +0200
-@@ -11333,7 +11333,7 @@
- fi
- 
- 
--for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask
-+for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror strsignal tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:11340: checking for $ac_func" >&5
-diff -r ab1558b934ff configure.in
---- a/configure.in	Sun Aug 30 22:05:05 2020 +0200
-+++ b/configure.in	Sun Aug 30 22:38:03 2020 +0200
-@@ -4012,7 +4012,7 @@
- dnl Check for POSIX functions.
- dnl ----------------------------------------------------------------
- 
--AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask)
-+AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror strsignal tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask)
- 
- dnl getaddrinfo() is borked under hpux11
- if test "$ac_cv_func_getaddrinfo" != "no" ; then
-diff -r ab1558b934ff src/config.h.in
---- a/src/config.h.in	Sun Aug 30 22:05:05 2020 +0200
-+++ b/src/config.h.in	Sun Aug 30 22:38:03 2020 +0200
-@@ -346,6 +346,7 @@
- #undef HAVE_SNPRINTF
- #undef HAVE_STPCPY
- #undef HAVE_STRERROR
-+#undef HAVE_STRSIGNAL
- #undef HAVE_TZSET
- #undef HAVE_ULIMIT
- #undef HAVE_USLEEP
-diff -r ab1558b934ff src/process.c
---- a/src/process.c	Sun Aug 30 22:05:05 2020 +0200
-+++ b/src/process.c	Sun Aug 30 22:38:03 2020 +0200
-@@ -1311,7 +1311,11 @@
- signal_name (int signum)
- {
-   if (signum >= 0 && signum < NSIG)
-+#ifdef HAVE_STRSIGNAL
-+    return strsignal (signum);
-+#else
-     return (const char *) sys_siglist[signum];
-+#endif
- 
-   return (const char *) GETTEXT ("unknown signal");
- }
-diff -r ab1558b934ff src/s/linux.h
---- a/src/s/linux.h	Sun Aug 30 22:05:05 2020 +0200
-+++ b/src/s/linux.h	Sun Aug 30 22:38:03 2020 +0200
-@@ -107,7 +107,6 @@
- 
- #define NO_SIOCTL_H           /* don't have sioctl.h */
- 
--#define HAVE_SYS_SIGLIST
- #define HAVE_WAIT_HEADER
- 
- #define POSIX                 /* affects getpagesize.h and systty.h */
-diff -r ab1558b934ff src/sysdep.c
---- a/src/sysdep.c	Sun Aug 30 22:05:05 2020 +0200
-+++ b/src/sysdep.c	Sun Aug 30 22:38:03 2020 +0200
-@@ -3526,7 +3526,7 @@
- /*               Strings corresponding to defined signals               */
- /************************************************************************/
- 
--#if !defined (SYS_SIGLIST_DECLARED) && !defined (HAVE_SYS_SIGLIST)
-+#if !defined(HAVE_STRSIGNAL) && !defined (SYS_SIGLIST_DECLARED) && !defined (HAVE_SYS_SIGLIST)
- 
- #if defined(WIN32_NATIVE) || defined(CYGWIN)
- const char *sys_siglist[] =
-diff -r ab1558b934ff src/syssignal.h
---- a/src/syssignal.h	Sun Aug 30 22:05:05 2020 +0200
-+++ b/src/syssignal.h	Sun Aug 30 22:38:03 2020 +0200
-@@ -223,10 +223,8 @@
- # define NSIG (SIGUSR2+1) /* guess how many elements are in sys_siglist... */
- #endif
- 
--/* SYS_SIGLIST_DECLARED is determined by configure.  On Linux, it seems,
--   configure incorrectly fails to find it, so s/linux.h defines
--   HAVE_SYS_SIGLIST. */
--#if !defined (SYS_SIGLIST_DECLARED) && !defined (HAVE_SYS_SIGLIST)
-+/* Systems that have sys_siglist but do not declare it. */
-+#if !defined(HAVE_STRSIGNAL) && !defined (SYS_SIGLIST_DECLARED) && !defined (HAVE_SYS_SIGLIST)
- extern const char *sys_siglist[];
- #endif
- 
diff --git a/app-editors/xemacs/metadata.xml b/app-editors/xemacs/metadata.xml
index b96ffa800d92..07a844ae677c 100644
--- a/app-editors/xemacs/metadata.xml
+++ b/app-editors/xemacs/metadata.xml
@@ -8,9 +8,6 @@
     <flag name="athena">Chooses the MIT Athena widget set</flag>
     <flag name="dnd">Enables support for the <pkg>x11-libs/dnd</pkg>
       drag-n-drop library</flag>
-    <flag name="eolconv">Support detection and translation of newline
-      conventions</flag>
-    <flag name="mule">Add multi-language support to XEmacs</flag>
     <flag name="pop">Support POP for mail retrieval</flag>
     <flag name="xim">Enable X11 XiM input method</flag>
     <flag name="bignum">Support for OpenSSL bignum implementation</flag>
diff --git a/app-editors/xemacs/xemacs-21.4.24-r10.ebuild b/app-editors/xemacs/xemacs-21.4.24-r10.ebuild
deleted file mode 100644
index a6933b3ba2b4..000000000000
--- a/app-editors/xemacs/xemacs-21.4.24-r10.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
-EAPI=7
-
-WANT_AUTOCONF="2.1"
-inherit autotools flag-o-matic toolchain-funcs xdg-utils desktop
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="https://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
-	neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif xim athena neXt Xaw3d gdbm berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb] )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6:0=
-	>=media-libs/audiofile-0.2.3
-	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( net-nds/openldap:= )
-	nas? ( media-libs/nas )
-	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	dnd? ( x11-libs/dnd )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	athena? ( x11-libs/libXaw )
-	Xaw3d? ( x11-libs/libXaw3d[unicode(+)] )
-	neXt? ( x11-libs/neXtaw )
-	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff:= )
-	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	>=sys-libs/ncurses-5.2:=
-	>=app-eselect/eselect-emacs-1.15"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/texinfo-5"
-
-PDEPEND="app-xemacs/xemacs-base
-	mule? ( app-xemacs/mule-base )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	use neXt && unpack NeXT_XEmacs.tar.gz
-}
-
-src_prepare() {
-	# see bug 58350, 102540 and 143580
-	eapply "${FILESDIR}"/xemacs-21.4.19-db.patch
-	# see bug 576512
-	eapply "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
-	eapply "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
-	# see bug 615544
-	eapply "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
-	eapply "${FILESDIR}"/xemacs-21.4.24-strsignal.patch
-
-	# Convert to utf-8
-	iconv -f iso-8859-1 -t utf-8 -o man/xemacs-faq.texi.tmp man/xemacs-faq.texi \
-	      && mv -f man/xemacs-faq.texi.tmp man/xemacs-faq.texi || die
-	iconv -f iso-8859-1 -t utf-8 -o man/lispref/ldap.texi.tmp man/lispref/ldap.texi \
-	      && mv -f man/lispref/ldap.texi.tmp man/lispref/ldap.texi || die
-
-	eapply_user
-
-	# Some binaries and man pages are installed under suffixed names
-	# to avoid collions with their GNU Emacs counterparts (see below).
-	# Fix internal filename references.
-	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
-	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
-	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
-
-	# Run autoconf. XEmacs tries to be smart by providing a stub
-	# configure.ac file for autoconf 2.59 but this throws our
-	# autotools eclass so it must be removed first.
-	rm "${S}"/configure.ac || die
-	eautoconf
-
-	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-}
-
-src_configure() {
-	local myconf=""
-
-	# Can't build with pie. See bug #75028
-	test-flags -no-pie >/dev/null && append-flags -no-pie
-	filter-flags -pie
-
-	if use X; then
-
-		myconf="${myconf} --with-widgets=athena"
-		myconf="${myconf} --with-dialogs=athena"
-		myconf="${myconf} --with-menubars=lucid"
-		myconf="${myconf} --with-scrollbars=lucid"
-		if use motif ; then
-			myconf="--with-widgets=motif"
-			myconf="${myconf} --with-dialogs=motif"
-			myconf="${myconf} --with-scrollbars=motif"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-		if use athena ; then
-			myconf="--with-scrollbars=athena"
-		fi
-
-		if use Xaw3d; then
-			myconf="${myconf} --with-athena=3d"
-		elif use neXt; then
-			myconf="${myconf} --with-athena=next"
-		else
-			myconf="${myconf} --with-athena=xaw"
-		fi
-
-		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
-		myconf="${myconf} $(use_with tiff ) $(use_with png )"
-		myconf="${myconf} $(use_with jpeg ) $(use_with xface )"
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-gif=no"
-	fi
-
-	if use mule ; then
-		myconf="${myconf} --with-mule"
-
-		if use xim ; then
-			if use motif ; then
-				myconf="${myconf} --with-xim=motif"
-			else
-				myconf="${myconf} --with-xim=xlib"
-			fi
-		else
-			myconf="${myconf} --with-xim=no"
-		fi
-
-		myconf="${myconf} --without-wnn"
-	fi
-
-	# This determines the type of sounds we are playing
-	local soundconf="native"
-
-	# This determines how these sounds should be played
-	use nas	&& soundconf="${soundconf},nas"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	if use gdbm || use berkdb ; then
-		use gdbm && mydb="gdbm"
-
-		use berkdb && mydb="${mydb},berkdb"
-
-		myconf="${myconf} --with-database=${mydb}"
-	else
-		myconf="${myconf} --without-database"
-	fi
-
-	einfo "${myconf}"
-
-	# see bug 576512
-	append-cflags -fgnu89-inline
-
-	# Don't use econf because it uses options which this configure
-	# script does not understand (like --host).
-	./configure ${myconf} ${EXTRA_ECONF} \
-		$(use_with gif ) \
-		$(use_with gpm ) \
-		$(use_with postgres postgresql ) \
-		$(use_with ldap ) \
-		$(use_with eolconv file-coding ) \
-		$(use_with pop ) \
-		--compiler="$(tc-getCC)" \
-		--prefix=/usr \
-		--without-canna \
-		--with-ncurses \
-		--with-system-malloc \
-		--with-msw=no \
-		--mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		|| die "The configure script failed to run properly"
-}
-
-src_install() {
-	emake prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man/man1 \
-		infodir="${D}"/usr/share/info \
-		install gzip-el || die "emake install failed"
-
-	# Rename some applications installed in bin so that it is clear
-	# which application installed them and so that conflicting
-	# packages (emacs) can't clobber the actual applications.
-	# Addresses bug #62991.
-	for i in b2m ctags etags rcs-checkin gnuclient gnudoit gnuattach; do
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
-	done
-
-	# rename man pages
-	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
-		mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
-	done
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-
-	if use mule;
-	then
-		dodir /usr/lib/xemacs/mule-packages
-	fi
-
-	# remove extraneous info files
-	cd "${D}"/usr/share/info
-	rm -f dir info.info texinfo* termcap* standards*
-
-	cd "${S}"
-	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
-	dodoc "${FILESDIR}"/README.Gentoo
-
-	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-	domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}
diff --git a/app-editors/xemacs/xemacs-21.4.24-r9.ebuild b/app-editors/xemacs/xemacs-21.4.24-r9.ebuild
deleted file mode 100644
index 578aa12874b6..000000000000
--- a/app-editors/xemacs/xemacs-21.4.24-r9.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
-EAPI=7
-
-WANT_AUTOCONF="2.1"
-inherit autotools flag-o-matic toolchain-funcs xdg-utils desktop
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="https://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
-	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif xim athena neXt Xaw3d gdbm berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb] )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6:0=
-	>=media-libs/audiofile-0.2.3
-	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( net-nds/openldap:= )
-	nas? ( media-libs/nas )
-	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	dnd? ( x11-libs/dnd )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	athena? ( x11-libs/libXaw )
-	Xaw3d? ( x11-libs/libXaw3d )
-	neXt? ( x11-libs/neXtaw )
-	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff:= )
-	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	>=sys-libs/ncurses-5.2:=
-	>=app-eselect/eselect-emacs-1.15"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/texinfo-5"
-
-PDEPEND="app-xemacs/xemacs-base
-	mule? ( app-xemacs/mule-base )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	use neXt && unpack NeXT_XEmacs.tar.gz
-}
-
-src_prepare() {
-	# see bug 58350, 102540 and 143580
-	eapply "${FILESDIR}"/xemacs-21.4.19-db.patch
-	# see bug 576512
-	eapply "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
-	eapply "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
-	# see bug 615544
-	eapply "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
-	eapply "${FILESDIR}"/xemacs-21.4.24-strsignal.patch
-
-	# Convert to utf-8
-	iconv -f iso-8859-1 -t utf-8 -o man/xemacs-faq.texi.tmp man/xemacs-faq.texi \
-	      && mv -f man/xemacs-faq.texi.tmp man/xemacs-faq.texi || die
-	iconv -f iso-8859-1 -t utf-8 -o man/lispref/ldap.texi.tmp man/lispref/ldap.texi \
-	      && mv -f man/lispref/ldap.texi.tmp man/lispref/ldap.texi || die
-
-	eapply_user
-
-	# Some binaries and man pages are installed under suffixed names
-	# to avoid collions with their GNU Emacs counterparts (see below).
-	# Fix internal filename references.
-	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
-	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
-	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
-
-	# Run autoconf. XEmacs tries to be smart by providing a stub
-	# configure.ac file for autoconf 2.59 but this throws our
-	# autotools eclass so it must be removed first.
-	rm "${S}"/configure.ac || die
-	eautoconf
-
-	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-}
-
-src_configure() {
-	local myconf=""
-
-	# Can't build with pie. See bug #75028
-	test-flags -no-pie >/dev/null && append-flags -no-pie
-	filter-flags -pie
-
-	if use X; then
-
-		myconf="${myconf} --with-widgets=athena"
-		myconf="${myconf} --with-dialogs=athena"
-		myconf="${myconf} --with-menubars=lucid"
-		myconf="${myconf} --with-scrollbars=lucid"
-		if use motif ; then
-			myconf="--with-widgets=motif"
-			myconf="${myconf} --with-dialogs=motif"
-			myconf="${myconf} --with-scrollbars=motif"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-		if use athena ; then
-			myconf="--with-scrollbars=athena"
-		fi
-
-		if use Xaw3d; then
-			myconf="${myconf} --with-athena=3d"
-		elif use neXt; then
-			myconf="${myconf} --with-athena=next"
-		else
-			myconf="${myconf} --with-athena=xaw"
-		fi
-
-		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
-		myconf="${myconf} $(use_with tiff ) $(use_with png )"
-		myconf="${myconf} $(use_with jpeg ) $(use_with xface )"
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-gif=no"
-	fi
-
-	if use mule ; then
-		myconf="${myconf} --with-mule"
-
-		if use xim ; then
-			if use motif ; then
-				myconf="${myconf} --with-xim=motif"
-			else
-				myconf="${myconf} --with-xim=xlib"
-			fi
-		else
-			myconf="${myconf} --with-xim=no"
-		fi
-
-		myconf="${myconf} --without-wnn"
-	fi
-
-	# This determines the type of sounds we are playing
-	local soundconf="native"
-
-	# This determines how these sounds should be played
-	use nas	&& soundconf="${soundconf},nas"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	if use gdbm || use berkdb ; then
-		use gdbm && mydb="gdbm"
-
-		use berkdb && mydb="${mydb},berkdb"
-
-		myconf="${myconf} --with-database=${mydb}"
-	else
-		myconf="${myconf} --without-database"
-	fi
-
-	einfo "${myconf}"
-
-	# see bug 576512
-	append-cflags -fgnu89-inline
-
-	# Don't use econf because it uses options which this configure
-	# script does not understand (like --host).
-	./configure ${myconf} ${EXTRA_ECONF} \
-		$(use_with gif ) \
-		$(use_with gpm ) \
-		$(use_with postgres postgresql ) \
-		$(use_with ldap ) \
-		$(use_with eolconv file-coding ) \
-		$(use_with pop ) \
-		--compiler="$(tc-getCC)" \
-		--prefix=/usr \
-		--without-canna \
-		--with-ncurses \
-		--with-system-malloc \
-		--with-msw=no \
-		--mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		|| die "The configure script failed to run properly"
-}
-
-src_install() {
-	emake prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man/man1 \
-		infodir="${D}"/usr/share/info \
-		install gzip-el || die "emake install failed"
-
-	# Rename some applications installed in bin so that it is clear
-	# which application installed them and so that conflicting
-	# packages (emacs) can't clobber the actual applications.
-	# Addresses bug #62991.
-	for i in b2m ctags etags rcs-checkin gnuclient gnudoit gnuattach; do
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
-	done
-
-	# rename man pages
-	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
-		mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
-	done
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-
-	if use mule;
-	then
-		dodir /usr/lib/xemacs/mule-packages
-	fi
-
-	# remove extraneous info files
-	cd "${D}"/usr/share/info
-	rm -f dir info.info texinfo* termcap* standards*
-
-	cd "${S}"
-	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
-	dodoc "${FILESDIR}"/README.Gentoo
-
-	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-	domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}
diff --git a/app-editors/xemacs/xemacs-21.5.35-r4.ebuild b/app-editors/xemacs/xemacs-21.5.35-r4.ebuild
index a3893f00a878..4b40276b8055 100644
--- a/app-editors/xemacs/xemacs-21.5.35-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.35-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 1-2)/${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png motif xft xim athena neXt Xaw3d gdbm berkdb +bignum"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
diff --git a/app-editors/xemacs/xemacs-21.5.35.ebuild b/app-editors/xemacs/xemacs-21.5.35.ebuild
deleted file mode 100644
index aff1f6acbb7c..000000000000
--- a/app-editors/xemacs/xemacs-21.5.35.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
-EAPI=8
-
-inherit flag-o-matic xdg-utils desktop autotools
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="https://www.xemacs.org/"
-
-SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 1-2)/${P}.tar.gz
-	neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png motif xft xim athena neXt Xaw3d gdbm berkdb +bignum"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-RDEPEND="
-	berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb(+)] )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6:0=
-	>=media-libs/audiofile-0.2.3
-	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( net-nds/openldap:= )
-	alsa? ( media-libs/alsa-lib )
-	nas? ( media-libs/nas )
-	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	dnd? ( x11-libs/dnd )
-	motif? ( >=x11-libs/motif-2.3:0[xft=] )
-	athena? ( x11-libs/libXaw )
-	Xaw3d? ( x11-libs/libXaw3d[unicode(+)] )
-	xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
-	neXt? ( x11-libs/neXtaw )
-	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff:= )
-	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	>=sys-libs/ncurses-5.2:=
-	>=app-eselect/eselect-emacs-1.15
-	bignum? ( dev-libs/openssl )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PDEPEND="app-xemacs/xemacs-base
-	app-xemacs/mule-base"
-
-src_unpack() {
-	default_src_unpack
-}
-
-src_prepare() {
-	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-	find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
-	eapply "${FILESDIR}/${P}-configure.patch"
-	eapply "${FILESDIR}/${P}-mule-tests.patch"
-
-	eapply_user
-
-	eautoconf
-
-	# Some binaries and man pages are installed under suffixed names
-	# to avoid collions with their GNU Emacs counterparts (see below).
-	# Fix internal filename references.
-	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
-	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
-	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# bug #639642
-	test-flags -no-pie >/dev/null && append-flags -no-pie
-	filter-flags -pie
-
-	if use X; then
-
-		myconf="${myconf} --with-widgets=athena"
-		myconf="${myconf} --with-dialogs=athena"
-		myconf="${myconf} --with-menubars=lucid"
-		myconf="${myconf} --with-scrollbars=lucid"
-		if use motif ; then
-			myconf="--with-widgets=motif"
-			myconf="${myconf} --with-dialogs=motif"
-			myconf="${myconf} --with-scrollbars=motif"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-		if use athena or use Xaw3d ; then
-			myconf="--with-scrollbars=athena"
-		fi
-
-		if use Xaw3d; then
-			myconf="${myconf} --with-athena=3d"
-		elif use neXt; then
-			myconf="${myconf} --with-athena=next"
-		else
-			myconf="${myconf} --with-athena=xaw"
-		fi
-
-		use dnd && myconf="${myconf} --with-dragndrop"
-
-		myconf="${myconf} $(use_with tiff )"
-		myconf="${myconf} $(use_with png )"
-		myconf="${myconf} $(use_with jpeg )"
-		myconf="${myconf} $(use_with xface )"
-
-		use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
-			myconf="${myconf} --with-xft=no"
-
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-xft=no
-			--with-gif=no"
-	fi
-
-	if use xim ; then
-		if use motif ; then
-			myconf="${myconf} --with-xim=motif"
-		else
-		myconf="${myconf} --with-xim=xlib"
-		fi
-	else
-	  myconf="${myconf} --with-xim=no"
-	fi
-
-	myconf="${myconf} --without-wnn"
-
-	# This determines the type of sounds we are playing
-	local soundconf="native"
-
-	# This determines how these sounds should be played
-	use nas	&& soundconf="${soundconf},nas"
-	use alsa && soundconf="${soundconf},alsa"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	if use gdbm || use berkdb ; then
-		use gdbm   && mydb="gdbm"
-		use berkdb && mydb="${mydb},berkdb"
-
-		myconf="${myconf} --with-database=${mydb}"
-	else
-		myconf="${myconf} --without-database"
-	fi
-
-	use debug && myconf="${myconf} --with-debug" ||
-		myconf="${myconf} --with-optimization --with-cflags-debugging="
-
-	use bignum && myconf="${myconf} --with-bignum=openssl" ||
-		myconf="${myconf} --with-bignum=no"
-
-	econf ${myconf} \
-		$(use_with gif ) \
-		$(use_with gpm ) \
-		$(use_with postgres postgresql ) \
-		$(use_with ldap ) \
-		$(use_with pop ) \
-		--prefix=/usr \
-		--with-mule \
-		--with-unicode-internal \
-		--without-canna \
-		--with-ncurses \
-		--with-msw=no \
-		--with-mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		--enable-option-checking=no \
-		--with-last-packages=/usr/lib/xemacs
-}
-
-src_compile() {
-	emake EMACSLOADPATH="${S}"/lisp
-}
-
-src_install() {
-	emake prefix="${ED}"/usr \
-		mandir="${ED}"/usr/share/man/man1 \
-		infodir="${ED}"/usr/share/info \
-		libdir="${ED}"/usr/$(get_libdir) \
-		datadir="${ED}"/usr/share \
-		install
-
-	# Rename some applications installed in bin so that it is clear
-	# which application installed them and so that conflicting
-	# packages (emacs) can't clobber the actual applications.
-	# Addresses bug #62991.
-	for i in b2m ctags etags gnuclient gnudoit gnuattach; do
-		mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
-	done
-
-	# rename man pages
-	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
-		mv "${ED}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
-	done
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-	dodir /usr/lib/xemacs/mule-packages
-
-	# remove extraneous info files
-	cd "${ED}"/usr/share/info
-	rm -f dir info.info texinfo* termcap* standards*
-
-	cd "${S}"
-	dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
-
-	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-	domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-
-	einfo "If you are upgrading from XEmacs 21.4 you should note the following"
-	einfo "incompatibilities:"
-	einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
-	einfo "- The X resource class has changed from Emacs to XEmacs,"
-	einfo "  settings in your .Xdefaults file should be updated accordingly."
-
-	if use xft;
-	then
-	  einfo "You have enabled Xft font support. Xft requires font names to be provided"
-	  einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
-	fi
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}