gentoo resync : 20.10.2021

24 files changed, 336 insertions, 64 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 50d40e346abd..f8916d73132c 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/diakonos/Manifest b/app-editors/diakonos/Manifest
index 456ed6668f05..73ce1703d418 100644
--- a/app-editors/diakonos/Manifest
+++ b/app-editors/diakonos/Manifest
@@ -1,4 +1,3 @@
 DIST diakonos-0.9.4.tar.bz2 102282 BLAKE2B f8625d87924815e816c2f5a07e5c1d35df4df6126531caf5c98a9fdcb20eb9543c028363344a3c20f2f8a0335fa9d071b168640d9bd4738b1d51737bcc548c12 SHA512 8aab6173c40b9a182853977ed7631c391a10d3339918fa96866da8c9fa8e36e40f1c5093465c734a9ce36a69c5d994d6b2d1c0306f1e57bff708fd7a64a62db7
 EBUILD diakonos-0.9.4-r1.ebuild 744 BLAKE2B 85acdf84654350292a5dc643285cb3255b0b135b5af24fdc988891f2348090d7145a23dbdd9130175bcc5f44d98fe6341286e810e3eb1d2465948bd5e96d28fa SHA512 eeba1065e75cf26a8699fb18a60618a23ed5cca6c7333e7ee3831e424254363152a1553ccb3aa4f388f10947124c8e4d61c6c0b73f0c35abf04268bb8bbad754
-EBUILD diakonos-0.9.4.ebuild 751 BLAKE2B c92192b54dd5789f6fdfb1aebbbccb7b21a6dcea061ca9f464a18d4c17b47cba13ce701ecba6c9f9dc3b30566d738da0de4b2859bae9b1673a98483cad47f1d1 SHA512 4ab68a494917f902cf1a8e53c53cdc00b06b59a2f00e5897540a80400aa17e963db6832ba6e4e4c651bf6eeb5aa5d2be984fe4b2eae3853902d25c408dd13070
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-editors/diakonos/diakonos-0.9.4.ebuild b/app-editors/diakonos/diakonos-0.9.4.ebuild
deleted file mode 100644
index d769980e0233..000000000000
--- a/app-editors/diakonos/diakonos-0.9.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit ruby-ng
-
-DESCRIPTION="A Linux editor for the masses"
-HOMEPAGE="http://diakonos.pist0s.ca"
-SRC_URI="http://diakonos.pist0s.ca/archives/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/curses"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/bacon )"
-
-each_ruby_install() {
-	${RUBY} install.rb --dest-dir "${D}" --doc-dir /usr/share/doc/${P} || die "install failed"
-}
-
-all_ruby_install() {
-	if use doc; then
-		rake docs || die
-		dodoc -r doc/*
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -S bacon -Ilib spec/*.rb spec/*/*.rb || die
-}
diff --git a/app-editors/fe/Manifest b/app-editors/fe/Manifest
index a2636e555d0c..dbd4c3b30c17 100644
--- a/app-editors/fe/Manifest
+++ b/app-editors/fe/Manifest
@@ -1,5 +1,6 @@
 AUX fe-1.8-makefile.patch 370 BLAKE2B f0bfc2c97e30ce35a904394a871b275043ee479392997117f1886cebf57fb1fe9f056fdb0bd94f4130837323fc2c20e94aeb575ad0d0f3a80af7199e2fbd3759 SHA512 09820543f98e166a9692788d0b42f29b6ee60852f0e6197af86b4b8da31c902ff9c8be59e925af21e50241d5ef6e629195190dda6a1d0317e601abb4135e1238
 AUX fe-2.0-ar.patch 502 BLAKE2B 4c3beea491ddb03a3adf5923c8fbdc0279ac9e6899216af71018af425f7caa33faa47ec6bc89b6a409d5370ffa0553fe9e7ca744a2ee238c36d2ceac378a1c3f SHA512 1c5ede0c9570f31ba3c42fd43f2c77170dce957a8376f02adaa2b82687e3daef9c8e0a941377de915be968d10e6fa34274b433eba396273cfe20ed1868dbd17b
-DIST fe-2.0.tar.gz 217430 BLAKE2B bbc886abdb54d5fe05f031a5e5700907586c4bae8812f4edd5bf6d35fa0ce16edb93a6f988a597e1b4aba69bde4019f3044091ab9285ee6138d913498816453b SHA512 85afa800466376e59aa8de4af06db51c5df8566109a1f632b30a366f944be3237f88a639329d44114360747836ed75c31746c7d6bf1568b7b4ff3e11d595a6e7
-EBUILD fe-2.0.ebuild 859 BLAKE2B 600346c9cd0ea2ffa6795579dfb05eb5af3307e9e63531049b717db05fcd140136d0c8d005cb0fc388e24c24c55cfeb6992cf324b782a9177f137c44f88b5b9f SHA512 d09002589b3c4a279131ce179bdade3772971980ad9bad00d3b9023b49f1a34e237fd083bb1b76001bfaece4608c54cbe26b72e0a9147e922bf9f1289a44513b
+AUX fe-2.0-ncurses.patch 784 BLAKE2B 90af3d2e4a402314b8d18bf817e84c7ca2b8f1d0da05d36d8971e31a8e293c016f6217f89d2575c4e3ecd5bab699bc3dd1a29118f7bfc174fa1e547a38be7650 SHA512 aedf564b7083536261d9b90dc3c8b9e247b98e5845c50259f27fe665661245f2454c3a1e3294815e32bb378f4959010ac0d181c9e8d56acbbbfa657a7b58ff3a
+DIST fe-2.0.tar.gz 237890 BLAKE2B 9fb2ad310016b52ebc807854c942c248b75a9e543aa919ccee0a1963d9a12b23ad9cbc4df884422654e2efb0b97ba2d590ac2d70be48dec3a19e7a455de5c168 SHA512 6967362b8ff9ce91e0480dfa8538e3d13b43748283423923a4ba19efc76fbe007975318d9fde758f9c9f0b8bd084ff49e45bfd5b9773a79ee85a2153646e0143
+EBUILD fe-2.0-r1.ebuild 999 BLAKE2B 91dd7ef8ba6f9ee2ad5057010ed057d61866bf63e20d50e316ced8e7702dd877e08d21b35ead4963c74cfccccb718c1ea2267d5974c075dc7dedee516c5757ab SHA512 a5a0a5cbe5dea74b17c35309b6ad3a2009f0e8411f5ffe8803e4005d56c94a83f8142189316a917747085bd62dc9e4ac3e24a78ac597ed7be85dcf0e70cd813b
 MISC metadata.xml 1260 BLAKE2B 50776c6064961af6dea0d9ff8435b5a8e246ae7b1a03f1b9181bd9b6b8cc66d0fd0426df3f323672f3e2b2014a7caf08f0a55da783565a870a16e2cff220b70f SHA512 84d731be9b361299802a4924278e5d7e3288075f7cdc3b8d1f8c78fd11a8f7bf9be58c89b5e5718a11e7c52b7aba1949db6a9f6b9a4cc278428dd292734aeff7
diff --git a/app-editors/fe/fe-2.0.ebuild b/app-editors/fe/fe-2.0-r1.ebuild
index 207e9ec3f773..90e47d9c22e4 100644
--- a/app-editors/fe/fe-2.0.ebuild
+++ b/app-editors/fe/fe-2.0-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="A small and easy to use folding editor"
 HOMEPAGE="http://www.moria.de/~michael/fe/"
 SRC_URI="http://www.moria.de/~michael/fe/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="sendmail"
@@ -22,8 +22,15 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.8-makefile.patch
 	"${FILESDIR}"/${P}-ar.patch
+	"${FILESDIR}"/${P}-ncurses.patch
 )
 
+src_prepare() {
+	mv configure.{in,ac} || die
+	default
+	AT_NOEAUTOHEADER=yes eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable sendmail) \
@@ -37,7 +44,7 @@ src_compile() {
 src_install() {
 	emake \
 		prefix="${D}"/usr \
-		datadir="${D}"/usr/share \
+		datarootdir="${D}"/usr/share \
 		MANDIR="${D}"/usr/share/man \
 		install
 
diff --git a/app-editors/fe/files/fe-2.0-ncurses.patch b/app-editors/fe/files/fe-2.0-ncurses.patch
new file mode 100644
index 000000000000..8eef06db6454
--- /dev/null
+++ b/app-editors/fe/files/fe-2.0-ncurses.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/818415
+
+--- fe-2.0/configure.ac
++++ fe-2.0/configure.ac
+@@ -55,19 +55,6 @@
+ AC_CHECK_FUNCS(strdup)
+ AC_CHECK_FUNCS(strndup)
+ 
+-AC_CHECK_LIB(ncursesw, get_wch, [have_utf8_ncurses=yes; LIBS="-lncursesw $LIBS"])
+-if test "$have_utf8_ncurses" = yes
+-then
+-  AC_DEFINE(HAVE_UTF8_NCURSES)
+-  AC_CHECK_HEADERS(ncurses/ncurses.h,have_ncurses_ncurses_h=yes)
+-  if test "$have_ncurses_ncurses_h" != yes
+-  then
+-    AC_CHECK_HEADERS(ncurses.h,have_ncurses_h=yes)
+-  fi
+-fi
+-
+-if test "$have_utf8_ncurses" != yes
+-then
+ AC_CHECK_LIB(ncurses, get_wch, [have_utf8_ncurses=yes; LIBS="-lncurses $LIBS"])
+ if test "$have_utf8_ncurses" = yes
+ then
+@@ -78,7 +65,6 @@
+     AC_CHECK_HEADERS(ncurses.h,have_ncurses_h=yes)
+   fi
+ fi
+-fi
+ 
+ if test "$have_utf8_ncurses" != yes
+ then
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index a44e6df0b5b3..db15c4605514 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST gedit-plugins-40.1.tar.xz 951024 BLAKE2B 8a5fa07d6b9a5848e66de995c05f389b288e7863fa506476fd82157dc203e472b8ac8b8bdd15b09513e5d819fc58ce4d1077e62e6c5b90f93b14775052bf2737 SHA512 71649d157ac5591e4dd317c44ae167c98fb59e253c45f8c1ff8ef397a9e3f0bb968f0ef2486f9021354269e77defb9e5e305f1538f69818480a250966143c7a3
-EBUILD gedit-plugins-40.1.ebuild 2695 BLAKE2B ee992e1c12e00cfac023232d931807af1bb3ab31d9c705e4d04f915d2b6aff31e73cb646086b534a8cdf49b39b39538fb08ef4ecf12783e58d5fed6cefc64c6c SHA512 82a7ab9742e53665f280fa27be86ed695ddabccf91298022456aad45eeaf96abaac7528ca9ec8500214f41a23a0631c1069b7f719e31ae79535c661439f204f5
+EBUILD gedit-plugins-40.1.ebuild 2696 BLAKE2B 5da3de7197568124632bf3662a266f04e8381f89efd43cf74a29f949be71f7b119e2952af94feb2a8a8b9156b7cfbefa0d1631c32260cc93ea7b2f5197df9aff SHA512 bac3a2a2d2dd6f3f5d3eaf2c64fb2635d8d719b2b0650208961fe3e7dff38b3ae7d14710e8b7c444fddd225e0bd22ee4a427c15f4adb850fe0712716ed39d229
 MISC metadata.xml 481 BLAKE2B 5fbf2df78aa40fce971741bb7d04de00cdc7a6371c2652ae0ae4bf253ee469c4bbb5e5a7c2b88226f95bb8865930dd19e9adedb191fd5a173ce915890ce40b32 SHA512 3b4b858659d1597e6c1ee574143de4864be8b75d4a6399d47bff85c4b18ec35472523bfeaa0815189a9008764405ee3b2fa53e73fcdc3edc8eda00a5f943f762
diff --git a/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild
index 266db95b91a9..1f95326960d9 100644
--- a/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
 VALA_MIN_API_VERSION="0.28"
 
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 95fbaaff1de0..c1d1ca0cae8a 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -2,5 +2,5 @@ AUX 3.38-make-gspell-optional.patch 1896 BLAKE2B 51c05e9a45aeb7586ba37cc0a3c01ba
 AUX 3.38-make-python-optional.patch 2255 BLAKE2B 25b50cfab045ab54c3d9e0ba5043ec6b839cffc31df3ebfd43dd438880c45d2d6eac0bea583209960d946591d3348070ec99e0b0056a5807a47eb84ddfec6363 SHA512 ad39c6f6ce36b19760bf726aedca158866158a4f2bb2479f752eab0eb2af7e4e425797bb20e301dbfdd58ac83bd824335499f99a6b4091c0835091848cc5de50
 AUX restore-overlay-scrollbars.patch 968 BLAKE2B b73f3fe61ba10c377b491fd00ccac333b772c415c49bbca472d60a87852473e4c73d5de327d83dc1756f188458564f5529555c69843b79274db83209faa4611e SHA512 37a6e3be8e62ede716ac3666f4ad5f2f12e2a49c5d4d15db91b2b3aaa27217b04e50bc80ed128da1b9f64d56a240c0d916d5b8335f1fec4db296f038951cca1e
 DIST gedit-40.1.tar.xz 6850264 BLAKE2B 2baabac1254d56bf4c6a663012f88505c8f3cfcdd8fd8e020e05d807f727f71cf9088c398702f559e40ba7db31d3a9d135c1148f8a8b178c9107aa2675265910 SHA512 ac4cd2864af63625dbdb5c55fcc5e7ea403d84d7cc25d9f1c121f544ef1cf686ab9b7c0d50ef73b4bf24e573cdf528622a49d82f675b0c1673c46f691b79ac09
-EBUILD gedit-40.1.ebuild 2270 BLAKE2B bf7a66b16e75dd44165ddd9c11be3621f7f8533d005ff73c5027267b56a4bb52c664d13e11f7b594bc1c59be045016019307dd78f59b7bbaee9e10d830d30a2e SHA512 dcd72286738424b24da6721a55f875131f343674ae2c306460352da986521079d9ef3e8245c4a8cb22e365b0ecf2d6ad841aa61f41e4ff037a8390747e56b5c9
+EBUILD gedit-40.1.ebuild 2271 BLAKE2B f6960c80961cdc8bdc11cd762e7935170ad08f8c6495b5bb9cd819f4732855faaf8f46a83af25d4b4ee1514fef233dd0ffcdca8747adafd49d8d5bfabbc9fe0e SHA512 35de2f1cf77a1f357c5427379dade5d252dc681435ceac949b9705bd5a8254e006d5257fc398e7bc63bbfed8fc57a47e727e372d05a3592c99397245878cabaa
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/gedit/gedit-40.1.ebuild b/app-editors/gedit/gedit-40.1.ebuild
index 415abe4e1829..78fd61b6a5d9 100644
--- a/app-editors/gedit/gedit-40.1.ebuild
+++ b/app-editors/gedit/gedit-40.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 VALA_MIN_API_VERSION="0.26"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 75f631917890..b830acf675eb 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -4,6 +4,6 @@ DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7
 DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2
 DIST vim-8.2.3428.tar.gz 15715383 BLAKE2B 865842bae0de25c34f255085f6edfe35b6905e220bdcb76372d7289ef1f6c2b2dee2f88e4a5f849d43fa560db4ade1e8e498d86f5651c5218d9153cde5ecddd3 SHA512 7cb473afa0ad6a9728dfc2f7d8ca19a21de329c4790141c7cb815b71c07e92a1ce04a5fcc2a0381c4beb304670d6c08629dc2ed2cb0842998cca2fd846c8cd6b
 EBUILD gvim-8.2.0814-r100.ebuild 10548 BLAKE2B 97622d1ec117107f2576a4b7f75097c3b4711402c3affbf433b2b317048b74697a0fb2b795f2ce6e388cf26885af9b972b68d7f0f73db5110a2bb9a43061ed4f SHA512 654432cab7092fadfabf35996a1ccd807eb76becdd8ed5eb95a5e153e8a6dd342debbd7fd28398bb9e83b4fbe87fa89995a619d4044a1a6300213c04f48325d6
-EBUILD gvim-8.2.3428.ebuild 10555 BLAKE2B f5aa08ee07139b66e07579438bd983367de04f904347fb5cd341ebdf58faf4e8a960fc61347f533daad5ad23e02a4a54ff26461b74cf5b88b7a12a4fc6bcb7d1 SHA512 413bf55268850a3f7b4fa90d8e29eed4bd6333396d4a23a5e6742155a033989151c54c703b635f0659c15e3bab76ece52df00fbf25fe4937551e26b442acccfd
-EBUILD gvim-9999.ebuild 10549 BLAKE2B c7ab38cb377298b8a74ea21bd19e1f29f0e304fcf02d46046b49a7443d6c0d795f71fd46fff3b142cb97b12e198537844a007e133ece4bbe479cc7ffe6503306 SHA512 5d8dcd41a8df4d9a58d4fb4d7fba11848a910cfc6d1fbcbcc83c47f5177f1ecf860b0fc4bfbf3b550e3c9203624ef982d3059870b57af8e2c02b5b4cfd32219b
-MISC metadata.xml 634 BLAKE2B 7827c5d8322794d1c1ae34fbd24bdf9f4852fa987f785220f42e25d0e7d1847628d29a576c373a12ec4d3c65380cd260ded87d7c719859c967e2a1e03f883a43 SHA512 0d30693f6de91d67dd56e71f3f86dc9ca57622516705270027c62c0bba6a8e4dcd01046662f0cb758b78076f09b88b79cf000f3dcd50fc020409267c27c76c2f
+EBUILD gvim-8.2.3428-r1.ebuild 10626 BLAKE2B c947c1839816c57c403bec4585aef0e32d301ad7f20ffd18e0cd4c65f9ad389ddb5d98ea99f386ff7399deb0b0d9abdc64d55271b4d11c76680fdbf9b439b583 SHA512 3060d3c97496a975f2ee26223b448e33c7eb10e59923884866f0ee920a29cbbfcdc6f1f21700eed870a425be84662dcfcc4382705d5966eb2dbfae7b02515480
+EBUILD gvim-9999.ebuild 10626 BLAKE2B c947c1839816c57c403bec4585aef0e32d301ad7f20ffd18e0cd4c65f9ad389ddb5d98ea99f386ff7399deb0b0d9abdc64d55271b4d11c76680fdbf9b439b583 SHA512 3060d3c97496a975f2ee26223b448e33c7eb10e59923884866f0ee920a29cbbfcdc6f1f21700eed870a425be84662dcfcc4382705d5966eb2dbfae7b02515480
+MISC metadata.xml 717 BLAKE2B dd4eae2fc90d0a00452dd91391acb2e15538a956af6a2a423427dd4835292fb17c43d805bb32d119d3743a00a524e2216befdc32831339241d7285871798e7f7 SHA512 b0cc1bae40d3cfb51bcab00ea245688d68410c17220a3f3c80793b6fb62abb007251c2ee2abd7612ed507462a3c77de48f3ceaf622a75c54436298fd43b7df10
diff --git a/app-editors/gvim/gvim-8.2.3428.ebuild b/app-editors/gvim/gvim-8.2.3428-r1.ebuild
index eac0fc37724a..0a202597784e 100644
--- a/app-editors/gvim/gvim-8.2.3428.ebuild
+++ b/app-editors/gvim/gvim-8.2.3428-r1.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
 
 SLOT="0"
 LICENSE="vim"
-IUSE="acl aqua cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
+IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -59,6 +59,7 @@ RDEPEND="
 			)
 		)
 	)
+	crypt? ( dev-libs/libsodium:= )
 	cscope? ( dev-util/cscope )
 	lua? (
 		${LUA_DEPS}
@@ -198,6 +199,7 @@ src_configure() {
 		--with-gnome=no
 		$(use_enable sound canberra)
 		$(use_enable acl)
+		$(use_enable crypt libsodium)
 		$(use_enable cscope)
 		$(use_enable netbeans)
 		$(use_enable nls)
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index ecd0b5e0dd0f..0a202597784e 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
@@ -25,7 +25,7 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
 
 SLOT="0"
 LICENSE="vim"
-IUSE="acl aqua cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
+IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -59,6 +59,7 @@ RDEPEND="
 			)
 		)
 	)
+	crypt? ( dev-libs/libsodium:= )
 	cscope? ( dev-util/cscope )
 	lua? (
 		${LUA_DEPS}
@@ -198,6 +199,7 @@ src_configure() {
 		--with-gnome=no
 		$(use_enable sound canberra)
 		$(use_enable acl)
+		$(use_enable crypt libsodium)
 		$(use_enable cscope)
 		$(use_enable netbeans)
 		$(use_enable nls)
diff --git a/app-editors/gvim/metadata.xml b/app-editors/gvim/metadata.xml
index eb9f0418416e..81f9a4724bf6 100644
--- a/app-editors/gvim/metadata.xml
+++ b/app-editors/gvim/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Vim Project</name>
   </maintainer>
   <use>
+    <flag name="crypt">Use <pkg>dev-libs/libsodium</pkg> for crypto support</flag>
     <flag name="cscope">Enable cscope interface</flag>
     <flag name="gtk2">Enable GTK+2 interface</flag>
     <flag name="netbeans">Include netbeans external editor integration support</flag>
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 3333beb5c8c3..81adc145e493 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -2,7 +2,7 @@ DIST nano-5.6.1.tar.gz 2957693 BLAKE2B dbd1a63b6e0997a30a2ef40ad3248a7f53e2613d4
 DIST nano-5.8.tar.gz 3038948 BLAKE2B 126976539e8ab3a7be986edc7422bc58d31e0c81dffbf34c9b701d09d268233ed0de4f07ac8d2dd0963b768cce4e2afe89a4f8ed9fd216a71ebac98c7f403deb SHA512 dd3a7e328f256052707c4d28f2ca32f9e44de123e3dee3c0747fbab222d215b2a895c403b9274fd286e19477b8be3314fc83167eec32194370105b1e70c05a3f
 DIST nano-5.9.tar.gz 3093675 BLAKE2B d4fa2f0e64b6ab243a2b127ff894e900098f6261f5d46657ff3459cc0b51683a63fc5de54bd4545b47bc16c633b09142f8501b84a09df3e8123da5233a063766 SHA512 61bf4de300579bc6f0028a2237e105228d8657819c02f32c7ef8f84f9c54734df8fb9a9cddbce0f7721ebc5ac8ae4799c118291ae15480082f8b1317019a485d
 EBUILD nano-5.6.1-r2.ebuild 2284 BLAKE2B 3de023e0cfdb8dd68560bf07d8a087d2fe6d0353301e7c4c9c5523678dd36d88a0c8b12aae748df5b84e7638aa05dd83f29586c53b250acd118280491594c62a SHA512 603dc715772e82eb32e1b639a4353869d29bdbd1dde767e7e6bb4b95cbb88d88f39ca48038f3c2a1dc988e8c74ba5bddab24060025fd8ebc89559f9d4a0f7b9d
-EBUILD nano-5.8-r2.ebuild 2286 BLAKE2B 37bbb792e4f3965b667b737c0a5da40b9d39c6031df43288acff77ff9693681d29afcb738cd06440dcd016acc1b4fb4388fd19a604de2166e3215fc459221170 SHA512 74d88caf1f4b70f832ff45f593e476898db59a70db6c02863b5e9cf2a680bd2769e05b66b1ad72e7d5593e6d2026592a384694663824b7bd8e110a078cae9c6e
+EBUILD nano-5.8-r2.ebuild 2284 BLAKE2B 3de023e0cfdb8dd68560bf07d8a087d2fe6d0353301e7c4c9c5523678dd36d88a0c8b12aae748df5b84e7638aa05dd83f29586c53b250acd118280491594c62a SHA512 603dc715772e82eb32e1b639a4353869d29bdbd1dde767e7e6bb4b95cbb88d88f39ca48038f3c2a1dc988e8c74ba5bddab24060025fd8ebc89559f9d4a0f7b9d
 EBUILD nano-5.9.ebuild 2292 BLAKE2B 0d92386a270b2b61978639ae83cef20a0cb426c4588b48cfda53916d78301c6dd1aa277c26e46458e6f9c475745930cf1d0c9cce706b4c528e82258d2697bbe6 SHA512 90e90e892197e5ed58e5097c98f7f68f92f52077a291c297db255908ce428b94be28ff84f2ced3a136448b3198ba326678d65727279cd6f9a396109fc2789bf5
 EBUILD nano-9999.ebuild 2292 BLAKE2B 0d92386a270b2b61978639ae83cef20a0cb426c4588b48cfda53916d78301c6dd1aa277c26e46458e6f9c475745930cf1d0c9cce706b4c528e82258d2697bbe6 SHA512 90e90e892197e5ed58e5097c98f7f68f92f52077a291c297db255908ce428b94be28ff84f2ced3a136448b3198ba326678d65727279cd6f9a396109fc2789bf5
 MISC metadata.xml 1643 BLAKE2B 0281963fbe6aff1bc6765b1c9964ac2a7e1237b4759c4ae34e83a9c79c86975d910a43edfec80f279ebf17beb58db2eeb430915a165ea252042900ecefa3c57e SHA512 8636fa9e9f1b2bbc72f3b7a4395a99a7158de48e6f10487f6b5d450e6c35226b0f4d4a68e5e995dd625065831a343070c4f227d1c4422a2140e09f9c003d8fdd
diff --git a/app-editors/nano/nano-5.8-r2.ebuild b/app-editors/nano/nano-5.8-r2.ebuild
index 855a256a8852..64cdf0ed0eba 100644
--- a/app-editors/nano/nano-5.8-r2.ebuild
+++ b/app-editors/nano/nano-5.8-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 4f498a65647c..b518c1d2d7ae 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -7,6 +7,6 @@ DIST neovim-0.5.0.tar.gz 10337976 BLAKE2B e7630e96fdd1a159ca68c8f61ed473a7fa7d0c
 DIST neovim-0.5.1.tar.gz 10349190 BLAKE2B eb7e0c6a0742369c4a0fbc32a0f0e5d595f03470fb10287c39dde2f86db433a21798acee49d2cc363f18843950ef76d1376f5e52358d0b19a4b1e090c0d620a6 SHA512 a5a976c4998e821e0d9a9038d3f0c9e7c424a951f6bfc6d75898916d6a004ac668f31a34c3472fc4fca6b1d9652ac662b06780dd04dc6a77ecdc81564ec05709
 EBUILD neovim-0.4.4-r101.ebuild 2831 BLAKE2B a40b6c9e26029ad0576b02980b2110ea5c4d4472d412f316d70124b4780cd1d63268c7e86f4115674697605b1af1171a8da43a985dcf629f5376a6e0377525a9 SHA512 f368803117ef4db403ea11dfba1c626bfc638e1ef278ec77e38de69043045632ed0aa2d40356ea8bc7a2ce74fef1086a879afc4da6cadcd820b5585ec1cd57ec
 EBUILD neovim-0.5.0.ebuild 2885 BLAKE2B c1897e51862089f380d35a3d54cef1c7105661b7987d0b5f9423910ea81d1d6c29af312398e22f7765b1496ebb695c4f50461b4a437837785127139be988da39 SHA512 48de0cc9496fd2c4f589abddc0c19c161535b69d3900bfe528a36e746774f98dc28e32f6698671943540a37a9227b756be5fadd605d39f29bcbe654dedb6f56e
-EBUILD neovim-0.5.1.ebuild 2885 BLAKE2B c1897e51862089f380d35a3d54cef1c7105661b7987d0b5f9423910ea81d1d6c29af312398e22f7765b1496ebb695c4f50461b4a437837785127139be988da39 SHA512 48de0cc9496fd2c4f589abddc0c19c161535b69d3900bfe528a36e746774f98dc28e32f6698671943540a37a9227b756be5fadd605d39f29bcbe654dedb6f56e
+EBUILD neovim-0.5.1.ebuild 2892 BLAKE2B aa157a38f7bd8a9a92b1a8ea2867adb56e973b817e6a1e813f9e37b97ee0c7f4f9e8bc2022ad1ffe55c2e4d227821eb6913e3eb03e97aae21a1fc5b6e0a3feef SHA512 1ec971589b5d84c3a89a79ddb670e89b340656fefca2a203c41f16f913f08b00879848e7bed80465fdf119731052558381c97db32bb07a71ae22907384e47bca
 EBUILD neovim-9999.ebuild 2885 BLAKE2B c1897e51862089f380d35a3d54cef1c7105661b7987d0b5f9423910ea81d1d6c29af312398e22f7765b1496ebb695c4f50461b4a437837785127139be988da39 SHA512 48de0cc9496fd2c4f589abddc0c19c161535b69d3900bfe528a36e746774f98dc28e32f6698671943540a37a9227b756be5fadd605d39f29bcbe654dedb6f56e
 MISC metadata.xml 536 BLAKE2B 48c85cdbe749584904a6719545308b55f130375464c55d6f458171707a2b72586bca6780b52bab3b379a2e0c471ec47026c1203edd4696fe38639f5718cc4896 SHA512 114c7fe41230c2aade3de44b37e51ae84a907b6fcb899732991f8013126214540f4b72e60b44c0993312ec8d7c8cc8c96eae8b9e0f78bd0d2cefb7497e5d16e8
diff --git a/app-editors/neovim/neovim-0.5.1.ebuild b/app-editors/neovim/neovim-0.5.1.ebuild
index 99aa8bbbb72f..6e99dc9e54d6 100644
--- a/app-editors/neovim/neovim-0.5.1.ebuild
+++ b/app-editors/neovim/neovim-0.5.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0 vim"
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 1fa89ed677df..410a00840aec 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -3,6 +3,6 @@ DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7
 DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2
 DIST vim-8.2.3428.tar.gz 15715383 BLAKE2B 865842bae0de25c34f255085f6edfe35b6905e220bdcb76372d7289ef1f6c2b2dee2f88e4a5f849d43fa560db4ade1e8e498d86f5651c5218d9153cde5ecddd3 SHA512 7cb473afa0ad6a9728dfc2f7d8ca19a21de329c4790141c7cb815b71c07e92a1ce04a5fcc2a0381c4beb304670d6c08629dc2ed2cb0842998cca2fd846c8cd6b
 EBUILD vim-8.2.0814-r100.ebuild 9303 BLAKE2B 90209968ee61a842a569d8fa8dcf58f77acc181b617aa638d92baca8b448897b8e76f377134a062b2501166361e8284cf08a31db1c730716fe8247c76b9b16e1 SHA512 604983d7893ac4fe47cc74c2182a82b60464fe2910775c889ea7c251f846fff77908c00c987c6bedb9acc55a6a26dc812fad7694b264c4c18e0e1f72eeccf815
-EBUILD vim-8.2.3428.ebuild 9230 BLAKE2B 11fcd309559250e68b0ea9ddbe6309e9668afcbde293f5c2e4097a7cd3ed0abc559a1d4a2a1f9ce4bfd8b1bc04a1686cef901a6b2865124bb3ea0e1d7555d9dd SHA512 2ee8e6a42f84503c83be45f3ad2439dfdd6750a380a46bb2dd57737bf4e6e078528b958c964a0ac3362ffa09cc9b349094494b6aad7a1b2931253e4295586caf
-EBUILD vim-9999.ebuild 9230 BLAKE2B 11fcd309559250e68b0ea9ddbe6309e9668afcbde293f5c2e4097a7cd3ed0abc559a1d4a2a1f9ce4bfd8b1bc04a1686cef901a6b2865124bb3ea0e1d7555d9dd SHA512 2ee8e6a42f84503c83be45f3ad2439dfdd6750a380a46bb2dd57737bf4e6e078528b958c964a0ac3362ffa09cc9b349094494b6aad7a1b2931253e4295586caf
-MISC metadata.xml 868 BLAKE2B e4d87b075de11ce8f87d58f8c01f976b816854f3e1339bbef0e9cad892f07cf9564716d60ce3b1b83f0bb380b9dfb3fc94ac21c21df4704f5ab8b54e8997217d SHA512 fb51df080c0cc8a458def353fb3eccea40c050eeb3fca53f3aa2be0ca11b0e869f93da8f123bda1c328a8a8ba29c02268535336566a1a77f367c6dee041e5a8d
+EBUILD vim-8.2.3428-r1.ebuild 9302 BLAKE2B 383a03fd372c7569c1e63ae8f8be2fcddbd93b91ceaebef35ecf17146b78a8a6825d9bd7069d6683d568d3135047a08061a5b1545beaed455f5817b64654948b SHA512 3726ffa921f14a3d65d65f61fb56ef95dff1c49b24844ca3ba13adcfb0ee722fa77818633128934abafb2647d96da3bf73b64367853e6d9879e682da74a826dd
+EBUILD vim-9999.ebuild 9302 BLAKE2B 383a03fd372c7569c1e63ae8f8be2fcddbd93b91ceaebef35ecf17146b78a8a6825d9bd7069d6683d568d3135047a08061a5b1545beaed455f5817b64654948b SHA512 3726ffa921f14a3d65d65f61fb56ef95dff1c49b24844ca3ba13adcfb0ee722fa77818633128934abafb2647d96da3bf73b64367853e6d9879e682da74a826dd
+MISC metadata.xml 951 BLAKE2B 10b867295bee9174e71d1df8a2a8a251c669fb2415893f2e90e361622520fa6b357a2098cb0184637a6f3078ed1873ed1d38f64be205d941de13040fb9f197e2 SHA512 683a03f6198c53c16874cfd8b50a265460a507afcb1bff104ce8932a9957cd4a3cc0cd6d0e494ea0757645162994c55a792d282fd6ad1278dd10659804d2f54c
diff --git a/app-editors/vim/metadata.xml b/app-editors/vim/metadata.xml
index cd2ce2b6d09e..4f3a37faf97f 100644
--- a/app-editors/vim/metadata.xml
+++ b/app-editors/vim/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Vim Project</name>
   </maintainer>
   <use>
+    <flag name="crypt">Use <pkg>dev-libs/libsodium</pkg> for crypto support</flag>
     <flag name="cscope">Enable cscope interface</flag>
     <flag name="ipv6">Enable IPv6 support in channel</flag>
     <flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag>
diff --git a/app-editors/vim/vim-8.2.3428.ebuild b/app-editors/vim/vim-8.2.3428-r1.ebuild
index fd00866b78b5..d15fa2f9dcc8 100644
--- a/app-editors/vim/vim-8.2.3428.ebuild
+++ b/app-editors/vim/vim-8.2.3428-r1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
 
 SLOT="0"
 LICENSE="vim"
-IUSE="X acl cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
+IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -36,6 +36,7 @@ RDEPEND="
 	>=sys-libs/ncurses-5.2-r2:0=
 	nls? ( virtual/libintl )
 	acl? ( kernel_linux? ( sys-apps/acl ) )
+	crypt? ( dev-libs/libsodium:= )
 	cscope? ( dev-util/cscope )
 	gpm? ( >=sys-libs/gpm-1.19.3 )
 	lua? ( ${LUA_DEPS}
@@ -200,6 +201,7 @@ src_configure() {
 			--with-features=huge
 			$(use_enable sound canberra)
 			$(use_enable acl)
+			$(use_enable crypt libsodium)
 			$(use_enable cscope)
 			$(use_enable gpm)
 			$(use_enable nls)
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index fd00866b78b5..d15fa2f9dcc8 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
 
 SLOT="0"
 LICENSE="vim"
-IUSE="X acl cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
+IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -36,6 +36,7 @@ RDEPEND="
 	>=sys-libs/ncurses-5.2-r2:0=
 	nls? ( virtual/libintl )
 	acl? ( kernel_linux? ( sys-apps/acl ) )
+	crypt? ( dev-libs/libsodium:= )
 	cscope? ( dev-util/cscope )
 	gpm? ( >=sys-libs/gpm-1.19.3 )
 	lua? ( ${LUA_DEPS}
@@ -200,6 +201,7 @@ src_configure() {
 			--with-features=huge
 			$(use_enable sound canberra)
 			$(use_enable acl)
+			$(use_enable crypt libsodium)
 			$(use_enable cscope)
 			$(use_enable gpm)
 			$(use_enable nls)
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index fbbd6947d3d7..c1431b02ab20 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -18,4 +18,5 @@ DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e54
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
 EBUILD xemacs-21.4.24-r3.ebuild 7093 BLAKE2B b110be14467c17919c72baeff5339dcc1d135f883047cf699e781b4302a0b37a6f6dfa0175de4a66e64fc0d457531ad85a20d83ca8e01d6660dcb0a5a83565ba SHA512 5f01488f2bc7155de34d0c8e7fde30f51584abbe45ad3f2d482b442df26305f8765c0940255e607bc09f9b914facaeb554e0d969bb72e2891fae944cb08c5f9c
 EBUILD xemacs-21.5.34-r6.ebuild 7320 BLAKE2B 7899c64b324d0ee03e39c4bc0e99ff376716fb9dd26a229a902392a8cbe7864c2a2069bb1d852e1bf551d7fde1e0d5dcecb62e1fea667bfc644ea4f77b6e996b SHA512 83fba83ef8fa82697a181f9c8934132e03e9452bb891112a91ddc0f720a9649942c9c2c7ea1c0151c48de8d342d85f83039f69faf685973d0112acb1cc224173
+EBUILD xemacs-21.5.34-r7.ebuild 7293 BLAKE2B 2d8ca8d8e740acd1ac2428a0ef6bf6f4ff4d0b7721269ac97134a998363f9785defa80ec557a1cc92d1bac30cfc8d66f8dd8a565e601883a45004ab4c8d5b889 SHA512 ac10ecd3e0ac78df8f57bdff5b32a5b9186699d03f3bc92f2333a8b757f17c8d216ed1eed38b2ec7d397906ecfb5153f25f7a3502f8bc33f3078109b350b283c
 MISC metadata.xml 683 BLAKE2B 060e4f7830a96404813a550debecf83c2de3993183d41638362ed01a3a6240bdd33a83c0db5e31a2f2e821046fb1c15199688271c27611689aac1bdf02bcde14 SHA512 176625d3c972766aaecd10125e69b4cdcbedff958b842b2ac2b6a39d728ec868b3311ef13f6854122063810c5125f48d73cd1e68083de5ddf3ef85f7f2b09cdc
diff --git a/app-editors/xemacs/xemacs-21.5.34-r7.ebuild b/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
new file mode 100644
index 000000000000..c44dccad1aba
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2021 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
+
+DESCRIPTION="highly customizable open source text editor and application development system"
+HOMEPAGE="http://www.xemacs.org/"
+SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
+	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 eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft 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-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 )
+	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:0 )
+	png? ( >=media-libs/libpng-1.2:0 )
+	jpeg? ( virtual/jpeg:0 )
+	freewnn? ( app-i18n/freewnn )
+	>=sys-libs/ncurses-5.2:=
+	>=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PDEPEND="app-xemacs/xemacs-base
+	mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+	default_src_unpack
+
+	use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
+	find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
+	eapply "${FILESDIR}/${P}-ncurses-tinfo.patch"
+	eapply "${FILESDIR}/${P}-gcc5.patch"
+	eapply "${FILESDIR}/${P}-glibc-macro.patch"
+	eapply "${FILESDIR}/${P}-as-needed.patch"
+	eapply "${FILESDIR}/${P}-configure-libc-version.patch"
+	eapply "${FILESDIR}/${P}-ar.patch"
+	eapply "${FILESDIR}/${P}-strsignal.patch"
+	eapply "${FILESDIR}/${P}-process-test-qa.patch"
+
+	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
+}
+
+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 --with-offix"
+
+		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 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} $(use_with freewnn 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"
+	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"
+
+	econf ${myconf} \
+		$(use_with gif ) \
+		$(use_with gpm ) \
+		$(use_with postgres postgresql ) \
+		$(use_with ldap ) \
+		$(use_with eolconv file-coding ) \
+		$(use_with pop ) \
+		--prefix=/usr \
+		--without-canna \
+		--with-ncurses \
+		--with-msw=no \
+		--with-mail-locking=flock \
+		--with-site-lisp=yes \
+		--with-site-modules=yes \
+		--with-system-malloc \
+		--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/
+
+	if use mule;
+	then
+		dodir /usr/lib/xemacs/mule-packages
+	fi
+
+	# 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
+}