gentoo resync : 21.01.2018

4 files changed, 6 insertions, 57 deletions

diff --git a/dev-ruby/locale/Manifest b/dev-ruby/locale/Manifest
index 6261dcc18f5c..db6764c0b14f 100644
--- a/dev-ruby/locale/Manifest
+++ b/dev-ruby/locale/Manifest
@@ -1,6 +1,5 @@
 DIST locale-2.1.0-git.tgz 99139 BLAKE2B d45adbc07795fb045e13ea62493c97b7b635093e61e7ca807bd5a63720a8ecef57cfc522fe9d5fd2d6cd8bc5c02aaccfc509bf191f0f9d7e8d0fbd70fdc84557 SHA512 6f87730f8e6b128a6647bc0c7d223d5e90e85d5bcec884c0680963b09a221882a6dcadb088a27aeb8cc96652582278a5ce24302125902b2c97ca8b00c701abeb
 DIST locale-2.1.2-git.tgz 99433 BLAKE2B b735d913e4a2f1f09131eb9aabc17cee93cd4b28f10458928942a3edd159cd1cde71226d4ad9aa9e340f5df5ba52a298805d1a4e73cb8dbc83d00bcecb7ceb85 SHA512 62a0c60f2102cd2d144126985748f4ab186b8f582c9597f7f4080e782196a39d72b9947b90aaecf5b208ccad0175064ac90e816472fb374d19cb5209da0f7ff4
-EBUILD locale-2.1.0-r2.ebuild 1094 BLAKE2B 7263fe9d70aa7816e4c1b174d3cbb01f71052e6fb09b71d183fca82ab1d2eb03149510572fe8bd1a855a28c231846271bc67d55e45d3aa339afd1c567ecf3c0d SHA512 1603b65744687d8c90b2fd07191eb17481b14cabc04d9f10c3cd5a8441b56004ae858fd049bec8198c6b86890a86bac0150c87fe2b65d79ed21517e9c38caa54
-EBUILD locale-2.1.2-r1.ebuild 1104 BLAKE2B d3016def4e0622165929e5558d7d1816760615fac6d769dd39910ded35fc321ad8221ad0dcd0b4a83f4fc019678011a6e9b538b1b048b527d573c679abca886e SHA512 14aa9060424e49af12f0cb8e1dbb8e41dd0788fc90f91ac7224bd458afdb4e7aac73818d78ffbdc4db7297705a4a2250ed2fa11db2f28ee0693c84eed3b7fec6
-EBUILD locale-2.1.2.ebuild 1109 BLAKE2B 09cba7ab9ee90d4ae13f09125459bf8d848df00e59590bd477f6c360e2162d3c584ec72cf7b8b46dba50c2a5ec15a323f6557c6d51de2488e09a46d373905602 SHA512 b3b77afb9e6c0d289a4320b4d8c8b9c3c975edfa2ac9e93e5e44a0095034363567767e406580417898d421a05d2a328be0de459d2ecbc97089bc255d3437ff26
+EBUILD locale-2.1.0-r2.ebuild 1087 BLAKE2B b3a834d32116c0f5353add347abea7f59e9322effe414fb9f299f25ca67f867cb7a61e3ac060177f0063dce02eed20b7e29573f4df7dd6cce55af30afa97c870 SHA512 c23d691a26387359a82fc617a1a6e9824e3693e20f292096988b5869512bf54e7afef3f5a54c3ba3e97caf27b640501d7440857eb603a959b8736ddd8428458e
+EBUILD locale-2.1.2-r1.ebuild 1103 BLAKE2B d26661b6aa8eefe2082a2a372d26887f4d7a173bfa5b5f51b025fe1030c308d81d5d123682f690b4c03d6844193b1cf63cea0737a63b5178f979843c9286935c SHA512 35f44701b6ac3827b2d8ba31383ab2a02a42cae8cce2ed81d551ae22665a13724b53742b993a2594a195d0627722d522fb0e7aeb0e3d0285e41a38a90686d2a3
 MISC metadata.xml 345 BLAKE2B c2f8101d9e2cd59540e4e95827ac5fa503b0f76bec78ba5a73031b3b966ed1e3153a05aadad5dd563db931881ff3597d1cfb74e113eba53470da11de29eaa809 SHA512 1da3655a6dd1df21971ff6ef41e3fce230f17379bb936ca8a03d1fec427a6904fec717884fd4551d23a493fcec85beb1a9107907c01faadb63b02db8efa0d5af
diff --git a/dev-ruby/locale/locale-2.1.0-r2.ebuild b/dev-ruby/locale/locale-2.1.0-r2.ebuild
index ffcf605d6a35..c673d1b10705 100644
--- a/dev-ruby/locale/locale-2.1.0-r2.ebuild
+++ b/dev-ruby/locale/locale-2.1.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR="doc/reference"
diff --git a/dev-ruby/locale/locale-2.1.2-r1.ebuild b/dev-ruby/locale/locale-2.1.2-r1.ebuild
index 8502e392ab2f..2a05ea204dc3 100644
--- a/dev-ruby/locale/locale-2.1.2-r1.ebuild
+++ b/dev-ruby/locale/locale-2.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ruby-gettext/locale"
 LICENSE="|| ( Ruby GPL-2 )"
 SRC_URI="https://github.com/ruby-gettext/locale/archive/${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-macos"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/locale/locale-2.1.2.ebuild b/dev-ruby/locale/locale-2.1.2.ebuild
deleted file mode 100644
index 0c777b1939f7..000000000000
--- a/dev-ruby/locale/locale-2.1.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc/reference"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.rdoc doc/text/news.md"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pure ruby library which provides basic APIs for localization"
-HOMEPAGE="https://github.com/ruby-gettext/locale"
-LICENSE="|| ( Ruby GPL-2 )"
-SRC_URI="https://github.com/ruby-gettext/locale/archive/${PV}.tar.gz -> ${P}-git.tgz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/test-unit-rr )"
-
-all_ruby_prepare() {
-	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		yard || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r samples || die
-}