gentoo resync : 25.04.2020

16 files changed, 127 insertions, 81 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 2c1e2bfc7b01..c16ddad55323 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/dash/Manifest b/app-emacs/dash/Manifest
index c92c7832d739..6d227786c042 100644
--- a/app-emacs/dash/Manifest
+++ b/app-emacs/dash/Manifest
@@ -1,6 +1,8 @@
 AUX 50dash-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST dash-2.14.1.tar.gz 141115 BLAKE2B 87fc7a02c66161d1c16debc54c6336f36cc47cf7c7c470d190424b9c463723058ef6f72cadf3f4d4215b36f369b9e5356101c4ea16fede10cefde90b5e0b384b SHA512 cfd4ed7a9eab881a0c3bd2744e78c5ef99a92db4d3afee8c632c0a766adcdbf1999f4e9770e2c4e941526d488dd6f9327937389490cc2310d79b38c5bf2ddd12
 DIST dash-2.16.0.tar.gz 148151 BLAKE2B 1c51d926a6dd4ecdbc2ad132347af7bbd27e604d6e2c61a6cfe548802b08a57678ca26aba69f8ae27ca7cdeca84cd469bd9a7849bf28c2abae44f7172ad2659d SHA512 a0196327c8e81d1b343bb56de00a3c2f59b1d3f86dc4e923cf350658590fa106aa0be933aa0f51ff3c02d9aff8450c5e055d169ae8fb876be068bf15a52af216
+DIST dash-2.17.0.tar.gz 149379 BLAKE2B d88106b08d1454b483f08db59e641680e7361b4572b47e238b096977ba308eb4c2810621c99e98126a94e4afdba9faf966e3c56cb6f4ad1292ef05fe7cc0546f SHA512 e53fa1bb9e854b446931d943caac719646218c96160f7c50615b5e95866f4db9dffa6e752596e9c223bcd5b39a80c0c75748b0e0564d72ce5825715a29b80d01
 EBUILD dash-2.14.1.ebuild 560 BLAKE2B ff1f6faf93907f3dc4ebf54fb77a6d6aef111dca5c61ad277b3f561e5035d0428225232a79536c61216e24e5992161f79dd83eb5e4ff1044d15aa6cb07044012 SHA512 2701b512cb5d8bcaea7b8d7298f04834f5e7099259414c894239470a5a3edda9574c85a5b02d224b26b797a9426fc7115c12de8eff96453bb675b85d99bd9970
 EBUILD dash-2.16.0.ebuild 561 BLAKE2B 6b6f0318611b3b57e47b16225e2e0998c3f3020a6aa4195e65cd5954ff01518c2b026fb181f22cd5131ffc42d39eabf48fb54bee1188ae51a5556c1d1f396ea2 SHA512 34266ac3d94e0ba59061f8c7ef9946a55449621baeef3a72293486a9f9e7575b40fc78ffd3d2f37893f2c824c4caa4e987f18245fac6e04c47a7ea2351afc8bd
+EBUILD dash-2.17.0.ebuild 564 BLAKE2B 949c330e199f88ca957a348373db0a3208628762269cc832f3c5b308e5b4a5a6b9232de8180a52b8a583d36380dbb20f8c68bee9b26f2301e654a6b0a15e9004 SHA512 30cfd972903a1d4be4c1f68d71715703bd7ef00b6b4c6b554bde5b0d634fd9b07085ae13afaeb592ef73968b6e2bc4fdd553a6ade65853a70d87a005a1e4877e
 MISC metadata.xml 360 BLAKE2B e70caec7e3633788a79217f8d41bd69056ed620396e4d22ecd0d80ad82f7dbe2e9ac3872c55cd94682cd16960e682b1f648863373cc941559b40045612188f8c SHA512 8de7334410a02599aff54733234d7b3333c4a61cd2ffc846f3f69df3b43a53c510b2235100fab79274e0727393ecec24e051b42aa36b878d6b45130b5b2e3ff3
diff --git a/app-emacs/dash/dash-2.17.0.ebuild b/app-emacs/dash/dash-2.17.0.ebuild
new file mode 100644
index 000000000000..62c3a1a1c7f3
--- /dev/null
+++ b/app-emacs/dash/dash-2.17.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+src_test() {
+	./run-tests.sh || die
+}
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 95e579b99e5a..11fc8f81e21a 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,6 +1,4 @@
 AUX 50ebuild-mode-gentoo-1.39.el 805 BLAKE2B 3cdb41677c5ef11ef6fb44001cc36b58f923c2be4090fe8635fa85d338af3d170b1ad3d6b2f31704cf24e1528d3ce9b6fd3d305c2e3c1b1923e345e011642307 SHA512 8038b7bac0f3322b1149467152790dac7cd133234afe7c362c0e14686e378bc27eaf432a7194e1748dda80b41483943facb44e1a66466ebdcb4e7a0768e8f629
-DIST ebuild-mode-1.49.tar.xz 34632 BLAKE2B 3e7814363aedbb5a05193faccc0815a7f4b0f56eacb03fb720fa270ac69faa163bd8164639390b1703bb0a82341975e9bfea143c651b5b0ba2825b2bbb3b3329 SHA512 440e23aa6f63307955a9c970f5cbcc175eb14cca4ff4035da4f10fa22d9c6766b29ca7842b800a43c46063f3045c2ff3b2d6b8e27026f47bd0ed0959a8f2d0e9
 DIST ebuild-mode-1.50.tar.xz 35440 BLAKE2B 281719a0a686ef1c80c8391cc118d14085ac6407dee5ee7ee44229bb529de041d31fcec7c08bb1e4b8b5057823c5d99a49a9786daa0b7b17a766155b7daaaecc SHA512 a7c232103848c7782a4ebad89e064f3bc37a78427228be799d8e1bd3670524b32050229ba7cd48d9e4c2b0bb32828ce95eb2e47038411591d03fa8f998614c1e
-EBUILD ebuild-mode-1.49.ebuild 729 BLAKE2B b9ef061e9ec7c6c86f6e273a8e14418c97d7b6f15e69c4d86d508a8d481181db11c8f1e803e6431d1c4d07d11cace5f2ff99d02781946f11be65a76196afedca SHA512 421366a5d630f2427c7e6ea0aac34bcae9aaf5f1761a06ed53dac7d27361b1494da86bccee90e57b0d52a21ad8302bdf28f8b13a161babc3212cbd184cf53ab2
-EBUILD ebuild-mode-1.50.ebuild 736 BLAKE2B b1354b8019cf64e7c06413dce30b50bbc56efd895acd85bfae1d1e20015ea0be6292bb0a782a637b71b460c7ca70b01babf525838412374dc2c2cc1fc21b0d8d SHA512 e661830c77df5a7e65924d598f02d67e17c71290038fdc352a5740e0f370cb70b98795a1a59670e7374ee4b3b7e232f51c30b340f4a733b2fddef2aaec2fd1bc
+EBUILD ebuild-mode-1.50.ebuild 729 BLAKE2B b9ef061e9ec7c6c86f6e273a8e14418c97d7b6f15e69c4d86d508a8d481181db11c8f1e803e6431d1c4d07d11cace5f2ff99d02781946f11be65a76196afedca SHA512 421366a5d630f2427c7e6ea0aac34bcae9aaf5f1761a06ed53dac7d27361b1494da86bccee90e57b0d52a21ad8302bdf28f8b13a161babc3212cbd184cf53ab2
 MISC metadata.xml 426 BLAKE2B d0b4dc2bd01fc6fb2f0c58b01676b80d09a4677876adc9681c3c436ebc437b6b034187b19fea30cf980927fec1f6a9feee9a0b7d1a4dd15818d02e4c8ec77af6 SHA512 058df2768030185953c7ac3622819c430681eae3ca60b0d02ad48ed22ab6a0ac7c169d93f8f54a3dddcade3f84c9bf58f662a58bfd78217ea8fc27a580ab9077
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.49.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.49.ebuild
deleted file mode 100644
index 50fe9824ef55..000000000000
--- a/app-emacs/ebuild-mode/ebuild-mode-1.49.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp readme.gentoo-r1
-
-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="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-BDEPEND="sys-apps/texinfo"
-
-DOCS="ChangeLog keyword-generation.sh"
-ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.39.el"
-DOC_CONTENTS="Some optional features may require installation of additional
-	packages, like dev-python/docutils-glep for glep."
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.50.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.50.ebuild
index 648009bb8835..50fe9824ef55 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.50.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.50.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/magit-popup/Manifest b/app-emacs/magit-popup/Manifest
index d2f1d9291949..1861ddbfca19 100644
--- a/app-emacs/magit-popup/Manifest
+++ b/app-emacs/magit-popup/Manifest
@@ -2,7 +2,9 @@ AUX 50magit-popup-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c6723772
 DIST magit-popup-2.12.3.tar.gz 40195 BLAKE2B a351e949207b674c734f66b0431fa4c137293ccff880e3f457dfb825d7a36afd37f59197170a86d52606d371c181cd8a23be54d74aeee192a2d1a56588a55b3d SHA512 50620ce1d364ae28f30658dedd8f235bb1055be5cf4320142b7648e2ff6137f84cf865ea8f41e34ad7fb42612ff5d36fc0c4f6caa0aa0d2071bf775c15be5833
 DIST magit-popup-2.12.4.tar.gz 40233 BLAKE2B 959ed85a1a4fec06ea30cd8d3482616fcaf145e4c043e48d872c830f24d627c4047c68d9424649a1c6b24a027309e900792a342f5a048d6f5aab32e8130eaa9d SHA512 c538d8227ebed85a161a62deb351994cfa3ea67b400ddd8423ae90a6ada8653f3798db2dfb942921bcb505af3fa757f8c2c911c9da583a42210db82e20d7fa3d
 DIST magit-popup-2.13.0.tar.gz 40226 BLAKE2B 9b5a115de98440873eae51e23c51b19a426518d66d9c9bf9f4d3b2476aa1ad7829311bde7845d861fc8f63c38c87d2236274019456fd773a90880acf73bb1cfb SHA512 27d8c9268a9ccc682105c67ec5f6dbfdf62e527ca982f4f71781f571af5374a364d290abe60c84286563b1d73e000550796c7b1c8f2474f5df62e552afe2cefb
+DIST magit-popup-2.13.2.tar.gz 40411 BLAKE2B 3100eb93ce97cacde5734bce9e8582ccb2e3eb7521e7a751967da43faf9cb91fc1467e3282f0e21d761d1e61bd3308616de83255809f064237415e6705b97371 SHA512 2d02a934083b6517d0e1c3d177c4266fcd9110a6043bf8d25272a0308a2ae4389b38dd84289554c16a97823d4fc6f2ad580fbf52f80babf804f2c72263201ed9
 EBUILD magit-popup-2.12.3.ebuild 594 BLAKE2B 4e1f7e95d6581b55aac702d4d4aed048f0ab0f9815b1d9a8dfb3688c541eadd13e39e9f9f40cb7ab931e6841f9cc9c86205d40dfff0560b8417a9764c7d12e15 SHA512 750cd4a10d07188fc9113e2e71604c3742f6d9ed02179f7cceef982fa1d4c037ef88eb4faf9ead8cc46d798cba9044c5f83cb183ceda69c110dccbd9a1d66e4a
 EBUILD magit-popup-2.12.4.ebuild 596 BLAKE2B 39e54e5f14d5648c2e8d1c30f2da09cfb7345d1cf80650a4fd226dc7dbbdb0560ca24761ed46a4910a47bc46bd6a5a403edab90afc051b7ea60c5af813106191 SHA512 60cf12225cf6a27a5ecbe0afe7ff6d3e6c20b351aae312518a150bd8bfbb485e7310b2a17ab4743f413f3cb7da35aef5ccc00d3a99fa23ee675eeb11e181a204
 EBUILD magit-popup-2.13.0.ebuild 591 BLAKE2B ec89fd14e36a646d09666602ec86ae84dd670c0b6d3de4706d19b36d9b75a40112d01e89ff83ca1935b03339643bcc640275e8274605c8028e8caccb56d4e2e5 SHA512 31c5003adf2dcf26c83b98df44854df881a5dc0998506ad0db51d4caab988d2e12e004559aca9b4e406b36e53a0547496ee420433ffb7d304af6e1539a6da587
+EBUILD magit-popup-2.13.2.ebuild 593 BLAKE2B 69c4ac3c36be4cd0aca43b3167e8aaf2e14de2f80a5b7cd90f04c739a5cf224b68f6f689aa01bc34acd68666e0b718143c359966fb4554b09c246e5a1e44d225 SHA512 b0bad18dc772f3db6334c98d0643e79929061cf82dce91eb667c510d878cea538597845733ea8467303e77e552a63f78fbd8e1feedc4ec21556b4914b3314534
 MISC metadata.xml 1170 BLAKE2B ab77cb475c6f77b7829a4fa62de4ab29423ed5e7531e64b60523ccf619b3e4edf4c69037d528bf3705f0de1311833445d02932d0a8b633860319ce200cadb454 SHA512 70806e5c38f43fcfe23b2eb64f818ad6d62fdacc61cb6d1be0b8aad236f766fd558592db617aeb0b41cc9330d1789339b8a3b9eefcf65f1bced7b18633cf884f
diff --git a/app-emacs/magit-popup/magit-popup-2.13.2.ebuild b/app-emacs/magit-popup/magit-popup-2.13.2.ebuild
new file mode 100644
index 000000000000..f58ae4d2112b
--- /dev/null
+++ b/app-emacs/magit-popup/magit-popup-2.13.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Define prefix-infix-suffix command combos"
+HOMEPAGE="https://magit.vc/manual/magit-popup"
+SRC_URI="https://github.com/magit/magit-popup/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"
+
+CDEPEND=">=app-emacs/dash-2.13.0"
+DEPEND="${CDEPEND} sys-apps/texinfo"
+RDEPEND="!!<app-emacs/magit-2.12.1
+	${CDEPEND}"
diff --git a/app-emacs/nxml-gentoo-schemas/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest
index 7a667734d4c7..a0654ef1de37 100644
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@@ -1,8 +1,4 @@
 AUX 60nxml-gentoo-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
-DIST nxml-gentoo-schemas-20180611.tar.xz 11572 BLAKE2B e8a573e79d9531d676b8c52ba9c2869f765e6bb0326f3f00c99dd3ecfd19af6eaedbb06ddf84ae541690962a5e67b87726d6cc90a3bf7dd6d805b5c2c96b6321 SHA512 8473233141a56935e41a9d0371501f3fe055b21600746db29e14ec91d12a43da595e500a876eea8cdddd885358df0825055143e901eb599a2fcbac7147a04fa8
-DIST nxml-gentoo-schemas-20200109.tar.xz 8672 BLAKE2B 8b27e334e0d4aa6d7ca2d85dfacf320fbc6f8ce6d801c2f0c8a12991b7346a8d9f6977d5071b409bdd059e29209130deb90a36556c58d1f98fad55e92e2be7bc SHA512 afbe78b4323ca6cd7a0f5855f0c29e65caed7f6587378cee66da284e3782035fea59171bd28dcd402ffbb65fbcb9261e4a2ed2abfd41b05d6581ae29f6852519
 DIST nxml-gentoo-schemas-20200303.tar.xz 8452 BLAKE2B bee7e3d58b03e3aaefcd09d93a9b6919ae6b4892ac09e218ac68cbbc048e28def8b49cc4c583ddad04da61d61bb76386f0c0f33e12d2c8a938447e3f590854d5 SHA512 42f8ee48e349423db156d585bdd2c1d333f69693ac541bc44f8c1d0bae412b1793e1d86fc527287225040aa9b4b791ad2922196cf750de6029b4c77eebdc62de
-EBUILD nxml-gentoo-schemas-20180611.ebuild 569 BLAKE2B 789267b1c9eb33374439e3bf4b3b212588c465b2b6a02c5da65ca8762a9ef6371364bc0bb31532cf7cc17d60495c73a52bc09f2767227f59a0758f3b4f2c86eb SHA512 272b38d9d09a1089dee357a80c780e4cc2ba14d50301d5d9c57a30cbff41db26865ecac9c9ffb209843aec46c6b63cdae767757c09eabd97aeedf03bb507320e
-EBUILD nxml-gentoo-schemas-20200109.ebuild 588 BLAKE2B e5bf9c11b375b4574a56c5c55cba78f768cc69cad53488b301066708a3903ee39c46ba01be0db7ca817f80c166ba852144f2a4732ab8f6286337d1325a44315a SHA512 b1ccc6b566c6593c4946b054b16b441c668cc54cee53de9841d27f4195a08dc8f066328b0c92ae7dd17a94d73b720c94457767f114d29ad3c30d1aff6420f801
-EBUILD nxml-gentoo-schemas-20200303.ebuild 595 BLAKE2B 7d6be323552ba34442df175900bc880fb0323ba6575ab5fdd7da0ecbf3530e80ba29aa512ba725ce473cedb9f14733b3d6c764765b86228f2f2e4c58e9d13342 SHA512 233025dea5bc9de2bfc33e5ff92a9c9c6714dd3979e07e2d738dd5df4bc64590af8de067d189b0724ae8b6bf5d5207a060dc9928b7813784482a8cf1a9406377
+EBUILD nxml-gentoo-schemas-20200303.ebuild 588 BLAKE2B e5bf9c11b375b4574a56c5c55cba78f768cc69cad53488b301066708a3903ee39c46ba01be0db7ca817f80c166ba852144f2a4732ab8f6286337d1325a44315a SHA512 b1ccc6b566c6593c4946b054b16b441c668cc54cee53de9841d27f4195a08dc8f066328b0c92ae7dd17a94d73b720c94457767f114d29ad3c30d1aff6420f801
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20180611.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20180611.ebuild
deleted file mode 100644
index 22039e659d7a..000000000000
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20180611.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp
-
-DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
-HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_compile() { :; }
-
-src_install() {
-	insinto "${SITEETC}/${PN}"
-	doins schemas.xml *.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc DONATING
-}
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20200109.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20200109.ebuild
deleted file mode 100644
index 04efebe9c919..000000000000
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20200109.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp
-
-DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
-HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_compile() { :; }
-
-src_install() {
-	insinto "${SITEETC}/${PN}"
-	doins schemas.xml *.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20200303.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20200303.ebuild
index 51c686ff5574..04efebe9c919 100644
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20200303.ebuild
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20200303.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 SITEFILE="60${PN}-gentoo.el"
 
diff --git a/app-emacs/pymacs/Manifest b/app-emacs/pymacs/Manifest
index 76b8f17e56c4..918bb8232886 100644
--- a/app-emacs/pymacs/Manifest
+++ b/app-emacs/pymacs/Manifest
@@ -1,4 +1,5 @@
 AUX 50pymacs-gentoo.el 183 BLAKE2B f1a4b874bb339b653c4fb6fb186bd7e531151c34d1df58be6963288d4443438fcae0f82c92a1667b4e7cb739bc2f7c6fd8d8d5f6d4e91413ee5bec47a609cc2e SHA512 f59fed86f859b796c901088b38fb570a5e5527d774a15456105ce75598c31fd20d0afaa62ad9cbf12063810fa592dbbd7c33aaece5871b36b488e5af6de0fac2
 DIST pymacs-0.26.tar.gz 123373 BLAKE2B 0c467435d18ebcbe7b263e90096363e201dd84ba770fa702beefac4318a713954c316f335ee005ea88370be29c3710a7df04fb05b6efd3816beedbb88e38126d SHA512 ae245de130f435d947788c5ac11d8ce6534df80f70a4e35fff903f22d2b79b0f66925059ebaf53bde45cd6660ac0a8a224490f4f9e256a84e3a08f6468c14dd2
+EBUILD pymacs-0.26-r1.ebuild 1153 BLAKE2B 7dc1a383a2c9c85e13b6ce77e2436899fb99349bc6230674bd728da7157659f055c77e856f9273c3b2a1e143848af36af9f1ae0a06eb73e51d1d6c6c1d8cbdc4 SHA512 186845389c72f84b09c05499524a9176edd7ea1e58cf0f183c97bc045e7070286f4ae7b9708dae23f3e13c17c9a50edc322af36c6d5e0ab6e90a375a8432dd01
 EBUILD pymacs-0.26.ebuild 1329 BLAKE2B 23b29f1fe217da9aa055a84040f0ab17c13a385abfe0d7aa5aeafaffdbc7a6209496affd80b702b0ef9dc12d35c204cd5f02154338f011159110a42765198d2b SHA512 dfafb9317794795ccb26f8c4a21cb59c290da71b76c19ef4f6e3657f35f0b0e5ea7fdc9a1a8e1f628e9ae209295988a1773bf32700657069bf8f1d261b77d7c8
 MISC metadata.xml 435 BLAKE2B 10ae4a8b61dfb10339404f38e37cafa1b66737a8f593bc4ba1c626b9d884ebb19dca555dbdf24b1418fec711f6b73865046cf50d58990980ab5115b1755ddd24 SHA512 bb1bdeb6695093fb0788f956059a6e081b98d8b769e2d336057954e85006dac277b756206f83565d52c2473dc45f3afb1087850e38843103f0ef7581a634eec0
diff --git a/app-emacs/pymacs/pymacs-0.26-r1.ebuild b/app-emacs/pymacs/pymacs-0.26-r1.ebuild
new file mode 100644
index 000000000000..0ff10a4675c3
--- /dev/null
+++ b/app-emacs/pymacs/pymacs-0.26-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit elisp distutils-r1
+
+DESCRIPTION="A tool that allows both-side communication beetween Python and Emacs Lisp"
+HOMEPAGE="https://www.emacswiki.org/emacs/PyMacs"
+SRC_URI="https://github.com/dgentry/${PN^}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc"
+
+BDEPEND="doc? (
+		>=dev-python/docutils-0.7
+		virtual/latex-base
+	)"
+
+S="${WORKDIR}/${P^}"
+DISTUTILS_IN_SOURCE_BUILD=1
+DISTUTILS_USE_SETUPTOOLS="no"
+SITEFILE="50${PN}-gentoo.el"
+
+# called by distutils-r1 for every python implementation
+python_configure() {
+	# pre-process the files but don't run distutils
+	emake PYSETUP=: PYTHON=${EPYTHON}
+}
+
+# called once
+python_compile_all() {
+	elisp_src_compile
+	if use doc; then
+		VARTEXFONTS="${T}"/fonts emake RST2LATEX=rst2latex.py pymacs.pdf
+	fi
+}
+
+python_install_all() {
+	elisp_src_install
+	distutils-r1_python_install_all
+	dodoc pymacs.rst
+	use doc && dodoc pymacs.pdf
+}
diff --git a/app-emacs/wgrep/Manifest b/app-emacs/wgrep/Manifest
index 3501ea801964..18b51934d70e 100644
--- a/app-emacs/wgrep/Manifest
+++ b/app-emacs/wgrep/Manifest
@@ -1,4 +1,6 @@
 AUX 50wgrep-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST wgrep-2.3.0.tar.gz 16241 BLAKE2B 83802934b36dfcad17e3486a7405cdd170b20bd6574d92032c92aa2a8ae84a2b6ce47313c8ca70327982bebc4fb78363181c66d1c745d2179ba84fc655c617be SHA512 2f817ef482d8ce98531494a5f19f477d7544bcc8b2747ebe184194a058c6cb26d571ba7de22f7e4307aa110806fa45f683b2363b1520b8fe5edaa05ce5ba8d61
+DIST wgrep-2.3.2.tar.gz 28908 BLAKE2B 992557cd59ac6887cec71c7dceac27ad5cfc153a09b68a1e312466077dfa08a6efb7e49ba24b06196daf41b2781f17a5d3f0c3f7b6ee28590d42db5a7de2a141 SHA512 a0a00f1d845c45f5de0e707ea5c8c14f9b01807533d7124be9fe0bfdd2d28c3e6fce2a4695daa1de880dd5ff5986b0533b3a5688790a7674576599fb2667ae76
 EBUILD wgrep-2.3.0.ebuild 633 BLAKE2B 6d2f46e64aef16640e29b582f4336c4a8128f8330c8cd0ebcaa02ab0a10b8c44a4c00d29d8a4c7ce923adf569174afbe828564ce0eef8e33b526b9df0c712ed7 SHA512 034ad467b3136f32dc2a62f89886a42d932c72ef21de742c220eb768f722066bbb365e0917ddba6b132a55ccd41ed021e7b35006a81eba4c1260c56a66d2eed9
+EBUILD wgrep-2.3.2.ebuild 633 BLAKE2B 6d41f13e18df6f693645dfd5ac5665f0e42511cabcba62d1674e052e39726496c7884aa6d1f39354ee4099984f996dd142f32376cd24b0c05c6a8320378b2797 SHA512 2c8be8ea70b54b175b7f14130b0de1eab6712fd4995157dafabf01d62cff97c595da17cf940df66df8d930c1ebbfa53e6f95a8fb56f8f1f3d957f961c3547acd
 MISC metadata.xml 493 BLAKE2B c8676488f610b89dab42bd037c33e1fe6af7861ad188c28e4703c7b18665102a4b2270a5c746929cad1ba11522be8e523b80712a929bc38d1ecef71b3a8b6ba3 SHA512 8af6e19dda9919614f6bb5e1dbde585fc0128d679c1ad0685eed2cd43d93e38686f1c88f1c86f0b6dfc5cc12cb7ce25c97fb4d2766d6e2cb33b1915dc9356763
diff --git a/app-emacs/wgrep/wgrep-2.3.2.ebuild b/app-emacs/wgrep/wgrep-2.3.2.ebuild
new file mode 100644
index 000000000000..0833f3eca7da
--- /dev/null
+++ b/app-emacs/wgrep/wgrep-2.3.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Writable grep buffer and apply the changes to files"
+HOMEPAGE="https://github.com/mhayashi1120/Emacs-wgrep"
+SRC_URI="https://github.com/mhayashi1120/Emacs-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/Emacs-${P}"
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="See commentary in ${SITELISP}/${PN}/wgrep.el for documentation.
+	\n\nTo activate wgrep, add the following line to your ~/.emacs file:
+	\n\t(require 'wgrep)"