Sync with portage [Sat Oct 9 23:03:57 MSK 2021].

3 years ago · 347d0aa921
parent 32a4bdfd27
commit 347d0aa921
1049 changed files with 8301 additions and 18111 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29302 BLAKE2B 6e06c949aaee110fad1175bf96ed1afdbe95fb031f0bf58b76ac53ba4df914b3dcd8ff21e70936c952e6e2ac0de3482e93dab4202113e3637887b529e2377409 SHA512 03ccc535c146da15b6d4cffb52ad5896b351570849ed771f3b0cb60c68706402cb1ec56b973f5d962cbbbae745735747299a6f37146340ef8cbe8eb1cecaea71
-TIMESTAMP 2021-10-08T11:39:20Z
+MANIFEST Manifest.files.gz 29296 BLAKE2B c0e3d2f6c5ec2e493175e04129f1efe7cc6088b4b72a70023d8188e7de6a6ce933d3bbd65bebd72db9dfd95b03357291397aa7a3a470b0ef830a25e4feb0768d SHA512 d62526bc1318a47919707eb02e0b01af3d3b33d5420fbed4aa4c788c3a1c8b82dec918f7f3ee49b6863f9d259799854ce61c269f8125979add9d8c1abc14fff1
+TIMESTAMP 2021-10-09T19:39:20Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFgLehfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFh7+hfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDEQg//dRmfO6C8S8YNIWo6xtpAOZrX1ySkeRFIlCu9p+Kna005Sz62F2vXnC+o
-X9jP3dHMLT07CvJ6cavDvyCjA9Tet+b+wRCnX0XQwU5XKlItK88HZyuV/PKLnRV1
-sFZSgtCAMy4N+yCDsrH9sLDUVrvhwx5R8nfQp+l0c7NuAnkxKZ6rwq7MfcSD1vQV
-80VCCKexKNEHqSwY9fCkxzCUDyLtkeEnXIpMKXsJlCtLqKAsElah5AorAMA2ZxYh
-fxsBxub31ymNMz+S7UiEukS418AN5L4O9giVes+XTixupA3rYUVkUnAgdNsmnhAv
-XVgKt8yXk0ZAjauJWE9gEb+Br2Y4ZGl3m2xvVShyyMPWAAag2QoY/2I1uSZQRWJG
-okWBt1gRNUm2AqSF3l80bXFxiw/tk0jmacc245Vlzb8jWYVvczpcqCPF83Bpiy7N
-rtBjCVuQr4j2dSkVHDYjUNar4LxTGpTaesPIKZAwtWfHtINd8JdvcDsMK8IURgNQ
-+gcleSGtnl3+j7LyDyjDgLcy+ecu+a2Xrp2kWnH/H5tAHrE+PgZdIDgHEIndWbxK
-ltb8Dvkg188lgHrYOBPjldA2MLo7iZtAuxtdZddQaqwqyQYvI8uOPoLKa0ZrtAUd
-iNC4d+L6PthO+sxBy+4ByRh6R47XDzac7PPu9gq5JhaV9mX69W0=
-=ecbD
+klA33w/+M37vzTTSu5gn7mjJBKLbrM7HAovm9/T0Nx3rr0h+e9rLKka5For8Bsjd
+eM7deGc10t1GdwIreMJDJ87MvKKaXtMhN7cMx9/1fqxHY3Jt2Smzje+XQAhL4/be
+i2UWoajqQMoo2azjAH7Y3vNhlYI6sj1yDH34NyD898eAt6eQCs7X44RnRcdpYYxz
+8O1hCNulGsx6u0N6Ek3ouxIdt3HTd2jSbe/zk37Wx+ZXomED/3wXQ6FfB6keVOdL
+QFW8DUfXRWp5WyiOLwClT60bksUU1siloGKBUp5901GmpsJr3qTQZA9L9CRTP/I4
+IWJ5RQmVPUHwsHwfiPdXZyr6JnQMosx4uC1TtIcQ/pXgPL1rGRaWGGBz0TjmvJwN
+zQeGh+DHaY/mc8jfMoCCfUdEyt4IhUnBzLO77chIY+ncEu6+Xs0YomUrKdpQT6ej
+6Bmsz2I2r7ys5DbwNacvgBgzAy/Tj1iy6Tj1h6vlNStOHkosf3o8X2MzgHARnLX8
+1CTMjbayTFxkR51ihmK3oYAy3+yo3jWPn24opauWyomcVntYiwc5DP108YJOUPPc
+TECSWN+IJRoVTexCh94oxE5kjbw2aSz38Ntl6q5zy7W+m6joOuBQ0dNUNJBp6tFd
+XCJSezO3LGAjU6nsuYgLSomshZGbzp6bwMplGrASOiIaE2fTl84=
+=BjjM
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -7,6 +7,7 @@ DIST awscli-1.20.54.tar.gz 2082080 BLAKE2B 157e35ab297d18aa9739319801e28fabfbd9f
 DIST awscli-1.20.55.tar.gz 2082482 BLAKE2B 5f8d9d84e6993e22ffd6f1e7e46b0afa2aecd12b4c2c18968e0f85d7544aced039a21b2245bfd66393bbb0d240f9b3119da7f745891b04f9156b677f613fbb63 SHA512 5d76c07417a3edcdff490ecdad9469f6f0f3077f4fccba9b6cf8518390df90d49d126e6c924a57333c5b68a97b833cb0bbb72133ddc63fd74893f888eca974a5
 DIST awscli-1.20.56.tar.gz 2082836 BLAKE2B e935334dba5aaa77cbd4fe3adb789c33c9fa80832bf4ad7517024787911e377020e8cdc38b0bd87db81571a2da888acd96306198a66748597495460292286938 SHA512 5b3bfebe217c05df70421b29c6a239a76493898717bd5db10ef7001e6c9af1488a52e6e25ab85b5ed725c87402a562ebe6849eb39743681c644143f17fccc3b6
 DIST awscli-1.20.57.tar.gz 2083414 BLAKE2B b3d21c0b8ceb0016def4aae9f2485dffd77bdd12a959b6c959d9c10cc3466fad9309a40102409ddf59d372bf95503a6bf87bc454d37400877a7cdc33564c0f45 SHA512 ad5d5a4de8083ce5198a49756da4ef6d630671c49ee0da0c15f06c9af1e92a9c98f2721b06df77adc47ea2b455e80e8aa92238a514039a213acbbf133753b430
+DIST awscli-1.20.58.tar.gz 2083928 BLAKE2B f8b67baa47ddb468395b0ad2029a85f40ea2241d34b00545d5e6ae9fb407eaa95aff48f3dbe59d2aed309167bb9056b0800987937ef53b0884006100b94150db SHA512 a51f530d3c0938544217febc76adc668b71ebedae2080154716fd4e3293cad8e8ce65f32a4b34f1d8069c42a596f94f123b1b043d55349e7910a98126c7bd9bf
 EBUILD awscli-1.20.28.ebuild 1465 BLAKE2B 0414a41a1f6a9234c4c74ed23e4ce30b1801ce885e556b290ede026239d537d38912c4557b11985e8e25d95916fbae319876900c46e89e5858ea051ee6a18373 SHA512 ed3d2f988845db9dfff03a8c64373a19dd7719945370e374092403c8a022a9a2f6acd294ed1ad857a40c76730a9a4c42d5a1da4b84cc5f37401317f63b19694f
 EBUILD awscli-1.20.40.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.47.ebuild 1404 BLAKE2B 7fde5eebee2268092ca0ed774ea605f9080af17d87614f6892fbba1b1f44440bfb8ee88ca6714d54c6639e17d5955b22b01ef609dcb5154aaa98710a73e73521 SHA512 6319aa19de797f3d1d33d6499be8502efbb1f33df58f83874a79ddd0bfd59fb9837891cde5e8b3deec254dd8dcdc784d8f23985e4022b6e31a248bd5395dcaf1
@ -15,4 +16,5 @@ EBUILD awscli-1.20.54.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd0
 EBUILD awscli-1.20.55.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 EBUILD awscli-1.20.56.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 EBUILD awscli-1.20.57.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+EBUILD awscli-1.20.58.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
--- a/app-admin/awscli/awscli-1.20.58.ebuild
+++ b/app-admin/awscli/awscli-1.20.58.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@ -1,6 +1,8 @@
 DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 DIST certbot-1.19.0.tar.gz 1338653 BLAKE2B b6ed909da2aed9853cf3dc6b936c513f33a127548ee30ac45a32a682141c5e4e79401ea328b7caf4e28d1d85aa2a9831e93deaa26c93216708a33be465dc8387 SHA512 2c1beb8c06299b9003fafd970cd3e977db85c4e84f1bf710166b7a99035b5c43a2a222d8d51513ac595255dd8eda02a1fb834c01ce68921927715c880052536e
+DIST certbot-1.20.0.tar.gz 1339066 BLAKE2B 01278a53ea7166037c039d270ddd11a10c0570a9f038571dc6791e51f214fbff1589371b40c0dc73cbc18ed2005cfc231452bd00b039841a09ddb3c65d4ab122 SHA512 d35b2574811ac896ad119355be3a901438400e81a67388bd93290c4e7e9f6fa60dad99b51bc9bac7a7ac60714ed8bb6f60f522ce1a1a169886d0a15f0d0e371b
 EBUILD acme-1.18.0-r1.ebuild 1123 BLAKE2B 37c29dec8eb47e63cc708fd431af8689155798c9a4fe2c07dd2de26980adf8335d523f1a5e06a17c707561571ac6b0b7ba97a477419b1f974c8881fd03b99ca4 SHA512 964a1b0e24ad95302f47a09d1c1f1560d5551547c36f3bd2eaaab6c03a320444ef296f4141017420a61d9d36378490a149a3c325e43e471796a960c913650a5d
-EBUILD acme-1.19.0.ebuild 1132 BLAKE2B c040463a55642cb2f08cd57c8dd7f8b2d338a785522b3aefb6f71f234d0800442c367ed545bb40b12eb82f0f43e8e26ba366d00f6e3bef8887e902b442cc8570 SHA512 3e75f147716119305b12826babb4431c467fd0bc285627e98ab3aa71008b7d70436cd6ca1cb595b5a8c743a07bea6d064024eba2ad0458486c94f8d2b18b0429
-EBUILD acme-9999.ebuild 1132 BLAKE2B c040463a55642cb2f08cd57c8dd7f8b2d338a785522b3aefb6f71f234d0800442c367ed545bb40b12eb82f0f43e8e26ba366d00f6e3bef8887e902b442cc8570 SHA512 3e75f147716119305b12826babb4431c467fd0bc285627e98ab3aa71008b7d70436cd6ca1cb595b5a8c743a07bea6d064024eba2ad0458486c94f8d2b18b0429
+EBUILD acme-1.19.0.ebuild 1130 BLAKE2B 2e8ae9c68f9af1eccbd9d16c7455f5c5d2f04b8501af4473bdff7318a688f7a61c16e2986323d2ece36a7dd63524526518fb9d4e115a4da1dddb17ce3201b62a SHA512 1b6934821006bc1608a47272d1beb4c8ab064cfdb2e5e9fc535a2544ab0a75df7b765c2e4bdb7349a899db41088e67909dac08226052b3a6e0da07557e760034
+EBUILD acme-1.20.0.ebuild 1132 BLAKE2B f8e07ded95e3da1a98b0e6ffc21c8bae395ad405e06fa455e57aeb76375c03a6f031951fc6a68c31eaf69073c6447c3b71009f388f78e361f2f62c3dfccd0d60 SHA512 1fd8de93d8b937a55600a92597a18c271cfc7cb407084ae88315616929c2e793ac0ccf6a219d0433270c0a68b8f8e2ae5996423c17403bf1dfdb7f19a40b31f0
+EBUILD acme-9999.ebuild 1132 BLAKE2B f8e07ded95e3da1a98b0e6ffc21c8bae395ad405e06fa455e57aeb76375c03a6f031951fc6a68c31eaf69073c6447c3b71009f388f78e361f2f62c3dfccd0d60 SHA512 1fd8de93d8b937a55600a92597a18c271cfc7cb407084ae88315616929c2e793ac0ccf6a219d0433270c0a68b8f8e2ae5996423c17403bf1dfdb7f19a40b31f0
 MISC metadata.xml 401 BLAKE2B 30a2ac1f03749a8e3bb98723c57f47ab6bcf7bfa58c2b6e21c309fae279feca0d3612df6c2a1dafaf27b4f0781c583a140322feac1a1cf2c13e50861cad129ea SHA512 d8e725b71ca81ce4ca6565ed58271b283c25394448f0f48f726f232122577c33d5b2d726e117419b2fae99f9dae29a8080bb9564eccbca13368c83988cf3da01
--- a/app-crypt/acme/acme-1.19.0.ebuild
+++ b/app-crypt/acme/acme-1.19.0.ebuild
@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi

--- a/app-crypt/acme/acme-1.20.0.ebuild
+++ b/app-crypt/acme/acme-1.20.0.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@ -27,7 +27,7 @@ SLOT="0"
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@ -1,6 +1,8 @@
 DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 DIST certbot-1.19.0.tar.gz 1338653 BLAKE2B b6ed909da2aed9853cf3dc6b936c513f33a127548ee30ac45a32a682141c5e4e79401ea328b7caf4e28d1d85aa2a9831e93deaa26c93216708a33be465dc8387 SHA512 2c1beb8c06299b9003fafd970cd3e977db85c4e84f1bf710166b7a99035b5c43a2a222d8d51513ac595255dd8eda02a1fb834c01ce68921927715c880052536e
+DIST certbot-1.20.0.tar.gz 1339066 BLAKE2B 01278a53ea7166037c039d270ddd11a10c0570a9f038571dc6791e51f214fbff1589371b40c0dc73cbc18ed2005cfc231452bd00b039841a09ddb3c65d4ab122 SHA512 d35b2574811ac896ad119355be3a901438400e81a67388bd93290c4e7e9f6fa60dad99b51bc9bac7a7ac60714ed8bb6f60f522ce1a1a169886d0a15f0d0e371b
 EBUILD certbot-apache-1.18.0.ebuild 945 BLAKE2B 5ec08b80fcce13df8f20cc1d2710abac4a8ed4e0847682b287c374921d2b7d301b75f34bce9090057548f5b1630f605a62fc3ffcfee3f13dff3f860350e04728 SHA512 8af41c92c60da9608015574316a2b776a8893b97e731d0bd779b200a2051708d3e6b2b98a0f140ed1c725bf697d56001cf608d51b68916c6e5fe6f19c40fb09d
-EBUILD certbot-apache-1.19.0.ebuild 947 BLAKE2B 5da53f56cef939f37cefd63251b522b54c18e30db386a229413bcc3a02605984194d1ea4c5647fa895a9502d254fcb9b73f5575fb7096f31df51f1e0b17659a5 SHA512 79358b1fe949ee2302a2db4c72b55bce960b0ba9aafff3cc50ee86e886c80a1337f086166646cb7f9e1baa8ead34dd43188feb53516321acd297e55a7475535b
+EBUILD certbot-apache-1.19.0.ebuild 945 BLAKE2B 5ec08b80fcce13df8f20cc1d2710abac4a8ed4e0847682b287c374921d2b7d301b75f34bce9090057548f5b1630f605a62fc3ffcfee3f13dff3f860350e04728 SHA512 8af41c92c60da9608015574316a2b776a8893b97e731d0bd779b200a2051708d3e6b2b98a0f140ed1c725bf697d56001cf608d51b68916c6e5fe6f19c40fb09d
+EBUILD certbot-apache-1.20.0.ebuild 947 BLAKE2B 5da53f56cef939f37cefd63251b522b54c18e30db386a229413bcc3a02605984194d1ea4c5647fa895a9502d254fcb9b73f5575fb7096f31df51f1e0b17659a5 SHA512 79358b1fe949ee2302a2db4c72b55bce960b0ba9aafff3cc50ee86e886c80a1337f086166646cb7f9e1baa8ead34dd43188feb53516321acd297e55a7475535b
 EBUILD certbot-apache-9999.ebuild 947 BLAKE2B 5da53f56cef939f37cefd63251b522b54c18e30db386a229413bcc3a02605984194d1ea4c5647fa895a9502d254fcb9b73f5575fb7096f31df51f1e0b17659a5 SHA512 79358b1fe949ee2302a2db4c72b55bce960b0ba9aafff3cc50ee86e886c80a1337f086166646cb7f9e1baa8ead34dd43188feb53516321acd297e55a7475535b
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
--- a/app-crypt/certbot-apache/certbot-apache-1.19.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.19.0.ebuild
@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi

--- a/app-crypt/certbot-apache/certbot-apache-1.20.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.20.0.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@ -1,6 +1,8 @@
 DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 DIST certbot-1.19.0.tar.gz 1338653 BLAKE2B b6ed909da2aed9853cf3dc6b936c513f33a127548ee30ac45a32a682141c5e4e79401ea328b7caf4e28d1d85aa2a9831e93deaa26c93216708a33be465dc8387 SHA512 2c1beb8c06299b9003fafd970cd3e977db85c4e84f1bf710166b7a99035b5c43a2a222d8d51513ac595255dd8eda02a1fb834c01ce68921927715c880052536e
+DIST certbot-1.20.0.tar.gz 1339066 BLAKE2B 01278a53ea7166037c039d270ddd11a10c0570a9f038571dc6791e51f214fbff1589371b40c0dc73cbc18ed2005cfc231452bd00b039841a09ddb3c65d4ab122 SHA512 d35b2574811ac896ad119355be3a901438400e81a67388bd93290c4e7e9f6fa60dad99b51bc9bac7a7ac60714ed8bb6f60f522ce1a1a169886d0a15f0d0e371b
 EBUILD certbot-nginx-1.18.0.ebuild 962 BLAKE2B d395edd7714ead5647918d5e413b61e4c9a4a9fa363504c204250b511e92d35ac032816892f97322ac1c1f99b9c446c2b5abccb9d341193a0e6bacea84d887ed SHA512 cfc5b873c74156fe3d8843a6dcbd3084af86778b4d66c26bae0d1ba6f5c22ca147b79098cc4ffb40986bc6f38cca0475682b15669940c88f01be8f535a26d8dc
-EBUILD certbot-nginx-1.19.0.ebuild 964 BLAKE2B 7c84e63e0f822a1c3f6db07b53f7f7c00a66e2d0f37d5cd2eaf3042710c3184074709a24d7fbf0af88a5802957212304c4dce35bf4466b7a6959a20c4ef6e89f SHA512 a4606d2e422a002e04b15c22d7d111b04e12e6ebdcc17afbc24322d6786e82a9a999370c68e26f50a0dba1056e5f9e61f84f3c03a524cd1e55f35c0d2e43375a
+EBUILD certbot-nginx-1.19.0.ebuild 962 BLAKE2B d395edd7714ead5647918d5e413b61e4c9a4a9fa363504c204250b511e92d35ac032816892f97322ac1c1f99b9c446c2b5abccb9d341193a0e6bacea84d887ed SHA512 cfc5b873c74156fe3d8843a6dcbd3084af86778b4d66c26bae0d1ba6f5c22ca147b79098cc4ffb40986bc6f38cca0475682b15669940c88f01be8f535a26d8dc
+EBUILD certbot-nginx-1.20.0.ebuild 964 BLAKE2B 7c84e63e0f822a1c3f6db07b53f7f7c00a66e2d0f37d5cd2eaf3042710c3184074709a24d7fbf0af88a5802957212304c4dce35bf4466b7a6959a20c4ef6e89f SHA512 a4606d2e422a002e04b15c22d7d111b04e12e6ebdcc17afbc24322d6786e82a9a999370c68e26f50a0dba1056e5f9e61f84f3c03a524cd1e55f35c0d2e43375a
 EBUILD certbot-nginx-9999.ebuild 964 BLAKE2B 7c84e63e0f822a1c3f6db07b53f7f7c00a66e2d0f37d5cd2eaf3042710c3184074709a24d7fbf0af88a5802957212304c4dce35bf4466b7a6959a20c4ef6e89f SHA512 a4606d2e422a002e04b15c22d7d111b04e12e6ebdcc17afbc24322d6786e82a9a999370c68e26f50a0dba1056e5f9e61f84f3c03a524cd1e55f35c0d2e43375a
 MISC metadata.xml 335 BLAKE2B 048854ec6bc919f9bf9b0bc74e7c291841cbfea0e571f43437937c5dd78cc65f9df53463adcf313441e01323491709b462bd9bc364876eb1508a83b3426b6b78 SHA512 25ac45574a568e362c419dfbeade4a977afa2885e7b32fb4c3d4c765450b09aa98cf419df1a39ab194518ad6f2b582e162d4dd4eec14f278635d63bf66352523
--- a/app-crypt/certbot-nginx/certbot-nginx-1.19.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.19.0.ebuild
@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi

--- a/app-crypt/certbot-nginx/certbot-nginx-1.20.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.20.0.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@ -1,6 +1,8 @@
 DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 DIST certbot-1.19.0.tar.gz 1338653 BLAKE2B b6ed909da2aed9853cf3dc6b936c513f33a127548ee30ac45a32a682141c5e4e79401ea328b7caf4e28d1d85aa2a9831e93deaa26c93216708a33be465dc8387 SHA512 2c1beb8c06299b9003fafd970cd3e977db85c4e84f1bf710166b7a99035b5c43a2a222d8d51513ac595255dd8eda02a1fb834c01ce68921927715c880052536e
+DIST certbot-1.20.0.tar.gz 1339066 BLAKE2B 01278a53ea7166037c039d270ddd11a10c0570a9f038571dc6791e51f214fbff1589371b40c0dc73cbc18ed2005cfc231452bd00b039841a09ddb3c65d4ab122 SHA512 d35b2574811ac896ad119355be3a901438400e81a67388bd93290c4e7e9f6fa60dad99b51bc9bac7a7ac60714ed8bb6f60f522ce1a1a169886d0a15f0d0e371b
 EBUILD certbot-1.18.0.ebuild 1180 BLAKE2B 55c9e5b606cd2d9e569483cc6d5e9ed558654685c30186dff79b38c0de8f449d16cf8b50151b0edee8343a8840e390019b75523be78f5db085914bc22bab57b4 SHA512 8299e5833351978765b9fc49dfb9f0434882a14d82ece0b21104ecdcd5d2e501d9c2407d0792ed1a9a3e26b56da0488c6d28603f9d85616296c50e0105b0d2e6
-EBUILD certbot-1.19.0.ebuild 1189 BLAKE2B 2bf07d3f5ce29a1d6fa94feac130e9b6826a5168762919953ff7496158103289a75f271c104774c6c9927750bcf126d40c3def6ade3bf15b108d4615b8e38e44 SHA512 2c6b143f928639c81cbd3d3d1b260a9231f75755ad10b470cd7e28b0f982094026f31ad75402f7e3aa20891448233751fb97b3185f79707d96f582c1b93d52ac
-EBUILD certbot-9999.ebuild 1189 BLAKE2B 2bf07d3f5ce29a1d6fa94feac130e9b6826a5168762919953ff7496158103289a75f271c104774c6c9927750bcf126d40c3def6ade3bf15b108d4615b8e38e44 SHA512 2c6b143f928639c81cbd3d3d1b260a9231f75755ad10b470cd7e28b0f982094026f31ad75402f7e3aa20891448233751fb97b3185f79707d96f582c1b93d52ac
+EBUILD certbot-1.19.0.ebuild 1187 BLAKE2B 94b32edb5153d49fd642b4f2eef6d14ff8691fd48586ccdb441ba51c5bc26b635281a0690850f1f98a93702021d129c0bceb144dc724622a641a7d9390537559 SHA512 5338016400e8103c6296efeba175452bbdfc962db04fec75a1dc8217fc20a1d727005e3d639eac127c1e32db146ac0e36aceb045f9b76cb2ab95618597da0400
+EBUILD certbot-1.20.0.ebuild 1189 BLAKE2B 361260e42aa3fd2f5ded08115be7a560baddc87b244c5149318bb7d86be6b1221a842d20a6b5e8ace174575d8ed2a9a8ac360fbc01756625d428bf13c314f64b SHA512 b9a40cca88a725402f3fb982868d885165d9136333ee80a04567376e21ee84ba50356b9b394c139332bafed2b3ac7d76b1fb6f5bf5ff7de6cf22feec7fa713ed
+EBUILD certbot-9999.ebuild 1189 BLAKE2B 361260e42aa3fd2f5ded08115be7a560baddc87b244c5149318bb7d86be6b1221a842d20a6b5e8ace174575d8ed2a9a8ac360fbc01756625d428bf13c314f64b SHA512 b9a40cca88a725402f3fb982868d885165d9136333ee80a04567376e21ee84ba50356b9b394c139332bafed2b3ac7d76b1fb6f5bf5ff7de6cf22feec7fa713ed
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
--- a/app-crypt/certbot/certbot-1.19.0.ebuild
+++ b/app-crypt/certbot/certbot-1.19.0.ebuild
@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 S=${WORKDIR}/${P}/${PN}

--- a/app-crypt/certbot/certbot-1.20.0.ebuild
+++ b/app-crypt/certbot/certbot-1.20.0.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+S=${WORKDIR}/${P}/${PN}
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@ -29,7 +29,7 @@ RDEPEND="
 	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- 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
--- a/app-editors/gvim/gvim-8.2.3428-r1.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)
--- 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)
--- 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>
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@ -1,5 +1,5 @@
 DIST mg-20210314.tar.gz 152749 BLAKE2B eec9740db1a543025450746913c1b07f0646f370906665122c7f5dd1ecc46b5cab102bd29aa51afb13972f4f17118ea20c33bb619e8dc4bc8982f8423ed189d6 SHA512 816b1bf8aec97dd790b0d5bf8836d46cb87f60d0bda94c2aecce4f8a6b8599ab2e90805fa6b129c9e40b54b340e33a47fec97c60e1b59b7706aa357d58b0e3f6
 DIST mg-20210609.tar.gz 156850 BLAKE2B ed8061aa808a8570f24198fb32fa3d24d66decdd07dab871502456d734a8d7867f384122361294bda0155bc3fecea80983fd41c00a2ffe02d00e380bf94e2f43 SHA512 a17b470e5e192c1f62700c7b78b15c9403b25528a7d6603fda0b6e618196150329fe4889cedfc8dbf621053d45b78294ed5c2766604aaa4c3ddbaec545693043
 EBUILD mg-20210314-r1.ebuild 1047 BLAKE2B 58927b004dd4d86b0b265c81c4143c3f5c89f40d68c8f97af75696885c2cfa1aa2a6d4e1f72507b30a424466e7da47ac88b66d9d0d17652f8e47f9cbf791122c SHA512 77ccf850b2e25689630b8b04a3bd075f8dd1c2852a4a5a64a18b846443ca4822045986e4798bc21a45512d8ba456b4ced44a0af6a6a047a117a0133c4a06f90b
-EBUILD mg-20210609-r1.ebuild 1088 BLAKE2B 4002a614b4dcbe1ac52bbcbf503bdc046934b25b674e3f70b16f1640fc01e5980a3e08c8d7569a59c5e0274d6b05c5364494987cf3529db89c7941c00de41b26 SHA512 a1a4d7024a141d902d2b0579867ce544c6310b7867dd622c8f069d67eb79f1e8162f1b4fd3855075d8f45e4d6122132d0c5b81b7b259dc6b0a0d5993e290cfa0
+EBUILD mg-20210609-r1.ebuild 1087 BLAKE2B 69f2f251a76e166321ca92817912d2e6e90b5c25bbc04052a77ec6c24262db52763e5fd5e15abb3382a7de205b2c2678164ade0b45a88be6200a6f3752e4e5b3 SHA512 d138e6c4702a8570469ea60fbedd0ffd6c97b2e965ce751950725414ddaa845619aeda68c4314d0fa9a7f91c444a591d3e5237207ade9c55bbe25b3e164b19dc
 MISC metadata.xml 619 BLAKE2B 746ed0d179b4fb8e40533411d3248b88c035a2f01ea6552af8e9bcf3d588a0e6a835ad12aa03a27052a7988646499538d991d05eb88c0125f3fc7d47e2ae217e SHA512 a1c066343bff1bd451d44850e8dd3f554fb330116a7e91b5a9c13f4c33e837018f81a9e77e1c9856651c877352aab68fe4f80f05a185996cce7eda91c45e6c8e
--- a/app-editors/mg/mg-20210609-r1.ebuild
+++ b/app-editors/mg/mg-20210609-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 sparc x86"
 IUSE="livecd"

 RDEPEND="sys-libs/ncurses:0=
--- 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 2287 BLAKE2B c22b6eb3bfcf01eecd6c0f502673b837e3273c8b43058012b38aaec178b2810f5dce6590c9b9566aee7a0f3f4bb40457f4ad3ed0f8f4412f2afd77b066b1af54 SHA512 47a2ecd9f8338f8e70fb8fcdf3e6f6c59fe0d8395309494b95a96e099fecbc2b78fa6172b0836e49ca8fe51151ea3efb45d7d2fddbe8ff025a23f052edff1fce
+EBUILD nano-5.8-r2.ebuild 2285 BLAKE2B aff7b8d6989f1de16e9ebe7d74a76a38b3776506a79e4b2533277a55314327a01e356dd89fb817d345749a7ca1b28fc0a9d7be311453b561bade6a2d3afe5a32 SHA512 c363a2aacaa04837cf85f9fe622f7cdb1be51804e4a24e7ee3c66adf1887635a29a6cef626a87c619804c398a9fdcb08180cfe7427255d570b76468c3964ac8c
 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
--- 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"
--- a/app-editors/ng/Manifest
+++ b/app-editors/ng/Manifest
@ -1,5 +1,5 @@
 AUX ng-1.5beta1-configure.patch 658 BLAKE2B c76c062312f36e59c4f31f6d24ab992b7722ea3f8d323954b4a3981acc708e751b869e5ce3aafd47869e3893effc3d5705cde7648bb948d7acb7d79d906953e0 SHA512 afea99d16b06308feed87512ccfe084b3f3c222afdb9a3f430ec02882d99cf81d7506dd329601a58ab62d8def05e48f3ff502d0d76ecada8cca2c42931bdca1b
 AUX ng-1.5beta1-ncurses.patch 556 BLAKE2B 87321f8f920609a64cf356a45517b3f3328a204dd65c3fb02faf891c748d4b0dd9fb61814b13d6e99f75255b6b3f544e12f757ac393fdd31ff74a889e0fa619e SHA512 0c53ac22f5452af1ce59dfd6e2bd35868e824a922bbd4742ed20d9e2e24752c2fab52504b1365736dde04ba212c458ace9335a8399509d1043b686d997bfbfbf
 DIST ng-1.5beta1.tar.gz 662557 BLAKE2B 02f1f5277aaba279226d732351eb604205e8bfc030678551a5f2439bde61651bf5aa4e02e06f3283fdab710cc5a1ed9a3eae1e42fd4fa8a8145699b425c4e61e SHA512 eaf3ee067cd98aebc757def9880c5a324975e9f5d0f1db030b11853e86631bca892bf344358ca21b778f5e10ae0d2ed97553221a368326f7a4d9d41f6867abcd
-EBUILD ng-1.5_beta1-r3.ebuild 1148 BLAKE2B 3aff452538e9ecf6cf08cad63c9012a19084e993703bc5bcdf47097ba5b1d5e80e4a167a6dc015fbe1e53c5becf9128ecec48acb6b8e843ed06184573534f19b SHA512 f8502ff42b24dd3901a16b3771ac041f588f26eab8a3a9476df2378580453abe147a441e950030481030ae9e25c61aeeaf1634df808f5a11040c329103c15ed6
-MISC metadata.xml 231 BLAKE2B c2fdc9ca113ea1fb6cb14f865609798058c3443d097117d61de82b4f53e8d293bc187413600b6a6eb3e1c744ae7712bf8c55db53562076e7bc5de5eae0c1f209 SHA512 281ccb55b01108f6fd9953a4fc8723e312c6416b885b11a32d2a0d4d532ebbc361990c814402bc8061e360c02b8074797b1b68ee9a8bc96d37f2cb6455e5949c
+EBUILD ng-1.5_beta1-r3.ebuild 1271 BLAKE2B 51430ead17e580a602aaa7abc8392c9e4c795934ab9e653337301c3c58bff3c112d2e19cec00e26fac23f7e8a90ee7358d1d86ffc422a66d2282f452bf49ea55 SHA512 efe5346aa34b4669bec5a88c8add2db33bfa254805245dc32ecae472a2ff4849986fa4c87df23da9acd76727a4c9d2604b8b91e58821ca3757180d09e001676b
+MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c
--- a/app-editors/ng/metadata.xml
+++ b/app-editors/ng/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>cjk@gentoo.org</email>
-	<name>Cjk</name>
-</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-editors/ng/ng-1.5_beta1-r3.ebuild
+++ b/app-editors/ng/ng-1.5_beta1-r3.ebuild
@ -1,39 +1,43 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI="7"

-inherit autotools toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs

 MY_P="${P/_beta/beta}"

 DESCRIPTION="Emacs like micro editor Ng -- based on mg2a"
 HOMEPAGE="http://tt.sakura.ne.jp/~amura/ng/"
-SRC_URI="http://tt.sakura.ne.jp/~amura/archives/ng/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+SRC_URI="http://tt.sakura.ne.jp/~amura/archives/${PN}/${MY_P}.tar.gz"

 LICENSE="Emacs"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"

-RDEPEND="
-	sys-libs/ncurses:0=
-	!dev-java/nailgun"
+RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
+S="${WORKDIR}/${MY_P}"

 PATCHES=(
-	"${FILESDIR}/${MY_P}-ncurses.patch"
-	"${FILESDIR}/${MY_P}-configure.patch"
+	"${FILESDIR}"/${MY_P}-ncurses.patch
+	"${FILESDIR}"/${MY_P}-configure.patch
 )

 src_prepare() {
 	default

-	sed -i -e "/NO_BACKUP/s/undef/define/" config.h || die "sed failed"
-	pushd sys/unix > /dev/null || die
+	sed -i "/NO_BACKUP/s/undef/define/" config.h
+	cd sys/unix || die
+	mv configure.{in,ac} || die
 	eautoconf
-	popd > /dev/null || die
+	cd - >/dev/null || die
 	cp sys/unix/configure . || die
+	# written in K&R C
+	append-flags \
+		-Wno-implicit-function-declaration \
+		-Wno-implicit-int \
+		-Wno-return-type
 }

 src_configure() {
@ -45,20 +49,20 @@ src_compile() {
 }

 src_install() {
-	dobin ng
-	dodoc docs/* MANIFEST dot.ng
+	dobin ${PN}
+	dodoc docs/* MANIFEST dot.${PN}

-	insinto /usr/share/ng
+	insinto /usr/share/${PN}
 	doins bin/*

 	insinto /etc/skel
-	newins dot.ng .ng
+	newins {dot,}.${PN}
 }

 pkg_postinst() {
 	elog
 	elog "If you want to use user Config"
-	elog "cp /etc/skel/.ng ~/.ng"
-	elog "and edit your .ng configuration file."
+	elog "cp /etc/skel/.${PN} ~/.${PN}"
+	elog "and edit your .${PN} configuration file."
 	elog
 }
--- 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
--- 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>
--- a/app-editors/vim/vim-8.2.3428-r1.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)
--- 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)
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@ -12,7 +12,7 @@ AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5
 DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418 SHA512 ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4
 DIST qemu-6.1.0.tar.xz 111258808 BLAKE2B 412eecf6d39debd6089b26d3b22e5d25c6c8c30d2eaf31b17c25cc2b3a1b10794a30218dfb151c78801aa295255aa974b297f1fe05b93f14334f203c2af5ccee SHA512 3378ae21c75b77ee6a759827f1fcf7b2a50a0fef07e3b0e89117108022a8d8655fa977e4d65596f4f24f7c735c6594d44b0c6f69732ea4465e88a7406b1d5d3c
 EBUILD qemu-6.0.0-r3.ebuild 25707 BLAKE2B e42d63e7b996356466a1aaecc99b6b6435d8a7c733694b9afd5279cebc973c9236e8544dc806d3117a60ee725e1a5a0bb3a2fbbecc0d7053b57fb4b5e66211b8 SHA512 26ff7c7d12b427621dbfea2a6fb9e5e79ae8e5ee6eb8bebfd6c0512bed547bb62c99629592d23ca2f24611fb17fd37f15a43ae063b5b4b8bf9c9ad0712c3c1ec
-EBUILD qemu-6.0.0-r53.ebuild 25775 BLAKE2B 1c5359d679f8285aae9f858e5ea090ef35934788574083de0eedc7983f37eb706a974bec0e058c92d97b4eedf8863f57ae7a8cd0f8165e580033a47aec3ae7e1 SHA512 7be0cc552c5b38a6e42d72fa46ebbcaabc53bdcfcea6540726254b174feb0bd61532b9e952187f7d53cd802c9eeebf82b5f573092f7b488bb3b235f01d977a71
+EBUILD qemu-6.0.0-r53.ebuild 25774 BLAKE2B ad019835cd1acd45f7b5c4d29161b3626a8a285d3d2c67b65aca3a5fe05a8748b252eadaddfbd177213f70f8be14dfec820e29a7ff068eb7fe87e5e742bc5901 SHA512 21c12bd597e7f1ed984aa1a6fb880a3cdfc5d7eb91dedd6265b8cd9be1d162eab371b3245ae02975fd9d7c981d5f1b944fa00fe4abd55458544e0fea72d75d7d
 EBUILD qemu-6.1.0.ebuild 25679 BLAKE2B 41ce7b2b45928ea5b5218f5764d0de0e96b40235663e573ec9fea0531e77dc3764dc87107239d6aa08e2b20b44cd30d01bf6bd344045a7ba8a42d9ebb4f7635e SHA512 0e26b90e4395d33b1cdebb5bf6ceb38f49fb0c191a3ce11b736cf94a1fb29369134fab7df834faa3b289a4ae68206063b4ade91d524b2d06ea7ba894cf26b885
 EBUILD qemu-9999.ebuild 25643 BLAKE2B 662ee64944087293a48267ce2c2e09ae940b088a50bf1ff6e09efddaf2656119267511130b8030c1d4e05fa3eabfc6c69ed7c302da6d1e952679c743a16e9dda SHA512 7389c614c6f092a0e333d5f9deca972d85dbc08fdd9bcfc3894aa14b506bcbcfa2810ac8ca097de7415eb1c3915a02c5984ea483db2dd9260a71aafcad407009
 MISC metadata.xml 4412 BLAKE2B c941bfcd3b0e601598859f87e5651959553e5b0baaa5f0adad01c6ea840cffb03612310e9fa034a92b16a1db27a5c07be3bd41be5105ba02bd8719e65bd43d6e SHA512 3639168093bf902d954c90748b69e3af66d9d03aeae8ddbf8ee5969ea9329f5a3a57312adf6995d12a26140b952a0a534eb4db6952f59b8bdd979c9bc91323c1
--- a/app-emulation/qemu/qemu-6.0.0-r53.ebuild
+++ b/app-emulation/qemu/qemu-6.0.0-r53.ebuild
@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.qemu.org/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
 fi

 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/libkkc-data/Manifest
+++ b/app-i18n/libkkc-data/Manifest
@ -0,0 +1,4 @@
+AUX libkkc-data-python3.patch 5566 BLAKE2B 6f7fdb8d7157f44e5d73521d2f5ca446729cedfcaa37b85c4f4b06bf063ac59eac4c803422f482cdef460b2025cdd9b8af8f26a3a56ecb38bfd10b49fb19e497 SHA512 3c353ad81fc7f7e773e7a1dfd3b488891c1ac6624e1abfdbf7c66d7a021a302e96e06d358bc1bb0587ddd413d23cf02efbb1b232a2dce03fe56aa744b80efef4
+DIST libkkc-data-0.2.7.tar.xz 22262552 BLAKE2B 2c735ee9fabf8f8f201591c9ed584cece22ddcd15da5f36b39bb422b1bce1dbcbcd66f71b5713e2dd4c5e2862b06b014c24a4a3db63c86ecee20519434da9261 SHA512 61c0cd8c0fa41ed8df49cac6709eebb245cc965d7e192b1ba945e95f2fc46aca8aa48c16e1977a12c157c55dab6b9f4c30f4905806725eca6e697b762eb7cbd7
+EBUILD libkkc-data-0.2.7.ebuild 522 BLAKE2B 3487d56f9c52e8b16c28e2788e6e7d97080916c60f74bf8d99e8a3aee1d4fed909e3465e385d86fae3415b92cf817d59298f1e7f0392ce1cdc70ffccf83f4f81 SHA512 2fe14d480f674c1cbcfaa01faab181b732f1664bf7cfeb91632a7c4fb306d49c056fc8d2bdd3a4ad88c39e0b51ef633bed36a5f55c2656df8fd28fccf3115562
+MISC metadata.xml 311 BLAKE2B caecd09cb85c028dbe6478523352bfaa1c577a93b747a39c4eafe68f7d154bb191320cb079e6cf288b59a5298a7953d0fd4d9ad3ab4a8973a5f6d04479e6222f SHA512 2ba94abaadf513ede547763494675f10a8d897be296937a9bff0ab97af7267f5213f4057d5b8a6127c913ecf4752661c4b873ee1cbda337002168a5dd1969c44
--- a/app-i18n/libkkc-data/files/libkkc-data-python3.patch
+++ b/app-i18n/libkkc-data/files/libkkc-data-python3.patch
@ -0,0 +1,138 @@
+From ba1c1bd3eb86d887fc3689c3142732658071b5f7 Mon Sep 17 00:00:00 2001
+From: Takao Fujiwara <tfujiwar@redhat.com>
+Date: Mon, 30 Jul 2018 15:26:37 +0900
+Subject: [PATCH] build: Enable python3
+
+---
+ tools/genfilter.py | 18 +++++++--------
+ tools/sortlm.py    | 23 ++++++++-----------
+ 2 files changed, 19 insertions(+), 22 deletions(-)
+
+diff --git a/tools/genfilter.py b/tools/genfilter.py
+index 5ffab32..0c5f75a 100644
+--- a/tools/genfilter.py
+++ b/tools/genfilter.py
+@@ -84,24 +84,24 @@ def __init__(self, infile, outfile, record_size):
+ 
+     def generate(self):
+         size = os.fstat(self.infile.fileno()).st_size
+-        n = size / self.record_size
+        n = size // self.record_size
+         m = int(math.ceil(-n*math.log10(ERROR_RATE) /
+                           math.pow(math.log10(2), 2)))
+-        m = (m/8 + 1)*8
+        m = (m//8 + 1)*8
+         inmem = mmap.mmap(self.infile.fileno(),
+                           size,
+                           access=mmap.ACCESS_READ)
+-        outmem = bytearray(m/8)
+-        for i in xrange(0, n):
+        outmem = bytearray(m//8)
+        for i in range(0, n):
+             offset = i*self.record_size
+             b0, b1 = struct.unpack("=LL", inmem[offset:offset+8])
+-            for k in xrange(0, 4):
+            for k in range(0, 4):
+                 h = murmur_hash3_32(b0, b1, k)
+                 h = int(h * (m / float(0xFFFFFFFF)))
+-                outmem[h/8] |= (1 << (h%8))
+                outmem[h//8] |= (1 << (h%8))
+         inmem.close()
+-        # Convert bytearray to str, for Python 2.6 compatibility.
+-        self.outfile.write(str(outmem))
+        # Convert bytearray to bytes, for Python 3 compatibility.
+        self.outfile.write(bytes(outmem))
+ 
+ if __name__ == '__main__':
+     import sys
+@@ -110,7 +110,7 @@ def generate(self):
+     parser = argparse.ArgumentParser(description='filter')
+     parser.add_argument('infile', type=argparse.FileType('r'),
+                         help='input file')
+-    parser.add_argument('outfile', type=argparse.FileType('w'),
+    parser.add_argument('outfile', type=argparse.FileType('wb'),
+                         help='output file')
+     parser.add_argument('record_size', type=int,
+                         help='record size')
+diff --git a/tools/sortlm.py b/tools/sortlm.py
+index a0dd8fe..40f0837 100644
+--- a/tools/sortlm.py
+++ b/tools/sortlm.py
+@@ -40,10 +40,10 @@ def __init__(self, infile, output_prefix):
+         self.__min_cost = 0.0
+ 
+     def read(self):
+-        print "reading N-grams"
+        print("reading N-grams")
+         self.__read_tries()
+         self.__read_ngrams()
+-        print "min cost = %lf" % self.__min_cost
+        print("min cost = %lf" % self.__min_cost)
+ 
+     def __read_tries(self):
+         while True:
+@@ -58,7 +58,7 @@ def __read_tries(self):
+             line = self.__infile.readline()
+             if line == "":
+                 break
+-            line = line.strip()
+            line = line.strip('\n')
+             if line == "":
+                 break
+             match = self.__ngram_line_regex.match(line)
+@@ -89,7 +89,7 @@ def __read_ngrams(self):
+                 line = self.__infile.readline()
+                 if line == "":
+                     break
+-                line = line.strip()
+                line = line.strip('\n')
+                 if line == "":
+                     break
+                 match = self.__ngram_line_regex.match(line)
+@@ -125,14 +125,11 @@ def __write_ngrams(self):
+         def quantize(cost, min_cost):
+             return max(0, min(65535, int(cost * 65535 / min_cost)))
+ 
+-        def cmp_header(a, b):
+-            return cmp(a[0], b[0])
+-
+-        print "writing 1-gram file"
+        print("writing 1-gram file")
+         unigram_offsets = {}
+         unigram_file = open("%s.1gram" % self.__output_prefix, "wb")
+         offset = 0
+-        for ids, value in sorted(self.__ngram_entries[0].iteritems()):
+        for ids, value in sorted(self.__ngram_entries[0].items()):
+             unigram_offsets[ids[0]] = offset
+             s = struct.pack("=HHH",
+                             quantize(value[0], self.__min_cost),
+@@ -143,13 +140,13 @@ def cmp_header(a, b):
+             offset += 1
+         unigram_file.close()
+ 
+-        print "writing 2-gram file"
+        print("writing 2-gram file")
+         bigram_offsets = {}
+         bigram_file = open("%s.2gram" % self.__output_prefix, "wb")
+         keys = self.__ngram_entries[1].keys()
+         items = [(struct.pack("=LL", ids[1], unigram_offsets[ids[0]]), ids) for ids in keys]
+         offset = 0
+-        for header, ids in sorted(items, cmp=cmp_header):
+        for header, ids in sorted(items, key=lambda x: x[0]):
+             value = self.__ngram_entries[1][ids]
+             bigram_offsets[ids] = offset
+             s = struct.pack("=HH",
+@@ -160,11 +157,11 @@ def cmp_header(a, b):
+         bigram_file.close()
+ 
+         if len(self.__ngram_entries[2]) > 0:
+-            print "writing 3-gram file"
+            print("writing 3-gram file")
+             trigram_file = open("%s.3gram" % self.__output_prefix, "wb")
+             keys = self.__ngram_entries[2].keys()
+             items = [(struct.pack("=LL", ids[2], bigram_offsets[(ids[0], ids[1])]), ids) for ids in keys]
+-            for header, ids in sorted(items, cmp=cmp_header):
+            for header, ids in sorted(items, key=lambda x: x[0]):
+                 value = self.__ngram_entries[2][ids]
+                 s = struct.pack("=H",
+                                 quantize(value[0], self.__min_cost))
--- a/app-i18n/libkkc-data/libkkc-data-0.2.7.ebuild
+++ b/app-i18n/libkkc-data/libkkc-data-0.2.7.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit python-any-r1
+
+DESCRIPTION="Language model data for libkkc"
+HOMEPAGE="https://github.com/ueno/libkkc"
+SRC_URI="https://github.com/ueno/${PN%-*}/releases/download/v0.3.5/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=""
+BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]')"
+
+PATCHES=( "${FILESDIR}"/${PN}-python3.patch )
--- a/app-i18n/libkkc-data/metadata.xml
+++ b/app-i18n/libkkc-data/metadata.xml
@ -2,10 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">fudge</remote-id>
+		<remote-id type="github">ueno/libkkc</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-i18n/libkkc/Manifest
+++ b/app-i18n/libkkc/Manifest
@ -1,4 +1,5 @@
-DIST libkkc-0.3.6_pre20190809104047.tar.gz 389976 BLAKE2B 03c43384f4f1f0e48a3eec2afb9f90a39e42469439a7dbc06692e020d83b8362f19c41ea8960cd5147edca04dcf67be5e74315f494dd017a6ce018f217b6a5a7 SHA512 87c5294900b29e4b2225c24ee744c619691a5f25edc453c2ece44133695a8d0e1a1a07bb5a00d615cc95057ae5b451c845c7ce476df555e025097c38aff87a69
-EBUILD libkkc-0.3.6_pre20190809104047.ebuild 1514 BLAKE2B 2c812e21be1734a9403ea270be1c815bfa7aad6b9e689a71ae97d731bcf07e7cc6d6efa43b32450f546c8540f4e8247c7066f3d7bed0946a6625c552db601a0f SHA512 b1b04062b2e8ad9f8220b99dc8e21baf87918951b99b11f2664349a6b0e38dcd28ac4777bd32a965b5e0f96f02d4e830874965e6635711626cced3ec2e6f8d93
-EBUILD libkkc-9999.ebuild 1463 BLAKE2B d584b34083dda535e540197f39a519b60f16ee1b1192b433945e44e07f79a805d5b4ab548c0d6e783df0959312eded5ba629a468eadbec5d2ef9115e8929414b SHA512 98459cbeb3a17a2affb401f180ad52a8cc7892accc5ae7fe1a66717dec6743a96de96fc921bc42e3b196ab3b156ad901d1ec31f9323424d4f30d48b7c4626537
+AUX libkkc-marisa-glib.patch 714 BLAKE2B dfe2c8c3f3fe0de904678a21890d99c548d08c2f79c9a2a5bf54080529336a0afe9ad1ef613fd1c2a2b692a3de6edd17e15a7434cb4c677660c035badc303c2a SHA512 b5f5f2158329b883709242bf7415fe91d1637f1ae6f8620ddf1b872b652292bda237b92ff1c0595168f3eb2b9b33cb48e33f02bcebd031081f2dff0b8493509f
+DIST libkkc-0.3.5_p20210928.tar.gz 390022 BLAKE2B d4b44861f4526f4f9581cd9343fb4d8dd361967cce153ab92fb9a3334502bd583081d4ae3c01879c94aee710d347c23d3372c0deb20d711b9792eb73a28b3beb SHA512 9c46ef09242ecf3d4864fff0e7df7ff362d71c382bb92fe1e784bd20bdf737dc6a528b57342093ab4415926b15f09db44a10b8088d1c9f8b9cebcb428aaee8c6
+EBUILD libkkc-0.3.5_p20210928.ebuild 1506 BLAKE2B b9421f38c9b17b27e5d8d2534a4474732021b62d195697adc0e20c7c10a7077035b977fd65de5b0575c519365a57899101e38825181f88559e72ba5e10c86c3c SHA512 bb3e2bcaf34af5819510ada361f41c43210e04ddc714052890693fdfc72f7e48a6a446992d362901d39b5e0bf3ca4137022b5089be8ece5220c94753cd7b26b0
+EBUILD libkkc-9999.ebuild 1455 BLAKE2B 993c4de5b282d984830a8fd9142bb2a84e7f59e606b29835fac6aa556e9b5708d282cd854377781a2bf2a7a279975f5ee2cd11f4dfb3d5d4b9a400a5dd992cb8 SHA512 5002724d10f3652489a699bfdf4c9dc6bcaac9f05ee2427d7d44aeca2234d878aa970b7de177f893d9a13c52c43c65555a646339996eb104a113c3f56c6e9dd9
 MISC metadata.xml 459 BLAKE2B fa914e2f676f1065402ac064f0253cd3ad5a97af0fa72f333bf312b033a1d8c7c40be04f6d9626afa4ad0b67c5cdfd6da4c75e0d261cfafcbe5010e8c994e4ec SHA512 8483db54ccb88733e541875f527350354c48bb258b7a7eb18f8d092eb4a1906082072178ad9ab371039dfc8dd2b2727dc4c269e5089f648a0bd03a3ee1233bf7
--- a/app-i18n/libkkc/files/libkkc-marisa-glib.patch
+++ b/app-i18n/libkkc/files/libkkc-marisa-glib.patch
@ -0,0 +1,23 @@
+--- a/libkkc/Makefile.am
+++ b/libkkc/Makefile.am
+@@ -49,7 +49,11 @@
+ 	-DLOCALEDIR=\"$(datadir)/locale\"	\
+ 	-I $(top_srcdir)			\
+ 	$(NULL)
+-libkkc_la_LIBADD = $(LIBKKC_LIBS) $(top_builddir)/marisa-glib/libmarisa-glib.la
+libkkc_la_LIBADD =					\
+	$(LIBKKC_LIBS)					\
+	$(top_builddir)/marisa-glib/libmarisa-glib.la	\
+	$(MARISA_GLIB_STATIC_DEPENDENCIES)		\
+	$(NULL)
+ libkkc_la_LDFLAGS =							\
+ 	$(CODE_COVERAGE_LDFLAGS)					\
+ 	-version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)"	\
+@@ -66,7 +70,6 @@
+ libkkc_internals_la_LIBADD =			\
+ 	$(libkkc_la_LIBADD)			\
+ 	$(libkkc_la_OBJECTS)			\
+-	$(MARISA_GLIB_STATIC_DEPENDENCIES)	\
+ 	$(NULL)
+ libkkc_internals_la_LDFLAGS =			\
+ 	$(CODE_COVERAGE_LDFLAGS)		\
--- a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild
+++ b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild
@ -1,8 +1,8 @@
-# Copyright 2013-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=( python3_{7..10} )

 inherit autotools python-any-r1 vala

@ -10,16 +10,18 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3

 	EGIT_REPO_URI="https://github.com/ueno/libkkc"
-elif [[ "${PV}" == *_pre* ]]; then
-	LIBKKC_GIT_REVISION="b2e5a152980ee627c39ca8a49082e6df7694b8fc"
+elif [[ "${PV}" == *_p* ]]; then
+	inherit vcs-snapshot
+
+	EGIT_COMMIT="cdcaf4dceaf273bfe7b018a4a651a92f786c6ec6"
 fi

 DESCRIPTION="Japanese Kana Kanji conversion input method library"
 HOMEPAGE="https://github.com/ueno/libkkc"
 if [[ "${PV}" == "9999" ]]; then
 	SRC_URI=""
-elif [[ "${PV}" == *_pre* ]]; then
-	SRC_URI="https://github.com/ueno/${PN}/archive/${LIBKKC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+elif [[ "${PV}" == *_p* ]]; then
+	SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 else
 	SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz"
 fi
@ -29,21 +31,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls static-libs"

+RDEPEND="app-i18n/libkkc-data
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	dev-libs/marisa
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
 BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]')
 	$(vala_depend)
 	dev-libs/gobject-introspection
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
-DEPEND="dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libgee:0.8
-	dev-libs/marisa
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}"

-if [[ "${PV}" == *_pre* ]]; then
-	S="${WORKDIR}/libkkc-${LIBKKC_GIT_REVISION}"
-fi
+PATCHES=( "${FILESDIR}"/${PN}-marisa-glib.patch )

 python_check_deps() {
 	has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]"
--- a/app-i18n/libkkc/libkkc-9999.ebuild
+++ b/app-i18n/libkkc/libkkc-9999.ebuild
@ -1,8 +1,8 @@
-# Copyright 2013-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=( python3_{7..10} )

 inherit autotools python-any-r1 vala

@ -10,16 +10,18 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3

 	EGIT_REPO_URI="https://github.com/ueno/libkkc"
-elif [[ "${PV}" == *_pre* ]]; then
-	LIBKKC_GIT_REVISION=""
+elif [[ "${PV}" == *_p* ]]; then
+	inherit vcs-snapshot
+
+	EGIT_COMMIT=""
 fi

 DESCRIPTION="Japanese Kana Kanji conversion input method library"
 HOMEPAGE="https://github.com/ueno/libkkc"
 if [[ "${PV}" == "9999" ]]; then
 	SRC_URI=""
-elif [[ "${PV}" == *_pre* ]]; then
-	SRC_URI="https://github.com/ueno/${PN}/archive/${LIBKKC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+elif [[ "${PV}" == *_p* ]]; then
+	SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 else
 	SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz"
 fi
@ -29,21 +31,20 @@ SLOT="0"
 KEYWORDS=""
 IUSE="nls static-libs"

+RDEPEND="app-i18n/linkkc-data
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	dev-libs/marisa
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
 BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]')
 	$(vala_depend)
 	dev-libs/gobject-introspection
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
-DEPEND="dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libgee:0.8
-	dev-libs/marisa
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}"

-if [[ "${PV}" == *_pre* ]]; then
-	S="${WORKDIR}/libkkc-${LIBKKC_GIT_REVISION}"
-fi
+PATCHES=( "${FILESDIR}"/${PN}-marisa-glib.patch )

 python_check_deps() {
 	has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]"
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/dateutils/Manifest
+++ b/app-misc/dateutils/Manifest
@ -1,3 +1,4 @@
+AUX dateutils-0.4.6-unportable-sys-sysctl_h.patch 230 BLAKE2B 66d3e0f227e06eef659c087512a21741c8375a5c7e4cb740cb95eeb5745bcb58830a1a5f19fcad5e4ed14b6de35ccfa9362ddf1a118b3bfcc9fc719467aa2814 SHA512 f42337fbe428503008c2129a82b13d536d7ce395e2f90aeffbd05f6ec358a80dc174ca5ed4e2f3113771b24aec15fc160537e8e6b4bb1743dd5fb6b6807a8f2d
 DIST dateutils-0.4.7.tar.xz 649932 BLAKE2B 710c22d63fe3c8f77c69c97c405d3d4aa5c51de3d5768076ca24f8b2be0d6033ae652825e528d99c36f382e25c4e0a60eaa7cb9eec58f6b814d60d513b37ce7e SHA512 480943c32585efd8f42958d6e7d3304a37568f2134c9561d6e0b38f4719fd149ec7e55c559a5e73e97e1c9d217f3d53fe76a7e6a9d3114c040915ebf48db4666
 DIST dateutils-0.4.8.tar.xz 642316 BLAKE2B 483ae60829c3b77bd7c2ce72347bc99fda6f63018c2e2335322175f962f904c97ba07c4e39bcdf6e549e2e09043d56bcc00863a1299225964cd15921a22bfc05 SHA512 964204e2a04a5aa7fa73cbddd98e1a953d498a4b5e0447daa5f912845fb74825d1791b6bea3ebca47784a8edd2e549dfee1e48e3050632efed7f11f109b74be8
 DIST dateutils-0.4.9.tar.xz 651024 BLAKE2B 9b9bab5f990689a367fa574c20113c01f4847cdcced47275b992655cb91cd14076c22e2d550a969c20ef979b63156c72a485c42105022e522dce4d1376aa0393 SHA512 b5cda838f8fa01e4208e11842f835503357c02b4a21b003db08ef88763a65f26ad2cd6f5d71c80b499d4e5ee5c0b4e552469ef91aa6cd02ebe5c5d2ad6e3105e
--- a/app-misc/dateutils/files/dateutils-0.4.6-unportable-sys-sysctl_h.patch
+++ b/app-misc/dateutils/files/dateutils-0.4.6-unportable-sys-sysctl_h.patch
@ -0,0 +1,10 @@
+--- a/build-aux/yuck.c
+++ b/build-aux/yuck.c
+@@ -65,7 +65,6 @@
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+-#include <sys/sysctl.h>
+ #include <time.h>
+ #if defined WITH_SCMVER
+ # include <yuck-scmver.h>
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@ -1,5 +1,5 @@
 DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
-DIST build-docbook-catalog-2.0.tar.bz2 4653 BLAKE2B 8a2753d68c352063bbf2f385cf321528fea556ecf78687557aceb4b2b84dccd2de2bade39660747254f0cbc5af52658002ba7d34a2798ee75941307395e35a4d SHA512 8a2507570c5785b646365e97dc3c659e5c799eda296716588dc4923c7512a21be1b396d4f79a356c04f10a825b1f4be8b7d7f42389a28b2b64daf75e3a174a4f
+DIST build-docbook-catalog-2.1.tar.bz2 4731 BLAKE2B 38864866f03052386a0ba2fe832c750b851a5a0730df54fbac5253da682e92c0d865333c136d9c169a843e2a1ce291b2e5b5af657e7dba0dbf8d2fda213f6891 SHA512 8399652841f25feefa9ad3c138580f31da34410a44f2bdbdb4d63cb6efd1be445c7c4df6ed93629e53df4a4c6d988ed32a6a709f1abb059ccac0bc35b3b516a5
 EBUILD build-docbook-catalog-1.21.ebuild 1155 BLAKE2B d8b4c8b5da15b768d2035cd6be5ecd87b8464b06d6b1170dd95916f83e7bce3c7dda519d204beb82d001a693456984bc790e952dba24fb63f81b17e5595c1835 SHA512 c3d583f8a38c1992dc7afc750a797ad17d14700331d2717244ff46f86cc859c8b91c5d899b58388b389ab34e2db2fbbc599805b1815476d093d7430d349c597b
-EBUILD build-docbook-catalog-2.0.ebuild 1120 BLAKE2B c8e9e18687d7cd93e99e4587f7dcee1e9d7b48b05972d28f647d445ad1269f23a4c8d9b2b882dfcbdf1521583283c97c80b1c425bc14fe3e22008055c56edd1e SHA512 de0acf25ef5e5fc7266bdbf65098e8d83c9c455afc43e9f13f9bfc6e10023c05ad533e70f155667b7a12318a654ebb0919aeb99d8e9bca80921d1ac51d15bb6b
+EBUILD build-docbook-catalog-2.1.ebuild 1170 BLAKE2B 04ec65eaceedc60d78a5c2a933a550fee1aa32094c23af6958930c44477efc2ef1703f9417a62515e4fb13810307f37158316c5f63110ba8f7a946264b5ecaac SHA512 ca2fa53858117a7079ffe111bfcd60bb65f0cfe7b2d96ee29f10c4b1f52e211bc634406bc4c3d77302b05efa71c5a35363a15dd647d6fd0905b9160e5a3fdc3c
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
--- a/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild
@ -33,5 +33,7 @@ src_configure() {
 pkg_postinst() {
 	# New version -> regen files
 	# See bug #816303 for rationale behind die
+	# create directory if needed
+	mkdir -p /run/lock
 	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 }
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@ -1,9 +1,6 @@
 AUX po4a-0.60-man.patch 577 BLAKE2B e2f9263b5c92b798224a1ae9ba9e3358bbf755f0573c34512151e7110517ecd7570b7946291de945f8f6557f6ff4b33c2d4f7900c4937ea284fe11e23f50c8a4 SHA512 5d88645d35234723f3b397953bf1aaaa8160fa591dd86430663f270ad10e4d5cceb7957774ce741bc0a46f37120473cb511eab88e78c0826717a4c5761d1c13a
-AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32a2a243995d9f26b0099e2194848a9a4d3b01dc24d4657cdc4470977838a96a1979495871dac5b8b SHA512 0d797b92c551eb75fa144e9b39d1aacc8acb00104a6d9e0dbdf4d00219b4c0c074637c953764e8cf1d67bdb1f3941fa0727da242b7761a96a8dafe66af224397
-DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
 DIST po4a-0.63.tar.gz 4067940 BLAKE2B 4cfa4163c21f5f8b783a5bdc29595f10cd172f7813de5617ed67a25bef547697084511a6f3897c47acb9158f15b3fcd97600bec7e23ba560cffe7cc646ce4c39 SHA512 556859b73728249795df22676a3cde1cbf575c608ad20f267fe7a6ee224d0262db2db19df8b7369ebf1ab568c017548ff118ae035608cca7a4d0963db8acd633
 DIST po4a-0.64.tar.gz 4121565 BLAKE2B a579aabb4245501be4ec7c319e8cef91db2e10883a09ef5a7eaf2d97aad64e8e59f25101c20286c955067fef2f58bc08c9865d5d608dd72913a38eaaff0ac542 SHA512 3d51aaa5894365087523b82e218819ba8a92d3cbc1b389648526f26fbbf37ccaa7ed6643bb388e5fa73a7a1abadee2b4ee2ebbcac14790c56567bf1a3e766fb0
-EBUILD po4a-0.57-r1.ebuild 1290 BLAKE2B df2dbc33e75186c1e578cc4ba02ae7df6aeee4e14139d8b9174791a747ae4064012df67b169f11ea5ca84f3b5d96abefd92faf39a0810a9b8e7dbe865bac4c3a SHA512 28847b243fb6a82d9650a1088db67d118ee53808231d2907ebe349e79e66f754a15747981d59faff82365363be613a42e8b5691a9a0118060c9df2e875b053b0
 EBUILD po4a-0.63-r1.ebuild 1379 BLAKE2B 69a7969a88f555ac4ea1b3a27cd99ca145f06c0accb67f6643374ddeea67e86590c54294de671350120bd6e7cca7af5ab57879baa147be1b1d0d138dfa98f7ee SHA512 d0d3afb9ddc10971ebef10faf3df5847a1a4c135311da11b504fdf4e0069073efaf86fd366680297edf46cd42f352d497c60da6e97665755f366d0345270bd8b
 EBUILD po4a-0.64.ebuild 1397 BLAKE2B 4aeba42b51780c8eae9fe0d594a286aa2febe52cd07cfe2b905742fe3aa44b7200f03fc242eb318a59142897a7b8a2badcfefe6d60eabf7fea04c994b583f32c SHA512 b6f5a4b8581599f3f2eb1d9ec36eba749be90c2c58e373cbb4030a56667c940d8430b836af329d6daa222c269b6076864461d85794e13f39770aff8ad8fa2e75
 MISC metadata.xml 327 BLAKE2B e4ac438b10bde7e247b0f098c104aa9956b264df04c81d10aff0f0a0ae45184a953443062f38bbc5fe0c7fd9a4e48219c5e0a76c5bb0b4fee9edf51e35ad50ec SHA512 934e9519050daf07edfee9e4a0041d808ea5eec4d414b738f1e2b909e821b83c8c7b39a15170041a9aba31df1c1a0b6323bd245507f7c9bea9556a332c6939ec
--- a/app-text/po4a/files/po4a-man.patch
+++ b/app-text/po4a/files/po4a-man.patch
@ -1,18 +0,0 @@
--- a/Po4aBuilder.pm
-+++ b/Po4aBuilder.pm
-@@ -233,7 +233,6 @@
-         }
-         $parser->parse_from_file ($file, $out);
- 
-        system("gzip -9 -f $out") and die;
-         unlink "$file" || die;
-     }
- 
-@@ -245,7 +244,6 @@
-         if ($file =~ m,(.*/man(.))/([^/]*)\.xml$,) {
-             my ($outdir, $section, $outfile) = ($1, $2, $3);
-             system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
-            system ("gzip -9 -f $outdir/$outfile.$section") and die;
-         }
-         unlink "$file" || die;
-     }
--- a/app-text/po4a/po4a-0.57-r1.ebuild
+++ b/app-text/po4a/po4a-0.57-r1.ebuild
@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sv uk vi zh_CN zh_HK"
-
-inherit perl-module plocale
-
-DESCRIPTION="Tools to ease the translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/opensp
-	dev-libs/libxslt
-	dev-perl/Locale-gettext
-	dev-perl/SGMLSpm
-	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N
-	dev-perl/Unicode-LineBreak
-	dev-perl/YAML-Tiny
-	sys-devel/gettext
-	dev-perl/Pod-Parser"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-perl/Module-Build
-	test? (
-		app-text/docbook-sgml-dtd:4.1
-		virtual/latex-base
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-man.patch )
-
-PERL_RM_FILES=(
-	t/09-html.t
-)
-DIST_TEST="do"
-
-src_prepare() {
-	plocale_find_changes "${S}/po/bin" '' '.po'
-
-	rm_locale() {
-		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
-	}
-	plocale_for_each_disabled_locale rm_locale
-
-	perl-module_src_prepare
-}
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@ -1,10 +1,4 @@
-DIST gentoo-syntax-20210716.tar.bz2 18872 BLAKE2B faef2f356331c8560cb8e8014ad1a32a299f94fe8d05be499955cb78f1537f85abe44864b782df34244c3e606443b2146bd58a55047b23d327a548a436e818dc SHA512 f1a374fb5cf05563ea8cafa2209c9e8ba62bc072cac99202f486c3f7412cbb63432a33830e285ba706f8f73ee7f7bfd4e0b30bfad6feee1643e862b86495b82e
-DIST gentoo-syntax-20210828.tar.bz2 18872 BLAKE2B bd3e152718b921aef8ce93e2d3e66d6195ab01801ea60987f62f9cb541fb726c2d552b6ec341943c1ca0e0cc1419c1cb75266e653b8bc958c8103855688f3d54 SHA512 e148c42b3e3281780d4f23ff1e464ba3c8404b3a4ba566a1a685c8364b6dd174830b489d5c7b561c3e30375fd9f510cfbf56d92f81c3f8fec8ab792ab48aa62a
-DIST gentoo-syntax-20210901.tar.bz2 18876 BLAKE2B ef3913d8e631903003f469a8500c24f751ab70c17b1718cb9cd06b1e81b2dc7c07ed686b03be1da05afd5c238b8fddf67d35a63e7f381176be9340371cdc5dc9 SHA512 40c4f8522ce90bb529fd1cb050d1dd50010547006e385827980559a9febaa78f6d29b4798f6580a0c00de32db21a5528a051c2906d9dec95b62b992ea4875afe
 DIST gentoo-syntax-20210911.tar.bz2 18865 BLAKE2B 14dfe4b1eaab39a7de11c9b2e00c6a39385cd81d5717522dbac1f9ff265047c9ded745c335cca88413f6ad622f2858d996bdb39c5f4b1b4796ef7740c48c5f68 SHA512 b7ac7aba50c086e1e550692426bb38dbca5bf4770c148ff4989686ef043a2d990710bec782f1baba582ff67da3b3db007a4dbc6dec16f69830312205f1a45d3c
-EBUILD gentoo-syntax-20210716.ebuild 1237 BLAKE2B e4376fc40d3d7c829e253383c0744e4369d312657a539b5d82387128c50c2ae35431207171d9f9a312e7350485c7f2c417d07c665fa345b5193964489a1727f5 SHA512 e692cfa8d4e37e9bfa6bea96c7948e1230a6ebf7bdb7601980e3f918fdec8e69d7e7273e6979ea3ac36446c2c7040e79e09e42d185e8e915d00286cd6c693521
-EBUILD gentoo-syntax-20210828.ebuild 1245 BLAKE2B 4de7b82e15d0e8e0716fa3b419297d3ce15bbe12d7fc8007e231bc09cd3d9236af4c5d08e7c6dec0c1058150eec401c37a24d3b5bade0319947617db9d358bb6 SHA512 9a14cb1d43d22cde53c0f7c9598bfdbb2cd1f0417bc69b604823f595b6f1a59a95aeb47cd61a68707abe8412a2ca44d71a67a51c731d7e083b2f4cab299e6584
-EBUILD gentoo-syntax-20210901.ebuild 1245 BLAKE2B 4de7b82e15d0e8e0716fa3b419297d3ce15bbe12d7fc8007e231bc09cd3d9236af4c5d08e7c6dec0c1058150eec401c37a24d3b5bade0319947617db9d358bb6 SHA512 9a14cb1d43d22cde53c0f7c9598bfdbb2cd1f0417bc69b604823f595b6f1a59a95aeb47cd61a68707abe8412a2ca44d71a67a51c731d7e083b2f4cab299e6584
-EBUILD gentoo-syntax-20210911.ebuild 1245 BLAKE2B 4de7b82e15d0e8e0716fa3b419297d3ce15bbe12d7fc8007e231bc09cd3d9236af4c5d08e7c6dec0c1058150eec401c37a24d3b5bade0319947617db9d358bb6 SHA512 9a14cb1d43d22cde53c0f7c9598bfdbb2cd1f0417bc69b604823f595b6f1a59a95aeb47cd61a68707abe8412a2ca44d71a67a51c731d7e083b2f4cab299e6584
+EBUILD gentoo-syntax-20210911.ebuild 1237 BLAKE2B e4376fc40d3d7c829e253383c0744e4369d312657a539b5d82387128c50c2ae35431207171d9f9a312e7350485c7f2c417d07c665fa345b5193964489a1727f5 SHA512 e692cfa8d4e37e9bfa6bea96c7948e1230a6ebf7bdb7601980e3f918fdec8e69d7e7273e6979ea3ac36446c2c7040e79e09e42d185e8e915d00286cd6c693521
 EBUILD gentoo-syntax-99999999.ebuild 1084 BLAKE2B cbe1d6aa8eca271a997dec67ba8ba3725e3c50d97ff2f1f18c169bd3ea84ed568390ffef00742d20748dec2ec9b98468a119fc10b62bd55cd05e0506227e58cd SHA512 e59ceccbaaeb0947a66c079380269acd431d9694a20b851c13d5772a610306db1ddb04e8d8173ad5b84723077dae034a60ac7d53ba448ae00e816fdc03dc9f61
 MISC metadata.xml 586 BLAKE2B 9425e6a21617f806a0232c7f0ff75f148dc6855679236c9c2b88270db48161d3bffcb32066b372dc6af9cbac594f9d9dce6447d03fc675c151e75982f86ba598 SHA512 cb343dede228edd5c51dc2b2f6b8a1f09e4847365284218d5eb0c23c675f32fe4ab5025c6671f1dafbb63a87b83763a9caf97b04945329c32a1898123149d04b
--- a/app-vim/gentoo-syntax/gentoo-syntax-20210716.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20210716.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
-HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
-
-LICENSE="vim"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ignore-glep31"
-
-VIM_PLUGIN_HELPFILES="gentoo-syntax"
-VIM_PLUGIN_MESSAGES="filetype"
-
-src_prepare() {
-	default
-	if use ignore-glep31 ; then
-		for f in ftplugin/*.vim ; do
-			ebegin "Removing UTF-8 rules from ${f} ..."
-			sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
-				|| die "waah! bad sed voodoo. need more goats."
-			eend $?
-		done
-	fi
-}
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		if use ignore-glep31 1>/dev/null ; then
-			ewarn "You have chosen to disable the rules which ensure GLEP 31"
-			ewarn "compliance. When editing ebuilds, please make sure you get"
-			ewarn "the character set correct."
-		fi
-	fi
-}
--- a/app-vim/gentoo-syntax/gentoo-syntax-20210828.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20210828.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
-HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
-
-LICENSE="vim"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ignore-glep31"
-
-VIM_PLUGIN_HELPFILES="gentoo-syntax"
-VIM_PLUGIN_MESSAGES="filetype"
-
-src_prepare() {
-	default
-	if use ignore-glep31 ; then
-		for f in ftplugin/*.vim ; do
-			ebegin "Removing UTF-8 rules from ${f} ..."
-			sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
-				|| die "waah! bad sed voodoo. need more goats."
-			eend $?
-		done
-	fi
-}
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		if use ignore-glep31 1>/dev/null ; then
-			ewarn "You have chosen to disable the rules which ensure GLEP 31"
-			ewarn "compliance. When editing ebuilds, please make sure you get"
-			ewarn "the character set correct."
-		fi
-	fi
-}
--- a/app-vim/gentoo-syntax/gentoo-syntax-20210901.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20210901.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
-HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
-
-LICENSE="vim"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ignore-glep31"
-
-VIM_PLUGIN_HELPFILES="gentoo-syntax"
-VIM_PLUGIN_MESSAGES="filetype"
-
-src_prepare() {
-	default
-	if use ignore-glep31 ; then
-		for f in ftplugin/*.vim ; do
-			ebegin "Removing UTF-8 rules from ${f} ..."
-			sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
-				|| die "waah! bad sed voodoo. need more goats."
-			eend $?
-		done
-	fi
-}
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		if use ignore-glep31 1>/dev/null ; then
-			ewarn "You have chosen to disable the rules which ensure GLEP 31"
-			ewarn "compliance. When editing ebuilds, please make sure you get"
-			ewarn "the character set correct."
-		fi
-	fi
-}
--- a/app-vim/gentoo-syntax/gentoo-syntax-20210911.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20210911.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"

 LICENSE="vim"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ignore-glep31"

 VIM_PLUGIN_HELPFILES="gentoo-syntax"
--- a/app-xemacs/Manifest.gz
+++ b/app-xemacs/Manifest.gz
--- a/app-xemacs/dictionary/Manifest
+++ b/app-xemacs/dictionary/Manifest
@ -1,5 +1,3 @@
-DIST dictionary-1.16-pkg.tar.gz 40085 BLAKE2B 413d5b82704eed5f96b99ffaedecdb149e8e562fa7e1a559cb396076d1ddae758fb634e00326f3f8682f7a1199905e3be7b0f271903f52faa532dbf31b8367fe SHA512 8dc0c0809d713f9eda280b110dbffa6f237c50ebb2e6c93f571efb3d22c1875ee5359fa91bc3faa58b3b0f431e75b84527262defb8aff5174a400be61f1a80dd
 DIST dictionary-1.18-pkg.tar.gz 40135 BLAKE2B 1fab7942a70e622613a5e126d2e48403d6b0d5594aca00e4cff9ac56db03aa2379a9742301a5a959e54ba8ca29780bd138d871577e31dc72805a6ccdabc4b44a SHA512 bdcdf63eb60dfe1a296b22b7493d842cbb3ae210dfc4cbcf7602fd00e7791736690961bb339293e1fdcee2bb527b87c003acd0dc640dce0c4dd5208c03fb1386
-EBUILD dictionary-1.16.ebuild 306 BLAKE2B 4deb58ace0e38527e7145bc35ccd06bb90517a65a1d8a408a9361e719b9f2c122dbd99e2a52578752170e8059c0cd2fa84ec97e74aa445171bf72a6fe65c5f5a SHA512 01718b404a4491d61d3e8902760088e1a8bed63477b786171e9dae2ee0523c43e4a06eef723d3661249fb364b01f83dddc59b046bf23f689a7f677fcd0d57209
 EBUILD dictionary-1.18.ebuild 306 BLAKE2B 4deb58ace0e38527e7145bc35ccd06bb90517a65a1d8a408a9361e719b9f2c122dbd99e2a52578752170e8059c0cd2fa84ec97e74aa445171bf72a6fe65c5f5a SHA512 01718b404a4491d61d3e8902760088e1a8bed63477b786171e9dae2ee0523c43e4a06eef723d3661249fb364b01f83dddc59b046bf23f689a7f677fcd0d57209
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
--- a/app-xemacs/dictionary/dictionary-1.16.ebuild
+++ b/app-xemacs/dictionary/dictionary-1.16.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Interface to RFC2229 dictionary servers"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
--- a/app-xemacs/easypg/Manifest
+++ b/app-xemacs/easypg/Manifest
@ -1,7 +1,3 @@
-DIST easypg-1.02-pkg.tar.gz 73462 BLAKE2B 050b064cf3b7618defbaf893babb5406f6715cb292aed99d9f54ae4e31a26f89a032a90aff0ffa313c7dd12d07e894ebc302fd311e5e5f3e7c49630285ff5fdf SHA512 ec73fbdec50a01788ca586212d4b71e2c744e3283117515a71f73c3bda82b26d86ef9be52c4f78efeb574635e0b84a87b763f09bb1ced956699d1d97fb294aee
-DIST easypg-1.03-pkg.tar.gz 78192 BLAKE2B 5369dbf4f5da0c25c9a2e451dd775a0dc4e6bb5fe077e35b98f655cd23174ec5fc3bcf5df397ad0e9fc5b5728b919da666e91397f0cf13c3a0d9788c580275af SHA512 62541d38a09bcd60232cd18c54ded710515a88c2aa7940d823f120fef1c5316afca746723fb7ac564fad7407365daa736d96afc9d228d74b5d9ff19c4121b506
 DIST easypg-1.05-pkg.tar.gz 78239 BLAKE2B 9ffa9b61b4089111d36119d0a011fbaf4b26c5715c383c65600499ca1d06f7f0030ee6d1fd4c746239757745058032aaad562bdeb5ac2ee0a8997ca4167e0f31 SHA512 be7f6770a6f343375ddc9aa54025985382ca41a598c935bceee6055d0bbddb7780f820e4124a5b634cb2c61585c6bcc4b9e3859a62a57f55538bc17c76a6e4ee
-EBUILD easypg-1.02.ebuild 308 BLAKE2B 37bc16f8b21c0c835269baccb6cf9b705111a27b5fd06c8b3133e34ca0351fee642df8001f619fd9370d1377afec87d86fdd50a4d91f7d4ab32bfbf6e5a32047 SHA512 a3cb0980b83c149a7abb9953e6c79cb815ba0d24e1a6e30183f30f7ed9a0d710e0a60daed9ce682acb3995c0f7cbdf6492abccc6c074dc624d259ccd2e41979d
-EBUILD easypg-1.03-r1.ebuild 331 BLAKE2B c508deba2e2d51da7a281fbf861fe68f6eadadd727ae0d4292418496a41c9ea97f1841f6aeb77d13a6a515870ffb8fea2a0046a68e53132838049358c56d9b84 SHA512 e71257993b2e3ecda07a32e0295dfd972090079f36e6c01a381a401469060763fcc68ff46181372df294775c3fd1015aa09ae6932d34b3fa0eea8b1c70058a2c
 EBUILD easypg-1.05.ebuild 331 BLAKE2B c508deba2e2d51da7a281fbf861fe68f6eadadd727ae0d4292418496a41c9ea97f1841f6aeb77d13a6a515870ffb8fea2a0046a68e53132838049358c56d9b84 SHA512 e71257993b2e3ecda07a32e0295dfd972090079f36e6c01a381a401469060763fcc68ff46181372df294775c3fd1015aa09ae6932d34b3fa0eea8b1c70058a2c
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
--- a/app-xemacs/easypg/easypg-1.02.ebuild
+++ b/app-xemacs/easypg/easypg-1.02.ebuild
@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="GnuPG interface for Emacs"
-XEMACS_PKG_CAT="standard"
-
-KEYWORDS="~amd64"
-
-RDEPEND="app-xemacs/xemacs-base
-	app-xemacs/dired
-	app-xemacs/mail-lib"
-
-inherit xemacs-packages
--- a/app-xemacs/easypg/easypg-1.03-r1.ebuild
+++ b/app-xemacs/easypg/easypg-1.03-r1.ebuild
@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-XEMACS_PKG_CAT="standard"
-
-inherit xemacs-packages
-
-SLOT="0"
-DESCRIPTION="GnuPG interface for Emacs"
-
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/dired
-app-xemacs/mail-lib
-"
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@ -1,7 +1,5 @@
 DIST ebuild-mode-1.51.tar.xz 35280 BLAKE2B 63f57919bb73937ce3d40b4d6762e78c78d273bcf67875434d12450e00632d457d3dedbe6f213c1979a60cbc0a0874723e3e9424fdcfb64a48acc885cc90e577 SHA512 ff9ece96fbe7bfc9c070769dc6667e8c33f8fb7ef20a2d347c670342ef7500b52b54a93ed37ac9ea13a89c1b89752f5dd6e56c234abe9a4fcd4eb6bad0d0b466
-DIST ebuild-mode-1.52.tar.xz 36100 BLAKE2B d5207d910088de9cf1a41580ce61c49632e8e7c1a1af5d95ba13a7865125ca487d770731bb49e12fdc36d3f557fadd51109de628e958166d064be025e4b91257 SHA512 852f968b44c80f98363d4663856317946992cf5d0daf9a9c63e8ec17c1a684e28c2de510ded98bd2ef84428d8d094c1b6f5060510e6475ce60183fbc8e5a0322
 DIST ebuild-mode-1.53.tar.xz 35920 BLAKE2B ee932441e23ba4b876e98feb9ff9dfea2e395296846e14f776ac10f4c5bab6b711161b4c890b0d8f2ccb5749db5bced3f693aa172e3ae92af506fee26fb5750a SHA512 8fcc28139c0cace21159a0b5026573f401f65b4501ff888f9818d8f5a506a7bc1f8d8a133f775619efc9e16e2172d6b5daba539b4e38b1a378c0b35395263ef9
 EBUILD ebuild-mode-1.51.ebuild 1001 BLAKE2B 5cfd46db07183e4a042b09072272acadba4c698baddb1022583d4f80b76a07f176bec9d58f348dd888c7b805ceb380a5bd99bc810b6e259d0b0924d95e1ef2d3 SHA512 5770a49c1af09516ee92468db7c7151fd817581836c84a289a936e4f63eeff2b002bd369ba9790d831807c759eabffaa5ce4fb74cda9cf7778ea507a86345fc5
-EBUILD ebuild-mode-1.52.ebuild 1003 BLAKE2B 2db38863c7f77c607530f79f9323d48c8c3c9635223a0c7c9a607524358aa494ca158516bcee91327f16e96413a69d3ea98e43e4a038d3ba78bfd59cde283e8f SHA512 c7dc7282574a83fb85f8dc7950365ad90e27a15b3fdc1be137593d2e07811fd8984cb3893421c271a544d35adf812cac8de131fe41e138389294555140177747
 EBUILD ebuild-mode-1.53.ebuild 1003 BLAKE2B 65c69a3ffae1c8ce9fd288ea981dd42da2c6ee8bddfa0a5ef893eece67a870ee74954e30c73d9380cb77b7fc63389c5b4756624ed46b8543a97ef56f60258b64 SHA512 2c82012b75ea3d3b8a3cb54764a3edd6eb93d59fb0882f42adbb9fe3dc47aaf93639b8f4005ed1d829f7fe4c22e44ce31ac0d67f20eb619dd85e62c8e1106a34
 MISC metadata.xml 443 BLAKE2B 80d7f482f6c34ad6d4a6073d2db913563da67e857e40bc68d04a603f9854bc7e6e06fcc025c92185b19c5705eccf92f4dc3852f3da895c7535222831e1bee119 SHA512 e712bc0b67b050d864c5a341728b3991f59b9be7bc9922c8eb7b67fea130b50ee76918b5a617df9bbde085e489592001dfc833189eeda1b89af31a3ab6c7c5bc
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.52.ebuild
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.52.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-
-RDEPEND=">=app-editors/xemacs-21.4.20-r5
-	app-xemacs/sh-script"
-BDEPEND="${RDEPEND}"
-
-src_compile() {
-	local XEMACS="${EPREFIX}/usr/bin/xemacs"
-
-	"${XEMACS}" -batch -q --no-site-file \
-		-eval "(add-to-list 'load-path \".\")" \
-		-f batch-byte-compile \
-		ebuild-mode.el gentoo-newsitem-mode.el || die
-
-	"${XEMACS}" -batch -q --no-site-file \
-		-eval "(setq autoload-package-name \"${PN}\")" \
-		-eval "(setq generated-autoload-file \"${S}/auto-autoloads.el\")" \
-		-l autoload -f batch-update-autoloads \
-		ebuild-mode.el gentoo-newsitem-mode.el || die
-}
-
-src_install() {
-	insinto /usr/share/xemacs/site-packages/lisp/${PN}
-	doins *.el *.elc
-}
--- a/app-xemacs/ecrypto/Manifest
+++ b/app-xemacs/ecrypto/Manifest
@ -1,7 +1,3 @@
-DIST ecrypto-0.20-pkg.tar.gz 76257 BLAKE2B f9ae37e7addb3670a162ac36750def814121da60864372ab1f75ceacd7133e7071d94962b41a103a27edd081d0f093859eb2db6f6a84f3dcb9517e12af37fe1e SHA512 bacf0b8e5ee3c11aed744a9e7a3b33a7e4d10aa698b43b95226cc476db0daaa821b1d8e9fd64a487efc8a8c69b932c3112020815ca8abfaa7e5b08785d8b3e9b
-DIST ecrypto-0.21-pkg.tar.gz 76396 BLAKE2B b5f730a90370968ab5596a5b0ec8ee72ec93eb71f14df30161be19a9d0b2b8ca82195df462c80120aca3dc6189a1a2158b724eae7ac21c47c88332db79c4f9bb SHA512 b5d74079d940753a809ac294f466ee93244f5c96a79d9af26a45d005ed9b2b4ccb2459baeb63430b8e3dab44db31ea845ec8c64c8d57482e382955b793510e67
 DIST ecrypto-0.23-pkg.tar.gz 76345 BLAKE2B c6d28f0d9b7b733fd5a976ebb14cfc846ed8bbe563d75f75103c0f05ae8b6830927d8cdef6c7f225d37fbf536687c54a0dfece04796714c39ee488fc5397bce9 SHA512 a273f687eb89360c521d478fc6f1d7bfde0bb0537c95eb05d5ffde2a20024e99cdd44ab8ec253093ab941322c1c7574bef474e8659d94c480079e3f58cdbdcbe
-EBUILD ecrypto-0.20.ebuild 301 BLAKE2B b63c4804b2733f3704dd464d18cf2f5a4ea7dfeeadab883e43008085410b8bbaad2ba84240833c5129bd7e37184d98729029ba49d470ed69bb30a0c455a5ff87 SHA512 17eeb75e4f9da611b00433522ab35b32b788c65c450041349869e9c0ec925807f7386f50eb8ef9be144accf643690f8d02e8a8fc2b2c7750e50d0ec7766fea9a
-EBUILD ecrypto-0.21.ebuild 301 BLAKE2B b63c4804b2733f3704dd464d18cf2f5a4ea7dfeeadab883e43008085410b8bbaad2ba84240833c5129bd7e37184d98729029ba49d470ed69bb30a0c455a5ff87 SHA512 17eeb75e4f9da611b00433522ab35b32b788c65c450041349869e9c0ec925807f7386f50eb8ef9be144accf643690f8d02e8a8fc2b2c7750e50d0ec7766fea9a
 EBUILD ecrypto-0.23.ebuild 301 BLAKE2B b63c4804b2733f3704dd464d18cf2f5a4ea7dfeeadab883e43008085410b8bbaad2ba84240833c5129bd7e37184d98729029ba49d470ed69bb30a0c455a5ff87 SHA512 17eeb75e4f9da611b00433522ab35b32b788c65c450041349869e9c0ec925807f7386f50eb8ef9be144accf643690f8d02e8a8fc2b2c7750e50d0ec7766fea9a
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
--- a/app-xemacs/ecrypto/ecrypto-0.20.ebuild
+++ b/app-xemacs/ecrypto/ecrypto-0.20.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Crypto functionality in Emacs Lisp"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
--- a/app-xemacs/ecrypto/ecrypto-0.21.ebuild
+++ b/app-xemacs/ecrypto/ecrypto-0.21.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Crypto functionality in Emacs Lisp"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
--- a/app-xemacs/edebug/Manifest
+++ b/app-xemacs/edebug/Manifest
@ -1,5 +1,3 @@
-DIST edebug-1.22-pkg.tar.gz 115557 BLAKE2B ce828bf916a02d15a699cbf0e1da97b3f2492595685bcd40c038dfdb3de2bc93cb1ef62a1ba280642384363a8c7fc7a23aa35073036d7e13aaa43597015a94e3 SHA512 5f4d86d770d68ab2199cb781da4f3b67dbda979396349212d851890bd257a85195fc5a8e0fa4ab337335887b3c2ff27e46002758926828093b6dce25f8796ada
 DIST edebug-1.24-pkg.tar.gz 115557 BLAKE2B 8112dcaf87747389c8311cbc47416b84eecda1b3393964444e342d97ec3ac3dd27330c16334c5ef435a314343a993c42892f50631149621cb94bcf2c2ce332cb SHA512 6af78de22e6ab18cf84602c4f19e0c6c8e91bf996e7c9faf97470246ec25df203cccff43b4172689ab1bfc3a7fd888f06e5306f6f5d3118d2cbfe453efa37b22
-EBUILD edebug-1.22.ebuild 313 BLAKE2B ba9b7ef3b564b2b93136366306e3b7b293f5f96d8f69cb830586d75117202b14c9592b7981608818de864dcba30d70b612f8f3956316cdac14620114124f0bd5 SHA512 bfbce094e72f42fbad3b3a62024c9e3905430fa585d6655783c6ebff94ca287c507eb1792ec40ff8e661f94789e8641ab407702f90243f0d30e6bb122c5a0051
 EBUILD edebug-1.24.ebuild 313 BLAKE2B ba9b7ef3b564b2b93136366306e3b7b293f5f96d8f69cb830586d75117202b14c9592b7981608818de864dcba30d70b612f8f3956316cdac14620114124f0bd5 SHA512 bfbce094e72f42fbad3b3a62024c9e3905430fa585d6655783c6ebff94ca287c507eb1792ec40ff8e661f94789e8641ab407702f90243f0d30e6bb122c5a0051
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
--- a/app-xemacs/edebug/edebug-1.22.ebuild
+++ b/app-xemacs/edebug/edebug-1.22.ebuild
@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="An Emacs Lisp debugger"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/xemacs-devel
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
--- a/app-xemacs/edict/Manifest
+++ b/app-xemacs/edict/Manifest
@ -1,7 +1,3 @@
-DIST edict-1.16-pkg.tar.gz 96111 BLAKE2B 60d0a990e8c2938205cdca4159f0d77360bb864b7ee66ac11b8f5714aa7cab1c2baf23fbcd891a2e0151be221efd9e46754e6ce651b2b4db2172a8835d7bbc46 SHA512 702d8d454310aaeb0804a96ed5f90c34eb2eeb72c598504404e257640a6cc153e5603cd7d8d1233b152e828fa44ec6919c7e0f9a9870a303b837db6dd5e0632c
-DIST edict-1.17-pkg.tar.gz 96241 BLAKE2B 7f353921e15a4334d5ba62048ed755b35e492536e43009c07d52acbb6a81ae92bc2190e3e8c033e1b9ad7cb685b2c673097ebe17c1eceab3d74fff4c9d82b44f SHA512 df70e1c128fd5d70ce9b5a927e25d3787b6f7e9bf7683c2da98e7a428d8bedbf2da9f1b26f7db41e94857cb30eed43e01eb9073b85a70650cabeea706599449c
 DIST edict-1.19-pkg.tar.gz 96228 BLAKE2B 32654036721787e8f3617303b61b26532d2e2ef56861c6d97e7f25a28953f95c275edb6c8778263a3209a22ebd2b22fed333740feaaa101169fba915a35f8e8d SHA512 2ce2028108a4d8923b3d9d82b8afffb228d103bab2d21c8a18649861a8e2281d3e68dda7990ac2d28d31171426344a0d7ab3a329f6f9d4a71b0300d368c4d36f
-EBUILD edict-1.16.ebuild 331 BLAKE2B 8528604227263e4f7003ce382a752c252651cc7566acd11878606fa26af25c25856a4ffead355a7c825c1484235180d751637e473ccec2c965a30ff3343a626b SHA512 ee02da2dae09eee85ce457c7f1cb1d7169c67ee14caf94059d7e47bc6215a0eda8e4764df29e7948cc1a87c928ed3b67e365437479edd7e3125b4b69d9955279
-EBUILD edict-1.17.ebuild 331 BLAKE2B 8528604227263e4f7003ce382a752c252651cc7566acd11878606fa26af25c25856a4ffead355a7c825c1484235180d751637e473ccec2c965a30ff3343a626b SHA512 ee02da2dae09eee85ce457c7f1cb1d7169c67ee14caf94059d7e47bc6215a0eda8e4764df29e7948cc1a87c928ed3b67e365437479edd7e3125b4b69d9955279
 EBUILD edict-1.19.ebuild 331 BLAKE2B 8528604227263e4f7003ce382a752c252651cc7566acd11878606fa26af25c25856a4ffead355a7c825c1484235180d751637e473ccec2c965a30ff3343a626b SHA512 ee02da2dae09eee85ce457c7f1cb1d7169c67ee14caf94059d7e47bc6215a0eda8e4764df29e7948cc1a87c928ed3b67e365437479edd7e3125b4b69d9955279
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
--- a/app-xemacs/edict/edict-1.16.ebuild
+++ b/app-xemacs/edict/edict-1.16.ebuild
@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="MULE: Lisp Interface to EDICT, Kanji Dictionary"
-XEMACS_PKG_CAT="mule"
-
-RDEPEND="app-xemacs/mule-base
-app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
--- a/app-xemacs/edict/edict-1.17.ebuild
+++ b/app-xemacs/edict/edict-1.17.ebuild
@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="MULE: Lisp Interface to EDICT, Kanji Dictionary"
-XEMACS_PKG_CAT="mule"
-
-RDEPEND="app-xemacs/mule-base
-app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
--- a/app-xemacs/ediff/Manifest
+++ b/app-xemacs/ediff/Manifest
@ -1,9 +1,3 @@
-DIST ediff-1.68-pkg.tar.gz 317183 BLAKE2B 56610f91e61cf4cfba0c7ad444d06a929ddfb6fc65e41bc8dce57ba354e1e6d5b99c5cea0121d11c32d4f277b7f8303026522b0423669d2e77126905b8d61a0b SHA512 adf3fc6fb0692022d4f44e9b966d076574dc12025b3f90bfb7f7bab6f3735d39c993757619d09a19479afdb73554cf484aae457f1184a8bf5bf831923c4ac6bb
-DIST ediff-1.77-pkg.tar.gz 317283 BLAKE2B 1f0fb3206ef6b05cc56ae9512ba7a3f9368952b898e6e324e7b73f748c91de3ec7ed0d7c34dd4961ba9c2d86b988e75065d0578f0777bba602e7693983829e20 SHA512 5f1ba2019dfa762382639516eabcfd81da14dcbb35df77c82f24ae3250d003fb4c596d529c6897b7502ee227a67be85da8d01d4d3109d9f28ef6558f0ebc78d2
-DIST ediff-1.81-pkg.tar.gz 321669 BLAKE2B b4d28035fc6ed786053c04f759524f538e1e61c18df6db1d9e844e8f5718c228cd4c3e8d62f0ba3ef112b6e7bd85c02727a4404fb067fca0135784b963323e20 SHA512 1535f39a6af02e488f756303223cb116687c28d635f761f8456a439c576bf6691119d29e5fa2c7fca2e2a578faa4d09bac34145a8ca92116aca14e7ea93d694f
 DIST ediff-1.84-pkg.tar.gz 321644 BLAKE2B 8d328b8d85103c6485af311b93265c0c48336f6c587a287312d654c57e97b80924b342e5fbab72a7ce23ea08461361ddb81ae4b9120c6e18f45c5e4f8f05e72d SHA512 e3655de8af7bfa44193ca2d168804ad047de686df5b46e8bdf521df69e38e6f9818415b7b031e8379ab2579276bd114920c1e7796f6a98f9808099a56a5c5913
-EBUILD ediff-1.68.ebuild 383 BLAKE2B 54818aa5c4932ef3ef11688daafd49ce281f4fa43d113d219cee3739c84a40194286c96676b51bf636280cd7f0407dce158cb2e3dc85bfa969ab70c148eba756 SHA512 24440d0a1cc80942b3c23c9e865559f885543d152ae1616a600ef3365509d04622a311eb45a269441974a15bcbdb33c921589a7b9fcf81e7f64667a06dcec355
-EBUILD ediff-1.77.ebuild 438 BLAKE2B 3c83c1884e1f6aa76fdb6dc5560fef1f9f0edd923981ab5e5fbe2be61388da3f7334b204adaf6e7a7f8f77ee67d1ac546fd89543cc86f9b20711eeff317b36f4 SHA512 51fbeca99179ded5f0ddb65d892a123e1f484d7198d75025e0d287aa8f3049737e05bd2a5286ad87631db771baa5151ccf38879f4c8174b36fd4cab0bc836b1f
-EBUILD ediff-1.81.ebuild 430 BLAKE2B 642a71dbb687165045c3033977d25405b824a7b41f8c5b1c3bbe0262b618d7d71eada771a7b8af4f9900ea1b55abb552eeafc789643affd45dca7c0f1f50e0cd SHA512 e314e06a838267770a1c367176816dde8920c1bf68a2a50cf3e8f0f4d391bfcab89022908fabc37c3be01c5c90b50f433ac6dfbe8452c88eda5425927a0662fb
 EBUILD ediff-1.84.ebuild 451 BLAKE2B 68af2da4bc02ce57fedd053c03a63138264b76207d80d52a399b079c167e396a61d344c8ded7c235354ac8ab153a36a978199d3accd987cbf6425af93990e59d SHA512 fd98e335a47c1aa0b8fc70b44e8da7f234c9018ed26a65cec3e4813dce2daa3f48b39ae4702bfcba3cf4a27c5f9ae7f8af89094c353707dad7cf4b9278b8e800
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
--- a/app-xemacs/ediff/ediff-1.68.ebuild
+++ b/app-xemacs/ediff/ediff-1.68.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Interface over GNU patch"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/pcl-cvs
-app-xemacs/elib
-app-xemacs/dired
-app-xemacs/xemacs-base
-app-xemacs/edebug
-app-xemacs/prog-modes
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
--- a/app-xemacs/ediff/ediff-1.77.ebuild
+++ b/app-xemacs/ediff/ediff-1.77.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Interface over GNU patch"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/pcl-cvs
-app-xemacs/elib
-app-xemacs/dired
-app-xemacs/xemacs-base
-app-xemacs/edebug
-app-xemacs/prog-modes
-app-xemacs/gnus
-app-xemacs/tramp
-app-xemacs/vc
-"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-inherit xemacs-packages
--- a/app-xemacs/ediff/ediff-1.81.ebuild
+++ b/app-xemacs/ediff/ediff-1.81.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Interface over GNU patch"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/pcl-cvs
-app-xemacs/elib
-app-xemacs/dired
-app-xemacs/xemacs-base
-app-xemacs/edebug
-app-xemacs/prog-modes
-app-xemacs/gnus
-app-xemacs/tramp
-app-xemacs/vc
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
--- a/app-xemacs/edit-utils/Manifest
+++ b/app-xemacs/edit-utils/Manifest
@ -1,11 +1,5 @@
-DIST edit-utils-2.39-pkg.tar.gz 962340 BLAKE2B 58fd356da23467c29976f39642d5aeac0898418deb60edc909b79d76e0e196bdf3757a672a12bebfd258014c495a8c43cc177dc00b5da5877905fe991814c41e SHA512 dcd6634ec0eb9cb71336ac445fa063a3fabf34d5bfe47f417c00b111a82c42f10679ab6512e1bfcb80596cacb532fa14cb3f5675fb36a5e6258696bb7491fb51
-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
-EBUILD edit-utils-2.39.ebuild 405 BLAKE2B 5f1f6b1aa72a8f9706f98fe217c50480c1ca31978506582c25b8796001e87d17772bbf53c856fabb5342d30de5943e34f9db8e1db0d24a98aeecb1edad49501c SHA512 2cffa7f1f051913d62d069748c39d08c7b86e1562080e82596aa6df88c7cc4bab569cc1de9199267eb1b5927f98b79d60a216270824ee50820ce65bde6fa0cde
-EBUILD edit-utils-2.43.ebuild 405 BLAKE2B 5f1f6b1aa72a8f9706f98fe217c50480c1ca31978506582c25b8796001e87d17772bbf53c856fabb5342d30de5943e34f9db8e1db0d24a98aeecb1edad49501c SHA512 2cffa7f1f051913d62d069748c39d08c7b86e1562080e82596aa6df88c7cc4bab569cc1de9199267eb1b5927f98b79d60a216270824ee50820ce65bde6fa0cde
-EBUILD edit-utils-2.44.ebuild 441 BLAKE2B 80e3e76d4377de7a1fcc9feb131c8c1b747c8821dad6f3677b031df875251ccc19429e77ab4cc897f9c7c0ca47f8369f80483d26893509ae5c0f71f9e8364e7f SHA512 b0e5deb82a3725758175ef0348229d59a9e647a6efd40dbf689baa842aedb9f3521cd6ca18b013ceade9f709e65abf826abe9c7e322b8ca7aad40a10c79a5b1a
 EBUILD edit-utils-2.58.ebuild 405 BLAKE2B 5f1f6b1aa72a8f9706f98fe217c50480c1ca31978506582c25b8796001e87d17772bbf53c856fabb5342d30de5943e34f9db8e1db0d24a98aeecb1edad49501c SHA512 2cffa7f1f051913d62d069748c39d08c7b86e1562080e82596aa6df88c7cc4bab569cc1de9199267eb1b5927f98b79d60a216270824ee50820ce65bde6fa0cde
 EBUILD edit-utils-2.59.ebuild 438 BLAKE2B a7fff7b20a23a988d5db53eeac5aded48d2903b35f0ec7073e179bfa438eabed4cc6829da271c922c39c534c8467392e2ac7b478481038dc0c58b0b50b36b3e6 SHA512 381a344170658c3b7544074f905dcc20a6738fdb485fdeade7e0e5fe030b0f46def9b84474328b8bbe16e3d98554118d3dfdc8a055462d43f8a3482af6adbc8e
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
--- a/app-xemacs/edit-utils/edit-utils-2.39.ebuild
+++ b/app-xemacs/edit-utils/edit-utils-2.39.ebuild
@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Miscellaneous editor extensions, you probably need this"
-XEMACS_PKG_CAT="standard"
-
-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
--- a/app-xemacs/edit-utils/edit-utils-2.43.ebuild
+++ b/app-xemacs/edit-utils/edit-utils-2.43.ebuild
@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Miscellaneous editor extensions, you probably need this"
-XEMACS_PKG_CAT="standard"
-
-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
--- a/app-xemacs/edit-utils/edit-utils-2.44.ebuild
+++ b/app-xemacs/edit-utils/edit-utils-2.44.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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
--- a/app-xemacs/edt/Manifest
+++ b/app-xemacs/edt/Manifest
@ -1,7 +1,3 @@
-DIST edt-1.13-pkg.tar.gz 62754 BLAKE2B f327f44febb3fcca7a79771126ff85716464ce23739b2caf49a95047f2244da706576f80e5ea58125f0c7cd4723262b6d759c77c66581d3393f56f1950465544 SHA512 8371dd96b6996d1257c769be4fcc77ae386d187bfb51ccd03c57e09b12a2b193c575f15b8fce29380a59f795adaf02a3528fa80f3b24536c349fc10ab54f808a
-DIST edt-1.14-pkg.tar.gz 62824 BLAKE2B 9ab1cc9e55364b901ee51d16b97ea8a72a935e10d2aec5ef4f1757954a5f3e0c36132686225bb64e47227e2c83171632b004621f14b1508a9bfc07c8ad4cfc04 SHA512 8179652766eeffdd12b673e453f4dbe0117bc8f2ad743943c5f613dd217c80d3433b7cbe3a2d8b55604eaff489416edc5afd3e5bafafcec8782dd471688555c2
 DIST edt-1.16-pkg.tar.gz 62865 BLAKE2B 22f62a7ab87a723339693fcd6351263b1347b464db1f2f15ad79543505faf837154d95efa03f9401a03d7838452cab72484251c80a517cb3337ea8e3bf2f595b SHA512 46a0452b11119d926a3d612acdbefec37731ac60a86b207e125c7ca6dcd962b419173d4a5cb96117a8f0afb29b9c8173a5bbdc69e8d8ae09276829a6dc44c931
-EBUILD edt-1.13.ebuild 289 BLAKE2B ca3abde2c2057e1c9054530c1e408d6c4cdf17669d666a5e813362db7dccbb530758d868d1cf38c39332348b5c257d7bb4672f636edaf504bb3ff77a07d82df7 SHA512 7110841668c31fe610f077abc1796303b07341fd089fdd0ccf7e6aaf4b1a96232ae23e631c936a0384b2c4e7f342fc35bf8525f3c8a5bb4985f2f6d7bbc405d3
-EBUILD edt-1.14.ebuild 289 BLAKE2B ca3abde2c2057e1c9054530c1e408d6c4cdf17669d666a5e813362db7dccbb530758d868d1cf38c39332348b5c257d7bb4672f636edaf504bb3ff77a07d82df7 SHA512 7110841668c31fe610f077abc1796303b07341fd089fdd0ccf7e6aaf4b1a96232ae23e631c936a0384b2c4e7f342fc35bf8525f3c8a5bb4985f2f6d7bbc405d3
 EBUILD edt-1.16.ebuild 289 BLAKE2B ca3abde2c2057e1c9054530c1e408d6c4cdf17669d666a5e813362db7dccbb530758d868d1cf38c39332348b5c257d7bb4672f636edaf504bb3ff77a07d82df7 SHA512 7110841668c31fe610f077abc1796303b07341fd089fdd0ccf7e6aaf4b1a96232ae23e631c936a0384b2c4e7f342fc35bf8525f3c8a5bb4985f2f6d7bbc405d3
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
--- a/app-xemacs/edt/edt-1.13.ebuild
+++ b/app-xemacs/edt/edt-1.13.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="DEC EDIT/EDT emulation"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
--- a/app-xemacs/edt/edt-1.14.ebuild
+++ b/app-xemacs/edt/edt-1.14.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="DEC EDIT/EDT emulation"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
--- a/app-xemacs/egg-its/Manifest
+++ b/app-xemacs/egg-its/Manifest
@ -1,5 +1,3 @@
-DIST egg-its-1.27-pkg.tar.gz 261339 BLAKE2B 8e0fb9cf66d373ccdee6d54c0eb0d996d5ebc03a5d85e1ae8c43b66ae53b7a9ee97a90526b70d52232397ef2982baefc3d4bb327bdebe60aa79bb77ffe4a785a SHA512 f5a2a9412175cc4a825de907f566df0228a1838b082a20f9f11164fb76b7f87db2f4f4e337a8d58f7e0479ffb498c32ac0a7413a70f047a10ecc631edebd4ded
 DIST egg-its-1.29-pkg.tar.gz 261073 BLAKE2B cc5c515f4ae3918954ad4fedb21b5262b29fe3cbfcb43faabbefb7882f16583b53b8a68cc943af77471fc4431898db6de1dd38f1146150050f5d422308ef241f SHA512 9457e69c652f13309616ffaa97bfbe64bb0699c958442a0b0bd5f9f215951688a77d7d689567b1fb09d74229460c2a7687b661bcd21a68646a01283929ef764f
-EBUILD egg-its-1.27.ebuild 365 BLAKE2B 9f479026668ff1466cb3310e6f6a7d2b210beb25f219170257a07b6633e7796f4cbe75a660543e212a5fb9206f196474033f9444e5f8cf4a3db208f2d89b7a0d SHA512 7b190c9dd1c75566e8798b99d739a90bc542e809d1914b33fcf53c3f82530ce2ea2709f096814b1e046281368d89cccc678b7ed54fbf46287b0e94c08356c856
 EBUILD egg-its-1.29.ebuild 365 BLAKE2B 9f479026668ff1466cb3310e6f6a7d2b210beb25f219170257a07b6633e7796f4cbe75a660543e212a5fb9206f196474033f9444e5f8cf4a3db208f2d89b7a0d SHA512 7b190c9dd1c75566e8798b99d739a90bc542e809d1914b33fcf53c3f82530ce2ea2709f096814b1e046281368d89cccc678b7ed54fbf46287b0e94c08356c856
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
--- a/app-xemacs/egg-its/egg-its-1.27.ebuild
+++ b/app-xemacs/egg-its/egg-its-1.27.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="MULE: Wnn (4.2 and 6) support.  SJ3 support"
-XEMACS_PKG_CAT="mule"
-
-RDEPEND="app-xemacs/leim
-app-xemacs/mule-base
-app-xemacs/fsf-compat
-app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
--- a/app-xemacs/eieio/Manifest
+++ b/app-xemacs/eieio/Manifest
@ -1,7 +1,3 @@
-DIST eieio-1.05-pkg.tar.gz 165803 BLAKE2B 92425dbaf275be435acc9d51f1ab5fad0a771d8205b11881229a244372059f71a8fa5c2d485c9cdc5208a21a4b54acd03f41e39847c4901bde81bb42b30bb2a5 SHA512 7caa2cff977f850e4b59b00a2c34252bb235d901e4605092181aebac7690eb996b2bce7bb9262a9ec4c6aa691e89046cb723b8f0cd643f5b9b6cb5af51385497
-DIST eieio-1.07-pkg.tar.gz 177923 BLAKE2B efc84c48fac4bd76ca4c843a4bff97dc10f21f45be9067c54c871a64314c9012b80e8d5e292f8844e1b7c3ed86a3f8044dfa547109c09891a3aeb11d515b7b0d SHA512 e4c76aa617bf80ca3fa7de249535ba63b22c3c8d787361dfce9381f4cb31500cb8f40e564c70928ee99492a0b71a67a13dd90e9626335b18b2a49877a124a551
 DIST eieio-1.10-pkg.tar.gz 179945 BLAKE2B 5bca0fb3ac1a94adc73dc7d0233645308aee5bd12923cb390c648a1334cb2b69488b8593781936ccea8719dc1e9a53526b1b348e1b9ca42681531f409029a48c SHA512 deb5de328e40a7c2fed189c89a3e3ab5cd5a26cd7243398c34bf2ed6bc1ebe7e72ecc23a2aef9d967a2477ecc4c797486e477a50e1cc78cd506c1e3170a85512
-EBUILD eieio-1.05.ebuild 357 BLAKE2B 9e75a8402e8effa825ee12189040860d88d55979545c9dcb249dd35d96e00ce693b4c37caba7a7b35fe7966f3900e17c9d65b678ea62a839e746524fd8d93928 SHA512 9cc259cd44f4be156fa70badcc387d94ed0e1a0d250dd1c1f362a9b754bfb24c1cc1bfe51cd20daaffb31ac0c0803abad8e284e6939c299bd430ff9fe3901f0a
-EBUILD eieio-1.07.ebuild 381 BLAKE2B 800a73d54872a13b574891ad6048deb1cc090dc3b8e7a2832aef9b28e583b2a1a0e286cda71992743e858c2a466603c82f0be5cb0fa2859eb43a2a8bf3427d3a SHA512 978abc828b206f85d5c2d0d849691c49f9ae6dcf39861a519e534ec3eb0e63cfa9f90cc13c53e39e463071573c3ebba8b5523f2a95c1e70976196adea81058f9
 EBUILD eieio-1.10.ebuild 381 BLAKE2B 800a73d54872a13b574891ad6048deb1cc090dc3b8e7a2832aef9b28e583b2a1a0e286cda71992743e858c2a466603c82f0be5cb0fa2859eb43a2a8bf3427d3a SHA512 978abc828b206f85d5c2d0d849691c49f9ae6dcf39861a519e534ec3eb0e63cfa9f90cc13c53e39e463071573c3ebba8b5523f2a95c1e70976196adea81058f9
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
--- a/app-xemacs/eieio/eieio-1.05.ebuild
+++ b/app-xemacs/eieio/eieio-1.05.ebuild
@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Enhanced Implementation of Emacs Interpreted Objects"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/speedbar
-app-xemacs/xemacs-base
-app-xemacs/edebug
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
--- a/app-xemacs/eieio/eieio-1.07.ebuild
+++ b/app-xemacs/eieio/eieio-1.07.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Enhanced Implementation of Emacs Interpreted Objects"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/edebug
-app-xemacs/cedet-common
-app-xemacs/speedbar
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
--- a/app-xemacs/elib/Manifest
+++ b/app-xemacs/elib/Manifest
@ -1,7 +1,3 @@
-DIST elib-1.11-pkg.tar.gz 73387 BLAKE2B 423476172a1a1ffe2731ca67fc24bec37a52de5387afc22c044aa90c40dbc0c2d4d858f57ccf2237274b7b3cc7b7b366bb44cd52c9c6f0d1264d1ad051a10be8 SHA512 0ed1b6bd47b13c69b5990e6e1ca8e203440e28527f860a70e22fe0da94811909bcddcf184cfc9a8016a2fe590cea5e3ceec270bfb33ff655b542a3c8c0ea8638
-DIST elib-1.13-pkg.tar.gz 80235 BLAKE2B b81ca5b529a808ee5a9c7f514cf53dfa1c5d5ad4531b3aef10706ba746b4ee4a3216460e006842f733bba073d1048d2d26c88643c1d3f9f5744924e66f84a9c4 SHA512 edffc77f9db1300693701df56fea7fa6e0fe3c4d11949bd8766faea21ccad79cb52b60f5c25e84350fa7f3cfc45820035b06f82890ea760dcb90e93a065feec9
 DIST elib-1.15-pkg.tar.gz 80288 BLAKE2B b336e467ef1b586bfcdec74f7c7766f16623ad223ced12c66b4a38282683e7a9ce7b8eb70b0b263be5e2cc42468c7cab622e8c2ce843680c28751c6202966e82 SHA512 16594062b094330a6cecfb9de8698c4f6608ed9276f8e4600658a9026ace1b3185fb9d23ec70fe4474093c8e95d67255d5a8741f0d84a906b415704e6fdc78ce
-EBUILD elib-1.11.ebuild 281 BLAKE2B 43ab30ca0efc7520bd50f2f01195721812da0ada78929c1acabca903a4f21d0f68ec70ca972f80317d645c80abd9305e16948d39ef4e9cbf3ab48494dcb3b1e0 SHA512 d973543fa435792c94f6701354343b4264796162483f899249c4d3883278773da2e06cea09612c8d7c5637841a2037f09a333e7521432c29995c6e8bf1aaf18e
-EBUILD elib-1.13.ebuild 304 BLAKE2B 52c98d7978e4dd320ff9adcd4650c24d245e9ec456cb76d9de581204bbf86b3828b38acdb5835eaf3fe76cd45a36168dadfb751ca3b140b4f35d4cacd9260997 SHA512 ba49c8b66fbc39fbf3a04ff47ee0ac15587d2140ad9bbbe81d5196d82d2718a5484d923c53411d830093f66f4e349d941fce08a3861a0f98382007617df9f1db
 EBUILD elib-1.15.ebuild 304 BLAKE2B 52c98d7978e4dd320ff9adcd4650c24d245e9ec456cb76d9de581204bbf86b3828b38acdb5835eaf3fe76cd45a36168dadfb751ca3b140b4f35d4cacd9260997 SHA512 ba49c8b66fbc39fbf3a04ff47ee0ac15587d2140ad9bbbe81d5196d82d2718a5484d923c53411d830093f66f4e349d941fce08a3861a0f98382007617df9f1db
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
--- a/app-xemacs/elib/elib-1.11.ebuild
+++ b/app-xemacs/elib/elib-1.11.ebuild
@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Portable Emacs Lisp utilities library"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND=""
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
--- a/app-xemacs/elib/elib-1.13.ebuild
+++ b/app-xemacs/elib/elib-1.13.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Portable Emacs Lisp utilities library"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
--- a/app-xemacs/emerge/Manifest
+++ b/app-xemacs/emerge/Manifest
@ -1,5 +1,3 @@
-DIST emerge-1.11-pkg.tar.gz 61367 BLAKE2B 4b97e5118c34d89f7387e29c7e19337a0adc89c1588d35f338f910ea8d5f3003e358613850acf3124911e88aee31f387a7853ad51cf9a0f90d5b13608c81fcaa SHA512 c72569dc28b5db4c1e6b5b35107dcb4e1772de7a7b42898895c538f0ec127e28104b0ea0612d01138c1ff715285f06b9cd642609272ed40360f9b97e5e8dc784
 DIST emerge-1.13-pkg.tar.gz 61362 BLAKE2B 23269f38554fe99532389831ed3f9ad310ebe78d8edb3475096170a8062671e609bfe2ec45e2b27bf6f90d0e90db1592be360c4600828f3f2c8fb9e71d07769b SHA512 4fe0545d6bf67bdd7456e19fbaefb741c20a0119e1bf780e9d43163970c1d2d76ab0a79bdadf24b38643423773db89d37e6cdeb131fb96154ed5df91cc7e55d8
-EBUILD emerge-1.11.ebuild 265 BLAKE2B 139ae3238b6589f9954e276e7e805e6392911751a69aefa2e82e24cbb6fbb4e1377b75f5a43dc011009d2a7e37ef56befc3d9bcdd417be93a52ba5c18278d44a SHA512 922bedfb7cd9acb49249558529b73748b3817be6a071b047053ba9631b1a7ddf65d724117653dce6b6952bfcd1acb2507cbf1c1da3cd8d5c1c70694aa4a91218
 EBUILD emerge-1.13.ebuild 265 BLAKE2B 139ae3238b6589f9954e276e7e805e6392911751a69aefa2e82e24cbb6fbb4e1377b75f5a43dc011009d2a7e37ef56befc3d9bcdd417be93a52ba5c18278d44a SHA512 922bedfb7cd9acb49249558529b73748b3817be6a071b047053ba9631b1a7ddf65d724117653dce6b6952bfcd1acb2507cbf1c1da3cd8d5c1c70694aa4a91218
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
--- a/app-xemacs/emerge/emerge-1.11.ebuild
+++ b/app-xemacs/emerge/emerge-1.11.ebuild
@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Another interface over GNU patch"
-XEMACS_PKG_CAT="standard"
-
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
--- a/Show More
+++ b/Show More