Merge updates from master

5 files changed, 0 insertions, 88 deletions

diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 89dc98b89fc4..e7c3d73db394 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,3 +1,2 @@
-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
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.53.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.53.ebuild
deleted file mode 100644
index 19ad8ec1607f..000000000000
--- a/app-emacs/ebuild-mode/ebuild-mode-1.53.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 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.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.52.el b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.52.el
deleted file mode 100644
index c93b8da476ed..000000000000
--- a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.52.el
+++ /dev/null
@@ -1,28 +0,0 @@
-(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-xemacs/ebuild-mode/Manifest b/app-xemacs/ebuild-mode/Manifest
index da35d49d5f1d..e7c3d73db394 100644
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@@ -1,3 +1,2 @@
-DIST ebuild-mode-1.51.tar.xz 35280 BLAKE2B 63f57919bb73937ce3d40b4d6762e78c78d273bcf67875434d12450e00632d457d3dedbe6f213c1979a60cbc0a0874723e3e9424fdcfb64a48acc885cc90e577 SHA512 ff9ece96fbe7bfc9c070769dc6667e8c33f8fb7ef20a2d347c670342ef7500b52b54a93ed37ac9ea13a89c1b89752f5dd6e56c234abe9a4fcd4eb6bad0d0b466
 DIST ebuild-mode-1.54.tar.xz 35768 BLAKE2B 8cfba7230eb61bcdede498c696aedd7c64d01e5a1e7a22ad0edf793fbf6970bddd818d431e717bcc0b5ea07d35b525468131df260206db912f36341947b98d08 SHA512 7e67f3875beb42bc94fe522364212a02ea93e11aa1a64512283ab783c5a41097076b29a3ecf72b4369180253efd26fd3a223d617909953b2c7626f5cbc2aaba1
 DIST ebuild-mode-1.55.tar.xz 36444 BLAKE2B b044f136dcd90608d2e6b3192ea35bdcfb19efb71a1ed9035d22afd9ee1aafe39e12c8e07908df8a222cded58b0549497298fb6cc92844794214d86e67225529 SHA512 ee1b25fcd12d5df56d9898eef49bd6df02d970bb62fa61a12a1a4a2fd165076d31cb99c92ee3bc7b64ad6b6d2d70a16933d84165640f25acfe5fc9252b0cee51
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.51.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.51.ebuild
deleted file mode 100644
index 6b86e560e824..000000000000
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.51.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="amd64 ~hppa x86"
-
-RDEPEND=">=app-editors/xemacs-21.4.20-r5
-	app-xemacs/sh-script"
-BDEPEND="${RDEPEND}"
-
-src_compile() {
-	local XEMACS="${EPREFIX}/usr/bin/xemacs"
-
-	"${XEMACS}" -batch -q --no-site-file \
-		-eval "(add-to-list 'load-path \".\")" \
-		-f batch-byte-compile \
-		ebuild-mode.el gentoo-newsitem-mode.el || die
-
-	"${XEMACS}" -batch -q --no-site-file \
-		-eval "(setq autoload-package-name \"${PN}\")" \
-		-eval "(setq generated-autoload-file \"${S}/auto-autoloads.el\")" \
-		-l autoload -f batch-update-autoloads \
-		ebuild-mode.el gentoo-newsitem-mode.el || die
-}
-
-src_install() {
-	insinto /usr/share/xemacs/site-packages/lisp/${PN}
-	doins *.el *.elc
-}