gentoo resync : 02.06.2019

12 files changed, 87 insertions, 51 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 5295666c58de..8ad529653871 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/eselect-mode/Manifest b/app-emacs/eselect-mode/Manifest
index cc7620316772..f332ca2afed5 100644
--- a/app-emacs/eselect-mode/Manifest
+++ b/app-emacs/eselect-mode/Manifest
@@ -4,6 +4,6 @@ DIST eselect-1.4.13.tar.xz 177848 BLAKE2B 70e5a793759e16119f5233b2c974e0fcc8d213
 DIST eselect-1.4.14.tar.xz 177492 BLAKE2B 236ddb09231283a153c20be779d012979a25d42a7043c75af866e777731761406d92896bfef399c3bc63e529af4e36cf538801302dc4bb719f065d6bab8ad9e4 SHA512 b17fb63039577f20515056fae1b0f7e86fa2d96f38a5eec22e637cee0b25f4d68087ef8a5bd4043893db5be66ea201bc8ae6437bb049d208b81e76a57612d658
 EBUILD eselect-mode-1.4.12.ebuild 573 BLAKE2B 49644f3440da18f4cbf22d6681edca141578776cb899cf25b888200eb99ff0b9068919e24d6c86c46ca41005763a94f951d598a5916f78949fbb99bbf830f622 SHA512 f4a8c484fb16d0408abeb8e269a034b71046cfdb2686462c5c7e64cce27f03ad71f6172cbf4fb0fbb9e91eb7ebed73f196d68de04bb26d7a4aed3644777a850c
 EBUILD eselect-mode-1.4.13.ebuild 571 BLAKE2B 7b4853cf735d2173233beacb2419a949c209ec92291c1ac97b52c327e4e72167709bdb0b1b082b3fafb413c9a1fec1c9e7c1f7230e1bbd8958af0cb079fc6fdb SHA512 166fa42fc67f91b91abaab8fd101bc8dc251274561143a3a9154174e8af7fa075e757d75ee87a4d711751e66868b03855059e5166c23375421cdc03037855587
-EBUILD eselect-mode-1.4.14.ebuild 582 BLAKE2B 721100792af38d09632673239f1956a15af5bc0b2aba872e024bf7c454b7882dde3d8eebf5ab2a1e3a11bc7be6611d1611efd8fac795c2bf015553875d0697d3 SHA512 957edb82115c3985d6a8cfa6eb6f5260f0ad84ac12075122d305372dd4b408f9046668ecf7107a72bd49f346320213b134a468b490026abe75b257df8cdfda0f
+EBUILD eselect-mode-1.4.14.ebuild 579 BLAKE2B 7259203662588c081c4d1f51f2c6346560e18dfcdaf8520b3f116e6814ea7d4e1a91aa62fdca3432c68b30c4235464cf6d466f2a45cf8f7fee196bba19f9b1e0 SHA512 f2210b6ae79479502515cd1fb9562896b49243daa7c8fc5ba8d12c7c57af3a495e051491e055f29ad1275cf500078f87f54ee83fcd89f40054ac7d43ebc34425
 EBUILD eselect-mode-9999.ebuild 458 BLAKE2B 0a5b748fc09dbfe532ec9b40adbbb939bd5150ecac9ee610ad0dc5b37e7b6ccdcb8c183337d6f0ce04ee5bfad4f1ede0c13cc4dc55c828474b07265fd91ffba3 SHA512 5d11532145273d6956274ce05d732352593a20daa1d86f900b1fa9927aa536131e5ec922996f4e3939803253e5649f6c2a3ec9a81dabd6dac0475422cf0a4ceb
 MISC metadata.xml 449 BLAKE2B 711e97a9feb5a464b81a738024f1f8b1ea4dcf2dab78f1e814fcb30569df5a3192cc6e72308687bffd9f7c806f3ce37ef62856f86737d3e8aa4334f721a2fd7b SHA512 38b645859453423cb80be836dc712364d5650f07f071c44d07ad7f5f629b8efd0d26535ebf61e8c38281e8426109ef5828015e01b3377486ab28f942163d155b
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild
index b342275247a8..6e34f02096e4 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${MY_P}/misc"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ess/Manifest b/app-emacs/ess/Manifest
index 63e548378309..ad613498aa00 100644
--- a/app-emacs/ess/Manifest
+++ b/app-emacs/ess/Manifest
@@ -1,8 +1,6 @@
 AUX 50ess-gentoo.el 58 BLAKE2B a643ea2780e8bb7c211ad438b41d709d39e3484a99ab1d603c86843aad92a66b8bbfc1bbe9a81c25fcc19cb68fa9de7d657bb99889704cc9593e61bff43e227c SHA512 e9023d176d39d3d3c35e004747007892e6f2e2b101b3c8e64fadc37d1fac8d264a786b7bad26c744730fec03580d7fb1170c8d2789e76e12b4eb47481b7f2808
-DIST ess-15.09-2.tgz 3248241 BLAKE2B 63e83436e60d6f9398dabaaed2aa795dee8888f3a992749bdf6ab9541464c65297c29e1d2936d3e6b1da6284c0c3508556b30a6b5a68e4e090e8e1ce3d925894 SHA512 9ba2f8800ece437e18749e29b6ecec3cf52297fa1c5a149dbf8eeb991df4f5dc99a76925458bd03203b7e8418347c4bcb5226e08dc64bd95d16e9a5b32f8634b
 DIST ess-17.11.tgz 3275703 BLAKE2B 50ec08040135fb05be35494829b347f1ce1c8fdb8bbc5c11f9327800cbfafbb4e7dd5dc46c2b6ce8d506e4e9ade90e369d14c0498e06f990eccbbacbb7d16cec SHA512 b2bb09d079922ed8bded04387e6aecd38d760d7a3b9a521044fb7e2537fdc0cbb59c707e5aa550fc76aa92a6c47eab0fa40f554060707cfc7656b19adbdea222
 DIST ess-18.10.2.tgz 2939425 BLAKE2B f9a6181dfaffc820a55214418d14aef1443945d6b15cb156ecfb70a8f5878df545662f37114a44ea8aa20338a5eaea6a6ce0884b02f108bd3372653db13e1eff SHA512 9bc04c5ec87ed639e56de9fd7817c3adb1a823f091254a91b906e22e8537fb097b21b80020bf245acbd61420d09949d66fc079f3c552d79bf32b95dc7fa1dca9
-EBUILD ess-15.09.2.ebuild 1164 BLAKE2B 8a3105ca2a7ff0acdf27c3b9a061a395a8eb005511c3515d286eb99b4aa1ba3b43ecc21c82bb01f82438934f47b4ca1f9a8723a82ba001b37d5e1d899815f52b SHA512 ae190fba951333cad7300484d6988ca1d6e2954697a36c719a0616b99b10911d00846f63f5a5c5ba2662ec90eaf9f9d991ef0be55a01c89c71263a28011c1067
-EBUILD ess-17.11.ebuild 1125 BLAKE2B 84b8e3cbdbee6ecb27fc88a742d209fc729c5fc107fbd7a6f78cafbb6f095db66781ad007f01b482548c48ac76524145fe88d9edd449031619e2d94f8e529fd1 SHA512 6756d9fcda88e56d09b84de0615c537c1ff0ef92d736f0b4a53b3ba081baace62bf7db0bfa0f3242d0bb9300322a6a7754130a49611ed835fbe63f5e16fa4436
+EBUILD ess-17.11.ebuild 1124 BLAKE2B 126dc327e8e0f412d08a5c6adb8daa604ecdd85bde5e0e6fee730bcd2d2173ba4a05e7067253be798b2e3db6c6597e0c97a6bab59e3ebdd8fd3eae919c4d2ac7 SHA512 7ee82320175b473c4546833e082d9e100cd7a34d4037a4959942785fb25b2d927ec1430c4da343269b724c4a758ca65ea18702c0838f56413da2f563da68dda8
 EBUILD ess-18.10.2-r1.ebuild 1151 BLAKE2B 6829c65356024a1e6a93372e245ca85a192c56ec50c3cbfb8097f1b9aa046226b62b8841d1cb12b9156b2fbed0e242a0d74747d6747f5d9368b232cba3eaad60 SHA512 49a8f781838fa66690e121e11e08ecb5ef91fd0338ef8aa3d51e3262b5319821567f1bf2a46f6e0a9d06130efd7ae063153f6346305689d0c9f40bbac2397d39
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/ess/ess-15.09.2.ebuild b/app-emacs/ess/ess-15.09.2.ebuild
deleted file mode 100644
index 14e85a135646..000000000000
--- a/app-emacs/ess/ess-15.09.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp readme.gentoo-r1
-
-MY_P="${PN}-${PV%.*}-${PV##*.}"
-DESCRIPTION="Emacs Speaks Statistics"
-HOMEPAGE="http://ess.r-project.org/"
-SRC_URI="http://ess.r-project.org/downloads/ess/${MY_P}.tgz"
-
-LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-DEPEND="app-text/texi2html
-	virtual/latex-base"
-
-S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	default
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" \
-		INFODIR="${ED}/usr/share/info" \
-		LISPDIR="${ED}${SITELISP}/ess" \
-		DOCDIR="${ED}/usr/share/doc/${PF}" \
-		install
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-
-	# Most documentation is installed by the package's build system.
-	rm -f "${ED}${SITELISP}/${PN}/ChangeLog"
-	dodoc ChangeLog *NEWS doc/{TODO,ess-intro.pdf}
-	newdoc doc/ChangeLog ChangeLog-doc
-	newdoc lisp/ChangeLog ChangeLog-lisp
-
-	DOC_CONTENTS="Please see /usr/share/doc/${PF} for the complete
-		documentation. Usage hints are in ${SITELISP}/${PN}/ess-site.el ."
-	readme.gentoo_create_doc
-}
diff --git a/app-emacs/ess/ess-17.11.ebuild b/app-emacs/ess/ess-17.11.ebuild
index 9cbcc38fe00e..d4a2ae5fbefd 100644
--- a/app-emacs/ess/ess-17.11.ebuild
+++ b/app-emacs/ess/ess-17.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
 
 LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
 RESTRICT="test"
 
 DEPEND="app-text/texi2html
diff --git a/app-emacs/magit-popup/Manifest b/app-emacs/magit-popup/Manifest
index e4f5d839f48e..b19370f2827f 100644
--- a/app-emacs/magit-popup/Manifest
+++ b/app-emacs/magit-popup/Manifest
@@ -1,6 +1,8 @@
 AUX 50magit-popup-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 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
 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 593 BLAKE2B 81f187d21e58948428b64ce385f9e639790279f0762368ff6a3882335c4ea4216205f46601f1602bc78336c1de5d4ae143ea34b43ba1cc4d902a7c2506069baf SHA512 ffe8a449c68138255d2f3f139217b664925492693911d9b272ced959877ddd0bc5165dea210bb7c0e4d84385afb37474fc6937ac4675827013c70598eb21cdcc
 MISC metadata.xml 1170 BLAKE2B ab77cb475c6f77b7829a4fa62de4ab29423ed5e7531e64b60523ccf619b3e4edf4c69037d528bf3705f0de1311833445d02932d0a8b633860319ce200cadb454 SHA512 70806e5c38f43fcfe23b2eb64f818ad6d62fdacc61cb6d1be0b8aad236f766fd558592db617aeb0b41cc9330d1789339b8a3b9eefcf65f1bced7b18633cf884f
diff --git a/app-emacs/magit-popup/magit-popup-2.13.0.ebuild b/app-emacs/magit-popup/magit-popup-2.13.0.ebuild
new file mode 100644
index 000000000000..ca68dfa895cf
--- /dev/null
+++ b/app-emacs/magit-popup/magit-popup-2.13.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 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/puppet-mode/Manifest b/app-emacs/puppet-mode/Manifest
index 0556f3a134d0..06ddfd237027 100644
--- a/app-emacs/puppet-mode/Manifest
+++ b/app-emacs/puppet-mode/Manifest
@@ -1,7 +1,9 @@
 AUX 50puppet-mode-1-gentoo.el 217 BLAKE2B 632d02667437b04642b7d3510d5010a3a7952ccd6aaa301a463c629c5dd6320c847e9f05425bd5882681a471761d0fe501ccf6860faa33b9e5458a761dad40a1 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a
 AUX puppet-mode-0.3-version.patch 547 BLAKE2B a3731babc0e9d207c5dde31f28f0a3e2481679bc2d95f9fdadc77e153689bf6e7c1498acb93e1783863bc66de1e65ecb332a4a605fb6c3856dc8964a42e4dd5e SHA512 623496493b6f920700e042c69099060b9e89cec3a04281af0d8fb7b32c57cfa9b70833935f1ec723c4e877545ac0962b9c70054891084b50c6eb2ad8bb1eb9f2
 DIST puppet-mode-0.3.20171221.tar.gz 36707 BLAKE2B 97b285e409a1e344c12773fd1fa64c87090c883662f87fbf01f5b535e5c9027a035b6c4656ac6ca138cf872b05ff8f05af2478f2bfa5b04a10168507b48c387c SHA512 12db350e4005d2b13d8e936f1a956c3bd603709a7a88489565fd4be3a8e74c7b33e6523a7371db85927c018c260762467d6e50153eea659f87711426df7774fc
+DIST puppet-mode-0.3.20180813.tar.gz 36999 BLAKE2B 1ba96a5bbe193c88e96e51973e0d742e611c2ffe0264bae998ce07d5e4f78d37e532dcedf578a801c8e6442ce35385b5c5915837da1073895ceeddeff99b65b3 SHA512 27aeb5a3029208180bd94d7f3f762d9a88863f963824636fdb688ccb79a3c41b9370c13a536e3438c94720e04d5a02c2f64f75d5c594fc7bca32d9738dd3b756
 DIST puppet-mode-0.3.tar.gz 25617 BLAKE2B a9afb8e2f6c0a2b40cef6bb39d0fa2effe2ddffaa3b646562f0fc5b84d1613e556df88206835d6aad5862d526161d69c49ecd188e299e4f4175b479fe1957eee SHA512 16ba5f71a1ec6c40b1eddf2acf5c1aa1968526b959279e1cac0cfac947f82f404fc35978ce12f5851309f293e2c92f054a718ade97d156528d505dcda58434e8
 EBUILD puppet-mode-0.3-r1.ebuild 613 BLAKE2B f98dab8fc53fcd00f2b3156ee8572d4c11181ff5d6660dda7b172e99f6ad7abf7f826c423e9500aacaa6d273c51b6acf3725deb76ab155ba5a5f4c34348382ca SHA512 12a42f2ecce4bce4b2963e22dd7c4b9f9545f1ccbb8713c0cf4344ee00da59b42e3eb5922b3b20e161d946aa7314a5c95df1a61797842e0ffcad4ae43e4f92e3
 EBUILD puppet-mode-0.3.20171221.ebuild 696 BLAKE2B 880055162bb6a62c1ce6ad5cf1843c8213aa24dbd56ef0664848320a349fac820c95e0dadbf17a3c3b5bb421230559b1f080c8bfb694ad19ca5e90f867380051 SHA512 4ce05b8aa028fdffca6b21c8309ddc4bf71bbf6e5ab183f4d3ed1028c97d556eb3914aaa7a7778cf75070d02998d6e31a90874618bb935e4d50468ef96adda47
+EBUILD puppet-mode-0.3.20180813.ebuild 693 BLAKE2B b83c5ef6c8f51f1a39f165ca84f9fc65ae67b3c74df6f4968ebd8c7cb008d3111719568aee531644e5320b25e00d055c9c9d90ef84df73ffc2719c3a97ca5195 SHA512 0ba3d4c9aad1fa9ba539247b26151bb0bb2a4b3a954507de5671c366492fbf0accabefa13ec5e1f8b5fc6ef80df45d8fe2a56536a544f1ad9c58c83ed7af72ba
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/puppet-mode/puppet-mode-0.3.20180813.ebuild b/app-emacs/puppet-mode/puppet-mode-0.3.20180813.ebuild
new file mode 100644
index 000000000000..3c55e2f588ed
--- /dev/null
+++ b/app-emacs/puppet-mode/puppet-mode-0.3.20180813.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+COMMIT=7dee1b5a5debac6e56f9107492a413b6c0edb94d
+
+DESCRIPTION="Emacs major mode for editing Puppet manifests"
+HOMEPAGE="https://github.com/voxpupuli/puppet-mode"
+SRC_URI="https://github.com/voxpupuli/puppet-mode/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+
+DOCS="CHANGES.md README.md"
+SITEFILE="50${PN}-1-gentoo.el"
+
+# Tests require unpackaged ert-runner
+RESTRICT="test"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed -i -e 's/@VERSION@/'${PV}'/' puppet-mode.el || die
+}
diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
index 2fbe80e3e2aa..ffc731ae8480 100644
--- a/app-emacs/with-editor/Manifest
+++ b/app-emacs/with-editor/Manifest
@@ -2,7 +2,9 @@ AUX 50with-editor-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c6723772
 DIST with-editor-2.7.2.tar.gz 30121 BLAKE2B a610348a3a2b26059bf58b4b26fdb4e2edddcf70604db7c9d69d2050f4ed1ac745cf94638656339a915ac11a2abe0e8eee5fcb73c768747a8d14078931106332 SHA512 9d412928ce5234d3541d717b5b800312c82495f937088cb8308ff64ab92d2639ce078cdc8eb86d34b775a0e6567409249d58d94eb61183b82b5c19e2465905a7
 DIST with-editor-2.7.4.tar.gz 30159 BLAKE2B 2e1e84dd1e4bd0c4f5c0e0bb8730e8c4327e58ae38ee445c4f7f365279f7b8293639be675e735e82fea15c0fa93ff7b02c18d0fdb81889d6b44459d40f7322ae SHA512 d35409bc761e5ee797ca758878365a11695e0e8558275e8dd8eb2b22c92b7ea92024a56c1adbab47d4b5e0cc49a2e6adf5e8d1f7fd3e784774dab39bdbf1d93c
 DIST with-editor-2.8.0.tar.gz 30519 BLAKE2B 80502d3839818e5d0277b0189b7c7b814eddae72007c4018500cf64136beaea3eccf23c147f02eaf734558c2f24e0dd7cb2a2a80c09e700df3e5ba1e911ba798 SHA512 15df8706754d61ab8d57f866cde54833ea3126915352ed7ebd5020224141a069a62a3872694f95fcff66be165310f8111e4d4c9a1717189686460e8264636b4c
+DIST with-editor-2.8.3.tar.gz 30648 BLAKE2B 8989f8506fb58c1f54efa4fcb72fa8ddd477c0c73d82672028bdb027f74093b62c44ab5a545cd9db2e0e3222bf461e605aebc805112c5ae8486c224b22806c26 SHA512 389aa084f7dfb7f7b59a37802441718e20ee70d88b9af9631b1fc547e4c3238d053bb2b3ef50a4e6332fc3befae183a49d55b3c7bd7719a149cf83001d23810c
 EBUILD with-editor-2.7.2.ebuild 648 BLAKE2B 04711d6eb908747d7f6d6043f4460b20e4d9f0aabe88c416cb1dc384f68c6109ea8f623c49780c31e5da572b79905ee206d3152158239f7fb02393fa058733a8 SHA512 39ead2bcf75c013d858a46192058c928bc20bd35de52cd8b572138df7506145091220d4c637867418b1a3c211acc1dfbd655fec0f0001b459e2689b4f8de9e1f
 EBUILD with-editor-2.7.4.ebuild 657 BLAKE2B df8b950d0098ee43e157b40c92fb525a06485afb5f653cd7a0958904763aad2c2e8f9b6ab691c3710a9ee2fbae295213857234d4595df95c289f36703a8cc849 SHA512 d85d8c903296986b112df6fb2c1d84e6e6e8bc77c4dcdfd620696f697d45cd6b3c494ff96fe0581d5c56baae6791ab3776da12e6b7b695b15657ac9d0ae64747
 EBUILD with-editor-2.8.0.ebuild 659 BLAKE2B d0ae1c4101e73725f922573b11996e1e4c5edf7b28f09106872dfbefc3688e21a05cc8885af648da2576e7356001f40e07aa3307c520fd080fcc1780cc8c1a8f SHA512 b69e940bee0264a1763fe11bc042b8aa6b2d93f6b32e0b8a5894cf4be93558765c94eb8cbaf88c27b2d9537a57c2e5185c5856d6e37b867f2449e6ebf6615638
+EBUILD with-editor-2.8.3.ebuild 659 BLAKE2B a373ff680eee3ae047e3d93100b27ad0287afaab6c3fe43e378f5d7da0807ec26668021c19c4c34e5bb2caa90f65726fe68561937a0a88a639c61f64a8b25433 SHA512 0e3ccacb84a2d7b4b0b03a4b27b277b68bfc2da88443a4bc32d0f11f06edc9fa95b708e8ee9c8717b37dbea0df03541189b23b30d297a7016e22f74477edc5e2
 MISC metadata.xml 707 BLAKE2B 7f4c983cfd2f8b87a3708301ccc570a0d88b3d9b21b3e089e44dc5b22f8313826d2469efabe7ff4dc2b27262f93dc4b5e8fe0e68b2b3b7a6f79fa6f34283eeab SHA512 bce73ef41113175585cc46d00fc1306537c71f860b1f2d699c086f2b1042d26fb02e9770122c586594ab9012eeea0fa73438a2fb9a9cf3b2c077481eef13a5b6
diff --git a/app-emacs/with-editor/with-editor-2.8.3.ebuild b/app-emacs/with-editor/with-editor-2.8.3.ebuild
new file mode 100644
index 000000000000..f7155f29d718
--- /dev/null
+++ b/app-emacs/with-editor/with-editor-2.8.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 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 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="*.texi"
+DOCS="README.md with-editor.org"
+
+DEPEND=""
+# Versions of magit before 2.5.0 bundled with-editor
+RDEPEND="!!<app-emacs/magit-2.5.0 ${DEPEND}"
+DEPEND="${DEPEND} sys-apps/texinfo"