gentoo resync : 18.03.2018

4 files changed, 2 insertions, 38 deletions

diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 129c37254cb6..c497bb9cd005 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,7 +1,4 @@
-AUX 50ebuild-mode-gentoo-1.31.el 649 BLAKE2B 47fbea3bd7d02a90b66c21577eb4e4c1b7a6083abab29ad57b3bd92c347fb11d3aa509c1d8dc43e37b8e8ac9a7414e1325951e5a72e998d5b7937bb07334fffa SHA512 59c1ca3ce148d037d16b06cfb5de56cefb608c514f942f9dbbdd8655ae65b438cc04d395647def321d85d7685a5f8ec5e5cf487edf9a5074d7972f489e8eafc2
 AUX 50ebuild-mode-gentoo-1.39.el 805 BLAKE2B 3cdb41677c5ef11ef6fb44001cc36b58f923c2be4090fe8635fa85d338af3d170b1ad3d6b2f31704cf24e1528d3ce9b6fd3d305c2e3c1b1923e345e011642307 SHA512 8038b7bac0f3322b1149467152790dac7cd133234afe7c362c0e14686e378bc27eaf432a7194e1748dda80b41483943facb44e1a66466ebdcb4e7a0768e8f629
-DIST ebuild-mode-1.38.tar.xz 30744 BLAKE2B a147fbb462f0e1a2ba3272c74b12c9357200b0ca6671d75263547d7b777489772504c9fda634a797fecff8dce35e40b7bb579cdbd9a7da99f68f74b08a48a4da SHA512 bfcc4fb100f7d9299e9b466c7661e865f9b93ee352780da1647f1a98159fe3e9eeb8cd4b7d1d9906d532316d1256ec7b6f821cac3d064cda15f2fd62ca7cb349
 DIST ebuild-mode-1.42.tar.xz 34936 BLAKE2B dd94d17dc57e2d32b329ab62ec6eec8ada6a4aeddadb8d978736f5dcb4d613759fd860043cab92d12db11614f8b7fa71fc5537576a2af3f5e6c9d56fc2fdcc05 SHA512 119f954eaf009bd0c9f0a75810b94a54d65ed91c6ffef20dd164c7a5ef095410dd0f3642426817f5efa6623d4f3e120ed3b27076222b02a90e75a83bb80b8703
-EBUILD ebuild-mode-1.38.ebuild 587 BLAKE2B 01bab3a0519d1fe60b3eb52cfcb8de2d56fe7a8ab0eca2a4189c9c498e74fc025833cb2fe53095f859ab3ab82221ca6de61ba5037c5f5e5f4b0f72f333947ee5 SHA512 cc893036f642763ae299d5b276aac11f0e7fd26559cff449b7e2964d9b58c8b03334a24b8702969609acfc59ae96944104f0b923449951ab953ead744ef52757
-EBUILD ebuild-mode-1.42.ebuild 737 BLAKE2B a4aaea39292f0cd32690b22d2b2823522fa10cfd17c8115b08e65eaea5110136ec3cc79c109e3bbfd862197c39c85356193056c68046974dd440de7659d1083b SHA512 e8b8d42084d2816d694e0cb592ce734a22d9a2cd7e4027b149977b8692c6ab34642e15624a410e4f2fd0066a443c7915e75cb9180a899db6c13743c04b93cd43
+EBUILD ebuild-mode-1.42.ebuild 732 BLAKE2B d80092df36e90cc356b7b0c3ae66405a08c5aab836f046ab9ddc268abb79766ed011ea390d0356f56555026af132d0b8d9be6f14c0eb82d3c09bd4835168e57f SHA512 fa0f2767f3eb6a4a5c94b9f633f4b3f778cd956f3995e5452b4c7548b6a79d9068f3d89e916aea696b34cf763c8754a193a546f35d7f7c9710b2eecb43853e2c
 MISC metadata.xml 403 BLAKE2B b3996463afa7f1471fafe74467cc3b2bfac32c9ed6f8cbab1390ac1b974be057982f8f3ec7d796f7eb45b023d702b668f979e962d6c33c525f1e644de2703007 SHA512 b6c2ed67a0eac9b03f15bc00374f925eb8ba28000f8d1ebbe03f75e26c953ef799fe73c0bc1658089e5ab687cb07e97ff8d74123b6a67cd5dd8246e81051c239
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.38.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.38.ebuild
deleted file mode 100644
index b0cb4539fd9f..000000000000
--- a/app-emacs/ebuild-mode/ebuild-mode-1.38.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-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 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-DEPEND="sys-apps/texinfo"
-
-DOCS="ChangeLog keyword-generation.sh"
-ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.31.el"
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild
index 43c6b1b88a0b..fe2cc0744917 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 DEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.31.el b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.31.el
deleted file mode 100644
index 5a096923c4c5..000000000000
--- a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.31.el
+++ /dev/null
@@ -1,13 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'ebuild-mode "ebuild-mode"
-  "Major mode for Portage .ebuild and .eclass files." t)
-(autoload 'gentoo-newsitem-mode "gentoo-newsitem-mode"
-  "Major mode for Gentoo GLEP 42 news items." t)
-
-(add-to-list 'auto-mode-alist '("\\.\\(ebuild\\|eclass\\)\\'" . ebuild-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 'interpreter-mode-alist '("openrc-run" . sh-mode))
-(add-to-list 'interpreter-mode-alist '("runscript" . sh-mode))
-(modify-coding-system-alist 'file "\\.\\(ebuild\\|eclass\\)\\'" 'utf-8)