gentoo resync : 04.08.2018

6 files changed, 7 insertions, 77 deletions

diff --git a/app-emacs/ruby-mode/Manifest b/app-emacs/ruby-mode/Manifest
index 716e52f035c7..2eb443cf617e 100644
--- a/app-emacs/ruby-mode/Manifest
+++ b/app-emacs/ruby-mode/Manifest
@@ -1,17 +1,12 @@
-AUX 50ruby-mode-gentoo-2.2.2.el 493 BLAKE2B d6a26c800c7fe4b3ff7e795be725861bde5115bf0d83845ab55fb686ff445cbc00e24989d69424d30d16a1460dad7e66e56dc18ff2c7714ad6c03f2b5c8fa8fd SHA512 fe876332aca925ae085ab78f77abc5f32aac6eadc9e34decbd337d9f08c1e5f3d27bb72a577717565610e7606a2fc9061ff06d8ed7b5c6293eafe498b904f3f9
 AUX 50ruby-mode-gentoo-2.3.0.el 493 BLAKE2B d6a26c800c7fe4b3ff7e795be725861bde5115bf0d83845ab55fb686ff445cbc00e24989d69424d30d16a1460dad7e66e56dc18ff2c7714ad6c03f2b5c8fa8fd SHA512 fe876332aca925ae085ab78f77abc5f32aac6eadc9e34decbd337d9f08c1e5f3d27bb72a577717565610e7606a2fc9061ff06d8ed7b5c6293eafe498b904f3f9
 AUX 50ruby-mode-gentoo-2.4.1.el 493 BLAKE2B d6a26c800c7fe4b3ff7e795be725861bde5115bf0d83845ab55fb686ff445cbc00e24989d69424d30d16a1460dad7e66e56dc18ff2c7714ad6c03f2b5c8fa8fd SHA512 fe876332aca925ae085ab78f77abc5f32aac6eadc9e34decbd337d9f08c1e5f3d27bb72a577717565610e7606a2fc9061ff06d8ed7b5c6293eafe498b904f3f9
 AUX 50ruby-mode-gentoo-2.5.0.el 493 BLAKE2B d6a26c800c7fe4b3ff7e795be725861bde5115bf0d83845ab55fb686ff445cbc00e24989d69424d30d16a1460dad7e66e56dc18ff2c7714ad6c03f2b5c8fa8fd SHA512 fe876332aca925ae085ab78f77abc5f32aac6eadc9e34decbd337d9f08c1e5f3d27bb72a577717565610e7606a2fc9061ff06d8ed7b5c6293eafe498b904f3f9
-AUX 50ruby-mode-gentoo.el 420 BLAKE2B 349d61eaae28873b6381139e6ec79b7f87ada03665e1611196d8997324429b2c757cb63568de106f75ca2b6e3084f21cfdeabd8568874da1722833a832cbfc3f SHA512 1b1063effe3132f2ab4f122957e8fb2cec1bb2ce4dfda38c183851408f33da3440730caeb3db96d1310f01163ad042e2753e1b5c3e1e04183a694230782c8b1e
-AUX ruby-mode-1.9.3_p429-last-command-char.patch 763 BLAKE2B eae2ec3ab822cabc08a8a2f958e5a2ac5ec2cf7b530e8be95ad7cae65b2bce26b983fcd89d78d5ca95b649450055ddfff50227606bed4dca9fb18b3df614d56a SHA512 3b42fb73b882350e9ef3d39fdfa91b5f43f19602ffd47db6bed912c36d360aae76519ecf6db6b2573ff98624bc2e9f4f404ae94ab3d4c24e0724d8fa693c2485
-DIST ruby-2.0.0-p247.tar.bz2 10804581 BLAKE2B b7f2f8234426361f7e53965ef93aada24f63975c4f920656541024ffced84a19b0e53f1c985879e3ca08ae9424f2b5b005afa31527eccb581ff7201e94b5b27c SHA512 9bd793d0df8f0704fb1521a937c09ecc89b777851312793f0b3391df11dec8239808585697b932c4a94665fa29c7781503166dbd109f269811788c4c648f285f
-DIST ruby-2.2.2.tar.xz 10463044 BLAKE2B 77e1bda547102da9aa47c1ca58c9c8189b204019605ca6363df678a4590fe59f63910a657bb653d605aab612351e09ba0384351e552c788fb6c54520fe9c6277 SHA512 bd72d0a4c017e2527659f64ef2781bbe8bd540a2302eaa60234a12282fd53c359e04205c56385402c67e81bb9dab3b88de53de82e12bb13e3386c26301043b64
 DIST ruby-2.3.0.tar.xz 11294412 BLAKE2B 2c1324154aadd287952cc6430891048ea69922c063b1b2bac89b58603247eb09a79a8c527259d59ceabfc7be08ec2528c982bf2b0f1a223cf3e60d7a3934e8bc SHA512 d893c5e6db5a0533e0da48d899c619964388852ef90e7d1b92a4363d5f189cd2dba32a009581f62b9f42a8e6027975fc3c18b64faf356f5e3ac43a8d69ec5327
 DIST ruby-2.4.1.tar.xz 9939188 BLAKE2B 5be893c8996d17ff333276a772747d3099cec0c41331e1a1916679afc43a8ad5ed99a827bc76b32652ec950eaec933dbe28e1dde313987c2891f258ba7097af7 SHA512 e6fd290b6edd166348b70f0f1c56f7ed9d956c4c1eb91d97d0548041ca4196b9b75ec1ad35c745bdbfd4de195899093e7205d7f02b014ecf1c48e6f31cf25903
 DIST ruby-2.5.0.tar.xz 11292472 BLAKE2B 852ce003a79d9d77e72928353382962440e99ed1d03558c89a928e8f4a582b27357ef63e3ef45f3b30009f7a95f356100941bd84151571ade3a88b2d0595f8ad SHA512 55714a33d7661fe8b432f73c34fd67b49699f8b79df1cbd680a74899124d31111ab0f444677672aac1ba725820182940d485efb2db0bf2bc96737c5d40c54578
-EBUILD ruby-mode-2.0.0_p247.ebuild 568 BLAKE2B 24b39cf684d204d000ccee421c8d06186e36c7bf444790e36ffa6987ba6a2b5d1927b527ee47af55cf0cfccf8990692dcb31ab584d3d1befc811afe96a8a19bc SHA512 69a1c4bcecb6a545b5a9c871152f5917524b158df8fdf507989f53f0968830613a86986e82c62771f3632979e4129c0fc1b70ed262ce193fb7730484590b0a6b
-EBUILD ruby-mode-2.2.2.ebuild 496 BLAKE2B 7227da6ffc85192d2c13ac6e1a172e26f40892f0dfb39e11020584d5e4dca28bea31f864b26fdb429e9633bf2c40b8e55a3ed9f1078d459032fa7ee767f33212 SHA512 5dd65768c7b7d51f1bff2b4ac12918fbb4178f876fa1ef8ade21623fa51bdb36496c4e247b40a3dc27c6f8e2786276f73c77fa7287fd8d8534213606b986b374
+DIST ruby-2.5.1.tar.xz 11348108 BLAKE2B ea1019a81f96169ab8d435215362b36b098df373ac4f53ecda328686ec2c13204a38c66bb1bf9504d18e1762e7e6ae277bab3b16bb53b8e628962df715769f3b SHA512 31bacf58469953282cd5d8b51862dcf4b84dedb927c1871bc3fca32fc157fe49187631575a70838705fe246f4555647577a7ecc26894445a7d64de5503dc11b4
 EBUILD ruby-mode-2.3.0.ebuild 494 BLAKE2B 31c71bd89eff5c173571f09ceff570f16c8f9ca01ded4541f8f021c96212f8c0112b49ba58f409ecd1caf9016706d8f254d938575cb3a324b6890ed6f2a3bb14 SHA512 0df916f8b8a5d7a3d2a7fa0613e74e3306398cb5f1a1c59f2bde940c9dba060f5675580cf5091333a243227b5c23bb4e176f86f9151e0311c95799c82a181efa
 EBUILD ruby-mode-2.4.1.ebuild 504 BLAKE2B 1328c07be2fd2c8e082cef902a973b79ae3962b3c0696c25602a2461020e47275ed378d791b6bd1208919cd02ff84e874359ee118caed5c5b1b0d41070184bb7 SHA512 fc416f5069b4758a889555f087882846b86fb482e3b615475ee2ab2f4c469662094f4b2b4ccc027ce2d874a0c4e31413a5e25e90a9ac5edf789550a9e1c7c744
 EBUILD ruby-mode-2.5.0.ebuild 504 BLAKE2B 1328c07be2fd2c8e082cef902a973b79ae3962b3c0696c25602a2461020e47275ed378d791b6bd1208919cd02ff84e874359ee118caed5c5b1b0d41070184bb7 SHA512 fc416f5069b4758a889555f087882846b86fb482e3b615475ee2ab2f4c469662094f4b2b4ccc027ce2d874a0c4e31413a5e25e90a9ac5edf789550a9e1c7c744
+EBUILD ruby-mode-2.5.1.ebuild 504 BLAKE2B 9572a046e742b45c05294bf4ff41b31c28f58ab56ec221903bb75a6bdbdf76ac6fc5a82fb6b0885445a5a9bed70e352206c954dcaf391cdd6cb1a3fce9607da9 SHA512 f268e47220d02c6dc37365dd87c66fd50bf8bb27d55c5d6b5293b9d0805a287b32744c648ffaad47d47859e95fd06876545647bbf8cc0969fc92ba71313221f4
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.2.2.el b/app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.2.2.el
deleted file mode 100644
index 691abdfdaf99..000000000000
--- a/app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.2.2.el
+++ /dev/null
@@ -1,12 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-
-(autoload 'ruby-mode "ruby-mode" "Major mode to edit ruby files." t)
-
-(add-to-list 'auto-mode-alist '("Rakefile\\'" . ruby-mode))
-(add-to-list 'auto-mode-alist '("\\.\\(rake\\|rb\\)\\'" . ruby-mode))
-(add-to-list 'interpreter-mode-alist  '("ruby" . ruby-mode))
-
-(autoload 'run-ruby "inf-ruby" "Run an inferior Ruby process" t)
-(autoload 'inf-ruby-keys "inf-ruby" "Set local key defs for inf-ruby in ruby-mode")
-
-(add-hook 'ruby-mode-hook 'inf-ruby-keys)
diff --git a/app-emacs/ruby-mode/files/50ruby-mode-gentoo.el b/app-emacs/ruby-mode/files/50ruby-mode-gentoo.el
deleted file mode 100644
index c1f9602d19d8..000000000000
--- a/app-emacs/ruby-mode/files/50ruby-mode-gentoo.el
+++ /dev/null
@@ -1,11 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-
-(autoload 'ruby-mode "ruby-mode" "Major mode to edit ruby files." t)
-
-(add-to-list 'auto-mode-alist '("\\.rb\\'" . ruby-mode))
-(add-to-list 'interpreter-mode-alist  '("ruby" . ruby-mode))
-
-(autoload 'run-ruby "inf-ruby" "Run an inferior Ruby process" t)
-(autoload 'inf-ruby-keys "inf-ruby" "Set local key defs for inf-ruby in ruby-mode")
-
-(add-hook 'ruby-mode-hook 'inf-ruby-keys)
diff --git a/app-emacs/ruby-mode/files/ruby-mode-1.9.3_p429-last-command-char.patch b/app-emacs/ruby-mode/files/ruby-mode-1.9.3_p429-last-command-char.patch
deleted file mode 100644
index 4d4bb2775c83..000000000000
--- a/app-emacs/ruby-mode/files/ruby-mode-1.9.3_p429-last-command-char.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 595825dc577616862b271ffac4c58eb27f0610af
-Author: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
-Date:   Sun Apr 21 10:04:54 2013 +0000
-
-    Replace use of obsolete variable `last-command-char` by @maser [fix GH-290]
-    
-    
-    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-
-diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
-index dcaa396..ace0f27 100644
---- a/misc/ruby-mode.el
-+++ b/misc/ruby-mode.el
-@@ -874,7 +874,7 @@ Also ignores spaces after parenthesis when 'space."
- 
- (defun ruby-electric-brace (arg)
-   (interactive "P")
--  (insert-char last-command-char 1)
-+  (insert-char last-command-event 1)
-   (ruby-indent-line t)
-   (delete-char -1)
-   (self-insert-command (prefix-numeric-value arg)))
diff --git a/app-emacs/ruby-mode/ruby-mode-2.0.0_p247.ebuild b/app-emacs/ruby-mode/ruby-mode-2.0.0_p247.ebuild
deleted file mode 100644
index 3b51eb835fcc..000000000000
--- a/app-emacs/ruby-mode/ruby-mode-2.0.0_p247.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-MY_PV=${PV/_/-}
-DESCRIPTION="Emacs major mode for editing Ruby code"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/ruby-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-S="${WORKDIR}/ruby-${MY_PV}/misc"
-DOCS="README"
-ELISP_PATCHES="${PN}-1.9.3_p429-last-command-char.patch"
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ruby-mode/ruby-mode-2.2.2.ebuild b/app-emacs/ruby-mode/ruby-mode-2.5.1.ebuild
index 0f4ff6d39b9f..aa54df2d0db9 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.2.2.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.5.1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit elisp
 
 DESCRIPTION="Emacs major mode for editing Ruby code"
-HOMEPAGE="http://www.ruby-lang.org/"
+HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="mirror://ruby/ruby-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 S="${WORKDIR}/ruby-${PV}/misc"
 DOCS="README"
-SITEFILE="50${PN}-gentoo-${PV}.el"
+SITEFILE="50${PN}-gentoo-2.5.0.el"