gentoo resync : 14.05.2020

15 files changed, 78 insertions, 16 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index c16ddad55323..65dbd794b43e 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/d-mode/Manifest b/app-emacs/d-mode/Manifest
index 010f00f262a6..1681ebeadf3b 100644
--- a/app-emacs/d-mode/Manifest
+++ b/app-emacs/d-mode/Manifest
@@ -1,4 +1,5 @@
 AUX 50d-mode-gentoo.el 157 BLAKE2B d92e7cb8b7121e989f3e68634db63f175b5145bf7f562758bcb7c3fce318ce6c72eef12201c9b332ea1309e4f4a20a6ea3051b8eab997413af08b4fc52fe1339 SHA512 12a89496192f10a221bf3be386339dd2494304f5e0e8c8ebca1d9e622b5304609b01370d64b009120f333794a41815fd73124114035e02ce53241f58e9968546
+AUX d-mode-2.0.10-rx-form.patch 728 BLAKE2B 04ce4363c53ea316297c316bd2a5c60f2f6ac9e1bc37a67fc7d979538e3ea33aea1a6d53b8d5565e83c50814401d9330b71a377d6d8df29c8b3d5490c38cb3bc SHA512 b2c0b4a542280b5eb9bfe54bbb0249ad0461002f630829775a78e60db6c9e71b138606625d4ffe9b4322b6facb57e232079ddc372ef6d1820d12ba693c889c84
 DIST d-mode-2.0.10.tar.gz 22394 BLAKE2B 16993c1da1b4362df4ef4674f58645da13466d6bf9a6215667a70868be7f6d3f992f0e60d9a3b6c4bcac7c3f4014fa987bfec2f3ee4e1503740efe316f29d249 SHA512 510ee3b1c1288b4b6772cdc9c436d691cc4c09fd1337886abe9a8c86e64a6fede3d8e2aaf46e847417cb667d36f9c5db3c446e7f5ca88fe2bc8b8fb80bcd1297
-EBUILD d-mode-2.0.10.ebuild 518 BLAKE2B 28995c68a007466c48cfd2d53e58d053633533cbf1b8e377762d7b3bfaccae7a03a80ae56f1ff150236dc8cab40091604934cde45fe03b2f9e78f012297d155b SHA512 00fb22f20f8d5ab16c7471f2c8f0f64a48af7c2b910accde3aeab00f59b24e79b92de8c19d3e0128d18ac8779083244cfe9a7b61e2fa72d435770617d67dc2fd
+EBUILD d-mode-2.0.10.ebuild 561 BLAKE2B af69024ac739dfa47704ba8f2c7dc4db652e63338a2b0c95173be48f6b9e11f77413327f4884ea5a8f9c7ba4dd88a1d122d250782f2a19bc5cdc1037a265e6f2 SHA512 c85a9c84080611b402359946a8c141103b185413d10c4bdf3ab23afa50c0bb8918255c4318ef5ddb2262c68f92e88600a90441ffad586d79f7ecf48eee2463c0
 MISC metadata.xml 382 BLAKE2B ca4199b6d9d35540d53a4bc673fa59babecd80579ede4c227954492ef2591d6d09e0d3938629f21606c7547ed3155d733582a1298067ffaeaae20bc0b5218e28 SHA512 8a55a3ae2146d4ebeef5075312482f0962e8e219f73cc9997c7ba19978830d42ac22c02b84be34a377841858d9fc19d85ce9243546759e8666230e9c311347b0
diff --git a/app-emacs/d-mode/d-mode-2.0.10.ebuild b/app-emacs/d-mode/d-mode-2.0.10.ebuild
index c410ee103834..4a23ae677547 100644
--- a/app-emacs/d-mode/d-mode-2.0.10.ebuild
+++ b/app-emacs/d-mode/d-mode-2.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,4 +16,5 @@ KEYWORDS="~amd64 ~x86"
 RESTRICT="test"
 
 S="${WORKDIR}/Emacs-D-Mode-${PV}"
+PATCHES=("${FILESDIR}"/${P}-rx-form.patch)
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/d-mode/files/d-mode-2.0.10-rx-form.patch b/app-emacs/d-mode/files/d-mode-2.0.10-rx-form.patch
new file mode 100644
index 000000000000..78ed206c3a80
--- /dev/null
+++ b/app-emacs/d-mode/files/d-mode-2.0.10-rx-form.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/722012
+
+From cfd1d0869d51b7548b3fb738b2f2593c76533d44 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Per=20Nordl=C3=B6w?= <nordlow@users.noreply.github.com>
+Date: Wed, 9 Oct 2019 11:03:00 +0200
+Subject: [PATCH] Use rx-to-string instead of rx-form to support Emacs master
+ (#97)
+
+---
+ d-mode.el | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/d-mode.el b/d-mode.el
+index f8211cd..df72b8d 100644
+--- a/d-mode.el
++++ b/d-mode.el
+@@ -210,7 +210,7 @@ The expression is added to `compilation-error-regexp-alist' and
+   (add-to-list
+    'compilation-error-regexp-alist-alist
+    `(,symbol
+-     ,(rx-form
++     ,(rx-to-string
+       `(and
+ 	line-start
+ 	(group-n 1 (one-or-more any))		; File name
diff --git a/app-emacs/ddskk/Manifest b/app-emacs/ddskk/Manifest
index 10e3561870b2..7c5b9d549d5f 100644
--- a/app-emacs/ddskk/Manifest
+++ b/app-emacs/ddskk/Manifest
@@ -1,4 +1,4 @@
 AUX 50ddskk-gentoo.el 112 BLAKE2B 090925d25ada70386b13c259fa0ac6eae72f45c7bcb9272b65f8332eddc384d52d473a33296ef0af27e6b55e85ad5eb6cb5a64d53eb15de8b4cb770461ff1472 SHA512 7d7212bb6da992a3bad619d4def98acbe31c4b7226de59c223825e49dbd202d378eb04e386d6087ba5608e4bf1ede8847e2d73d068a6fe147322da7b5329fe09
 DIST ddskk-16.2.tar.gz 886618 BLAKE2B 854b9d57993e8f69af4035df49511ec110a1afd83ee290be8934283fc5f2a1a648b80f80811396083fa019d9eb12469998ff26b692296dd770c21da81c3cad3e SHA512 591d66e2d217a289ce8273ed7da10c0ed72029e961efde0537044f7ad3f5f46943cf5c71ec1d97a27743fcea91a9fab81c86e2772047892f53e2852bf58ef45c
-EBUILD ddskk-16.2.ebuild 1491 BLAKE2B da585b678248cd72ecf9cfbff6fbe01f5e1353fe241dae084a51bc69739aa75483a89864c61e442f7e4e24280da651d8b58d5e9c51d1b4378e8f68a8f5c00bc7 SHA512 c91fe42bfcc27f7e738db982259c1c92a7f76a37d4bc5b2f00c7ec6d79e689cf3c47470ecb02e5589739518a7abb2aacf8cc61b7d3ec81c6f8cb5a086a01fe3f
+EBUILD ddskk-16.2.ebuild 1491 BLAKE2B 9c128ebe2d7ebf3559085c48ab45ecb72e3b4185e3fcf85506bc519cfcf923959f15d9c8f68faef9e4ef5ab805f3dfffb6c08e40a6838991c0268de899c54905 SHA512 1939dc7bd18d3f3e6d8874e98e27761d6e7aba9b0759ee2dbab0d2807ac3b002d62fb446feed4e96302f957f0ef4d2d62889d57ee81ac56416ec65747b2e5c5b
 MISC metadata.xml 450 BLAKE2B 5458defeba3a265354c3a885106a590beb379c83bee36af2859e604a2ae19c108962a6400a614443dfb3a6391088c98474cae996e60bd02d320d9f44de990bf9 SHA512 8a7b366ada5366e2713e3850421729b395862f662476225f3a7ae24dcc0067ff51c4a8ce8408c2ce2082722f0649b0ad8c047230a0223c03e2ef8b416c7e65fe
diff --git a/app-emacs/ddskk/ddskk-16.2.ebuild b/app-emacs/ddskk/ddskk-16.2.ebuild
index b57957d03456..184535ef601e 100644
--- a/app-emacs/ddskk/ddskk-16.2.ebuild
+++ b/app-emacs/ddskk/ddskk-16.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
 NEED_EMACS="24"
 
 inherit elisp ruby-single
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 354f9255064b..ae7c9e189561 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,8 +1,8 @@
 AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe9856c526d77e5e988a35203c35322a1ea7ce9e19b02ff9a5ce1b2b4d73b8ba19bada30b7fbf453e43b01 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000
 DIST org-8.3.2.tar.gz 4442361 BLAKE2B f21f07578e870cd3edaa3721a53f679627c0115c320c666c2086e201e272c0ef03540bfdd90936a624cd4c4dcbac21b91346ba975b6006ada2d46184f73574f3 SHA512 3e1ff47c875a2db3239add8b060f555da357e465161ca62860c0ac2734c2e31c5387d2df4223ab7ea8ea60050f9a845d160b0bcb3afcf36f1d3cabcaa961e6a2
-DIST org-9.2.6.tar.gz 5720665 BLAKE2B 19346696b41c2ab5b66ca58b0e28c4ddfa184a390d39b1edc80536901754ac81a479cfb1ead5aaca6d93c9060fc122bbdfe1307900fbf0fc8cdb8fb7a2b2153c SHA512 8aba98bcd2e8e8d40c90524c7b0fd85526fc64725823a6ba66ef80b8f5f2e7d2b1d3363db2553af6672ded085a0abbf00311e36f02cfc1c2dbb18184df8f34a5
+DIST org-9.3.6.tar.gz 4669953 BLAKE2B 1d221918f8145b789d979ee7822640dd37c5722e9f65ba36e945f7d574cfb89d48e2da1812d5dc727301ef1ad8bd2ef5628f54cbbfef5bffbab48656ed4c1e65 SHA512 47b5b81f47474d399cc7aada0e32f376d4c8758f6e955b7d889035610c20a4c372ea0571a510695822d2b87bd1e8002c2d0d8c73dc730144540c59b5ef25e090
 DIST org-9.3.tar.gz 5189006 BLAKE2B 1e082988a47e2058fe248dd1f8f5f0e75291279be1a7abf75d507786f84f93e9701607d15688162ff4d3e4f590ac8391c37d1f6d047ed55d9d9bfb498b47cfa4 SHA512 e00f15750b76350765b6a01e5b0021fec4dcbd9dd5ca4de6745e0df6881b9d62ad496b7d579c0cc0f6dbb206bb27e5a219e0a668a6167ccc7f629d763eafa24c
 EBUILD org-mode-8.3.2-r1.ebuild 1746 BLAKE2B df764e008c1f4bebde801dfd922c16988d863f598e39619b953aba8013d1737f6aebca910bd395cb4ad2f8004c2d0fc326e40b6daa3f534e74e1223da752751a SHA512 f5d1edbc5eba7d392823bccc0ab9338baa2db8687ad1112be351a4fade13c94cc3727c9a91f0cef2137cc8efc727aec86e9dbf3115a16f9e4894aa19280562ca
-EBUILD org-mode-9.2.6.ebuild 1720 BLAKE2B 0e3b01f35f5a2673293cd24053761661f30e8f28e7c38d05288acd494e873da96a2044fd9ddc7ff2b637423761429dd74820b7d854dcebb9d1091ee6459c99c7 SHA512 e87f1d004a54d722576fdddc0f0d8004e181948235cbdc4a8e03e98d0a0959c56bcf1574c721dd012b8d699c978896f0e7bf60162cec646339ff442ca73ab69c
+EBUILD org-mode-9.3.6.ebuild 1723 BLAKE2B d07d2342272f740a2837a3fcb046456a1ea59f030849f29d5346f0660d74c5bd8364328cb5ebb0b86aac5629e78d3b0ec4dafaaa963e808310b3479b139b7488 SHA512 138d6d5de547a4fa13787634f387c51ada66de1867079885d6efd7179df0c38ae224dd95d42923f859c953c64777873cfd180f7d6ff78d8146bd778a9de1f785
 EBUILD org-mode-9.3.ebuild 1720 BLAKE2B 0b0b38326d521754bc7a3b4148f21f290b39ba55c17c28423f31b6e130933f843b698472db4cff1d9a5bb738d14ee959504c9465e0712542823a71116ab5cdb5 SHA512 8827962425b24c573ae7f6b72dd96cfcc5c9c495b57c1516a6139da8ed9b8e79c96949c57db75401e70c9df7baf097a7cc6d3a5faa2f4c6aa8cddae86e9e8669
 MISC metadata.xml 1368 BLAKE2B 2680c11ca69b9acd8b96b6dc76586037bd1b7ce0e9cdc183781742f373ce8d0be5b8820b7fa4d18c4f59523e10d3b40df3edbba5178169fb993bacc8d10cdfe1 SHA512 6c557a3a3ecb9b1993bd8c976d0a81460cd1ecc6e53fbaeb0d086e8d78497485a1b34470b72a73e779878b4947a22d61ef36259037cf6ff0315a823e15e09c66
diff --git a/app-emacs/org-mode/org-mode-9.2.6.ebuild b/app-emacs/org-mode/org-mode-9.3.6.ebuild
index 78704a201192..60448056b54a 100644
--- a/app-emacs/org-mode/org-mode-9.2.6.ebuild
+++ b/app-emacs/org-mode/org-mode-9.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://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 ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-macos"
 IUSE="contrib doc odt-schema"
 RESTRICT="test"
 
diff --git a/app-emacs/php-mode/Manifest b/app-emacs/php-mode/Manifest
index 7377ef6034b1..770ec101d870 100644
--- a/app-emacs/php-mode/Manifest
+++ b/app-emacs/php-mode/Manifest
@@ -1,6 +1,6 @@
 AUX 50php-mode-gentoo.el 286 BLAKE2B 1c823d8244e714811c5f1be402d1cd41e7b81951aafdedd01f36fe93f3cb6150792b5ed09ef5fd859211692f766fb8e931581c5e9cd60401d6eade364696edec SHA512 5f6205a7f3300d02b612a0aba58566dba1ad2a5f090c827c7d2d740af9c425cccb8384b37ac81e05eb81b4e31e649726433105b9862b92913e56752c554eec93
-DIST php-mode-1.19.1.tar.gz 94857 BLAKE2B 65ecb228fd4cd2c09cf38836b7d04ac270051976dc97dd7a3124f5a86d4e95bf9a097c6885f55c0ea40599fc2d3f813204e7f28a5f75223cae9eb51e74136017 SHA512 ca4fd798690d5b855a8d4b0cf5b631c32a561466b7697c9498bd89ad1059b774616acab10e30877b3053ba613b63db5da74a479c0a09c57b9b7b2350f42e68dd
 DIST php-mode-1.22.1.tar.gz 90539 BLAKE2B 3cf2f282cbf87d7dc0ef15d81341de851ad95b7f5426ab6495e55729774fa9d1a32bbc36dff40869c219c71e0ff5d55642f99782a18722c94abeda78b45e0023 SHA512 482f07bec5f8ce21396cd4d39b14dbfe47d73f4e06b7b178b3e01c2dc51f89f1693a032384e4ad812c46a344e531a4a626c4f8eb414fe22dfadd9f1a71c55238
-EBUILD php-mode-1.19.1.ebuild 507 BLAKE2B 479b22bfa2025f6c451eb7241533a5bff188495bbcc01e5c3c2817995ab0a4d3e909a0dcff752b95477bacb584087a58bbc6d5fecee4ef13fcb131fa4081f480 SHA512 79adda0a1cbcd74af2b1b26c701ac9e559e9325456d52f4deee568bc4341b67cd4a657351477d8eec3f406b20544644c838edc1212158f3d386d73b64277ef84
+DIST php-mode-1.23.0.tar.gz 94451 BLAKE2B 324eda995ba8d93ca9bec691c88b05caac3d6786b2d1caac39dc34f513e8a026b3803ad3712729b147a8ee839fe337bf11ebaa1b718cb4c741997a9e1c9279a3 SHA512 051adf317ac1dc4ae14b3aaad9aa15ef650a74c7c1ff134ff9a26664cc7494b522957d9cbed981ec398e9bdc6ccae4437c628b2fe3535e8f2a95da34363ec88a
 EBUILD php-mode-1.22.1.ebuild 489 BLAKE2B 3e5205d2c9e19753905442d8d85ca9bbde730cb100a6d377a006d26a39f88f038e76168e67e2ceee540efdd9623dd155c3a5c3794eec621117107563064095a1 SHA512 4b666428f344d42e2d672eb481d715aefb0b5f45c984f9f1782a004d903a1c21a2bb9d9119f6beb5f306faff3266cb074c79d11756ac34e02253c4dbd45a0f47
+EBUILD php-mode-1.23.0.ebuild 493 BLAKE2B f0b338f0c4a4878b7a19df0ed6b08c7b00e6be95dd2700b1ab5bda0a4fa39c03c35936c11626c3a2c57ae14a0989f3de4f74af22937567359919ba0e78f7464c SHA512 48b20b80aa6a528c2f7a7b5766999e28104d17075f36aeee3924402f9d2f027a4b607e7d0bad13c15457dfcec1c46c2f609e9715371cbfef81131f4bbd3fee89
 MISC metadata.xml 358 BLAKE2B e43dc1a1d876d29121c6745f2e66c3b3585ea5ab0aed824c28bece59078fea9df0f6f438701dfc64fdbf90cb258091d5b96b4dc8fa320161ee241fc17be0a4b9 SHA512 eadc968656b4fe2150fd3d360c32d3fc66d42408c61ea60b3df5be2ba6cd3ed6abec1ba45e37269f5d06721eea30d3dbf95f3a747000e5b5d60e614c56ce3f85
diff --git a/app-emacs/php-mode/php-mode-1.19.1.ebuild b/app-emacs/php-mode/php-mode-1.23.0.ebuild
index 7fd367f22226..3a75d798770b 100644
--- a/app-emacs/php-mode/php-mode-1.19.1.ebuild
+++ b/app-emacs/php-mode/php-mode-1.23.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,8 +12,7 @@ SRC_URI="https://github.com/ejmr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md Changelog.md"
-ELISP_REMOVE="php-mode-test.el"
+DOCS="README*.md CHANGELOG.md CONTRIBUTING.md"
diff --git a/app-emacs/pymacs/Manifest b/app-emacs/pymacs/Manifest
index 918bb8232886..b58e5500faa0 100644
--- a/app-emacs/pymacs/Manifest
+++ b/app-emacs/pymacs/Manifest
@@ -1,5 +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-r1.ebuild 1163 BLAKE2B fd526963d505e5264810c26a90970104ca0b2de5ed85e8c038b35f106c6754ddc4bcf6e790e8df97d521169b2e4bbdf298f8ab94ce8f05deca74211a5d91823f SHA512 8336a43fbaa4dc848dd338877a9058117907520c281ae60c5ee233e4c37c568bf611bb9154d715899bbcb8e531a0bb7eee17302e243b240b1141a92b7a90ca12
 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
index 0ff10a4675c3..4cf124e76ef2 100644
--- a/app-emacs/pymacs/pymacs-0.26-r1.ebuild
+++ b/app-emacs/pymacs/pymacs-0.26-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit elisp distutils-r1
 
diff --git a/app-emacs/xrdb-mode/Manifest b/app-emacs/xrdb-mode/Manifest
index 3bf36d2f8e46..fb0b68ad99ec 100644
--- a/app-emacs/xrdb-mode/Manifest
+++ b/app-emacs/xrdb-mode/Manifest
@@ -1,4 +1,6 @@
 AUX 50xrdb-mode-gentoo.el 223 BLAKE2B 2d2d85455f676760bcce88965406a226528da07d29f34b409c35f539e2dafe6750a35e6472194c0969fec7dda3a04abb65ded5dd6b1be3ea0a0cd63fa9a2f03d SHA512 324609b05517c26d58759bf3c4445b690bb8c8ab00361f3157b06964458f9ca777d8963ac9c5e49df6c75d4d8eb27ea7754639bbbb8d1550b96fdbc954b3ed5b
+AUX xrdb-mode-3.0-backquotes.patch 355 BLAKE2B b465b94aa8960d2d2309fa72db08236deb63ed4d3c7b763f93e7ab9c10f08636c8f5e7f5eb095b102fc50c46b67c48c3e2c126f6e8f3b6714a86734fc1e7e889 SHA512 75379ce55eda18df7102c35ea8786eebf18a015ae3e7c6a936ac7794b5a4e24b610ad21c228761d390467622c876cc34d97e3709d8be91c8fc70fd049f09e01f
 DIST xrdb-mode-3.0.el.xz 5448 BLAKE2B 32ce6b427ab2338d66a52c722ae3c69e1966c53cd63be15c35e218b17cb2c7476da5d5c1e49df3df1114b97382724f273f2f302abaef5995b5aa53824673867a SHA512 1ad0f92edf08cca604b9534a5a715f79d019f73f8ad80bf8297fa3b4a201f8dbd864c23bed86579b7c48ddd9180add7b39e22469f6c23dceef4be9fdfd1ae290
+EBUILD xrdb-mode-3.0-r1.ebuild 550 BLAKE2B 811c30e5d0dfe922e736ef17398381f7ea32340547c3d50182f6904ebce2660b318788c1ce12260fd87da45613faebdf1357f8cb84f952999e784053551c26d2 SHA512 6b9158ff80745ff7cb21b193f7a6c2c02097f016354250b59f1507c85e733226d9da4d192a41bd6f5dd76a6ead92796e3b242e6ae01cb9199ec9c051aa8c1026
 EBUILD xrdb-mode-3.0.ebuild 505 BLAKE2B bf3d1f240e3be4d56e1315cad7bf5c14d962196d7f55f74720e5cd7a8ef2519aeea2f9b04d9bfcf444b2b90afa7bd22eb128b0d9e52027a6a1917ff27a44c503 SHA512 6da052641466348b40dd059761a3591dbe69bc7750650088367fe14034d5e7b799aaa7f33087fca4277d287128b33ae53fa5fbd89230aa2641c8e36c2236b82c
 MISC metadata.xml 357 BLAKE2B 5f0984d66c30be81bdd275c54b1171fc16a714b95f74da7700518cfece8d773433d1ce8151968849ebc3b02c255686e086e2f2282fd9b09a340c2c24da48b334 SHA512 3a98228940548b16f0ff1e6a33bc4d5a2c0d4b650187533dfd431e8c1fbcc59c3c5587a9df1d2bbfcf8c161ade94af51a5b95475fe3900e68108dd86924904d7
diff --git a/app-emacs/xrdb-mode/files/xrdb-mode-3.0-backquotes.patch b/app-emacs/xrdb-mode/files/xrdb-mode-3.0-backquotes.patch
new file mode 100644
index 000000000000..f0cd950c3a3a
--- /dev/null
+++ b/app-emacs/xrdb-mode/files/xrdb-mode-3.0-backquotes.patch
@@ -0,0 +1,15 @@
+--- a/xrdb-mode.el
++++ b/xrdb-mode.el
+@@ -178,9 +178,9 @@
+ 
+ (defmacro xrdb-safe (&rest body)
+   "Safely execute BODY, return nil if an error occurred."
+-  (` (condition-case nil
+-         (progn (,@ body))
+-       (error nil))))
++  `(condition-case nil
++       (progn ,@ body)
++     (error nil)))
+ 
+ (defsubst xrdb-skip-to-separator ()
+   "Skip forward.
diff --git a/app-emacs/xrdb-mode/xrdb-mode-3.0-r1.ebuild b/app-emacs/xrdb-mode/xrdb-mode-3.0-r1.ebuild
new file mode 100644
index 000000000000..9f7879241eac
--- /dev/null
+++ b/app-emacs/xrdb-mode/xrdb-mode-3.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="An Emacs major mode for editing X resource database files"
+HOMEPAGE="https://launchpad.net/xrdb-mode
+	https://www.emacswiki.org/emacs/ResourceFiles"
+# taken from https://launchpad.net/${PN}/trunk/3.0/+download/${PN}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+PATCHES=("${FILESDIR}"/${P}-backquotes.patch)
+SITEFILE="50${PN}-gentoo.el"