gentoo resync : 09.03.2018

3 files changed, 4 insertions, 70 deletions

diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index 769413f95a2e..22ba4fddea4a 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,10 +1,9 @@
 DIST gettext-3.2.2.gem 283648 BLAKE2B d9095e11f3f92ac37f84aad9059e5740af07186caad963b6cbd6081329031122ed2acf402565b5e8bf7c6f51b18d045fab09e6d390effe2f0d7d66981f253efd SHA512 c6806a4f2b9c8519cccdf7651b3482e5938015323648cb1b82acd0632d88ea5c7cdabd925eecb2d4e17d0d396126d4e2ebaac26241c3c7b4f61e187cd4b3133f
 DIST gettext-3.2.3.gem 283648 BLAKE2B b746edbc9effd191a2abcff90f699d7a460845104b76410fab20bfef3294afc51951918441f0912fcadca4f59d810ffde9d5ac16c3de7adde6e5f7508c558bb3 SHA512 a7e6ca4e54a81eba7bd148849823ea480526f6d377d818f89aad28fc4cf79eb7e01dbbbbded441cad143ac806c73241173a1437deddb165ce7f178a9367bc4c5
-DIST gettext-3.2.4.gem 284160 BLAKE2B dcd4154686fc4bc596d5433a2d1f3c74eff136dcd2945b65caea495541b5d18bd4a77c7ceafa27c4d5c04b40d11b807941c504f07293bdbb16c473003cded72c SHA512 53613d29fbd68866a66c912428f87e8191682838f2ea9c218972633cc075a19052a7ed1f7e02c5818f2b600b2e0296c4efe832fd854557bfd0afb746cfbfa2c7
 DIST gettext-3.2.6.gem 284672 BLAKE2B d431abb3b81e0293eca4b8d3f50fb5840d030aa0c61e2f8f1144680d1e69de4404760f4a0d2b48afbc3a2ca9a6a2a943cd3cf49b9784a33bdde6b0136cbef015 SHA512 8d8a820e9d22aae93de69573b4312f7490d0f494bdd27d6b920c29b5100620297d0622ea6dd693e3f7b0b4e1ebfd867de5e7fcfc04633c211ad2f414d23bb36a
+DIST gettext-3.2.9.gem 285696 BLAKE2B a7bc40b2102f5b937d5f0e407dbaa23ead1da59eb9284c10a249c59548d0e2ad5fcd56b8855439893d2d31b57e0109bb6a9d5cc2d24075f5e360dc16b9291137 SHA512 21496c38cfc16a2b280f30bb94ff4560007eaa7f02c2341cb26aca2969a663c0863cdb650b4eadfd262d8585111dfb572e2ebc66a7a879045de50bf9da80a501
 EBUILD ruby-gettext-3.2.2.ebuild 1655 BLAKE2B 7116c8fbe19549b5ff575f328994e768dcd2ee8b4677a7a5229157fe0e16f63b9f0b27171e4e8256a2ddf79afe7c4b1f51d2b5f15ba2abe6cfef59dcc8fc5c14 SHA512 826549c1ab3f856631b2ef339c920810f5644c31b64103e1668ec0d36ff0f88ed6b1de0654602a25c2df74c06444cfa6183515cde2eb54a80dfabd2f46816222
-EBUILD ruby-gettext-3.2.3-r1.ebuild 1664 BLAKE2B 3991c851114473b292a89738f7ca98a7eeb970b10ca3912dd981fc67607270280774bc077200e33b484b281287a157f75bfcb36270498a9a312f0fc9dd8bb267 SHA512 da8466edf629fcfe6fa6019f9fa2de1a32c8a347f89be35530f36da47d0ed76cae879d2f35b1a48360c8fd55b7d37e8315fd18d01245ef8af440dadb86b6009a
 EBUILD ruby-gettext-3.2.3.ebuild 1664 BLAKE2B ded260d3515874743b1c6f3aed8de9a5078dc8bc4d9d1521eaae6f00941b53cbfe8fddf04edc47af90a714d2a0f71b65660338170bc089b55268fbcca598f7d7 SHA512 24ef75a8416152521253c812d06cd211312d38eadcd99120965d9de112a988ace5c7fa3fc6d86d028f6df032cb81f5fcebfedb9fad897d46923c5b61ff70e3ad
-EBUILD ruby-gettext-3.2.4.ebuild 1664 BLAKE2B 3991c851114473b292a89738f7ca98a7eeb970b10ca3912dd981fc67607270280774bc077200e33b484b281287a157f75bfcb36270498a9a312f0fc9dd8bb267 SHA512 da8466edf629fcfe6fa6019f9fa2de1a32c8a347f89be35530f36da47d0ed76cae879d2f35b1a48360c8fd55b7d37e8315fd18d01245ef8af440dadb86b6009a
 EBUILD ruby-gettext-3.2.6.ebuild 1657 BLAKE2B 29bc093dfb7fd29f34b5636337da7bd632027bbfdaf567bdc460710a68fd7724760e14cba19b74130efe7d777ff5fc31f38ab2a65c8f3449e27babd4b4c7f8ca SHA512 13087f1cb0633b0a6408766b44f33aa5f3cf4f49cddef549852c35f5cfe78bbbbf60f8ad726747fbbd9d37d285f4822c033d0f4dfe7b3221f5709d7fcbead8e3
+EBUILD ruby-gettext-3.2.9.ebuild 1657 BLAKE2B c96fda644d3fdbf1f24e5bb96133d20ae860b0eaeb61eb1860b45c5728d48f87e080773eab8146c8e7d1d4da3ca4853934d8cb6b0e60045ce722072c31710c54 SHA512 a505946fa187626ef3480acd68db360f0a18749deae489c4a4b0bdf36a19f292a29993c0f4857941afeab62bf14d0c89314436c0b44c8d0a02800b2802b4df5f
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.2.4.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.2.4.ebuild
deleted file mode 100644
index 26a27fc5f540..000000000000
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.2.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_NAME="${PN/ruby-/}"
-RUBY_FAKEGEM_VERSION="${PV%_*}"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locale po"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
-HOMEPAGE="https://ruby-gettext.github.io/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-SLOT="0"
-LICENSE="|| ( Ruby LGPL-3+ )"
-
-ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	dev-ruby/racc"
-ruby_add_bdepend "test? (
-	dev-ruby/test-unit:2
-	dev-ruby/test-unit-rr )"
-
-RDEPEND+=" sys-devel/gettext"
-DEPEND+=" sys-devel/gettext"
-
-all_ruby_prepare() {
-	# Fix broken racc invocation
-	sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
-
-	# Avoid bundler dependency
-	sed -i -e '/bundler/,/helper.install/ s:^:#:' \
-		-e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
-
-	# Avoid dependency on developer-specific tools.
-	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
-
-	# Avoid tests failing due to a missing test file.
-	#sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
-}
-
-each_ruby_test() {
-	# Upstream tries to daisy-chain rake calls but they fail badly
-	# with our setup, so run it manually.
-	${RUBY} test/run-test.rb || die "tests failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r samples
-}
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.2.3-r1.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild
index 26a27fc5f540..e751a423ee90 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.2.3-r1.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.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=6
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_NAME="${PN/ruby-/}"
 RUBY_FAKEGEM_VERSION="${PV%_*}"