gentoo resync : 08.10.2021

29 files changed, 260 insertions, 133 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 0c0b06e0964f..9d3ec4bc8032 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/dash/Manifest b/app-emacs/dash/Manifest
index f0349f466625..298a9e0cc9ff 100644
--- a/app-emacs/dash/Manifest
+++ b/app-emacs/dash/Manifest
@@ -3,8 +3,10 @@ DIST dash-2.16.0.tar.gz 148151 BLAKE2B 1c51d926a6dd4ecdbc2ad132347af7bbd27e604d6
 DIST dash-2.17.0.tar.gz 149379 BLAKE2B d88106b08d1454b483f08db59e641680e7361b4572b47e238b096977ba308eb4c2810621c99e98126a94e4afdba9faf966e3c56cb6f4ad1292ef05fe7cc0546f SHA512 e53fa1bb9e854b446931d943caac719646218c96160f7c50615b5e95866f4db9dffa6e752596e9c223bcd5b39a80c0c75748b0e0564d72ce5825715a29b80d01
 DIST dash-2.18.1.tar.gz 150343 BLAKE2B 5bd0db651830d828c3c51739ab90fb34c1a70b9e72eb434d9dafca0b6e5c6f57bd121eca45fc01a20ce32f20d0c3b49a34bb4a214bacb19712a931e8a587a40b SHA512 f9f0eea41cbf589e2024955f43ec7cd00c37947d07cfd68fe267e541baec1f0c86066c39ad2fb4e467c1cc579c2369a0d75496d176775122e7e48dd24954640c
 DIST dash-2.19.0.tar.gz 155484 BLAKE2B 88ec15c5b566787191ef0b64ef1f6abeb191825ea61bd31358dcc019042c39ba5e4375648e78cf9d1b0d459104ca521d39ebf0d71781ab82c7778869030446bb SHA512 fafb080d3b55184c7304cd6b317b9aaf281427083b7925e233009451449dc4f59077618017b0ddaa91bc87c48dde5f981c6e0f51a19063a35b2ccc1b9ea49b2a
+DIST dash-2.19.1.tar.gz 155540 BLAKE2B 6c705d2a3af77c79d91e2fbf5dd766e6d1e6e741a56a8b1e062e9316d2c62f686a6935de46c56bb3a7a27bd823772061329aa09e2e33d68b3bf7a35f65732dc4 SHA512 6822e0068bf2f2082faa4de47521982eba0117037c333178517eca9e6db1c33a2767b250a6ecbd329d2e2ca9e107d2baf0b025e34ba50f1b60da5bb7da06c195
 EBUILD dash-2.16.0.ebuild 561 BLAKE2B 6b6f0318611b3b57e47b16225e2e0998c3f3020a6aa4195e65cd5954ff01518c2b026fb181f22cd5131ffc42d39eabf48fb54bee1188ae51a5556c1d1f396ea2 SHA512 34266ac3d94e0ba59061f8c7ef9946a55449621baeef3a72293486a9f9e7575b40fc78ffd3d2f37893f2c824c4caa4e987f18245fac6e04c47a7ea2351afc8bd
 EBUILD dash-2.17.0.ebuild 564 BLAKE2B 949c330e199f88ca957a348373db0a3208628762269cc832f3c5b308e5b4a5a6b9232de8180a52b8a583d36380dbb20f8c68bee9b26f2301e654a6b0a15e9004 SHA512 30cfd972903a1d4be4c1f68d71715703bd7ef00b6b4c6b554bde5b0d634fd9b07085ae13afaeb592ef73968b6e2bc4fdd553a6ade65853a70d87a005a1e4877e
 EBUILD dash-2.18.1.ebuild 525 BLAKE2B 05a3f145a89433220f90a50ed1bb52d24e0671704b00f52c31e9f16a16c44f5a05ab3cbe2b6c495d8c5f9c4b0b5d3a1c2c5bff4e1fe71519c2de7107974d3a73 SHA512 75255e9396bfe95b1a65f5300b766275d6a1e3cb316768b6b7ff63ef37ecc58632e253303b69ff2f8d3aca87a9f7085384dd119d307ea93f366eb824218d838d
 EBUILD dash-2.19.0.ebuild 525 BLAKE2B 56bbc542ab3da296acd8a3448e2c198c9b22b6474db9e64dbe41c92deaa7d9fbe273d08be3df8cc89086dd7c1720b29187b2df48c5ef6090704db8a068cf11f9 SHA512 8345d8bdf25e1a9c0a254990e7955d19936e92910991c18da13d533bda3c3805513af8a7d60dedfb5785679d925f8393688bba21b7f730a491fec977e10a9ad8
+EBUILD dash-2.19.1.ebuild 525 BLAKE2B 56bbc542ab3da296acd8a3448e2c198c9b22b6474db9e64dbe41c92deaa7d9fbe273d08be3df8cc89086dd7c1720b29187b2df48c5ef6090704db8a068cf11f9 SHA512 8345d8bdf25e1a9c0a254990e7955d19936e92910991c18da13d533bda3c3805513af8a7d60dedfb5785679d925f8393688bba21b7f730a491fec977e10a9ad8
 MISC metadata.xml 361 BLAKE2B 526ffa8914e45d9df6ab9b109ebd1bdb229a72fd8bd3aa5afda015814245847540ca2528130953ceb17e16a8e8a4c736603cac7226a4dc05d2f0cb635e6b3924 SHA512 f7edd41fd870cb9d3bce26c0670515d13e175be0dab988889c36450c24d5b898ad49550902d5c07e898bf29cfe183372747b1317ba36834ce68e9ef0bfcb4f24
diff --git a/app-emacs/dash/dash-2.19.1.ebuild b/app-emacs/dash/dash-2.19.1.ebuild
new file mode 100644
index 000000000000..fc2e95a1f688
--- /dev/null
+++ b/app-emacs/dash/dash-2.19.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="A modern list library for Emacs"
+HOMEPAGE="https://github.com/magnars/dash.el"
+SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="sys-apps/texinfo"
+
+S="${WORKDIR}/${PN}.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="dash.texi"
+DOCS="README.md"
diff --git a/app-emacs/editorconfig-emacs/Manifest b/app-emacs/editorconfig-emacs/Manifest
index c2d8168e8280..7c70cf3a4fd2 100644
--- a/app-emacs/editorconfig-emacs/Manifest
+++ b/app-emacs/editorconfig-emacs/Manifest
@@ -1,4 +1,6 @@
 AUX 50editorconfig-emacs-gentoo.el 315 BLAKE2B caefc75ef9a37e43d2a5de2f9c50a8f2992124fa98030080d5a5dc6c37490e1217e47595e4e894aa264568899d54891db8676348d10984327a4c596bcbf7b923 SHA512 66e86f6af9fa2feadc5477b6b7290320b2544219d8c099f74f94873fa4d4d45dd8f0dad17b14dcb455f1e18f1dd7606ade1ef77e0aff5708102ed5f35df81705
 DIST editorconfig-emacs-0.7.8.tar.gz 28250 BLAKE2B 8c09b7e495ff38d4276cdbaf60109f91b3e32215f2c6a8aceffd80a02cf024d79eac1739b3f2efa3697b78804da32d0cc2969db628d1064a0fb1db1b059a191d SHA512 21815a5a778ffef68b5205e409aa827c1bd6c9a8c542647ebec889a9f00f5b3f71e3a2072bc2f0373e8ce30c1bb57f5f6350953a3c149742a8e2e46ca9846c9a
+DIST editorconfig-emacs-0.8.2.tar.gz 39675 BLAKE2B a2a9641185a00c2908715b59a7e4429008f7587e00552ebc19f6cc38b6a10423c26a25557b887caaddc47d9c136fdec82476ef916e18c06b8228925b4554428b SHA512 6934418fd7890c49d8df7cdac1a0afe066e07ddf6274f674a4624dca47de278a78778f25beca793cdb537852beb7c8df5ea46743fb0bc753acccbb9974448e18
 EBUILD editorconfig-emacs-0.7.8-r1.ebuild 648 BLAKE2B 613aad383cca044f944485ad202a062a33d21ed6d2a2b81e4d5e402055f58debefffa8888f2123849c31ae9091baf46755ad9c9d126ce41047da4f14ec791a0d SHA512 112c8a2861d5d845ce34107d02fde7f8d674930ae5c01cc9e6e868c3eff7bfaea74f4589774cb722c6f673f3bc11ac996425bbc212cbd246c0d2b4d86b013181
+EBUILD editorconfig-emacs-0.8.2.ebuild 645 BLAKE2B ac115d62641e0f7db43c60e0a29fb68747cf982e9364496994a6c757af5bc7960716b1ac7595e0d1833d33425b7f41f9ca23e490d054d356732928eb5262d620 SHA512 cae754c60d8583ebd3f232635c48f4b36c25e64fc8feb08830cba9bad4ba33af522671df276d07c85a4af5dea567f68d1fcc0d56baabc4cf77a1f51fbcf3fd0d
 MISC metadata.xml 461 BLAKE2B e8415c92944d44ef9186b4882d7a5b912ccc16f224da3faef90b43ee8077e94496234341b80eaaf20a17118ebe6f8e8b0cfb70910c948a3ef5a8f853a02cba22 SHA512 a679c75eda6a98c3810b3fc1982ed8c7ff9349a63541eaf3c2b5dfdfec4d1a97f7c540d6b6442511c2645aed46e4b6d346f01ed952a51eb12d076aab8d29351f
diff --git a/app-emacs/editorconfig-emacs/editorconfig-emacs-0.8.2.ebuild b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.8.2.ebuild
new file mode 100644
index 000000000000..28b91eb6580a
--- /dev/null
+++ b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.8.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="EditorConfig plugin for emacs"
+HOMEPAGE="https://github.com/editorconfig/editorconfig-emacs"
+SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"		# make test requires a git repo
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
+DOC_CONTENTS="The EditorConfig feature is not enabled as a site default.
+	Add the following line to your ~/.emacs file to activate it:
+	\n\t(editorconfig-mode 1)"
diff --git a/app-emacs/ghub/Manifest b/app-emacs/ghub/Manifest
index df5257120f60..e122ce8d7322 100644
--- a/app-emacs/ghub/Manifest
+++ b/app-emacs/ghub/Manifest
@@ -3,8 +3,10 @@ DIST ghub-3.2.0.tar.gz 65346 BLAKE2B c3aa5195a574de870fcd757bf4efb4aaca6fd83fc06
 DIST ghub-3.3.0.tar.gz 67861 BLAKE2B 60006417d24110bdf99eae860b0a639e5757afe0da94b8bb5186d54ee14b360c473acebf667a7a262a1edd581da99f4896814b6ec2c49f8c9dc23b5c5e89d63c SHA512 7071f50d66ffd580d0cbbcdd7a3776fae70f090bb4d970a3b7767b9add3893c8cf286996f70baf4c214a7957fab5504596120305be23dd300c0c4c0fd2f660d6
 DIST ghub-3.4.1.tar.gz 56401 BLAKE2B 889fde5b091f20242679986eec31ba918c657a5317486c01eee6c9a8997173a4cd1a1474b4f287ae459786338073dce2cf9fe01ce1def17f3fd923cad9c81823 SHA512 76d3628a29afb2d21ee6bc438213712acf20db4a5181ecdc6362816d5af70b3876c1319efe348287a838916afb5d4ed029eaaed3245a4da539354dd6551d8290
 DIST ghub-3.5.3.tar.gz 57896 BLAKE2B 24274c51605356353d87ffe7a4c9e843fd76a9156be6a48b11a3871f3a1f8a0ecc3a256bcad951e21d2cf4c9005c1bdf9a43f8b85df9c2ad67f632eebe0a3df7 SHA512 0e87e778a01ecc992156d751c5882c403b9f6978b647d9f1ea5613a6b837edbd0fd7841e9d90d8a7148f76dda8e54c40e92570af6a591263329a139d5530fd29
+DIST ghub-3.5.4.tar.gz 58088 BLAKE2B 5ee6fe56455e8f12e7be8c1ae705a426677fab0b9a5da8f42c4b331bdd635120a2f5475055c9e98c8df01b259f76aa2dd4cad6e8b4562481d261bb7802b826f6 SHA512 df8ba56195ae3773c0c8c8a8f555e562b04de59ce3fb1c17c24ca3b10418299555326f0a9360eb47725310890e31f73221eece3ca1ff83e47d52941e224fc562
 EBUILD ghub-3.2.0.ebuild 594 BLAKE2B 525b954b0ed721868b8c103904d51af3cc58dd79be779369e51e583902325b6941d76624c51818f3f1eaee72665e8a00aad2c190276c4efeae5fa328cefedf94 SHA512 89ab29b8e2b87ca07d4012ed4be91a6e73ac6a01ee42d4a66bddeb86b8a5568e43f273febac5c585e9259ce7060da72ad3569ee3a38094ce6d7f92b290208310
 EBUILD ghub-3.3.0.ebuild 544 BLAKE2B d287f40bf4c9d6fcfe2de2c559aa41d215fb5263c101890f06e399a7600e7b457f027d0a2bf3957e4913fa938afbf8bb23f4d16cf37bc13ae1fd4c584ee6eb64 SHA512 d8fc2184ff80159745225f31b1f207dd07cad9c818cf589882ac7e804a48785431907cf3f4f445d6124e7688cfc8ddcac01c0587c41c75bad5aa079093820c52
 EBUILD ghub-3.4.1.ebuild 544 BLAKE2B d287f40bf4c9d6fcfe2de2c559aa41d215fb5263c101890f06e399a7600e7b457f027d0a2bf3957e4913fa938afbf8bb23f4d16cf37bc13ae1fd4c584ee6eb64 SHA512 d8fc2184ff80159745225f31b1f207dd07cad9c818cf589882ac7e804a48785431907cf3f4f445d6124e7688cfc8ddcac01c0587c41c75bad5aa079093820c52
 EBUILD ghub-3.5.3.ebuild 544 BLAKE2B e973f6187ddf451b6d390e8e81cff824a92e66a1822dcddc2cc474ec8069a5237e158bf2e22de556aba3eb0a6b0881d5bfbbf49b4b20279b328104d1f7223529 SHA512 f714fcf9147e9490829fb6d4064c9d3012ab4cdc2d6d2dd9a64f1a9555af263a000ea2d5dbe831dbb0f7c53c34e6b05752f005f9dbed55b45d7d2ddef7db8525
+EBUILD ghub-3.5.4.ebuild 544 BLAKE2B 4882e4a605d4aa6f04ceebececc2999c44c60aeee8c1aa46fbca85aaec2c6bc189a0b7003f5ad692080e4efd97d636f772eeb57bf3cc5e5ea018f2b3e834272c SHA512 4808df8b5cc71b02826be83afd818a0505451c87cc16d67f4d3005c201743e91394f350134cfb258d16ea1b3f5a095ba7cc78c1fa44918ad225264ee40416161
 MISC metadata.xml 1297 BLAKE2B 76a67936c0754ffeba3ca47551417bea6a0996c5197977b2dce2c73bf7acbe421f0c7ac0f8415b529f1ee3109868bc5306d7e714a58f3faec549ddd575cc82b1 SHA512 8cb4ebebcce9526416253b528bd8e2865311a796f10cc176b7d87d0fd06b573a9d7dc094cf3c2ccb916eccffb69dd5a164ad64c8f0310727147bea3804aa79de
diff --git a/app-emacs/ghub/ghub-3.5.4.ebuild b/app-emacs/ghub/ghub-3.5.4.ebuild
new file mode 100644
index 000000000000..b4d2f0b5ef1c
--- /dev/null
+++ b/app-emacs/ghub/ghub-3.5.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=25
+
+inherit elisp
+
+DESCRIPTION="Minuscule client library for the Git forge APIs"
+HOMEPAGE="https://magit.vc/manual/ghub"
+SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="*.texi"
+DOCS="README.md"
+
+RDEPEND="
+	>=app-emacs/treepy-0.1.1
+"
+BDEPEND="${RDEPEND}
+	sys-apps/texinfo"
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 1b92097b6070..a8f87b94df76 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,12 +1,8 @@
 AUX 50magit-gentoo.el 77 BLAKE2B 85c942a0eeb84d6d45931a318108dff2006fc38e9e9eac37e906e03619c41fce8c151417a5e3b4fd9cf8db8fd084363a5ab6ca0765ea74e9a052d409528b6c39 SHA512 ab812cd1f5451868dd62a4bd3e87b2d5061ef4e3010a2a4c63396c9b797fbfb45c02d045dfde55de1b7e91c98375ba7a56b98f65beaa697d35228b9c870daae6
-DIST magit-2.13.1.tar.gz 520271 BLAKE2B fdffa561dccaafc2be56bf285e286859145e00f5037c99b5ab1ee50c9895eee56dbe8a5470e3a148e0150367bf92ed1c7cee4a35662f5c0bed0e4e7a2d49638c SHA512 f9f796fd6840788cebff62b316a0a1d708736e7a6962cd34d8ea86e94fb5a55c9e25f9aace17bceec199b2b931a0d5e586c4ab7d189c64ec6e5a9e42d041b269
 DIST magit-2.90.1.tar.gz 544968 BLAKE2B d3a38cf8c4d8c15529463028c4f6718d65bff044f91f58f2027c62d584202835d17229ec1db93d2990b5bb59403eabf7f12e7e91e2de519149ad40c274da5f25 SHA512 57a81fc72276907009fd3d05abbaed930d089d3e4621d539abb6ce2b24fd594950533f47d60682e25f0bd1c9f1ab3a16ba6b2698d79c6980f250ffd335be7789
-DIST magit-3.0.0.tar.gz 610528 BLAKE2B b667a6f12020f37303fa5d5c8bc71cb8f66bd25acbed704f3b3ba666b95b656da8c1b979d592e58171dd7bbaa4896b8fa144f52ec65e28976a88f42917df9323 SHA512 f1bb0d96906d327bb929cc45e2496a214513b1da4fd68e78a3db188f19dd69bd253c83e6b7881713989ee2a70d2f2cfdc9414263e0ee09be34cd72eb7fcb198d
-DIST magit-3.1.0.tar.gz 613295 BLAKE2B b2ab1e56d1dcab7476fcfd22563452c0b6977a90f9d614911f13fb9eb591b75197d3ba7f74a1acab9eee464d4ab8d3c63e2019e7b974b3895d4a9851e37887e7 SHA512 b4e884aea1d6b0cbf7861016b7fbc8214911ea84afd349320c929368a245da31105555e644d4e2e9f5aa6787202c9c30c24e62f64f5671cc036273c22ab65bfc
 DIST magit-3.2.0.tar.gz 618602 BLAKE2B c96226669bc5160460d24a1b9b36784d6764234e2e2690f059c362176e9a56fc742b961a0d4103049b33d958e44c092f4bbb75de3b3437ac178dae89e34028e0 SHA512 3b4bd5a13592814c0c638a26ba09c6e01a15db6af3555db41bc0adc53e8c08eaa2e7c58d8a105101fb46a8a04be0e09a0f2c86d365391430b42adee83df382f6
-EBUILD magit-2.13.1.ebuild 835 BLAKE2B 786b7e8ac034d16b1baef4620c1eca7b436dc3c13b75d97e246970d80a96575c5111d12edd3c34e792126706b1cc87ac295e8292361a917948f9988949730869 SHA512 78e0c514ebe0eeaaeb69c66980794886e8584e52dc1a695ff8a333eb91be08ca8ee6b8cfae902633aa7572d123b609a82d4e3ed96ff59e27c4f4f410a3004df8
+DIST magit-3.3.0.tar.gz 629283 BLAKE2B b07a071682ac543ba4a94b9bb8d78cedca1dcc4a7140ad2972d65e014666a2fea078611a7fd98356747d02431e5aa2456801e7e9a12e2b08027666b437863535 SHA512 22fa7c41cb18746b33f64ef936f88dbf229f998e2d2a5d066771711450753c98430335040d0a9812832f3fa39f96f6e88133d5274964332bc899fa7ef19422eb
 EBUILD magit-2.90.1.ebuild 828 BLAKE2B f2ddb437ef786073f6a9f7f5561cbc9452bfa274c3b1e31a49ae9f5984f5ca63d54468e51023e1990da073bc162808b38f12c9b1ee9a51509ea5d2fbf3de525c SHA512 a85ae33cef7625b40c7d8dd1794075adb4dbe0eae2b99a08395ab91bdd0ff590cec877298d5e20c1868322e6eba2dc1ee08ec9306b60be8c65a13cd15de0091d
-EBUILD magit-3.0.0.ebuild 823 BLAKE2B eead5e1ea1d1ba7e2969cf81358cc9089c1e7b7d5df257d93133033430e7ea5342cef6cd4aa3b74b1cf8615205f6e438ed1dc52704330bb8d0e5cf7a41fab80c SHA512 fcc54d58483dc52229468ea2e90150be80d3efce32e4cab7fdf8d12956c9a8a51143da6b99151f402934d777eaf6d0134bbf8f5381a696cd10fd489ebab8666e
-EBUILD magit-3.1.0.ebuild 823 BLAKE2B d7b1760ed5f5d5c95204933f5346eff2a40824b7fe6a44a689dd37afcc9b57ab53a9550ec89819074fd3d7c56ea399fee97b34a846690c2ba2c5acef3145bcbb SHA512 c319209ba031fd875f8838ee848d275682032de23f912aa763bfb7f6dbc2d6c76a04a5906bb173763cf3036357d2d88bfbf5c96ab787c7ab5d8f6ef674ecc6e1
 EBUILD magit-3.2.0.ebuild 823 BLAKE2B 0bd97294709e7cc31744117cf8cc92c00a1f7b3aac89a2085c1652510da6269ce9738302079f5828a909434fae9382387bf2d5ab1099cfe5dbab03e4d78cf680 SHA512 bfa883e5a9567aae7be3999536735fdc97707925095520a2307ddd01151052b70bd68d7991abfd3c50926793cdf673c277d0a7cf6b492775d3014606cb317e64
+EBUILD magit-3.3.0.ebuild 823 BLAKE2B 7106b5b0ecf09334a6c9c906b973fc79b7224e8e9d63028831b4d94ec0d50c86acdf5099d8b8924df6d083a8f92cfea8927a97c84d8aee6852868ac9e94bf656 SHA512 b50e63e2bc0c63588e61295524062bda2f0ae9b9a204d74370856dd0656c44ea4d26b2c9f89cfde034c668dafd16b32c37d181d884032942f37df06f23f5ab3d
 MISC metadata.xml 812 BLAKE2B a00fcce22437d2853e3c6ab16e57e284444eed91cc2ec90e443ac14ab61c60dd476b21504fd41fae27eb0180cebb236f86b35cee557a41ca34c854939c8a0ab8 SHA512 a0aa797e586bdb7657c9f4af4eaa8611a012146abbae4f47f47b124a7ebb9c2a8e65f9e862464bef0cc6f5671da40a2bd6e6cb78e0fb9d6ec02c362bcbd27399
diff --git a/app-emacs/magit/magit-2.13.1.ebuild b/app-emacs/magit/magit-2.13.1.ebuild
deleted file mode 100644
index e01da9137a1e..000000000000
--- a/app-emacs/magit/magit-2.13.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-NEED_EMACS=24
-
-inherit elisp
-
-DESCRIPTION="A Git porcelain inside Emacs"
-HOMEPAGE="https://magit.vc/"
-SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-S="${WORKDIR}/${P}/lisp"
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="../Documentation/*.texi"
-DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/${PV}.txt"
-
-DEPEND="
-	>=app-emacs/dash-2.14.1
-	>=app-emacs/ghub-2.0.1
-	>=app-emacs/magit-popup-2.12.3
-	>=app-emacs/with-editor-2.7.3
-"
-RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
-DEPEND="${DEPEND} sys-apps/texinfo"
-
-src_prepare() {
-	default
-	echo "(setq magit-version \"${PV}\")" > magit-version.el || die
-}
diff --git a/app-emacs/magit/magit-3.0.0.ebuild b/app-emacs/magit/magit-3.0.0.ebuild
deleted file mode 100644
index 1315dee8fe75..000000000000
--- a/app-emacs/magit/magit-3.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-NEED_EMACS=25
-
-inherit elisp
-
-DESCRIPTION="A Git porcelain inside Emacs"
-HOMEPAGE="https://magit.vc/"
-SRC_URI="https://github.com/magit/magit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-S="${WORKDIR}/${P}/lisp"
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="../Documentation/*.texi"
-DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/*"
-
-DEPEND="
-	>=app-emacs/dash-2.18.1
-	app-emacs/libegit2
-	>=app-emacs/transient-0.3.3
-	>=app-emacs/with-editor-3.0.4
-"
-RDEPEND="${DEPEND} >=dev-vcs/git-2.0.0"
-DEPEND="${DEPEND} sys-apps/texinfo"
-
-src_prepare() {
-	default
-	echo "(setq magit-version \"${PV}\")" > magit-version.el || die
-}
diff --git a/app-emacs/magit/magit-3.1.0.ebuild b/app-emacs/magit/magit-3.3.0.ebuild
index 9eaf6e8ef348..5b015439899f 100644
--- a/app-emacs/magit/magit-3.1.0.ebuild
+++ b/app-emacs/magit/magit-3.3.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 NEED_EMACS=25
 
 inherit elisp
@@ -20,10 +20,10 @@ ELISP_TEXINFO="../Documentation/*.texi"
 DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/*"
 
 DEPEND="
-	>=app-emacs/dash-2.18.1
+	>=app-emacs/dash-2.19.1
 	app-emacs/libegit2
 	>=app-emacs/transient-0.3.6
-	>=app-emacs/with-editor-3.0.4
+	>=app-emacs/with-editor-3.0.5
 "
 RDEPEND="${DEPEND} >=dev-vcs/git-2.0.0"
 DEPEND="${DEPEND} sys-apps/texinfo"
diff --git a/app-emacs/org-contrib/Manifest b/app-emacs/org-contrib/Manifest
new file mode 100644
index 000000000000..80610dfb11ec
--- /dev/null
+++ b/app-emacs/org-contrib/Manifest
@@ -0,0 +1,4 @@
+AUX 50org-contrib-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST org-contrib-0.2.tar.gz 231795 BLAKE2B e8ec122bc87a50ae9b718ab984418a73c6e6734920a208815cac11ecbc2a3897409f3f4d3c0bbbc04f2f4a1a5e657ef35b71e0342156e1b82e2057a6deffdcb8 SHA512 26ce845a9f845ceee2326bd006ff18ef35ba5b1af438d9d02e7f249bf45df293128b24f9f9ff15d7c87271618d1e4ee95d689a96e2104b6dee09ef7b78a6d581
+EBUILD org-contrib-0.2.ebuild 485 BLAKE2B 8aaa5f0c018709f38d3e39243993f3717f4cbda884cfe35dd872c787e541adc07fb56a30f23c4a8f76ffa4ca872058d197e1d10c377688e273533997a7fadcf1 SHA512 3a2a8d69f0c9fdacd05b15efe565eb6bca77a1ffbe6c350308d1e087993a03d29a19ab8f888a1d3562f3c9dd0d63a6a54c261ecc9a2afdd17d91ee289e2de3e2
+MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/org-contrib/files/50org-contrib-gentoo.el b/app-emacs/org-contrib/files/50org-contrib-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/org-contrib/files/50org-contrib-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/org-contrib/metadata.xml b/app-emacs/org-contrib/metadata.xml
new file mode 100644
index 000000000000..986088003fe1
--- /dev/null
+++ b/app-emacs/org-contrib/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/org-contrib/org-contrib-0.2.ebuild b/app-emacs/org-contrib/org-contrib-0.2.ebuild
new file mode 100644
index 000000000000..b3eb691a59b1
--- /dev/null
+++ b/app-emacs/org-contrib/org-contrib-0.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Contributed packages to Org"
+HOMEPAGE="https://www.orgmode.org/"
+SRC_URI="https://git.sr.ht/~bzg/${PN}/archive/release_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-release_${PV}/lisp"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=app-emacs/org-mode-9.5"
+
+DOCS="../README.org"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index d6657dd8da1d..4f987f97ef20 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,6 +1,8 @@
 AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe9856c526d77e5e988a35203c35322a1ea7ce9e19b02ff9a5ce1b2b4d73b8ba19bada30b7fbf453e43b01 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000
 DIST org-9.4.4.tar.gz 4725983 BLAKE2B 69fcd15e13c55b71a2c0c6185a0b82dfd8f72ef2c68a8ccc5aa9d3e9f134233d7c7c3cb38f4957cc7d5d70a082067412b61be2111b484b6a91a8a2e5f077bb39 SHA512 ec857f9765a869371bd3425aaecdbe1c8bb8f605640d81efebd7ed13afcb05439cf3a5277457ed399bc501f95a6d823bda7f46b6991cd5f21cf53cf0e666d831
-DIST org-9.4.tar.gz 4724986 BLAKE2B 8f56c2459e1718d4982ccdba3a8fb1403ff4a66a5425ec341f6d5ef01b2415c87d77c7ac8a8cd7046b4398a18688ef5fb4f92d0131f6694bc6047b32e3dd5827 SHA512 480377b13950e1f9cfa2ec553f274156ff9a25a5572d5eb6137fa08a3d6f1d5c0a6942f4d139379974861ee467c3be17105bec6b17640beaa308c8fa6825f8f5
+DIST org-9.4.6.tar.gz 4729335 BLAKE2B b88edaf8098124b2048ce57d6005d2af0de34e9b8fa94c24eb041a42a6fca1fd6da7f242be89e6b0ca5e7b80d879096f9114dca0ba86b20a5d26d2a185baa537 SHA512 7e50d7e9e2073bc0f06d2c861f59d4c9b8af4cf63c98f730c810a3a8721e65829fe9ef7ba0ac99f49bf9da427a4d5ad1d028e05c1a8ab6a3bea2ff2020c0e61d
+DIST org-mode-release_9.5.tar.gz 2043985 BLAKE2B 7f8c45be0c3c873eb9dada8d637088aa0fac4d2b2e4ddd7523c305e0c1acdc10c58ed36646285cff2ecac78d5d862f08fcd113dcb4fa853db04e59a6252a1d7a SHA512 9f05ef6d4adb89224248299ca7c8120924b6ad4c2fa5d0804ac4985b35f87382e20e0c6fecfed59bd52917cd1b6e57830505d47fc80102390cbc6336029fe132
 EBUILD org-mode-9.4.4.ebuild 1710 BLAKE2B 4f0a97a455d97ade5ed4743abef2c8027a6e20bec8f758d146cd027123f8ed9cdc6c282e93a7b6325b6bd728158350caf36cd6eadc523d91278f3169b8900436 SHA512 f60a2887ae93d3ff50cc1e2300703b2154d983923e445e63dc8736245c39d80db60ad8d9aa86c8f2780bf051930dea53f865fb611d84e472e13f178f687a693f
-EBUILD org-mode-9.4.ebuild 1710 BLAKE2B 4f0a97a455d97ade5ed4743abef2c8027a6e20bec8f758d146cd027123f8ed9cdc6c282e93a7b6325b6bd728158350caf36cd6eadc523d91278f3169b8900436 SHA512 f60a2887ae93d3ff50cc1e2300703b2154d983923e445e63dc8736245c39d80db60ad8d9aa86c8f2780bf051930dea53f865fb611d84e472e13f178f687a693f
+EBUILD org-mode-9.4.6.ebuild 1713 BLAKE2B ce3a94f20fcef4d3d9ffe14908227763159cadc44b86af63d33788452320e382728b78841582d38b329365d881a44aa909b35686235c7a3be259dbf58a34c481 SHA512 46982cd5c1880aafbf6a9ee14bcb7b5c1c5188a549fd2ac86fe9de3e8ca33e327a6f270992fc1eb5bca46962c376413bc68b04ffa48a670d036d52db34669bb6
+EBUILD org-mode-9.5.ebuild 1357 BLAKE2B bd6f1c161575a24cbde34d6a8a9242d0a846df938a79af2b00d8af2814449fe864558c45579e60b9da4b731fe5a8f03ce1e93e8f11e9cc7dce8997e159509516 SHA512 7313065c1f6245682e0dcbcb8614d5186b3eaab6f4716710ecb7087055651ed2b18122c53a4db4baea5838041bfd7b414fcd500fa056cce2b90e52b2d3d5b85f
 MISC metadata.xml 1369 BLAKE2B 4da436ff9e2de1e6f01a37be7cd8a893d49896d00c83a16a47838c3908e04b46f7f07499ce3bdf41a25033ec1313e16b30d6498622e476fdede774ce711d77ff SHA512 d0817690d4662401fcdd28de85b3e7e5f0c69cb37de4ba7ada8499d7ef964217cda8cabed4849c9b48ebecc393d65b2de5067c36db1e98834ac8a86024b901d1
diff --git a/app-emacs/org-mode/org-mode-9.4.ebuild b/app-emacs/org-mode/org-mode-9.4.6.ebuild
index bffbcb8d7146..9e5416d94789 100644
--- a/app-emacs/org-mode/org-mode-9.4.ebuild
+++ b/app-emacs/org-mode/org-mode-9.4.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 NEED_EMACS=24
 
 inherit elisp readme.gentoo-r1
@@ -12,7 +12,7 @@ SRC_URI="https://orgmode.org/org-${PV}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="contrib doc odt-schema"
 RESTRICT="test"
 
diff --git a/app-emacs/org-mode/org-mode-9.5.ebuild b/app-emacs/org-mode/org-mode-9.5.ebuild
new file mode 100644
index 000000000000..d4f4644be22f
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=24
+
+inherit elisp readme.gentoo-r1
+
+MY_P="${PN}-release_${PV}"
+DESCRIPTION="An Emacs mode for notes and project planning"
+HOMEPAGE="https://www.orgmode.org/"
+SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc odt-schema"
+RESTRICT="test"
+
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	emake datadir="${EPREFIX}${SITEETC}/${PN}"
+	use doc && emake pdf card
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		ETCDIRS="styles csl $(use odt-schema && echo schema)" \
+		lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		datadir="${EPREFIX}${SITEETC}/${PN}" \
+		infodir="${EPREFIX}/usr/share/info" \
+		install
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc README CONTRIBUTE etc/ORG-NEWS
+	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+
+	local DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
+		so you may have to install one or more additional packages.
+		A non-exhaustive list of these dependencies may be found at
+		<http://orgmode.org/worg/org-dependencies.html>."
+	readme.gentoo_create_doc
+}
diff --git a/app-emacs/python-mode/Manifest b/app-emacs/python-mode/Manifest
index 16bd35e66cfd..f348b4b968c9 100644
--- a/app-emacs/python-mode/Manifest
+++ b/app-emacs/python-mode/Manifest
@@ -1,4 +1,6 @@
 AUX 50python-mode-gentoo.el 541 BLAKE2B a1657fc49011246ba1cfed1cd8993a222c4932516c6a8e3be4fcc53200510ad8e9a3e1072c2bce641cded4be1581a9c950991d6864c2136668ddba4de8f2429d SHA512 8e1c2c68409c48f3e7c2ae36128380fd5358a12470db571ffa22b1c9cb11730a2f2a84ec66f23c064e32b504c8ae002033e77640d85e11577c50e31462cd5274
+DIST python-mode-6.3.0.tar.bz2 377148 BLAKE2B f55620dcda63bb074116ad622d0ac2431839277a9f525be857bb4245a6b5b9f7daaefd538e166efb327333bb2186f2998541f3a1816bff76c65a726e78265c01 SHA512 cc4a9e67ec3d751040a1ee453360f7aad127688db9c67385b669aa76ad7504dfea1b15408f4ff130a5103f5266ee4eeb920e66b1c1fd1f2dcbfe6302cc8f847a
 DIST python-mode.el-6.2.3.tar.gz 314461 BLAKE2B 3bd71b47de1284d59db61f829e3419f2fb10e226900392d903256f31ad90f47317b7bde4cde1cf7d86518f9c706d9c844b208a9e2469a41037252a63f7bc1ba6 SHA512 4aeb33d4054d582cd2a3f4834472c7d0cb3fe5e12e10f5117dcbcd90ec2ca490964c774918c83697f283c68e57766c3c67d3853ddbaa3408777fdafc7f2674f2
 EBUILD python-mode-6.2.3.ebuild 686 BLAKE2B 198606ca07bfd459b226a8b555bc14a82e54d5d7b23fbee377cc80851a34f54c0dcb3ea86cfb0b9741a4ae45fc833faa06aa6e8d6e5833cad37a97224edfc98c SHA512 8c34226a45a852fb468cab7c87ceb9f96c422626e0a24f05e9472c2486381cd7f3d31fefc93555b4d7df8e1a7eb781736d253f679e07d1064541bd99d679974e
+EBUILD python-mode-6.3.0.ebuild 713 BLAKE2B 038ceb3b3515efdf5ab7be45bfaafd4865f48f90337662bfcb67bced764e3bd2ec5584af2899291ea0aa7289d94c0efd5da18a84f24a5638e9ee3d0bf4a1eedb SHA512 2bc1c6de00426fe11791ad2fdbe03306de936348d203df49a318e2ecbfdf2d9495c28b902276b895a5e6b247a6870f288836529b39450e4de4559bc2d648917e
 MISC metadata.xml 360 BLAKE2B 45f8523f260073dea339ca644560c2b44187bc4c01037fe63caf546406f0f8ebc016a9cb4f99039bcacd99a7ea96e4a8e529e43632d7ad8c5a9a3c65d75f503c SHA512 705c854935095cd9d3eb54cca4cb23e15a3727337a2b8ef9d7b92dbc11bfd068836e739e399490f01619bac7f4ec5475ea29f74d1f319a93e33a7db465f510c2
diff --git a/app-emacs/python-mode/python-mode-6.3.0.ebuild b/app-emacs/python-mode/python-mode-6.3.0.ebuild
new file mode 100644
index 000000000000..2dd18ba0b96c
--- /dev/null
+++ b/app-emacs/python-mode/python-mode-6.3.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="An Emacs major mode for editing Python source"
+HOMEPAGE="https://gitlab.com/python-mode-devs/python-mode"
+SRC_URI="https://gitlab.com/python-mode-devs/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+ELISP_REMOVE="python-mode-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="CONTRIBUTING.md CREDITS NEWS *.org"
+DOC_CONTENTS="Note that doctest and pymacs are in their own packages,
+	app-emacs/doctest-mode and app-emacs/pymacs, respectively."
diff --git a/app-emacs/scss-mode/Manifest b/app-emacs/scss-mode/Manifest
index 2ac448f11356..a7e9a79a6a26 100644
--- a/app-emacs/scss-mode/Manifest
+++ b/app-emacs/scss-mode/Manifest
@@ -1,6 +1,4 @@
 AUX 50scss-mode-gentoo.el 161 BLAKE2B bbe35fe0ab2a4857ad2ab3fa6866e39f873c9c32fec93eb321de9fbb20128be2fb49d36028f778217f4199603a5d5be8e4d1932a5799173b92768ec7b80c0f16 SHA512 099fe31e6a15247502498b3e27e8e462b0ca08b719becc8c22e3e6877aafa1987934b68e916cd2be1237fccda2bdd550402fd168c28967721ce472a033a61a7d
-DIST scss-mode-0.5.0_p20150107.tar.gz 2718 BLAKE2B 5551ca7258caf22957e1d3becf147cfb617378c606c05196b87fa2ce7b035f06e48db1ad01476bcca87bde461971ab040fc7085422cd076469c6d7a9b73b624a SHA512 68a33d14166289af119625a5609c4dec47a05eb8c8452b42cf8e819368cc7561270c8223ac0624fee989f8c51592f456f91009c153fb857549d9c7e7c7e801a2
 DIST scss-mode-0.5.0_p20180123.tar.gz 2802 BLAKE2B 0254fd89ee50de2bb9c6abb1ed1ff5f97f8a938b4fa84f38409b87049fe5e0618bc4be9c0a85d17b3911cb1d0b731b1602f76e047b3acd6e290dc091a80c9c93 SHA512 0c83d9c956d197e33c71840818dae1ad722812d1aa95ff7896091682ba7e710f3ee9855210fc403a30d76ef4986803da5dbcd7907c22b221a5cc2d619db22bff
-EBUILD scss-mode-0.5.0_p20150107.ebuild 518 BLAKE2B 137b61d375bbf2b6751e2416a16352673cb3f682e8814f7a8e57898d59b5f079252830350681d994edd1c6a5c1275e9442687612f743cb74268a6b812a25b5d1 SHA512 724f62c4a6783cee97f8cd270e325173a59ad8fd69fc13b9f7603acb6632a89a3f537b53fd4c17655d7cab484225c5f1f40fb8e840696196b7b69406ad9a25df
 EBUILD scss-mode-0.5.0_p20180123-r1.ebuild 518 BLAKE2B d02ec0d733fb453268e5fe071a6a26dee8ab4e0dc899c74042ffca09434721bd2a1512cb8670fe2ab183787af15505e586fbca1adc53a8ba9179d5176936dd41 SHA512 1d5e4eb09f7d46eb12963a7b55af2aff16e9a6c03cee40b11ba5e4bf8d471340ba204f522e7d565e934dc1935d4cfcfbe804eff2ac8ad0022240481a3c34b174
 MISC metadata.xml 362 BLAKE2B 9571bfbd3e390e62dded17d14cc36acd296246a2ca396bec6ac53eac7caca8dad88f23670cf5dc0978d18637145c5cff71ce20aab63b8d479b9909842b4f348c SHA512 b530e7b98ef34173ded4058adb7cf092e8a024c48f44c6be988a3fccfcb4691da7a2893c584d7d4c1f7e07c07634243a0c46dec643747d25e94c8d80230471cf
diff --git a/app-emacs/scss-mode/scss-mode-0.5.0_p20150107.ebuild b/app-emacs/scss-mode/scss-mode-0.5.0_p20150107.ebuild
deleted file mode 100644
index f92573000689..000000000000
--- a/app-emacs/scss-mode/scss-mode-0.5.0_p20150107.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp
-
-COMMIT="b010d134f499c4b4ad33fe8a669a81e9a531b0b2"
-DESCRIPTION="Major mode for editing SCSS files in Emacs"
-HOMEPAGE="https://github.com/antonj/scss-mode"
-SRC_URI="https://github.com/antonj/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-ruby/sass"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.org"
diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
index 140355c585e6..46eea38acbec 100644
--- a/app-emacs/with-editor/Manifest
+++ b/app-emacs/with-editor/Manifest
@@ -1,12 +1,10 @@
 AUX 50with-editor-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST with-editor-2.8.3.tar.gz 30648 BLAKE2B 8989f8506fb58c1f54efa4fcb72fa8ddd477c0c73d82672028bdb027f74093b62c44ab5a545cd9db2e0e3222bf461e605aebc805112c5ae8486c224b22806c26 SHA512 389aa084f7dfb7f7b59a37802441718e20ee70d88b9af9631b1fc547e4c3238d053bb2b3ef50a4e6332fc3befae183a49d55b3c7bd7719a149cf83001d23810c
-DIST with-editor-2.9.2.tar.gz 31201 BLAKE2B 9aa1edbf217b7b1f0d1755f74526d4623d71eb3b66654b774d84a0faac9e3b39e2b8c511db23b15a151e263f0944e08aad07a1c3cba92aa309cf9e63b97b61ed SHA512 040028dd47cc5aaef5f0324fa8e4f53e55578b69efd55d0904e357f6cce2b69243b51d22bed8d56fc19649621446edca72fc11a3c7f4342056ce76d02f3a0502
-DIST with-editor-2.9.4.tar.gz 31639 BLAKE2B 9a9dddc7f4470d06fc3d94c7a41d034483f6143cb38c1cbded3ec4c760799da6f7a85b474e113a976a57db4ed609200f6395b48dedea2d805e3d7b1a9ec9ecb0 SHA512 017d9d815bb1ead3331e0f8d8c89cdc5646fb5e37ecbf7c1f4c8e7003e23acce21187d0a22e483a293096796b76f0bd1403d1e58bc02d212ecdf01bbc4329802
 DIST with-editor-3.0.2.tar.gz 31992 BLAKE2B ca7d63d07f44243a0d6218b02d5a96b01e92e07ad5c515fc74f3aaa08b78f2114410cfc634b17ac8d342381d679787c2608a526b5147ed29f2a45a5e1c513685 SHA512 3040358f5cb78c89a110fabed62c9693c2c69b742cd42d603fa3de6d3b1fcee693a1e7bf052b9e5a3da1e3f935911d4a054f14430367012a713caf1541ec9f6c
 DIST with-editor-3.0.4.tar.gz 31998 BLAKE2B 9ad3311d24e791a4fd4d4a8ce190386a714393465569bc65d0b8bd4222bb98b33cc1d85c05acd3be0c8d273b6faf3e9c482f94be3af476cf847c4bfe777165be SHA512 bc51bee024dda578794a263798d07e1c216b8d4e2cc3f039226186bab1ed48e95d0ec57be0e4c0d5f0e8a4b1c2033647722f4f4c47bc404c9ab17c63aa5dbbe2
+DIST with-editor-3.0.5.tar.gz 31985 BLAKE2B 9d4bda1f4e7ae3ec5c9014b0e7a74bf703e9b80990b138ef6108275c9a117611d542e1dad03bb8537c7e8e3ffbbf3aac433bb4d3fe5eb07378f27dc1579a13ca SHA512 cc60a69ebfbb7d802a7bc64b56bf866111799b5a2a3140dd203bc3a4257756f558e81169b418bce2daa91e7aab7feb4d22115fcedf9efe46026745c4e3cf0268
 EBUILD with-editor-2.8.3.ebuild 585 BLAKE2B dfb15f185a82227721d375b17e162e98b0e2620bb3bf71e6e110a68c1a8ec5f38a07d847918a9cedae4a506b2028c03f6032794c3ddb3341385fd5d518bbd10a SHA512 051602ed7993dcf52e8ce87ea00caa88e35b46a46e84acfb38adefe49808976f179f6e4672196032caf4901acc59439abf07cfa97234dc4d4038e9cbff35c847
-EBUILD with-editor-2.9.2.ebuild 588 BLAKE2B 79c96cde6bb7fa2998827b490b8ccc8fcc809364d8a846132d6abc3083e1ee19e578a41107cd7cd11549c1e2737c04568249ae5fe6352a7ecf50f37da72f22e9 SHA512 2ca005827f37bcfe9b3044486abd9492621ad19bd868bcf973c7fd3eafdb993aa0d1de1cbb311ddaeb5fe92a325531f4d830560c06e3cb8c774d480b1fad13db
-EBUILD with-editor-2.9.4.ebuild 588 BLAKE2B 79c96cde6bb7fa2998827b490b8ccc8fcc809364d8a846132d6abc3083e1ee19e578a41107cd7cd11549c1e2737c04568249ae5fe6352a7ecf50f37da72f22e9 SHA512 2ca005827f37bcfe9b3044486abd9492621ad19bd868bcf973c7fd3eafdb993aa0d1de1cbb311ddaeb5fe92a325531f4d830560c06e3cb8c774d480b1fad13db
 EBUILD with-editor-3.0.2.ebuild 588 BLAKE2B d8fda53659a95060e2ed96307d5f2b9ef3381eda05551a3e99609d8262cef9f4b35142eec138b5b625cd6b993b8a365d9455371457a03ea7953152984639eadc SHA512 97a68fd31882bbbc112096d76ebcf6326af1984d3d31b538f66654e068d4eb53adc0ccffb03d03a614ac2956679010539b94e700992a358309c96f325af10541
 EBUILD with-editor-3.0.4.ebuild 588 BLAKE2B d8fda53659a95060e2ed96307d5f2b9ef3381eda05551a3e99609d8262cef9f4b35142eec138b5b625cd6b993b8a365d9455371457a03ea7953152984639eadc SHA512 97a68fd31882bbbc112096d76ebcf6326af1984d3d31b538f66654e068d4eb53adc0ccffb03d03a614ac2956679010539b94e700992a358309c96f325af10541
+EBUILD with-editor-3.0.5.ebuild 588 BLAKE2B 2acd9f9fc583d83cf38652366fe0a89e1297869147b3a24640f46aa0f7125161950d0323f8841389703c6ed352971cccd7413ca5ce01f3f7226a4afc26d05a5d SHA512 ff4fdc1231df2f9130b05f0bcb16212a43b0bcc4d3d583e3e369152386e5f75cc61d4792ee64e774ce426b2b5730bd40ff25cf1e6e7bec5f26f8966b3c4a7efc
 MISC metadata.xml 708 BLAKE2B f2e619818ede95a7a0b17cc7f36f903f4210ddc634d4f0edf27886e8fbc4d084daa5ef67c8167ef2f39930141c8dbe1e98c4e5992b7af35234499fa73e9de4cc SHA512 bf422e1a42e025426795319834a7fa75252e8f2c42da1d82098e2def918ed9c4f827978753c86cc4e41cde581bcdc8eb2c9781d75849a80ab6f94f945b4cdea3
diff --git a/app-emacs/with-editor/with-editor-2.9.2.ebuild b/app-emacs/with-editor/with-editor-2.9.2.ebuild
deleted file mode 100644
index 246c2876e638..000000000000
--- a/app-emacs/with-editor/with-editor-2.9.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-NEED_EMACS=24
-
-inherit elisp
-
-DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
-HOMEPAGE="https://magit.vc/manual/with-editor"
-SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="*.texi"
-DOCS="README.md with-editor.org"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND} sys-apps/texinfo"
diff --git a/app-emacs/with-editor/with-editor-2.9.4.ebuild b/app-emacs/with-editor/with-editor-3.0.5.ebuild
index 246c2876e638..a778e115e55d 100644
--- a/app-emacs/with-editor/with-editor-2.9.4.ebuild
+++ b/app-emacs/with-editor/with-editor-3.0.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 NEED_EMACS=24
 
 inherit elisp
diff --git a/app-emacs/yasnippet-snippets/Manifest b/app-emacs/yasnippet-snippets/Manifest
index f4b59a06ef73..2a9b44d59f21 100644
--- a/app-emacs/yasnippet-snippets/Manifest
+++ b/app-emacs/yasnippet-snippets/Manifest
@@ -1,4 +1,6 @@
 AUX 50yasnippet-snippets-gentoo.el 161 BLAKE2B af28f32bcf248a9557c25e4afd50110b6fdeb8f376b41ba645da1ee3c39429cf6b967bc77ce60f29a28d7dc01903a620997cb9a6bf7a62628bd3ff7495f8a015 SHA512 f675ccdd153f0c386d384df2db90598c08f2d49cadc434d1bba7707a7681b0d1dfa410bf188250b05003544c17bba11b132d9d8f3741865cf64ccce5b117c4d4
 DIST yasnippet-snippets-0.3.tar.gz 97229 BLAKE2B 26fe83c35be1b20b6a1e414144149cf1feaf4463833634bbd0a3db6f56b1da46d8e379c3dd19217cfd36f12cb9dc796eac4efef5c2ba472ce79f8c8b8d816969 SHA512 4aaac9d7c880642a1e802abb98bd6d6c94557fe0e609db5ce5b4ce2af921235d3e6bb2488c052adbe2940d41e85297520081ae0847b52642bc97610e6614727f
+DIST yasnippet-snippets-1.0.tar.gz 178027 BLAKE2B 0b44c94c3ad3f2a1208aefba110945aeae74e7278c93078c59677985efc89767b670c99b4b8303b56ea0b748375762ada1e45653e02922b248273af5818514d4 SHA512 2df010f24e51d0156bcb3d488cd6a63a47d2d92e4c5f3cd081e377dc91426d630bde41db6f79d1b5ac1e932e4d0ab11f9be945e94fb35d50b1789adab19bd15b
 EBUILD yasnippet-snippets-0.3.ebuild 614 BLAKE2B 73559131e05601b6a1f80ee513e8a2eef5f718d9b037476adfe2dfdb9d15162ee0dc6e2b249851aa1e3aef2ebf0b9363eab6f9e2996adf1d5c19496d75b3012c SHA512 d9d3d0044e4a527ce6b8b0e93f9ec4e63ac0a331d2834c9d283d9cd5f00c0627ece69b5ae17e346401cd345ec32a2daf97f7c86e1833980de2689b85bf0bb89b
+EBUILD yasnippet-snippets-1.0.ebuild 611 BLAKE2B 78a8ae161f1b000d3a7d17c160767f74a7e9a0b758f419c3aef625347f0a497017585fcb35ce153d7cebc8008cd1f1a2d43693df222d98b61341c7c4c98f40da SHA512 b7ed9b5b6435ce5a70ef8d470db964be6b4f88001569bda80ec3ebf203d2160f74e15bee0a4670f7c45a7f8e310c67cb6f251e9cfb59e047ebcc8752328f054a
 MISC metadata.xml 377 BLAKE2B 78f369ac63a6ba16eabfbc21367b0e29221a94a8460b877e58b23e4c4176e3d4393ac7cb657057fe239298fc9836365b8a5d6ec789251ed552e684590b40e6e4 SHA512 72e8f247f2bb604ea52229c1aa68abf0fdd6649c87ffaad7f2893131f522cc3d7283251d8e365def16ac5eea831c98472a0ebe591cb6188132e0d7696b559b55
diff --git a/app-emacs/yasnippet-snippets/yasnippet-snippets-1.0.ebuild b/app-emacs/yasnippet-snippets/yasnippet-snippets-1.0.ebuild
new file mode 100644
index 000000000000..3b0d29b244e7
--- /dev/null
+++ b/app-emacs/yasnippet-snippets/yasnippet-snippets-1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="A collection of yasnippet snippets for many languages"
+HOMEPAGE="https://github.com/AndreaCrotti/yasnippet-snippets"
+SRC_URI="https://github.com/AndreaCrotti/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/yasnippet"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() { :; }
+
+src_install() {
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	insinto "${SITEETC}/${PN}"
+	doins -r snippets/.
+	dodoc README.md
+}
diff --git a/app-emacs/yasnippet/Manifest b/app-emacs/yasnippet/Manifest
index 44e31da55123..8890d0c765ed 100644
--- a/app-emacs/yasnippet/Manifest
+++ b/app-emacs/yasnippet/Manifest
@@ -1,4 +1,6 @@
 AUX 50yasnippet-gentoo-0.13.0.el 221 BLAKE2B 51f86d04a825b5e1cb60019bddac2b0e2d91d735ffafdae497c87413eb0ad88efd969575edfe139ba250d2e2115f1c5a242de61f54031b684f35437e6e868989 SHA512 ace64b43229ee327add5d6ac056b86f7468ffb79569ca55d3692c93fd4b9e847d83fa731c8e54ad2aced5d64ed73c9cfa1fc6d6f9a883356dbb6a39142d9a2fb
 DIST yasnippet-0.13.0.tar.gz 577330 BLAKE2B 21830c0a2e99d7669093c16f527debb4921e96aad006887ec1c7e35da58745721658417f1aec96ea78ba4dc5f3951c857848fce67e6d2ff7f255d4aea5687ab9 SHA512 73b111f72e98c4183764cef08ddfaa861dba49f171f96026b074bf62a7aa5e2d8529f616805ba386dd4157b675da953784d5bcd832d6015ce1b72e9c240988c5
+DIST yasnippet-0.14.0.tar.gz 581053 BLAKE2B efae02939d0174724803819fb9a47a414acad3b1d58da91d4f35c42c02282db9773f4f3caa020d01c2d87de741d3c60b39e1406b6ff7b3e5310ed4efc477d635 SHA512 c7f704187b3c700f8ea9e0205941d7a32602b6994307007cb83aa984ccf7e7e37be9589277a56c294703eab82ee4b1dffae7040f2e175e7d56cda5ef3c70eb39
 EBUILD yasnippet-0.13.0.ebuild 1014 BLAKE2B 37db6268c4d6d08820e368c26fc6e488f50da201740e03acdb1aab3885de6163dd0d827dbb70d55ff8baf77ec030ca318f44db111ef862a66d1e5555c01174bb SHA512 64122bd778495c2c8114dffba65a1f556e18594679270996759c6edaff19662711e2482152b0cb8c4d658046aa601fb93115b32b884dc2931e1becb0e23da244
+EBUILD yasnippet-0.14.0.ebuild 1022 BLAKE2B 3df524906b793fcc0100d6b48acf7c86dad71db9dcd8ca31a461d1146af72b17b4c45b425676166b8452a649fafe6406510b1f3b90425f1b9909a7062ab0e92e SHA512 9c480537944c21bdced0eb4b88f288fffa039d0445519facd7ac2c22adf9cec846aca9fe240e256518593a94e4cf9d65817e91244fc93f274280de6de1ef18f3
 MISC metadata.xml 520 BLAKE2B 2c5dbc7b7bedf1a900acbb8a48b07787857479210f3ea504a30119ee2669039ad00ddbdd09712dcb21cd99ed7db62ba4f81d901effe5442148ea40e0cb2c9220 SHA512 0c738db961c5deaffbae27974d89fccae4002c1209316b0ad1f9140a4959de9911edacab324b02f3bbec70db235da3454f08d43a7d8a4c13d955a99aff27487b
diff --git a/app-emacs/yasnippet/yasnippet-0.14.0.ebuild b/app-emacs/yasnippet/yasnippet-0.14.0.ebuild
new file mode 100644
index 000000000000..7e8fc0b1160b
--- /dev/null
+++ b/app-emacs/yasnippet/yasnippet-0.14.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Yet another snippet extension for Emacs"
+HOMEPAGE="http://joaotavora.github.com/yasnippet/"
+SRC_URI="https://github.com/joaotavora/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+SITEFILE="50${PN}-gentoo-0.13.0.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -l yasnippet-tests \
+		-f ert-run-tests-batch-and-exit
+}
+
+src_install() {
+	elisp-install ${PN} yasnippet.{el,elc} yasnippet-debug.{el,elc}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc CONTRIBUTING.md NEWS README.mdown
+	use doc && dodoc -r doc/*
+
+	local DOC_CONTENTS="Add the following to your ~/.emacs to use YASnippet:
+		\n\t(require 'yasnippet)
+		\n\t(yas-global-mode 1)
+		\n\nYASnippet no longer bundles snippets directly. Install the package
+		app-emacs/yasnippet-snippets for a collection of snippets."
+	readme.gentoo_create_doc
+}