gentoo resync : 15.12.2019

4 files changed, 2 insertions, 44 deletions

diff --git a/app-emacs/ruby-mode/Manifest b/app-emacs/ruby-mode/Manifest
index 5f9894cfcdbb..10834da0b60b 100644
--- a/app-emacs/ruby-mode/Manifest
+++ b/app-emacs/ruby-mode/Manifest
@@ -1,12 +1,8 @@
 AUX 50ruby-mode-gentoo-2.5.0.el 493 BLAKE2B d6a26c800c7fe4b3ff7e795be725861bde5115bf0d83845ab55fb686ff445cbc00e24989d69424d30d16a1460dad7e66e56dc18ff2c7714ad6c03f2b5c8fa8fd SHA512 fe876332aca925ae085ab78f77abc5f32aac6eadc9e34decbd337d9f08c1e5f3d27bb72a577717565610e7606a2fc9061ff06d8ed7b5c6293eafe498b904f3f9
 DIST ruby-2.4.1.tar.xz 9939188 BLAKE2B 5be893c8996d17ff333276a772747d3099cec0c41331e1a1916679afc43a8ad5ed99a827bc76b32652ec950eaec933dbe28e1dde313987c2891f258ba7097af7 SHA512 e6fd290b6edd166348b70f0f1c56f7ed9d956c4c1eb91d97d0548041ca4196b9b75ec1ad35c745bdbfd4de195899093e7205d7f02b014ecf1c48e6f31cf25903
-DIST ruby-2.5.3.tar.xz 11453336 BLAKE2B 66c59448a23c22796b43f04a1f84359386b7bee7163da4255426ea75b1c7af0a7a7142991b870a75a72ded56ac49f47c51bc162ebf2be2af0d1b1608b60c02df SHA512 6dcae0e8d0bacdb2cbde636e2030596308b5af53f2eb85d3adccb67b02e6f8f9751e8117d12f8484829fdd9d995f6e327f701d9b433bcf94f1f59d13a1fd7518
 DIST ruby-2.5.5.tar.xz 11459832 BLAKE2B ced1105a87e7df8f82a65ca8d1d329d5a9d110d2f3f88b27a79262c4ac1484dda16d8646c0c03f18c1bb25f8b154075eb03a0614355ec62f677c2fa56ab3c956 SHA512 06b1d58536ebfacb7b56c1e6ed4b8ab816fadc4f48c845a452554cd262e7908199a30e5793f3cbaec2db56a8803aa5c6089abf7bf06c8fc47867e97870b7dfec
-DIST ruby-mode-2.6.0.tar.gz 28460 BLAKE2B 15ab0115cc669f31d656a6af03c061699cfd872130ed51240ecbf80fae413b1d2d8ed87ea1515584f276d15ee164a3c14f9138bf5054418419f6c09b2a72e8e4 SHA512 bbeaa3ae788ea3a536715dc8dc0b4c82803d0a21ce44ae048a5a1c1e331f8c571980feaf38f42455e2de099210bbd4d6f3e8dc2984d6318a70fe04aa6c0d9520
 DIST ruby-mode-2.6.3.tar.gz 28460 BLAKE2B 15ab0115cc669f31d656a6af03c061699cfd872130ed51240ecbf80fae413b1d2d8ed87ea1515584f276d15ee164a3c14f9138bf5054418419f6c09b2a72e8e4 SHA512 bbeaa3ae788ea3a536715dc8dc0b4c82803d0a21ce44ae048a5a1c1e331f8c571980feaf38f42455e2de099210bbd4d6f3e8dc2984d6318a70fe04aa6c0d9520
 EBUILD ruby-mode-2.4.1.ebuild 505 BLAKE2B 59762ae1916eca477938b094557b0ee96c536e1fa0b20202d43b6b6f9f9f75066e9347d6f9ed83168ae169ac780c98ac7e6b43933e789ccf8f7ec5fe44d59483 SHA512 92636fdd139bdb68f96b063a6137bb7467f7cd0b608fe4951d5db59808d571377e93a8ab911acf93d020b4b206db90a5118eeb5a80ef12b035ee7fd62201ca26
-EBUILD ruby-mode-2.5.3.ebuild 514 BLAKE2B 2a70606409efcea5e671ced15054bf6221b7e5e74e0002bc8ac51a1d6ad6a5e1c2b94399c791f044c48e2c679a604c87c56a9e64635c07965b93a2ef0b67ba01 SHA512 796693a1b168dd6d99a89bc829c86f8626514f80628376c5ac2e079acf67e24bfda5f8925d962f8af54ff418a79a03da54f3aa6bf2105cf0cd15f52bbb951930
-EBUILD ruby-mode-2.5.5.ebuild 514 BLAKE2B 2a70606409efcea5e671ced15054bf6221b7e5e74e0002bc8ac51a1d6ad6a5e1c2b94399c791f044c48e2c679a604c87c56a9e64635c07965b93a2ef0b67ba01 SHA512 796693a1b168dd6d99a89bc829c86f8626514f80628376c5ac2e079acf67e24bfda5f8925d962f8af54ff418a79a03da54f3aa6bf2105cf0cd15f52bbb951930
-EBUILD ruby-mode-2.6.0.ebuild 578 BLAKE2B 20fe8c18865b478dd3d8074902a083797059075fbe7bba5804b332bfaaa018e256fabeaa9a2830310021716855fb5ac5928490f66297e018eff88d8581526e9b SHA512 0c0df43a0cb68bfa10c2d299ec9f2dfd064fbc722d5eb8cbef3bfefa97313f247d344d83b5663bba4991869d1db962441cc3ec27da0c779e693650c27cd03707
+EBUILD ruby-mode-2.5.5.ebuild 505 BLAKE2B 149545702966852e6c5087563463176348044677834bb578fc63ccaad53f76b1da0cc286b586b33dea6ee49b40b1b5fb6b288e11289a06d5bf29030da2f3106d SHA512 c5f74c6646b31f09db24eb1632d082665f379a0039b9ccdec281e27b308799bb435b68d9bee4059d302a8f5b02baea1847c085726e26ddad9de7895c41da1861
 EBUILD ruby-mode-2.6.3.ebuild 578 BLAKE2B 20fe8c18865b478dd3d8074902a083797059075fbe7bba5804b332bfaaa018e256fabeaa9a2830310021716855fb5ac5928490f66297e018eff88d8581526e9b SHA512 0c0df43a0cb68bfa10c2d299ec9f2dfd064fbc722d5eb8cbef3bfefa97313f247d344d83b5663bba4991869d1db962441cc3ec27da0c779e693650c27cd03707
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/ruby-mode/ruby-mode-2.5.3.ebuild b/app-emacs/ruby-mode/ruby-mode-2.5.3.ebuild
deleted file mode 100644
index 17e27bf7d62b..000000000000
--- a/app-emacs/ruby-mode/ruby-mode-2.5.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Emacs major mode for editing Ruby code"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/ruby-${PV}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-S="${WORKDIR}/ruby-${PV}/misc"
-DOCS="README"
-SITEFILE="50${PN}-gentoo-2.5.0.el"
diff --git a/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild b/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild
index 17e27bf7d62b..a4975e61bc42 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cache.ruby-lang.org/pub/ruby/ruby-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 S="${WORKDIR}/ruby-${PV}/misc"
 DOCS="README"
diff --git a/app-emacs/ruby-mode/ruby-mode-2.6.0.ebuild b/app-emacs/ruby-mode/ruby-mode-2.6.0.ebuild
deleted file mode 100644
index 6959b4080a38..000000000000
--- a/app-emacs/ruby-mode/ruby-mode-2.6.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp
-
-COMMIT=75bccbb384e6907df47ab69acdccb4536806c890
-
-DESCRIPTION="Emacs major mode for editing Ruby code"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://github.com/ruby/elisp/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-S="${WORKDIR}/elisp-${COMMIT}"
-DOCS="README"
-SITEFILE="50${PN}-gentoo-2.5.0.el"