Merge updates from master

35 files changed, 353 insertions, 64 deletions

diff --git a/app-xemacs/bbdb/Manifest b/app-xemacs/bbdb/Manifest
index d61b34a01e3c..4ee52ed5e4f1 100644
--- a/app-xemacs/bbdb/Manifest
+++ b/app-xemacs/bbdb/Manifest
@@ -1,2 +1,3 @@
 DIST bbdb-1.32-pkg.tar.gz 380002 BLAKE2B d4ba20cdcbb63cbe3aae65cf7c7dc69ef1dea7c888a841a697a77ca63bf6af58caab38efcda5993e6b029e8536cbe47312670498c0f0496dc2422138d8c8d6eb SHA512 238ab158f3a3606bfb753aa02aa6556170df61bfa523cada8570feb97d43cdee481264c2faef30eb2a9c6e345dc1e3f5fbdbe1e44272a2a57115733cc4e2e28c
 DIST bbdb-1.34-pkg.tar.gz 379894 BLAKE2B 5d6eba9c0594a4edc61d626245a0827f2886cf588de9c7fca9748af88cd3ac9740c9552f817f3f882129dbfa5daed9d5c7f00698aa14e63852daf2b81f5a1236 SHA512 2f92a7dca882083631bf0c4dcbad3e29cdd2920b48aebb19a6f83e21ccfefbd8534278579248d74f1f152613fa601af22f8d30236ed0fcae83c3e3eed0ccd4e3
+DIST bbdb-1.35-pkg.tar.gz 379950 BLAKE2B 6882b1ed92edc0f65ab272e8b4642bbdc0af72220b764ae0d5f13589f82d936b90040f7a8792794884fa73ea9cc49415d15a0883cd693610190fcfa06a2a8b6d SHA512 616c260cbd673fd71387a35eb266763a9558f7d0645d57d6aa0fe53b071e23166e7cb8e070876abf279af434583956c68544921f26e661348b7ee42905c872a1
diff --git a/app-xemacs/bbdb/bbdb-1.35.ebuild b/app-xemacs/bbdb/bbdb-1.35.ebuild
new file mode 100644
index 000000000000..d0b1737bc70b
--- /dev/null
+++ b/app-xemacs/bbdb/bbdb-1.35.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SLOT="0"
+DESCRIPTION="The Big Brother Data Base"
+XEMACS_PKG_CAT="standard"
+
+XEMACS_EXPERIMENTAL="true"
+
+RDEPEND="app-xemacs/edit-utils
+app-xemacs/gnus
+app-xemacs/mh-e
+app-xemacs/rmail
+app-xemacs/supercite
+app-xemacs/vm
+app-xemacs/tm
+app-xemacs/apel
+app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/w3
+app-xemacs/fsf-compat
+app-xemacs/xemacs-eterm
+app-xemacs/sh-script
+app-xemacs/net-utils
+app-xemacs/os-utils
+app-xemacs/ecrypto
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/debug/Manifest b/app-xemacs/debug/Manifest
index d13b1c8bf0d2..b5f093f09bd0 100644
--- a/app-xemacs/debug/Manifest
+++ b/app-xemacs/debug/Manifest
@@ -1,2 +1,3 @@
 DIST debug-1.18-pkg.tar.gz 107997 BLAKE2B 06873ef6d3886c8b5e9659084bb3a50db955e27ab5104d0f29271ebcfa2e5c298c1bee59f46dac0d4d10f8c0dd89c4b0c99e23bef2c449da697d22641d15bb6f SHA512 0bbd5496636bf6b850d44f953865ca7c23bb5f5040be0d8f6ec385a590ffaa6d5e325b24aac7f07b0b6c8ba0abf3fc3b7214f06a09d20eabc6bdf940237106a1
 DIST debug-1.20-pkg.tar.gz 107953 BLAKE2B 90af70a49f6d62224248a73907dec986ba9671a99782aa84cdf9024426f192fca74781ced10f539da9c3115586cc1fe6ecfbe91fef536228d259280c251fb6f3 SHA512 3985447986f5129a8789d1f9058a662cef5dbbe0e9d565f00973e79a6d32139581fef777f0e6d683ad5338896cc679bea3ffaf18d51976a5a2e27ba5484cd9c9
+DIST debug-1.21-pkg.tar.gz 108036 BLAKE2B a713832c1ccb5c17d61b8ddd054db638537bbb8f9d82e59a7caaa623c2fdb1cacd7d6c585fc2ccb25948ed73a578720eae9508fc81b710e0949654891f0919f0 SHA512 91d2597c85ee207b1c28c433aacd856bbdb136d69c1979a6d84a567dcb1b1ac2b09fcc788a784252d4319d52d45788f3570c59fb248c99983144114b31fd7f17
diff --git a/app-xemacs/debug/debug-1.21.ebuild b/app-xemacs/debug/debug-1.21.ebuild
new file mode 100644
index 000000000000..dee1b7628140
--- /dev/null
+++ b/app-xemacs/debug/debug-1.21.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SLOT="0"
+DESCRIPTION="GUD, gdb, dbx debugging support"
+XEMACS_PKG_CAT="standard"
+
+XEMACS_EXPERIMENTAL="true"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ecb/Manifest b/app-xemacs/ecb/Manifest
index 4cd96a1da909..5de15dd3f96b 100644
--- a/app-xemacs/ecb/Manifest
+++ b/app-xemacs/ecb/Manifest
@@ -1 +1,2 @@
 DIST ecb-1.25-pkg.tar.gz 872399 BLAKE2B 513181b108efa75b0d54ed2f568d586db6bd944a453ac2334a6b43ce83d8331b53dd34a68029869a1b7cc1e4f0218277c5966e8d49a4bd87a065719bc3dac58c SHA512 bfcb9e9d7fc55b9eb281f991ee57ef7059b7ecc6cf9b7a3c9693d40afbec36fc90789cfe2c3b007aab737db341154ac5cee73ea5056fc435ff6b0d86941ca8ba
+DIST ecb-1.26-pkg.tar.gz 872978 BLAKE2B 5b969a574ae209a0942782b82b9f62b0a01e333d485da616fc65fcce3e5256d06d40ae816d2596276675bbe213dec48822e67859ca6225699ca73d5fc2ee5a2e SHA512 b6baca962bc41abeb67b58eb266d12196a60bf1cb8d3359a0c30e65ed068a89a4e03b35893eef8caa8ccb524d81332aec8ffa3e56adc93aae5fedae0046df1ab
diff --git a/app-xemacs/ecb/ecb-1.26.ebuild b/app-xemacs/ecb/ecb-1.26.ebuild
new file mode 100644
index 000000000000..e7eba06657f0
--- /dev/null
+++ b/app-xemacs/ecb/ecb-1.26.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SLOT="0"
+DESCRIPTION="Emacs source code browser"
+XEMACS_PKG_CAT="standard"
+
+XEMACS_EXPERIMENTAL="true"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/semantic
+app-xemacs/cedet-common
+app-xemacs/eieio
+app-xemacs/fsf-compat
+app-xemacs/edit-utils
+app-xemacs/jde
+app-xemacs/mail-lib
+app-xemacs/eshell
+app-xemacs/ediff
+app-xemacs/xemacs-devel
+app-xemacs/speedbar
+app-xemacs/c-support
+app-xemacs/os-utils
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/edit-utils/Manifest b/app-xemacs/edit-utils/Manifest
index 8d175934372f..85826d205617 100644
--- a/app-xemacs/edit-utils/Manifest
+++ b/app-xemacs/edit-utils/Manifest
@@ -2,3 +2,4 @@ DIST edit-utils-2.39-pkg.tar.gz 962340 BLAKE2B 58fd356da23467c29976f39642d5aeac0
 DIST edit-utils-2.43-pkg.tar.gz 958798 BLAKE2B 276bc16f5e7dbf29fcc78ed05da80976262dd48b1a088e8070192dd414240389da08a737dc6fb8c8459552d9c5ae491e248196ba8e7bf30d49cd7c74d0070cae SHA512 e42e416002f0f0c580f241ce4753c3868494025b4bfd087f5654e3c238a4b5c99d56f01db6b0fa47d1142085d5b4183625248266d76381387030a89e47a9e68f
 DIST edit-utils-2.44-pkg.tar.gz 958866 BLAKE2B 826d508304a2b08b76b7f358e7629184ef5d441d5a728e4943158b6e5c37cd128a5353f4b760a1a460f7f6487b51f10882462859388618587a984b298dc92b98 SHA512 fcb37c24304756e83cd273497cedf671e62ddce78f7bc460052cd3725948e35d87ce9d3108938483cd2ab8fb2d663ffb1df033b47b6e4b7e73f3a71d6d0ae886
 DIST edit-utils-2.58-pkg.tar.gz 1159051 BLAKE2B 4eb07e163863724431e2b2692014db84b0aa3926f1a40e3ef958285f692107fc00c132b30e6b74bd68fd90e916d1602dbc98b29c13d3c1e59e2f4f58b387c3a9 SHA512 42fa35bf31a0941186ceeb89afd138604cfc9903ad2feeaa7623e8d2343660368cb57b8aaaa9104182eb314a3641b0a7a9f8ee8fa525cff88a6b071c96820b5d
+DIST edit-utils-2.59-pkg.tar.gz 1161415 BLAKE2B dbfa16c4b641cce2b8d122bd3e3e55a56347cdac8bf9fe03987f32d6ee607ba29e976b0ee3e2532f79194f3352650b8943a9c7867a6ec877f1af108d2919780f SHA512 d602bb7f238f8dc6f716be6e1a83c7d027c0b0e57b7538a28ed60103c0afb746f6aeffc3d88f7f8b70d130ed47f2842769d30cbc006f7b574bdf78f5aa298c98
diff --git a/app-xemacs/edit-utils/edit-utils-2.59.ebuild b/app-xemacs/edit-utils/edit-utils-2.59.ebuild
new file mode 100644
index 000000000000..09766526bb92
--- /dev/null
+++ b/app-xemacs/edit-utils/edit-utils-2.59.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SLOT="0"
+DESCRIPTION="Miscellaneous editor extensions, you probably need this"
+XEMACS_PKG_CAT="standard"
+
+XEMACS_EXPERIMENTAL="true"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/xemacs-devel
+app-xemacs/fsf-compat
+app-xemacs/dired
+app-xemacs/mail-lib
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/eudc/Manifest b/app-xemacs/eudc/Manifest
index 88b9fc2dcf15..14d72703db2b 100644
--- a/app-xemacs/eudc/Manifest
+++ b/app-xemacs/eudc/Manifest
@@ -1,3 +1,4 @@
 DIST eudc-1.39-pkg.tar.gz 79488 BLAKE2B 62789aeedcc6f1efa1cb453161cee6d3134295d84bff591c606b5a871cf355a2f377d557a99bb4e818916b5a611c18d838bc375e539fe0219f07d111125914df SHA512 c2442e701dad665fc0651aee3d9f0affd72006abcceb6da46eea67f0cdaf75a285f330615de54a5097ce39786537612b1dd053268fda01c0c18a00bb44c0fdda
 DIST eudc-1.40-pkg.tar.gz 79675 BLAKE2B e3bac796fb0b7d496d6a3066795c5e89372b22a4af693a91cc3dbe6b6e68b3b9327841a18fb42b03bc6435b8831785872dad95516f2b494bc003be4ac85745ef SHA512 ecd14560771652450e6f4acbf468efad9215681e6c85e8f5b3c999a222f8e90299f7e63c4951a122f5d04a08ec247c95bc5da910df47f66b5f88656acf2ad827
 DIST eudc-1.43-pkg.tar.gz 79973 BLAKE2B 86c53b32707c715f7501d5467c8c6e80a5829a5c36baf57ee6ec23766a5ab5882731eacf258489fa8c1120ab1e593e8fbfc66e33b1cb758ac3a9743f85536e2c SHA512 2a4b4c46c4e164fcac083dc75c8c2f2b8eafc0882d966c5e7fea8cc899a13f0c89f8d7b8562a79f972482dc569d48e8004a121a02a7a0b430a1da0800009635d
+DIST eudc-1.44-pkg.tar.gz 79883 BLAKE2B 81c5c4ddd8244a422a229c47826f8d39876aa474ce38236bbeed311ed4349ad04a7b8ed2a4f23585a65273fd8636adcb8b2f57031516c509b32ef22d928d6972 SHA512 5d0348454e52bb8140f9df3f09fad909ad3927ba849faf8dd3c4b31aa4d0774957bb16b1edc8827f2e1248dc2646b51a772a015da54520dbe65c42741e95f978
diff --git a/app-xemacs/eudc/eudc-1.44.ebuild b/app-xemacs/eudc/eudc-1.44.ebuild
new file mode 100644
index 000000000000..9e7d12b98b8b
--- /dev/null
+++ b/app-xemacs/eudc/eudc-1.44.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SLOT="0"
+DESCRIPTION="Emacs Unified Directory Client (LDAP, PH)"
+XEMACS_PKG_CAT="standard"
+
+XEMACS_EXPERIMENTAL="true"
+
+RDEPEND="app-xemacs/fsf-compat
+app-xemacs/xemacs-base
+app-xemacs/bbdb
+app-xemacs/mail-lib
+app-xemacs/gnus
+app-xemacs/rmail
+app-xemacs/tm
+app-xemacs/apel
+app-xemacs/xemacs-eterm
+app-xemacs/sh-script
+app-xemacs/net-utils
+app-xemacs/ecrypto
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/general-docs/Manifest b/app-xemacs/general-docs/Manifest
index 3321f173c796..3102833c97ca 100644
--- a/app-xemacs/general-docs/Manifest
+++ b/app-xemacs/general-docs/Manifest
@@ -1,3 +1,4 @@
 DIST general-docs-1.04-pkg.tar.gz 43374 BLAKE2B 535370c9dd135ac36603812db099624a167bc234203fb4b87f5a8b0e9a535d9e0bb9f6a9adad00fd62d4caf904f551ad61e50f3b16d9ccff9ab795b9e88d5a78 SHA512 a5df76303cffcac6e334decca3b11900e927e1ee70be73bbbd217e67ab0594c8f9829f7a0f582c254e616df491aee9a4e89c5a8ad6ef54ab3157abf367ecf647
 DIST general-docs-1.06-pkg.tar.gz 146305 BLAKE2B 5341120385d4c6c9d631f604e8ad71a8213c5033184a1b8ed14a14c066024a16bda397db9c656dc0d01483e42bfc9ff7754a47afce654014677187479dc4b828 SHA512 ff4847f881dd2f431e3a861015212798b23716087bd15ec117b7edb8f182bf5bddb31d370e9e69aa21847fd062164f05d2b4eba93326d6ffb784134b9152ddf8
 DIST general-docs-1.10-pkg.tar.gz 150069 BLAKE2B 12bc9cdb095685d954500373dcbf5b9000cbea49bda67dc81945ade24896a66ff3ec7b9d73a840706f48570b30da2dd10874bb15bc732a6cd11de5bfa56f64aa SHA512 f94798e437d5278c31e0cf18e22f22c88cc0c8eca1febf23f6c1e5dbe8856955c9334334c70832d6ce25db535704e56355536cb402c7c587a2bfee450c1485b9
+DIST general-docs-1.11-pkg.tar.gz 150119 BLAKE2B 3f7a9a32d6725de4ebf146df461b4a2d2b4d23ef49b91efbe201e964d6a82721d7a9eee8f960565b683255057dc6f3fdd49114a5032703a6d869a1ae0a50589f SHA512 9b11acf31eed4ff79f2c488f7036d4855fe7dd38bf510d00bb87b94b4fbe7587c0cef776b6d2b5a69d9c69745e534b997a2374d625c179c540c631d396361599
diff --git a/app-xemacs/general-docs/general-docs-1.11.ebuild b/app-xemacs/general-docs/general-docs-1.11.ebuild
new file mode 100644
index 000000000000..8ff538f85b47
--- /dev/null
+++ b/app-xemacs/general-docs/general-docs-1.11.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SLOT="0"
+DESCRIPTION="General XEmacs documentation"
+XEMACS_PKG_CAT="standard"
+
+XEMACS_EXPERIMENTAL="true"
+
+RDEPEND=""
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/gnus/Manifest b/app-xemacs/gnus/Manifest
index f7544508f0f9..b2cd5f148980 100644
--- a/app-xemacs/gnus/Manifest
+++ b/app-xemacs/gnus/Manifest
@@ -1,2 +1,3 @@
 DIST gnus-1.99-pkg.tar.gz 3636886 BLAKE2B 5345498a95388998c5cefe65c20991ae34386e582e291c45d51194e509670ec395b2d4ad164ca219e4892a7377030bd769b2e76e3f624b6751d60f2a5161bb5d SHA512 f938e77d2a93e29b7eb89db5b67d717a55ff36e827b7ba3ea1d114f59eda763e06933b645fe42d51a53c483f1e6fe74c669d595af36aa97b30cb97f5ca39db79
 DIST gnus-2.04-pkg.tar.gz 3628467 BLAKE2B 1b6f6ffd4693065a666353e87cf5ec4ae5f897470fe1423f43c5f3ec99c827f6c9074c70f4add6cbf7462491ee0a50b8faf0b9f6e1d4cab16d23e64e20d07975 SHA512 d7bce3b6ff62ca901e9dabf59a5bf2044ec569ab1dd84898f11cb966dc97bc35b1842b61c62ad024e200db4bd1df9f7d17fd642c251e42931603b0eb286356e2
+DIST gnus-2.05-pkg.tar.gz 3615284 BLAKE2B c06784a2e7a42df390f67b3e2e4dbba2a427b932bb4e2e864b2bf696adda8bff16d61892167219f5b391befd2ef667f36b67304b22d3e80cb63a6e7a47df485c SHA512 892b76ec6a57d8359d48cfda322ccd7679a018d2f7e6bf40b5d4c412dcac0fe3ea42e94decb05d5ada4765e323646c1eae6d30f1ade97ae30ded07355279a75a
diff --git a/app-xemacs/gnus/gnus-2.05.ebuild b/app-xemacs/gnus/gnus-2.05.ebuild
new file mode 100644
index 000000000000..a3336556ada5
--- /dev/null
+++ b/app-xemacs/gnus/gnus-2.05.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SLOT="0"
+DESCRIPTION="The Gnus Newsreader and Mailreader"
+XEMACS_PKG_CAT="standard"
+
+XEMACS_EXPERIMENTAL="true"
+
+RDEPEND="app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/xemacs-eterm
+app-xemacs/sh-script
+app-xemacs/net-utils
+app-xemacs/os-utils
+app-xemacs/dired
+app-xemacs/mh-e
+app-xemacs/sieve
+app-xemacs/ps-print
+app-xemacs/w3
+app-xemacs/pgg
+app-xemacs/mailcrypt
+app-xemacs/ecrypto
+app-xemacs/sasl
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/hm-html-menus/Manifest b/app-xemacs/hm-html-menus/Manifest
index 016cff6d0f4c..6426bb25e75f 100644
--- a/app-xemacs/hm-html-menus/Manifest
+++ b/app-xemacs/hm-html-menus/Manifest
@@ -1,3 +1,4 @@
 DIST hm--html-menus-1.23-pkg.tar.gz 179091 BLAKE2B caac889d17634f85084db88f4b6e2d97e0aa69224f52ae1e68daa536b7c339b8d1ab55e8b04f9ba26173b07e0bbfc8e6850285ff39311a30ff33d34b70671e9d SHA512 9197c8a5c8bdf10c69e974ef80c51cb3849fd86f6ac40cccc50bf044f09d47d0f8ab77c637789a3175024ed8f818cbe0ffcfb548028e7cdcc112f81e0b2c3e54
 DIST hm--html-menus-1.24-pkg.tar.gz 179443 BLAKE2B 91c8d753f7687b12f0d0b95393a21a3d05705725dcf9f1ed9eff44949763f3c6ec06367cb7df8d0ecf1aa11fbeb7409df316781dc51b0db37bd9a7ca53f77434 SHA512 2576ba402fbbb6a538e497c88fd3472c37f7047c75a41396a94e17984021fa3c2bcf2c0c7c2c81a4a1a711d1dde474ad7505b7c78d7300d46a64ce3fdceded7f
 DIST hm--html-menus-1.26-pkg.tar.gz 179409 BLAKE2B 483ec82621700591f47128f9268b0c839d9094cff1044ac00deea0c4d1629bd7a6d4a66d7bd4db7e3ef54a73e89574ec23a1568a204b05713ffedf083396dfe9 SHA512 943c3e5667ad1f2caf6d66ef046e744c90cd1a2b7f06dcbf1e935cda984b62365b34b74e66f014c79e1a1bc0b97b183f85846d59a9f3da1aa400cb3d39949ce1
+DIST hm--html-menus-1.27-pkg.tar.gz 179441 BLAKE2B 3ec0aff8ca7697576c82cc0efef441996d950784363b69662f048892c541c0e532f221c514f62fb94070cd851bc2929371485c555336d624c6662a61860d69af SHA512 91856d8687803c486935ae85f6252ae94f3c04af32285ee3993c1f796488c7234f5d24b834ced3e574b2b1046ad72f562fad61b69e4bb733ff75696bf9945218
diff --git a/app-xemacs/hm-html-menus/hm-html-menus-1.27.ebuild b/app-xemacs/hm-html-menus/hm-html-menus-1.27.ebuild
new file mode 100644
index 000000000000..2851c32ca986
--- /dev/null
+++ b/app-xemacs/hm-html-menus/hm-html-menus-1.27.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SLOT="0"
+DESCRIPTION="HTML editing"
+SRC_URI="http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/hm--html-menus-${PV}-pkg.tar.gz"
+XEMACS_PKG_CAT="standard"
+
+XEMACS_EXPERIMENTAL="true"
+
+RDEPEND="app-xemacs/dired
+app-xemacs/xemacs-base
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/mail-lib/Manifest b/app-xemacs/mail-lib/Manifest
index 33a9cfd536b9..f305d9851cd6 100644
--- a/app-xemacs/mail-lib/Manifest
+++ b/app-xemacs/mail-lib/Manifest
@@ -1,2 +1,3 @@
 DIST mail-lib-1.83-pkg.tar.gz 211862 BLAKE2B d84e39e45b8193bbb05a6d724d6b8672aae2daf506fef5ae99a71c4d122834d5259e82e83e05aa5480c1327c523c19f58f70e921eb44a6a90f84ad4c3aac36d1 SHA512 09149c96e3716c2df054654a6111cd45f0bc86c47ea5a8c699e8c7822052c68885a01392e07611ad7b5f721679aa1a9c5da0694d1a0aef6af3a51b4290c31162
 DIST mail-lib-1.84-pkg.tar.gz 245832 BLAKE2B 500f1f63a23b200a3636792886ffb61e7dcb22c03f6a2237f3f5789cb1798eac5abb52f24b54f31e0678af375f6d569c675ceca3385cc502e5bc1014e758ea70 SHA512 43c43715b1950fb665feceacf8422e26e8a7739ce2491bb9fb80bbda27c70f9452a3c146de3c54ed14f38e6b56176610fc301bdeff4cdbc8de83828f96d87269
+DIST mail-lib-1.85-pkg.tar.gz 245917 BLAKE2B 0c43375f1543bc269c36e894782bafce1b3cf27db7b2c7119df43aa7946005d101f9a3accac13627e274b89a22d0faef22d5367456d1fa29c212e3ff6f7225bd SHA512 a35afc2b74cc173f0811245ecc17eaae9883062f8a07ef22cedbbaf57b7b6ff49ef9c64abe0bd9043c20e4a6b96ad7a43875016341aad38e8ddef7ed15bb5c17
diff --git a/app-xemacs/mail-lib/mail-lib-1.85.ebuild b/app-xemacs/mail-lib/mail-lib-1.85.ebuild
new file mode 100644
index 000000000000..939d1b1f75be
--- /dev/null
+++ b/app-xemacs/mail-lib/mail-lib-1.85.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SLOT="0"
+DESCRIPTION="Fundamental lisp files for providing email support"
+XEMACS_PKG_CAT="standard"
+
+XEMACS_EXPERIMENTAL="true"
+
+RDEPEND="app-xemacs/xemacs-eterm
+app-xemacs/xemacs-base
+app-xemacs/fsf-compat
+app-xemacs/sh-script
+app-xemacs/ecrypto
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/mmm-mode/Manifest b/app-xemacs/mmm-mode/Manifest
index 6e80b40dbe3b..204fcffd15f2 100644
--- a/app-xemacs/mmm-mode/Manifest
+++ b/app-xemacs/mmm-mode/Manifest
@@ -1,3 +1,4 @@
 DIST mmm-mode-1.02-pkg.tar.gz 176072 BLAKE2B 36bcf9c5bd889b988f8190277b4d02546d286fd2695c557cd7f703a8888a21416cae054d5e1192c6fcdcffa193d4017dcbb5f16a4ef341071ee8658bd9292c33 SHA512 9fa9d9d461a063a08b7b7874fb8329b9a7e84b3268593554c9c46e9ee0d433cfcff4049056a4d85b829d14d6bc50f495951b708adff27c43b7961a8ee6b4c5c3
 DIST mmm-mode-1.05-pkg.tar.gz 205381 BLAKE2B 532d29da7ec761e1c79d0b5e77c7f95694f8c22541834164c3c90d2dc21c9c2218614cec43ee2344cdfbf5acb2eba328f6fd55631a011256f7311f449479ec3c SHA512 4b5b649a0d25a6eb8967549188c32d9b6a2e7fb3abc0375b633df7c7b133a06f2c5bfae31aef8704c17e9ced32d205def85c906472fda00ff0d5fdfc6b95b01b
 DIST mmm-mode-1.08-pkg.tar.gz 205604 BLAKE2B afb2b9c3f43fd3256ca2de0c32d3356a206a6f883303698cad719f8fd287366ce2fd91a275922fcd6d61e31cccba93b0f0c836a3ff468ca2e28aa2e18ad45e7f SHA512 d26b2d4762e363d34a0fdac19841640351532f3c28772eefa7dda3a24decfa8035f7e156fa3c8c49ede54291a4bda31ee707467757c704a76803718e7d463853
+DIST mmm-mode-1.09-pkg.tar.gz 205637 BLAKE2B 7f2a89b3ef432bb18c21575f021969be55b3ded4f5301cb166df4861de50617957bb40c0162556b8c05311596f61afa18f5e591c8099911687beeb016fd430c3 SHA512 b2d0b282eec99d623cf8dae21db71e7622689d4276c48691597d6df6fa5b2ae289ac214fbceac6e06bc083628911c797eec354e1f4181c5080cc3cfc8d98e0ec
diff --git a/app-xemacs/mmm-mode/mmm-mode-1.09.ebuild b/app-xemacs/mmm-mode/mmm-mode-1.09.ebuild
new file mode 100644
index 000000000000..adeba0b23c66
--- /dev/null
+++ b/app-xemacs/mmm-mode/mmm-mode-1.09.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SLOT="0"
+DESCRIPTION="Multiple major modes in a single buffer"
+XEMACS_PKG_CAT="standard"
+
+XEMACS_EXPERIMENTAL="true"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/fsf-compat
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/prog-modes/Manifest b/app-xemacs/prog-modes/Manifest
index 561d8ed4c760..53938564cebf 100644
--- a/app-xemacs/prog-modes/Manifest
+++ b/app-xemacs/prog-modes/Manifest
@@ -1,3 +1,4 @@
 DIST prog-modes-2.10-pkg.tar.gz 777434 BLAKE2B f3061eaf61767ed3f43b2602eb2f648cb2feee04e9c77d50ad8ab95f93643126d3644ddcdd24cc40e9fa6981552cd7e44bb9dca08da733443504c87a96ab5045 SHA512 63758b8bcda1c23c6da9658de4af2a96e18c0aa3a14a2e8aec481fa1f5275a2d44b07ada45f9081f992eaf04f304caa0429acc01130e9cb718f392b630e3db39
 DIST prog-modes-2.20-pkg.tar.gz 821805 BLAKE2B 73b69223d9c51338e4e9fa4cac4db80168df2991461e4813e7277ef79f02470fa9437cc442579bd35123bd67a3fd375a76656fd9d86a35940b409dcb0df19a27 SHA512 54123746a23e7ab480485042717474a28cf78425088416a3dfeaaf949207377f465057b18beb308ab11131f852ae715708ace53e5f57f3925b21dabeca106e07
 DIST prog-modes-2.33-pkg.tar.gz 874585 BLAKE2B c29525ecad896041368bed7fb647110428c968fbd77b13b0322a59eb1fe2e73e7000e6e119b2658ca82bd01b6014aece2b588f807f80ecd926e755e28f09ed5c SHA512 e2c7cba8916b41c1c3e932c4daddb57ce330f242c6ef189916608b0f682122f066f18706e05b8a1b68ad5b993bd873e47fee558c540b7f6a58bdffa68544e880
+DIST prog-modes-2.34-pkg.tar.gz 874544 BLAKE2B dd1c2dbbf9d775eb725894ec3f57a31496f7554923cd551e8ca3b49d360b943926f6f84ea9f6680e2d062ae60a08ef67ad5c2cd72e983215422d5732b73d6ca2 SHA512 8879850b19129617ed6dba24cd4194df28df06c4adeb2b7156bc83920992ab6745ffbf0c94051be2130fc3a8b021f2faf9dd81001e647322e034455339e94d29
diff --git a/app-xemacs/prog-modes/prog-modes-2.34.ebuild b/app-xemacs/prog-modes/prog-modes-2.34.ebuild
new file mode 100644
index 000000000000..7b545e4f262a
--- /dev/null
+++ b/app-xemacs/prog-modes/prog-modes-2.34.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SLOT="0"
+DESCRIPTION="Support for various programming languages"
+XEMACS_PKG_CAT="standard"
+
+XEMACS_EXPERIMENTAL="true"
+
+RDEPEND="app-xemacs/mail-lib
+app-xemacs/xemacs-devel
+app-xemacs/xemacs-base
+app-xemacs/cc-mode
+app-xemacs/fsf-compat
+app-xemacs/edit-utils
+app-xemacs/ediff
+app-xemacs/emerge
+app-xemacs/efs
+app-xemacs/vc
+app-xemacs/speedbar
+app-xemacs/dired
+app-xemacs/ilisp
+app-xemacs/sh-script
+app-xemacs/cedet-common
+app-xemacs/w3
+app-xemacs/gnus
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/time/Manifest b/app-xemacs/time/Manifest
index 28780c837650..64199bff32e9 100644
--- a/app-xemacs/time/Manifest
+++ b/app-xemacs/time/Manifest
@@ -1,2 +1,3 @@
 DIST time-1.14-pkg.tar.gz 20431 BLAKE2B c0b28f83de39a82fad9965e13681e4c88c1fad59d19821f951739dc7fd915b01f3308d0b6fe6485def0e65a4396b6fb6941103863243e9848f5ec235112b7c67 SHA512 62dfea425ac0fd00d4e8003377341c03970fde921acc06f94cbe98e6c37e255462e7ba9e72d0d540c557d64559ce9d39d2f21bcb7736e0ee7939e4b41ab5c0ac
 DIST time-1.17-pkg.tar.gz 23678 BLAKE2B dadcbde74e0a007932bd63b85159dd431846428c44149544a7afc9e4039f0edda02c8d76da75636aad022afcd6491fb2d23a250213ea8f0fbd1bff10b4eca4c0 SHA512 d143cea2d2da37234b33581a1be2a90092c3e1de78e14331674e8bcacd3f38ce0d61ccff7b7c94153f6bf7daa0516eecdc493893933d68f57f6878f2c7105df8
+DIST time-1.18-pkg.tar.gz 23916 BLAKE2B 46b24d87d71e03b525921125633df4c1a14dbd8ac0f01d5f5af351f5ff090a9aeda24bb0c417432a64c248477180332487e7c7c11ef9fdcf7b21d428839f7ce4 SHA512 020f3f17cdd741b6fd27533318c764b934f9e4f8657b7e5b1637731a989db0ef87953d6e7e57ccea5e062f9a43c083c5f3f6bf954754189a5ab7fa5ac1a39751
diff --git a/app-xemacs/time/time-1.18.ebuild b/app-xemacs/time/time-1.18.ebuild
new file mode 100644
index 000000000000..8ff66ee98185
--- /dev/null
+++ b/app-xemacs/time/time-1.18.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SLOT="0"
+DESCRIPTION="Display time & date on the modeline"
+XEMACS_PKG_CAT="standard"
+
+XEMACS_EXPERIMENTAL="true"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/w3/Manifest b/app-xemacs/w3/Manifest
index 7f7297a0e355..869ac6e62002 100644
--- a/app-xemacs/w3/Manifest
+++ b/app-xemacs/w3/Manifest
@@ -1,3 +1,4 @@
 DIST w3-1.33-pkg.tar.gz 695864 BLAKE2B 504f29d232a537318896ae3f1376f45ffb3638682a95fa56029bac8a79cb81bcf99805d2cc38200f5d0ee676d422bc56bcda0b44d743176ea4e34ba5505c8657 SHA512 f5093d9866dd229d4541e981be94a353ff27be21f4d3118701b31a8bed0e81bc04c2abdae5082f1cc26a2c414614e7b522515f3716ed1443c9ce996a013f9e54
 DIST w3-1.35-pkg.tar.gz 696392 BLAKE2B a92f46c5cc3ec4d7bb9c250a88ba417c10fe0a398b70a408c327f878e02dc78f510de0f2e231ae5431db5a2554248510ff76a3792e037d90a29b0810b97d48fb SHA512 773de63d8e1de48ab8329eba1b0f38f1892a5e29c6cbe0b20ff6b9147527c393a79e8a3ee6e4027e73d385abe68c12352f97114a83014a99a186e3672d458e92
 DIST w3-1.41-pkg.tar.gz 683044 BLAKE2B 4e00bf669ec3208771c08333e9231ad596b54727277d10b0dbad8e053dffd1269c1d8559621786b4a8e9c07f598ff564d9379212cc5a1ee8a8871e08cd17e953 SHA512 e050f51644f08f8a17976c118e4dcb1a70b1b91bf26c56d7a48a0f65e1076bbb6ba54e4c36c027ede8fade2f12542cd785dc0b876247523bb4933c4e89a6ce60
+DIST w3-1.42-pkg.tar.gz 683362 BLAKE2B f8d6f550d3e3c85d39881fa91205d43b8911ea6a2ba430e9595807473defdf13b0fd9ddd8b1fbc50acee4e1c4fc24e47174fa267716a8c587c32a82adba3312c SHA512 4a3ea84adfb19e9d86469b07aafa9b78d44a66512b5d86218503a6a143ece501d1d8fab01f9b1bd22fe4bdb2f9f5012a1442cb4b3a1caa5001d05b402a0f4a21
diff --git a/app-xemacs/w3/w3-1.42.ebuild b/app-xemacs/w3/w3-1.42.ebuild
new file mode 100644
index 000000000000..2854356b260f
--- /dev/null
+++ b/app-xemacs/w3/w3-1.42.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SLOT="0"
+DESCRIPTION="A Web browser"
+XEMACS_PKG_CAT="standard"
+
+XEMACS_EXPERIMENTAL="true"
+
+RDEPEND="app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/ecrypto
+app-xemacs/gnus
+app-xemacs/net-utils
+app-xemacs/sh-script
+app-xemacs/fsf-compat
+app-xemacs/xemacs-eterm
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/xemacs-base/Manifest b/app-xemacs/xemacs-base/Manifest
index 32a751d0e425..406fbf93323e 100644
--- a/app-xemacs/xemacs-base/Manifest
+++ b/app-xemacs/xemacs-base/Manifest
@@ -2,3 +2,4 @@ DIST xemacs-base-2.08-pkg.tar.gz 537716 BLAKE2B 4662de783de62da43de6c463350f1399
 DIST xemacs-base-2.10-pkg.tar.gz 538066 BLAKE2B 732ddf3bc9946997e87d7b5ccae31aacea40cbdb3048eb9309069f569b4461663ebf19c5e8757cbceb462b3c51af1cadc9b46b98ac0bd178a63cb6dd65a84705 SHA512 c073b9799d5b02ace8aedf397ecd9cd25344cfe70479df52c8f1724df63f8d6400e04ed4f89714637afd0b854f3a36af6193ed68e71703f4a98e17ad59ef8fde
 DIST xemacs-base-2.27-pkg.tar.gz 535989 BLAKE2B dae22f9e8121074fc992c2b73703cc2c66c42b4d90a55bebd9facf9aaa697ce195937fef0bd4740ff1ff9aa340d43b43db70a4edeb2aeabb996e37fee22d50e8 SHA512 5ed06fdf13cacab6bcf7429cd2d600dce54d3038fe9b9184aa41e847882ca9b51e7b9841fc383aae7df21eaaec36971471d598d0c0d165b0f07d1c6b0ac71508
 DIST xemacs-base-2.46-pkg.tar.gz 581493 BLAKE2B 096cd02bd906d6d382dcdc1ccf8d5ec1c97ef312fdeab9d74dec5b684e71fd9a0d2b23f4927b305053dee8696e1c72d4f25280df016c067e00c4697efcd86224 SHA512 0d22dab87005463702774d150e0a742201eaf77ff17070d6bf0fe9bb85e862a0212a346c03e19188f952fbb30401a2a8088b83330d7ed34cf2b94b04972755e2
+DIST xemacs-base-2.47-pkg.tar.gz 581876 BLAKE2B cd3c7b1f4f01028b72c787ea59e540c1516d5ee2206d5664b26d32a0f1915d2d158c906cd99939d8eb961ce0b5664b6d9b3ccfa95dbf3aad3cc1feffd45712b4 SHA512 4552911f090feaa1a34db8a4717aab27389926dcef4e6e53340b5c823ee3a23977ffb278ee345e3d862b11b6372802320f0b35d64a996abd95bc8efb9522bec6
diff --git a/app-xemacs/xemacs-base/xemacs-base-2.47.ebuild b/app-xemacs/xemacs-base/xemacs-base-2.47.ebuild
new file mode 100644
index 000000000000..eeabca84ae42
--- /dev/null
+++ b/app-xemacs/xemacs-base/xemacs-base-2.47.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SLOT="0"
+DESCRIPTION="Fundamental XEmacs support, you almost certainly need this"
+XEMACS_PKG_CAT="standard"
+
+XEMACS_EXPERIMENTAL="true"
+
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/xwem/Manifest b/app-xemacs/xwem/Manifest
index bdf4bbeb2ac5..3db8622143e9 100644
--- a/app-xemacs/xwem/Manifest
+++ b/app-xemacs/xwem/Manifest
@@ -1,3 +1,4 @@
 DIST xwem-1.22-pkg.tar.gz 649363 BLAKE2B 732ea3fa3810a5a2aff923ed1e9e6d5aa8d95a6b27ba888f2a9ea6590c1e61e37a4c2df1e4af35e7bed1886bc85a3118deb56b2071eee8ffb78be56583f0b22a SHA512 5de50db9a9b0e3fe33aeae0f01cf5f4df61c57760c0cb66ec37288f03f3c3da1c45805b9d37b2ab6e375ac308f7074fb2cf12d9f6174742a9075cb64c82f68f5
 DIST xwem-1.23-pkg.tar.gz 649490 BLAKE2B 1d31ae12ffda979da37872a1653709f80b8965380d23ebbb3d021cfa86b3fee7fc3c232d000c27b4c0eec2ea5e34a27c80af283f14decc0ea72acca4685dd305 SHA512 f070ca895b6b1144444e2d17198b07e3584fd72410b0663fb86fe3048635b8a795ee9b575c8f583108bddaae37de44864080a0402ae6312dd1d7172882473063
 DIST xwem-1.26-pkg.tar.gz 649043 BLAKE2B b644127e233b0c93816687d992f54a2c3cbbb822100d4e56ca088ee9d05306a1a14ff602ddfdf5ea1ed822813df4df6bd6dc802d5f27b670bae86ea61eca742a SHA512 00783faa899bd2f3da8128339c54b677843bafb30b8c1a5fca29709de31448aa29a91bf62affbbe42981a97a8ec7ab807b8ee0b64642c73e6a2fda412213eb0a
+DIST xwem-1.27-pkg.tar.gz 648980 BLAKE2B e4170d56e52f5cf46b314ace4c53fde5b38c64e385411b0011b6168e6ebc26fbde1e616349eb499cc5ff816862f4cf30e9663f9dffbdb01910a0fcd4eb44cc9c SHA512 0b6029f659ae1150c74b93d654e1ab01823386336796fe18eb4f542e9de0ceb2a171a6ed32cf941b2a872a6422e9842f44ae2767550bcc3bbd19f08fa4bbdabe
diff --git a/app-xemacs/xwem/xwem-1.27.ebuild b/app-xemacs/xwem/xwem-1.27.ebuild
new file mode 100644
index 000000000000..62f1f29fc25e
--- /dev/null
+++ b/app-xemacs/xwem/xwem-1.27.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SLOT="0"
+DESCRIPTION="X Emacs Window Manager"
+XEMACS_PKG_CAT="standard"
+
+XEMACS_EXPERIMENTAL="true"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/xlib
+app-xemacs/strokes
+app-xemacs/edit-utils
+app-xemacs/text-modes
+app-xemacs/time
+app-xemacs/slider
+app-xemacs/elib
+app-xemacs/ilisp
+app-xemacs/mail-lib
+app-xemacs/apel
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index cb4d92da3576..1e45444306d8 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,3 +1,2 @@
-DIST schismtracker-20180810.tar.gz 1064821 BLAKE2B d8016437db7cf6e0087150755090621ba15661753ebcfb8081f0c137a93389d04aa7a5e1ac09fb1366d1d3b3f76c22cb497171a74fb226347eb194c58c1f0f18 SHA512 d131cec7e4749941f0e5806bff14e0782a01f14f8a68605270d09ff40af1d20fffd4c7caf2926c5a63d3e0c0bb1ed24ce4a5e4cccc280ac045a22cfb8544c498
 DIST schismtracker-20190805.tar.gz 1307914 BLAKE2B 97158f05b55063173fb3a8198d21d4c3f33a1c9d2882170b8dbce91dec75863ae1f282297c66fea376fc94559b9492477dadbc3e2516cfb2dda8772793f59124 SHA512 6ef51d8938a31b2978cfa40bef2bf04eb6b02e8443d8b221454f6e47f3b49308c9999f1af61cf9786b5bc32b621c1548a702e53403df211176dacabc3252b83d
 DIST schismtracker-20200412.tar.gz 1308056 BLAKE2B 8c104d92889982310d895b9d432ee8bf6da75f583d38490d6796718411298aa0627cc268e070f8c679de4341c910507f78e394b5ba8aeb5b71b3410f2919aa35 SHA512 f4c55ad7d47c9e90aecd8fbe9be399e0b82cd8a815ba1df9c1e23141b0c8a8bb80c9256ce5530327f52b3a34bf84b918d4e1f093ab19d47c180435a63ee6f23b
diff --git a/media-sound/schismtracker/schismtracker-20180810-r1.ebuild b/media-sound/schismtracker/schismtracker-20180810-r1.ebuild
deleted file mode 100644
index 5c18d760c9f3..000000000000
--- a/media-sound/schismtracker/schismtracker-20180810-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop xdg-utils
-
-DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
-HOMEPAGE="http://schismtracker.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2 public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/alsa-lib
-	>=media-libs/libsdl-1.2[X]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXv
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-	eautoreconf
-
-	sed -e "/^Categories/ s/Audio/AudioVideo;Audio/" -i sys/fd.org/schism.desktop || die
-
-	# workaround for temporary files (missing directory). Fixes:
-	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
-	# /bin/sh: auto/default-font.c: No such file or directory
-	mkdir auto
-
-	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
-	#   wine provides /usr/bin/windres
-	# and schismtracker fails to use it properly:
-	# sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
-	[[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
-}
-
-src_install() {
-	default
-
-	domenu sys/fd.org/*.desktop
-	doicon icons/schism{,-itf}-icon-128.png
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/schismtracker/schismtracker-20190805.ebuild b/media-sound/schismtracker/schismtracker-20190805.ebuild
index a7d82e1898fc..1c2988cf91b2 100644
--- a/media-sound/schismtracker/schismtracker-20190805.ebuild
+++ b/media-sound/schismtracker/schismtracker-20190805.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-video/rav1e/rav1e-0.4.1.ebuild b/media-video/rav1e/rav1e-0.4.1.ebuild
index 8b07f2528793..04d3867b61d3 100644
--- a/media-video/rav1e/rav1e-0.4.1.ebuild
+++ b/media-video/rav1e/rav1e-0.4.1.ebuild
@@ -272,7 +272,7 @@ else
 		https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		$(cargo_crate_uris ${CRATES})
 		"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm ~arm64 ppc64 ~x86"
 fi
 
 DESCRIPTION="The fastest and safest AV1 encoder"
diff --git a/net-firewall/ipset/ipset-7.11.ebuild b/net-firewall/ipset/ipset-7.11.ebuild
index 34abab5cafd3..ef2705b37cbd 100644
--- a/net-firewall/ipset/ipset-7.11.ebuild
+++ b/net-firewall/ipset/ipset-7.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
 
 BDEPEND="virtual/pkgconfig"