gentoo resync : 14.07.2018

3 files changed, 2 insertions, 54 deletions

diff --git a/dev-ruby/locale/Manifest b/dev-ruby/locale/Manifest
index 096cf0537bb4..5f5560406678 100644
--- a/dev-ruby/locale/Manifest
+++ b/dev-ruby/locale/Manifest
@@ -1,5 +1,3 @@
-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 1088 BLAKE2B 2d4199383f4b8f87e6314242c5a248a2d55cd88c5da876511713be897d89b7ad09d6419bb1dd3248d57a20e412028d660ac02b5d62a8457bb3d9e5ed609d7b6a SHA512 9c5344814cf59f9ad8b16afe14f836fbffa3477a490c3a411d60f8ed5fc0e5bae2fe59f88ed5d9e38bb02c661fe6d4c581875dff38c9a87d1850956f6df5e881
-EBUILD locale-2.1.2-r1.ebuild 1102 BLAKE2B 2fa5e29cae9a87e698d6f7645d146377e4e530950a483739602ea75daa9b25f6de2d6c9f355c8b74c5094f41d4006e2cb5d2d4033b73ccd15e28f47faad89788 SHA512 28eadb15246e9f1c0131c93edb648764a9f9e1f3d5ab80c263305e38b06ab10ce6dc57d16a8d416b0bd3097d93bc37cbbebd3e4f4caa109152cd0c28b3ec762e
+EBUILD locale-2.1.2-r1.ebuild 1100 BLAKE2B 4bbdef576654b42d057e83c1843db0b47a84a9a24716a340a7294c98756fc2968d752f105f418674cff016904e0eb35df8e3bee43b6da03e5e064102c681a355 SHA512 09cc35c68e346f5930721214ab235109f6fc80e25b2954d8bc935e2e814fa92ed4b3b09fe150b8c65bcb47b4e550851f248727e2bef8c0d63d9871c04d726f94
 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
deleted file mode 100644
index c28536704f9a..000000000000
--- a/dev-ruby/locale/locale-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="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
-}
diff --git a/dev-ruby/locale/locale-2.1.2-r1.ebuild b/dev-ruby/locale/locale-2.1.2-r1.ebuild
index 905e25db6994..92ef353756be 100644
--- a/dev-ruby/locale/locale-2.1.2-r1.ebuild
+++ b/dev-ruby/locale/locale-2.1.2-r1.ebuild
@@ -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=""