gentoo resync : 16.01.2021

4 files changed, 34 insertions, 4 deletions

diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 54445b09606d..e57d03d5ed6f 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,7 +1,9 @@
-AUX 50ebuild-mode-gentoo-1.51.el 1209 BLAKE2B 06da1836a37ec6eccddcac50e999e5e19336f0d9da06813e2d2467a5799a79c848b5363fe1c7725801d6302310b37fa92c80373de0810a8330a50c2157e37839 SHA512 23022e1f532f0b3a1c14f855113b29529501ab84f685471179454fda7ce6494d9744204ee02cb729d402921469ecdc9addaabc43a6f4aec378b55f0b6f599718
 AUX 50ebuild-mode-gentoo-1.52.el 1419 BLAKE2B e5242bd136609761e103acb6d7fea200b6f762b115b86f9ce64aeef7403327c79802ed5ca26127c3b83fba78fced025333aa7a6e4e796f2a1d58d1a7d3c5e6dc SHA512 d6169cb25438da932888a7104089471392afd6f5a95acc0fe96647aa4482054e91041bf77bdd694e700dcc51155aee9165fc98b21e8e9859a2235ea4c8a8e4af
+AUX 50ebuild-mode-gentoo-1.54.el 1509 BLAKE2B 98cf2a1672723ffaa3f4d2f57b4b67b897df56cc2d7352366b79df0578b927faae53c3cc703fa70cf23bd0b1006d8c49dd8e59fcaffa3a231fd7ec5e26c7dce5 SHA512 91c59e85ea79733c195985e4a33dfb1aec8ac13457c0dc3fe7353fb2616787ebde4393b671a2943b752725593929070b658c24955d5e2132b6e9b76daa749850
 DIST ebuild-mode-1.53.tar.xz 35920 BLAKE2B ee932441e23ba4b876e98feb9ff9dfea2e395296846e14f776ac10f4c5bab6b711161b4c890b0d8f2ccb5749db5bced3f693aa172e3ae92af506fee26fb5750a SHA512 8fcc28139c0cace21159a0b5026573f401f65b4501ff888f9818d8f5a506a7bc1f8d8a133f775619efc9e16e2172d6b5daba539b4e38b1a378c0b35395263ef9
 DIST ebuild-mode-1.54.tar.xz 35768 BLAKE2B 8cfba7230eb61bcdede498c696aedd7c64d01e5a1e7a22ad0edf793fbf6970bddd818d431e717bcc0b5ea07d35b525468131df260206db912f36341947b98d08 SHA512 7e67f3875beb42bc94fe522364212a02ea93e11aa1a64512283ab783c5a41097076b29a3ecf72b4369180253efd26fd3a223d617909953b2c7626f5cbc2aaba1
+DIST ebuild-mode-1.55.tar.xz 36444 BLAKE2B b044f136dcd90608d2e6b3192ea35bdcfb19efb71a1ed9035d22afd9ee1aafe39e12c8e07908df8a222cded58b0549497298fb6cc92844794214d86e67225529 SHA512 ee1b25fcd12d5df56d9898eef49bd6df02d970bb62fa61a12a1a4a2fd165076d31cb99c92ee3bc7b64ad6b6d2d70a16933d84165640f25acfe5fc9252b0cee51
 EBUILD ebuild-mode-1.53.ebuild 729 BLAKE2B cc851471e66575177f4216249b09291adb0ba6f5ae739cc4b4621df2a5fc39bb903c67c5f25a8d6fdfe617b65a4386a5afab1e6bca8e565997bfd07ad3a28b64 SHA512 0b95e084c2972001c79ba3fdd9d9852be104a0a5065619de6ce4e0d0894a88e99914c361a789e8fd3fc56fe01a76580b5cc16a54ed1d175fb6064e41ad5e9313
-EBUILD ebuild-mode-1.54.ebuild 736 BLAKE2B b241e8af5d898ea544bf28cf7fe3904917a26b480ffc9591e3a7b3cc7d4f53aa6f6901aee704cc9d4856b9e55631b22aebddb777ab04863b777c104407c998d6 SHA512 5832a9f2bd3f0c0bf88e83dc836200a4323671a3737f019950d7ed673b77d176312ca3983828762968da1e2f6493518cc93297545ff5d384af9f52010950a9e7
+EBUILD ebuild-mode-1.54-r1.ebuild 736 BLAKE2B 71e62344d03621defdb9be57b0f1da6a4db3e1d84c0d6ef9118273fa5025c5cdb999ed4e509c4d0f8d551fc8a58d9bbaf891e5e61bdb7a64e177fc7314a24d20 SHA512 73dee87d1887bf399a87d22022aa80b6cac9697e5a537b9e953555d4aa3ec84f0d5f74ebcd03be59ceb0e07df22ee2298214f1826d9f0129c4f3708a5d9d6b64
+EBUILD ebuild-mode-1.55.ebuild 736 BLAKE2B 71e62344d03621defdb9be57b0f1da6a4db3e1d84c0d6ef9118273fa5025c5cdb999ed4e509c4d0f8d551fc8a58d9bbaf891e5e61bdb7a64e177fc7314a24d20 SHA512 73dee87d1887bf399a87d22022aa80b6cac9697e5a537b9e953555d4aa3ec84f0d5f74ebcd03be59ceb0e07df22ee2298214f1826d9f0129c4f3708a5d9d6b64
 MISC metadata.xml 427 BLAKE2B 2c0846e1ff38584a4101b645f7242526d43c4b6e2eaa202f7d063de531fca4bcecefbdd81278caf3b9e6fe1492277d4c2aa33104eae3ce99f7c4b30c5709946e SHA512 5f4d98e87b3e28bfeb13476382ad46673cb5896bfaa994b856350609ffe9fce1bf31ff8e63702689f5d0a7e07c2e50c1a8b22b09559d77606321981e63e79467
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.54.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.54-r1.ebuild
index c972bf6d3080..54add5db8bed 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.54.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.54-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,6 +17,6 @@ BDEPEND="sys-apps/texinfo"
 
 DOCS="ChangeLog keyword-generation.sh"
 ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.52.el"
+SITEFILE="50${PN}-gentoo-1.54.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.55.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.55.ebuild
new file mode 100644
index 000000000000..54add5db8bed
--- /dev/null
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.55.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~x64-macos"
+
+BDEPEND="sys-apps/texinfo"
+
+DOCS="ChangeLog keyword-generation.sh"
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo-1.54.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.51.el b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.54.el
index e4bbe683dd62..06ae54410391 100644
--- a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.51.el
+++ b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.54.el
@@ -1,6 +1,9 @@
 (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"
@@ -19,6 +22,9 @@
 \\|license\\|properties\\|accept_\\(keywords\\|restrict\\)\\)\
 \\|\\(package\\.\\)?use.\\(stable\\.\\)?\\(force\\|mask\\)\\)\\'"
 	       . conf-space-mode))
+(add-to-list 'auto-mode-alist
+			 '("/make\\.\\(conf\\|defaults\\)\\'" . conf-unix-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)