gentoo resync : 15.01.2020

3 files changed, 16 insertions, 19 deletions

diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index 7b9f03d7be67..7affe7a68ea9 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,9 +1,9 @@
-DIST ox-2.10.0.tar.gz 199144 BLAKE2B e2d175c379e4c860d540313642ab4ea39cca1eed7d5a0a896f6eb09786d0c421f5a2a0e4af5880c07b757a1604a8ede47ef4737739eaf53f9ba733b67b3e0091 SHA512 0fc7809f86528c745cc6719fd92bb51fe7c895c62b2cd27c02f2b596c19078f04aacfee90e489bede0ecd47876e36280e6852509f6d34f9b4a6292441745763a
 DIST ox-2.10.1.tar.gz 200165 BLAKE2B 46daff5d1f0b4230fddfe72217b25a77de03f3a9431a6daa93e7bc88c46482b80717f1f2bc623fbf94f3bee90e2c3655aa1b6f6d48cb9b31cc5e530c14aef25a SHA512 b1f6ec2337e5d7db96cb2b3bacb4850b9b2b64426250203de7613845fa83ce68dddba0bb6a6560c8e04f0a6416a0dc9443a469d40261e6d6bc42b14239a1eaff
 DIST ox-2.11.0.tar.gz 201028 BLAKE2B 52c908be2a1d08ad563137f99e68f7734c2fa6aa87391ddd5efddc60d2e4efcea93cba9097e3bf0373ee9d22fa101d6117e092414c7266045ed6d93a32951b12 SHA512 4a755f6d1f832ec41b50b92deb686307d177c35eb1e27bb1e61c0b0a698db7730239fa4167f8a84892a9fb81cc67abeef059b1138b01759ba993a57471e4eff7
-DIST ox-2.9.4.tar.gz 198547 BLAKE2B 4a088fb9d8ff0aa89c6496f8d1228ca33445e34fd66476de288c4373401421b27fceced671d4754b23ddc4da0b49b1ddba1ce060c5468723a146e4d5d10b7a0f SHA512 babb1e4a88596553ddba79afeaa2bad0221e90e08cc0505c8297b61b6a1acb7c9e458ee71da420ee49378c4ac8d3b8545d1ab7e05710da556c452f3f7bb133f1
-EBUILD ox-2.10.0.ebuild 856 BLAKE2B 11753f60afcad4f816476945dd3d3438270e9af6f2ce55f356a08c9d6619eec450827491f7cd04d944e45855e75bbb610e9e20f44d0214bda4fd9276a932b0ce SHA512 142f28d29ab128f8c51a3641d567d3dfc8c448f42e62d3ef3576c0440abe3694b88896385f56f5cbf4895178b1f391776c883d8f21a9106560609fb6116a649b
+DIST ox-2.12.0.tar.gz 201909 BLAKE2B 02aad0b822463afce57447b8d2277f00015715eefd570025386d2ff745eac74a934df41c7ce4f4c742593b780783d7040dfcf712600dc6d1246de7a5d90b5e1c SHA512 09f3db6037662cbd6f4fb128f5df61ccf1d22c8949a315f766518984bf1ab57a83789d0b0a9f4982c5356e28190440092971163de3680b36285fab1fed0a91b5
+DIST ox-2.12.1.tar.gz 202784 BLAKE2B b42a364e4e2c1bfbefd06bd0b5162838e473cbd48582e20336cd50173278a81e56eb6cefb826b1155a19ab7ed1484f0e4a4715d640ff0ff7d4fb82d3feade647 SHA512 0bf3b4d21e5b09695595b3846ed893a0d23f4479388036447dc2bfa5440d1b4350289ef023176a9f1fc14383c76388d3ab906ba6c8c919b519bb029438cbd1b1
 EBUILD ox-2.10.1.ebuild 702 BLAKE2B 4506f7b26619479a6a3e19f04a5dfc5e06df4138f10a7f05578253ae948fd43d943d2072fb8f14f93a4d89a786f9b7884d7fb8dd88356560568cd3a1a8cb973a SHA512 c292bd0a6038c05f2a7665a747d3516f6aa5035e02db88aeb1c35aa874a67a084dc88c7332ccfc501096fb74f457bb7f63889abe7ca6d81f4f5445d48e1180c4
 EBUILD ox-2.11.0.ebuild 703 BLAKE2B 3f5023edc767873c0e4fd05e94fd96d7814460a3d1c7a76dc66bf937b4e10bab6d973627dc54877714dbcaf1f8c88b66ed50a8826f52a3da0740211ecb660101 SHA512 0d052fcf7d238ad037322d004c8478742f2c703e05fe852882228fc1ac5da1581608bdcc78e3e83c12c14b78c18aefbc886e9d380c1166b9771cdb7bc4e70607
-EBUILD ox-2.9.4.ebuild 705 BLAKE2B 8733bfbbc871b1a0c48535a843e1c3e2238b83856d2b4d6217c815721add2131242af2fb77b6a84b53c403321c1a0833c39da6550d77a0e711680836ad6db4c9 SHA512 5b8cc05d083eb5e4b9f9b3d133357185c266f96663d8362e7d8c02174eb5cb11f8af671fedc8d10ce7b46777c115201ec0ecb3d3e500184ff31db411e92fdc97
+EBUILD ox-2.12.0.ebuild 707 BLAKE2B 489f999ba3ed9e58d2846d284f90bcb344118fedeedac22a8bc4ae8c22df43857e4347daa28461303a33dbe08a38b9057f08c712a90179bb4127206a5ca35698 SHA512 2aa632ec8ba972372fe09a7efa49d1cacf1f7faf9bcc615843777448d148991889aadb7be8f064e4848b5a8444e21f13a36959000915df28035df69afabd0ec1
+EBUILD ox-2.12.1.ebuild 715 BLAKE2B 916ca3f9ce3fd847de972d8fe94973a23ff47a6c676d512ae027cf9a9b9fdd649bb058acce5e8f3f388156010e3a0ade09c80cfe9e7c6e7ae1ce929b4388ffa5 SHA512 301d0292cecbb395f1466b53dfeef2784c333e88ccfef93e663cacdbdcf263a5ea40a121b4a2af87933636bb2cddbac35528becbe2999a0d7460d40c7f679b66
 MISC metadata.xml 336 BLAKE2B 7371e572c7bce86e0d3c2ac19ff7555b4bdf793d96377dcdbb810f8fc09feb597f4cc883a03e888c0c38c1a1d9ceb7ef150ac228db7300aea01238f497f0473d SHA512 43b8b42cb09fe73a49e0db49671effd91859d2b9001fc3e51761a1b51b245e83a719ddddd100ecfeb92910baa06690b2cc0bd52db0afc872e007c4be9616908e
diff --git a/dev-ruby/ox/ox-2.9.4.ebuild b/dev-ruby/ox/ox-2.12.0.ebuild
index 61a6f743a6dc..2fa31d97bcfc 100644
--- a/dev-ruby/ox/ox-2.9.4.ebuild
+++ b/dev-ruby/ox/ox-2.12.0.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="ox.gemspec"
 
 inherit ruby-fakegem
 
@@ -14,7 +15,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=""
 
diff --git a/dev-ruby/ox/ox-2.10.0.ebuild b/dev-ruby/ox/ox-2.12.1.ebuild
index 997658880e31..dfa02327978f 100644
--- a/dev-ruby/ox/ox-2.10.0.ebuild
+++ b/dev-ruby/ox/ox-2.12.1.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="ox.gemspec"
 
 inherit ruby-fakegem
 
 DESCRIPTION="A fast XML parser and Object marshaller"
-HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
+HOMEPAGE="https://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"
 
@@ -18,11 +19,6 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 SLOT="0"
 IUSE=""
 
-all_ruby_prepare() {
-	# Avoid test that depends on did_you_mean implementation details
-	sed -i -e '/test_nameerror/aomit' test/tests.rb || die
-}
-
 each_ruby_configure() {
 	${RUBY} -Cext/ox extconf.rb || die
 }