gentoo resync : 28.04.2018

3 files changed, 4 insertions, 36 deletions

diff --git a/dev-ruby/actionpack-xml_parser/Manifest b/dev-ruby/actionpack-xml_parser/Manifest
index 7a09edab1369..f09072035294 100644
--- a/dev-ruby/actionpack-xml_parser/Manifest
+++ b/dev-ruby/actionpack-xml_parser/Manifest
@@ -1,7 +1,5 @@
 DIST actionpack-xml_parser-1.0.2.tar.gz 6623 BLAKE2B 4dc039b2db8397d41f7da5cc643e8e990b4a3a5a1e86e67657a6a59681688144562a66484d1bec49b7166b1df5d2e30ddd882dcb2448cd14e6b44580e2fc354c SHA512 6fb9323b2632059d6c253083dfe6a09c413d4a5f7d622457402db95529ccad6d28b0471b01f4555c4e448b65183e6d07ef639de994c47c4858d2bfe5318aaa0b
-DIST actionpack-xml_parser-2.0.0.tar.gz 6499 BLAKE2B 260cef14c65ae7b723c60f53206dc16eebec719c80147c353bf82124ca07db4afb59b2d4c7354b58746045b34c57b50826661b515ceff768608d1620e2d98f03 SHA512 fb1a9c551a3ff6751e0b9e95b1c667ef5dd6da50b4e5cf4d010468f76d022cb437b20a02e8ee795da757de98e3e45e8b71b9f37f2c0dc16f1a338f8d335d712f
 DIST actionpack-xml_parser-2.0.1.tar.gz 6494 BLAKE2B 271e1352085e7c75754253222c9f861f7ece9875102a0bb4c47e20311367fcc040c5680ad0406112f8e312c4a8ae1a3f9b6d33f3736db3614ca1c3584942f800 SHA512 a240e59178722025a0c967cfc2f63ca1ed8a2aff55ad913652f06018b712a7009eecd915f494dc4087de12ad5dbe5a0f3c7290fc530a2e475b39318520809112
-EBUILD actionpack-xml_parser-1.0.2.ebuild 833 BLAKE2B b221813f631864219e866e3b1a68203631bc75e5cb22158c0d4017abbfdf981457c88ee5a89a974c8d6faee92a0970dd0ba119851acf1f2b1fcb0c6f141ecbcc SHA512 05122ccb0a1c290339fff553743aacdbc766898b69fcc244a5e8378a6c37f5b08d96d6404f967cc2ce1b95128b144d0c0f908204489bb8c56aeb099defcc3aa4
-EBUILD actionpack-xml_parser-2.0.0.ebuild 764 BLAKE2B 51ecf1e58480e7538335baf0df5b33dca396ef7d79fb5d39860bb4722a29d832acbd2bdd344e37828717c470b84917c11ca810dfdd430fbb0225ab19a9c35632 SHA512 7a2df495fc38db4ececb516b2a159639f4180d7e453eeed86d2df044412bdb7ff0a526c1765158b115f0f549d312cbf11479c096dbe5a052c020a8dafa65d961
+EBUILD actionpack-xml_parser-1.0.2.ebuild 838 BLAKE2B d29970900fd94346b8d780ef35b50102c4d3c930cb0607de030e0f757b272c999a133ff0217517e66eaba1f7e3bdc6a7173d792fbb77ce6b35adc173ef1cdf2f SHA512 636f0991a94b457cc9f511f1a435894952772cb9470fa755065358c20268d4da25b7ad609289387e54cfe78a932df47d9f31edf7d933a985990a6542ff31b499
 EBUILD actionpack-xml_parser-2.0.1.ebuild 771 BLAKE2B ba4a5920a0f535489b6ae1db8407e3b27d7902444d9c02bf3184f990fa01721f724cfc235066339937648a2bb3f81cf973b64226fe26cc2356da3a16014bcad2 SHA512 3207765c4578bbd64d2f47209b1d0263b273bb3210352d80e60613de6223322ff3d2207874c48e116c518aa65fe68be5e930bb0e6070c2a6a860d52a3f188cf0
 MISC metadata.xml 343 BLAKE2B fae09bfee8e2838dae045fb6920229bf6d0d87affced294d61535b221af86767fc95fec8a7f5f87832d1948e50165369751b6450b84b31d0611e72cb0eafba19 SHA512 2e931999edbe73e74146107d2a75df2050649d682fcbba40cb877b742af15de0d0709a3acbee03722eff1bd1ddc3619a3c2a61e976a526f34f1bbc3bb0b87593
diff --git a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-1.0.2.ebuild b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-1.0.2.ebuild
index 58acb6a61502..5d0dbebe3ebc 100644
--- a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-1.0.2.ebuild
+++ b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-1.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 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 ruby23"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -27,5 +27,5 @@ all_ruby_prepare() {
 }
 
 each_ruby_test() {
-	${RUBY} -Ilib:test test/xml_params_parsing_test.rb || die
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:test test/xml_params_parsing_test.rb || die
 }
diff --git a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.0.ebuild b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.0.ebuild
deleted file mode 100644
index 3f42e2c7db62..000000000000
--- a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="XML parameters parser for Action Pack (removed from core in Rails 4.0)"
-HOMEPAGE="https://github.com/rails/actionpack-xml_parser"
-SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="2"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/actionpack-5*:* =dev-ruby/railties-5*:*"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" Rakefile test/helper.rb || die
-	sed -i -e '1igem "actionpack", "~>5.0"' test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e "Dir['test/*_test.rb'].each{|f| require f}"
-}