gentoo resync : 27.03.2021

9 files changed, 25 insertions, 11 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index e623ef80c387..8ff8c3eea462 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 2cc9b17dad6f..02f7c3e97865 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,7 +1,7 @@
-AUX 50ebuild-mode-gentoo-1.39.el 805 BLAKE2B 3cdb41677c5ef11ef6fb44001cc36b58f923c2be4090fe8635fa85d338af3d170b1ad3d6b2f31704cf24e1528d3ce9b6fd3d305c2e3c1b1923e345e011642307 SHA512 8038b7bac0f3322b1149467152790dac7cd133234afe7c362c0e14686e378bc27eaf432a7194e1748dda80b41483943facb44e1a66466ebdcb4e7a0768e8f629
 AUX 50ebuild-mode-gentoo-1.51.el 1209 BLAKE2B 06da1836a37ec6eccddcac50e999e5e19336f0d9da06813e2d2467a5799a79c848b5363fe1c7725801d6302310b37fa92c80373de0810a8330a50c2157e37839 SHA512 23022e1f532f0b3a1c14f855113b29529501ab84f685471179454fda7ce6494d9744204ee02cb729d402921469ecdc9addaabc43a6f4aec378b55f0b6f599718
-DIST ebuild-mode-1.50.tar.xz 35440 BLAKE2B 281719a0a686ef1c80c8391cc118d14085ac6407dee5ee7ee44229bb529de041d31fcec7c08bb1e4b8b5057823c5d99a49a9786daa0b7b17a766155b7daaaecc SHA512 a7c232103848c7782a4ebad89e064f3bc37a78427228be799d8e1bd3670524b32050229ba7cd48d9e4c2b0bb32828ce95eb2e47038411591d03fa8f998614c1e
+AUX 50ebuild-mode-gentoo-1.52.el 1419 BLAKE2B e5242bd136609761e103acb6d7fea200b6f762b115b86f9ce64aeef7403327c79802ed5ca26127c3b83fba78fced025333aa7a6e4e796f2a1d58d1a7d3c5e6dc SHA512 d6169cb25438da932888a7104089471392afd6f5a95acc0fe96647aa4482054e91041bf77bdd694e700dcc51155aee9165fc98b21e8e9859a2235ea4c8a8e4af
 DIST ebuild-mode-1.51.tar.xz 35280 BLAKE2B 63f57919bb73937ce3d40b4d6762e78c78d273bcf67875434d12450e00632d457d3dedbe6f213c1979a60cbc0a0874723e3e9424fdcfb64a48acc885cc90e577 SHA512 ff9ece96fbe7bfc9c070769dc6667e8c33f8fb7ef20a2d347c670342ef7500b52b54a93ed37ac9ea13a89c1b89752f5dd6e56c234abe9a4fcd4eb6bad0d0b466
-EBUILD ebuild-mode-1.50.ebuild 729 BLAKE2B 7a3aea7ffb24774518ce77fcdc6020ffbb603524e06dd6662ec3c7effbcf2997403728d05db42a97cb3bb1ead20ff09a5d07a3c6aa2c7215079b720c96068306 SHA512 890d22a7dcfe831c93452a328c7511688e43f08c7b3b2c53fc8f52378229a45bd9ef96dc138db8ba63500804966708c27d0ff279322036a41d071ce9bb8c3c2f
+DIST ebuild-mode-1.52.tar.xz 36100 BLAKE2B d5207d910088de9cf1a41580ce61c49632e8e7c1a1af5d95ba13a7865125ca487d770731bb49e12fdc36d3f557fadd51109de628e958166d064be025e4b91257 SHA512 852f968b44c80f98363d4663856317946992cf5d0daf9a9c63e8ec17c1a684e28c2de510ded98bd2ef84428d8d094c1b6f5060510e6475ce60183fbc8e5a0322
 EBUILD ebuild-mode-1.51-r3.ebuild 729 BLAKE2B 46f74b1b56541e80f41bf14092627d542ca6c434bad44f606d548cc388102b78855db815fa6d151588e2fca2e6913781677687dcb1eb0b058db358d80669fb4e SHA512 7adf4ff115b8aa78d5dd7a6a222fa535dd85c26390e349896d17b8b729abdf73960bd8b4dd5014c47d87d26dcae28aba5f23a0262c4f8bbaf472c7468ae4c610
+EBUILD ebuild-mode-1.52.ebuild 736 BLAKE2B 5eb9b964d2c708c5334fe9f89ee78b7628ce2e20eb23124ffcb0481abf683355925db3ee0b8aedea84f86479559b9b314f8021579533ffcbe87eb89faf6cdc49 SHA512 54c3c580b468e24669e67bae3495e03683283fb1675d2e9d9977ae0111854d0ddfe63fcc878d7179bd5454bae20d9f75a46e5c1fba69de880038a103ed5fab25
 MISC metadata.xml 426 BLAKE2B d0b4dc2bd01fc6fb2f0c58b01676b80d09a4677876adc9681c3c436ebc437b6b034187b19fea30cf980927fec1f6a9feee9a0b7d1a4dd15818d02e4c8ec77af6 SHA512 058df2768030185953c7ac3622819c430681eae3ca60b0d02ad48ed22ab6a0ac7c169d93f8f54a3dddcade3f84c9bf58f662a58bfd78217ea8fc27a580ab9077
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.50.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.52.ebuild
index 590200037821..a1123e589d57 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.50.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.52.ebuild
@@ -11,12 +11,12 @@ 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 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="sys-apps/texinfo"
 
 DOCS="ChangeLog keyword-generation.sh"
 ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.39.el"
+SITEFILE="50${PN}-gentoo-1.52.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/files/50ebuild-mode-gentoo-1.39.el b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.52.el
index 8683a654d3f4..c93b8da476ed 100644
--- a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.39.el
+++ b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.52.el
@@ -1,16 +1,28 @@
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'ebuild-mode "ebuild-mode"
   "Major mode for Portage .ebuild and .eclass files." t)
+(autoload 'ebuild-repo-mode "ebuild-mode"
+  "Minor mode for files in an ebuild repository." t)
+(autoload 'ebuild-repo-mode-maybe-enable "ebuild-mode")
+(autoload 'devbook-mode "devbook-mode"
+  "Major mode for editing the Gentoo Devmanual." t)
 (autoload 'gentoo-newsitem-mode "gentoo-newsitem-mode"
   "Major mode for Gentoo GLEP 42 news items." t)
 (autoload 'glep-mode "glep-mode"
   "Major mode for Gentoo Linux Enhancement Proposals." t)
 
 (add-to-list 'auto-mode-alist '("\\.\\(ebuild\\|eclass\\)\\'" . ebuild-mode))
+(add-to-list 'auto-mode-alist '("/devmanual.*\\.xml\\'" . devbook-mode))
 (add-to-list 'auto-mode-alist
 	     '("/[0-9]\\{4\\}-[01][0-9]-[0-3][0-9]-.+\\.[a-z]\\{2\\}\\.txt\\'"
 	       . gentoo-newsitem-mode))
 (add-to-list 'auto-mode-alist '("/glep.*\\.rst\\'" . glep-mode))
+(add-to-list 'auto-mode-alist
+	     '("/\\(package\\.\\(mask\\|unmask\\|use\\|env\
+\\|license\\|properties\\|accept_\\(keywords\\|restrict\\)\\)\
+\\|\\(package\\.\\)?use.\\(stable\\.\\)?\\(force\\|mask\\)\\)\\'"
+	       . conf-space-mode))
 (add-to-list 'interpreter-mode-alist '("openrc-run" . sh-mode))
 (add-to-list 'interpreter-mode-alist '("runscript" . sh-mode))
+(add-hook 'find-file-hook #'ebuild-repo-mode-maybe-enable)
 (modify-coding-system-alist 'file "\\.\\(ebuild\\|eclass\\)\\'" 'utf-8)
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
deleted file mode 100644
index c394966135c2..000000000000
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST emacs-common-gentoo-1.6.tar.xz 61224 BLAKE2B 70e4f30c26c9098fdb02a53cab5d60cb611143d8bac6947707f3c7596b5a81ceb513b5a0809ee90f351472824f1d4216720c02cadb51d25b3dfce5e436e02bdf SHA512 a7daed2241d778ab283482ecc016801e25084eed10fcbbc50e187d5f842df5a0d278a77f94ae950b086c8651e8ca1a18f89c11dffdde9cf9168755288aae926a
-DIST emacs-common-gentoo-1.7.tar.xz 61344 BLAKE2B bb5ec108ce230cfd45fa9cff1426b3731baf6a25b8346681128b0fc149649db5ca3b22720b3f8dba8495544f1ec5357a612aa35c687e36f5a181b2ab2fc324e5 SHA512 6c321a63d5329fe5e33f674951f1483acd724072a1d453ac0f4dbcb9b87825b735ac865fd9b9706a460b88828d1bfefbd65cc83d24a87b6359dd354c686605ce
-EBUILD emacs-common-gentoo-1.6-r4.ebuild 2825 BLAKE2B 9528a1c14c99d835334b2753bc9e8c10ab32f39532d38912898f77caaaff2706acb328675daf6783c7746f62a615450387011444e67e42f821b5ce4e441d29fb SHA512 bc987ccebb269bb20152934dec00ef58bab7f1310dfd91c4dc34dccbdba622c40ad2b9d841a1d5d0f5b1a406ffdad8716af0656bac36d7fedde74a9ee91835d6
-EBUILD emacs-common-gentoo-1.7.ebuild 2895 BLAKE2B efad77e6d07629efd12b0ffade40c817fc22918b88c6787eede21a67b36a156b9656f598385af311925699e1a8c13901384ee15e1ebb261e269fba453cc62bf2 SHA512 047c1e3f21238458293f8c4f39908a1a586502424f0540a8d37b15961cc708303092bf8f51e66443535d74a355c14406f0bfa283fee730865767bb8af7eb6bdd
-MISC metadata.xml 360 BLAKE2B e7e420afb7a8377bffcf2a23f3954bbf4cc80fcd19a8514733e2e0164f4235271e21dc860bf77cb9cfcd1a4026ef3dafe97a10dc397e2d8e6f001f02bf6e9bc7 SHA512 d57f8f097617229f774b06437aaa83595aab2a6d9321d51b97dac8bd56fa94db396c7bdca538570f0912390e25ae8643c5adc374908757f67f1422fa1f872605
diff --git a/app-emacs/emacs-common/Manifest b/app-emacs/emacs-common/Manifest
new file mode 100644
index 000000000000..1b0cfe8864c7
--- /dev/null
+++ b/app-emacs/emacs-common/Manifest
@@ -0,0 +1,5 @@
+DIST emacs-common-1.8.tar.xz 61352 BLAKE2B 084cf06c03db231c92d0074a2e633d209257941b2840c2c745462050e694756f97679c7078357d9eab7b2fcfb85b00ab390d65254ddd106d0ef1a1fd723b2c4c SHA512 85c4b826c0691fd24f260750f4c3f9ecc3b59d11b4dafcae608e1a2546c064b240084974962b0727ac8183b8f5b0891cf47add901461f77ee275a129341b2b13
+DIST emacs-common-gentoo-1.6.tar.xz 61224 BLAKE2B 70e4f30c26c9098fdb02a53cab5d60cb611143d8bac6947707f3c7596b5a81ceb513b5a0809ee90f351472824f1d4216720c02cadb51d25b3dfce5e436e02bdf SHA512 a7daed2241d778ab283482ecc016801e25084eed10fcbbc50e187d5f842df5a0d278a77f94ae950b086c8651e8ca1a18f89c11dffdde9cf9168755288aae926a
+EBUILD emacs-common-1.6-r4.ebuild 2884 BLAKE2B e4a0abd806c807511afaf5442ef0f7f925f11a331197108b87760ff795cc9149ebc9be3f236f55a8127ee1400dfe373a2afefd71768f945882f807ba5b1edca2 SHA512 d7b30bdf7d642534605618b9f73677b4d1ecc9a5a970eafcf91c86f1e8819eb58356d5debfe93ad8dc25b660f89e7a17d4a81cc9a80d32e03eaff6e148a9eb70
+EBUILD emacs-common-1.8.ebuild 2895 BLAKE2B efad77e6d07629efd12b0ffade40c817fc22918b88c6787eede21a67b36a156b9656f598385af311925699e1a8c13901384ee15e1ebb261e269fba453cc62bf2 SHA512 047c1e3f21238458293f8c4f39908a1a586502424f0540a8d37b15961cc708303092bf8f51e66443535d74a355c14406f0bfa283fee730865767bb8af7eb6bdd
+MISC metadata.xml 360 BLAKE2B e7e420afb7a8377bffcf2a23f3954bbf4cc80fcd19a8514733e2e0164f4235271e21dc860bf77cb9cfcd1a4026ef3dafe97a10dc397e2d8e6f001f02bf6e9bc7 SHA512 d57f8f097617229f774b06437aaa83595aab2a6d9321d51b97dac8bd56fa94db396c7bdca538570f0912390e25ae8643c5adc374908757f67f1422fa1f872605
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r4.ebuild b/app-emacs/emacs-common/emacs-common-1.6-r4.ebuild
index c4365debbdff..ebc8a1b9774e 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r4.ebuild
+++ b/app-emacs/emacs-common/emacs-common-1.6-r4.ebuild
@@ -5,9 +5,11 @@ EAPI=7
 
 inherit elisp-common desktop xdg-utils readme.gentoo-r1
 
+MY_P="emacs-common-gentoo-${PV}"
 DESCRIPTION="Common files needed by all GNU Emacs versions"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.7.ebuild b/app-emacs/emacs-common/emacs-common-1.8.ebuild
index 314ea5c739ad..314ea5c739ad 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.7.ebuild
+++ b/app-emacs/emacs-common/emacs-common-1.8.ebuild
diff --git a/app-emacs/emacs-common-gentoo/metadata.xml b/app-emacs/emacs-common/metadata.xml
index cdc9b75d52a0..cdc9b75d52a0 100644
--- a/app-emacs/emacs-common-gentoo/metadata.xml
+++ b/app-emacs/emacs-common/metadata.xml