gentoo resync : 20.03.2021

3 files changed, 7 insertions, 48 deletions

diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index 6521c1657b13..884e4b61162c 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,11 +1,9 @@
-DIST ox-2.13.4.tar.gz 207814 BLAKE2B 8a94569e6e10b92574fa330d60aacc069a558003c7b285cb1178dfe0e6cfe02a2590283249f7a1b5adc89b41c3414b1a919367889b0296cf909eeafd88cc8a27 SHA512 a97fef40eee3616bab32394340c452138fe1cf5cec92e6457c3b2ce8866f7e5b143ee7e0191af09d96128a2d7a0ee3eb58fbcea16074ce33db8a845867175423
-DIST ox-2.14.0.tar.gz 208213 BLAKE2B a5f99c8878efb9f87d8061d57ffb0afe26329b7e987c4de8c084a3453e35404fdfe29805d9a4cf60f3e30c39f47de5721a9d5c52b87660066ee484a30ef0837c SHA512 51bafbef13b1d3e0a5f27f69f9ca21b5774cb32f4b0d55e12ec5b94b1dad3febdfda37b43b84f599d7874f5ed28fa85d094a6f9c0087ca1d9b5d77b969c7de88
 DIST ox-2.14.1.tar.gz 208294 BLAKE2B 588d9171de5db1cec6e24ea64a604ab85074ebb59be0d53afc040c9a47c64e2168abdd86271da8d1dad05803c98a64f8d12ea19297638a2f2a54a52c1c3f4342 SHA512 c82e9ec18a4003ab1e76f03b024b345b77a83a72f9f01d0dea1d9fdbf7c948638269e8331c19715b6b8bd999c2a104cf3660ff1f95cb445f13956ca0f95b723c
 DIST ox-2.14.2.tar.gz 209260 BLAKE2B b1893aca7f49d98b402f071feedf8b7d903692654620a9cab37024b9bc2f8e710c46862b8155113ad3618fcb24b1baf55d69c8c9aeec1528b477afc6d1ac2d1d SHA512 f7e34a702d7be5001f09bd919108e0da30183f4c4bbc6c8b533fc3d4892770300c76075af28d21227cf840e43ec868c7f623028a329d0e49997bd1bfeffb35af
 DIST ox-2.14.3.tar.gz 209300 BLAKE2B 3101d41491b11262e012bfd807396af12c4bb05d626432bdf4e539d90f3ffcf17c09a42c883d64e21e7f02431ca49acb00d0808593b822afc499fa4fe99935b7 SHA512 a6b9ef9b6f3fe7c73ccd1c69cecf9187c586ffeb22eb3aebb542cc22231ab929b1c76c81d3ea065c073e732d4cd12d74c7bc35f3b406b8bb1ca20edb1f5050e9
-EBUILD ox-2.13.4.ebuild 707 BLAKE2B 1852a031319f51213ada103be5f623496d42bf59af37148be1bcb8f8a8cbc3a31f15a03eec4c94a970e52008f02316becbdcd4fafadaecf9ca9b243f84c9c188 SHA512 80f3d533f0375bbe3847036881365440dcbf7179d2c0a1b892ada22b78720bca1879ecad24695afdc61992c70138fc58094f1f7222b0a10228ddada44a6d4e99
-EBUILD ox-2.14.0.ebuild 708 BLAKE2B b73770ef9835c297afabc649ccd4472a29ff182209a5f9336fbd029c9246dbfdc450d9ce777a1bf5c208b142b19bf20c22df7e3e7d270075f215f0fb07eff3ef SHA512 7bb13132c4b87e254ba69d2e56037aadc14817839690f27d6d834f5e88019d1f2001e363b105b736b84b290d8bd12d329b1be72a877d0929fda9b1cbfa53bce5
+DIST ox-2.14.4.tar.gz 209459 BLAKE2B e5e029ac5050cd44d0b80c313afb7415495203562bd08b34d4028310e853654b287920531f59f11c149715145e5aa44d3a9b1b2c8eb1c13a1095dc78a5fab95a SHA512 885aee65ae4a833dc9fc1847201f1d922e0d615831674abaa2d8169a22913202e49d677ce792bfe2d71cc9990d5a7652684f0d55606daf5f4a538d24078b4496
 EBUILD ox-2.14.1.ebuild 714 BLAKE2B bced0d68b0e355f590b3b972287b31af82d0e810b1864079d2e7444d9199cf7fc3dcc5c78bc18e8d396390dd0b290089a3ce876b98f787e12f79ecddb07a9c2a SHA512 42764a17622d54d7cbf74553ec7253712a857ea4788dce7e6735349db03896eca324ada0dafa4f29edd62a515fbcdf7bb867729ea75087d36838569b3593e080
 EBUILD ox-2.14.2.ebuild 646 BLAKE2B 0c6710ec158d41c628e382838fcdd5a43f4fa2e2c91ce5a274bf217951a1c6e5bbf64be9661932c38812c08758cd6d11891d0e219e4fec97f461c24ca5b8c3f4 SHA512 4fd7e1fd1fe3a53c49b18247e373f1bba7c484be9e7bba1b253fc43632c06f33d29255fd445eec45e3ef43d3215076bbd0f377b99edb035bad0c709a5ed7542e
 EBUILD ox-2.14.3.ebuild 646 BLAKE2B 0c6710ec158d41c628e382838fcdd5a43f4fa2e2c91ce5a274bf217951a1c6e5bbf64be9661932c38812c08758cd6d11891d0e219e4fec97f461c24ca5b8c3f4 SHA512 4fd7e1fd1fe3a53c49b18247e373f1bba7c484be9e7bba1b253fc43632c06f33d29255fd445eec45e3ef43d3215076bbd0f377b99edb035bad0c709a5ed7542e
+EBUILD ox-2.14.4.ebuild 646 BLAKE2B 0c6710ec158d41c628e382838fcdd5a43f4fa2e2c91ce5a274bf217951a1c6e5bbf64be9661932c38812c08758cd6d11891d0e219e4fec97f461c24ca5b8c3f4 SHA512 4fd7e1fd1fe3a53c49b18247e373f1bba7c484be9e7bba1b253fc43632c06f33d29255fd445eec45e3ef43d3215076bbd0f377b99edb035bad0c709a5ed7542e
 MISC metadata.xml 336 BLAKE2B 7371e572c7bce86e0d3c2ac19ff7555b4bdf793d96377dcdbb810f8fc09feb597f4cc883a03e888c0c38c1a1d9ceb7ef150ac228db7300aea01238f497f0473d SHA512 43b8b42cb09fe73a49e0db49671effd91859d2b9001fc3e51761a1b51b245e83a719ddddd100ecfeb92910baa06690b2cc0bd52db0afc872e007c4be9616908e
diff --git a/dev-ruby/ox/ox-2.13.4.ebuild b/dev-ruby/ox/ox-2.13.4.ebuild
deleted file mode 100644
index dd9b6593b596..000000000000
--- a/dev-ruby/ox/ox-2.13.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="ox.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast XML parser and Object marshaller"
-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"
-
-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.14.0.ebuild b/dev-ruby/ox/ox-2.14.4.ebuild
index ca6de7a13bb8..43ef944b9a38 100644
--- a/dev-ruby/ox/ox-2.14.0.ebuild
+++ b/dev-ruby/ox/ox-2.14.4.ebuild
@@ -1,13 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
 RUBY_FAKEGEM_GEMSPEC="ox.gemspec"
 
+RUBY_FAKEGEM_EXTENSIONS=(ext/ox/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/ox
+
 inherit ruby-fakegem
 
 DESCRIPTION="A fast XML parser and Object marshaller"
@@ -19,15 +22,6 @@ 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
 }