gentoo resync : 23.03.2018

3 files changed, 3 insertions, 37 deletions

diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index f68a8ee1388f..9c2e871e3963 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,5 +1,3 @@
-DIST ox-2.6.0.tar.gz 191979 BLAKE2B 744d00262e3f33ea6b11c2b38417ca26dfd61c115847b115c0999d9d9edae3befc5a088f54ce53bf6324505c9444d4b2c72479167691b962a0ab749b4c032ea2 SHA512 8765fc3bfd10e52a05d59dab9e9ec973f933976c3511a91d6c84f120e2cac6abccc8ccb7ea9d301882198049b37823a392520464197a791cddf79ba9ce252f37
 DIST ox-2.8.2.tar.gz 193670 BLAKE2B 70e38754594a40ed35aa43aad32806d5c9eec7d3f60ee18a846a99f28b558173ea99b554f7f3a4f2b848686536d194035fd345ab33b9d7b5e12a246a472463d4 SHA512 18a887db70962a1dd1c6ea18461eca0efbcffdb231f934c3603e63537e9911e820465ce5e4ab86cbedd65b396a9a12b0ad7e60ea7ae687c4ebe8436e0c37988c
-EBUILD ox-2.6.0.ebuild 706 BLAKE2B 6e0c9d7838d5abd253f0d88a78757e62db1444ffaeb1181b5aa5dc822d6d40adc9722ef0a9c7d1ae45f692e92ba2c9fa8116270e54873a8f0261d1ba7082d662 SHA512 f6c0b22612c2b119afe4153d7611896fff59a2f5105c2f5ca96962eea8aa7c333ee54cda34ea4521306e7e8cb49afa5555771e004f034a66cb82f61677f99117
-EBUILD ox-2.8.2.ebuild 706 BLAKE2B ac8f3329a276431dff5156bed9aca0cc4ffaf56e82a6b4c20f09345082b71a428fe01142db9b509562673616fc546d7dddaa67a218c9d7b01763c27d3df79094 SHA512 48d3e77ca274280e240f78c910a57b6192ca15f48d32a1913796f1a84b3498d5bb6bbdcaddd2bef46a6aa3c87110d64675e0b6d6bccbb303d278e6727cdb6ad4
+EBUILD ox-2.8.2.ebuild 713 BLAKE2B d8d3bd205f3daf3e5169d9232b131f907cd9b948fab849dcc41ab2aaacf712b6a9aa10ca247345f847a8b2883562170d60f88ea39edaeffcb3f64c05a092e92b SHA512 4b85e25b89f8b8c024746a24b08d8ed6c626d62525b6e0a388078b0cb39caa4290d9517f379cbbca4df914f5e091b25e19f044806641bdc8ac110ccdb1e764e1
 MISC metadata.xml 336 BLAKE2B 7371e572c7bce86e0d3c2ac19ff7555b4bdf793d96377dcdbb810f8fc09feb597f4cc883a03e888c0c38c1a1d9ceb7ef150ac228db7300aea01238f497f0473d SHA512 43b8b42cb09fe73a49e0db49671effd91859d2b9001fc3e51761a1b51b245e83a719ddddd100ecfeb92910baa06690b2cc0bd52db0afc872e007c4be9616908e
diff --git a/dev-ruby/ox/ox-2.6.0.ebuild b/dev-ruby/ox/ox-2.6.0.ebuild
deleted file mode 100644
index 3bbef8256d75..000000000000
--- a/dev-ruby/ox/ox-2.6.0.ebuild
+++ /dev/null
@@ -1,32 +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_EXTRADOC="README.md"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast XML parser and Object marshaller"
-HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
-SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/ox extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/ox
-	cp ext/ox/ox$(get_modname) lib/ox/ || die
-}
-
-each_ruby_test() {
-	${RUBY} test/tests.rb || die
-}
diff --git a/dev-ruby/ox/ox-2.8.2.ebuild b/dev-ruby/ox/ox-2.8.2.ebuild
index f03cb3bed818..193ee535eed2 100644
--- a/dev-ruby/ox/ox-2.8.2.ebuild
+++ b/dev-ruby/ox/ox-2.8.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY=" ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
 SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 SLOT="0"
 IUSE=""