gentoo resync : 03.11.2019

3 files changed, 8 insertions, 27 deletions

diff --git a/dev-ruby/ffaker/Manifest b/dev-ruby/ffaker/Manifest
index 060be1ede00d..d3b294756627 100644
--- a/dev-ruby/ffaker/Manifest
+++ b/dev-ruby/ffaker/Manifest
@@ -1,9 +1,7 @@
-DIST ffaker-2.10.0.gem 421376 BLAKE2B 30976c0bee8862623c923b3797bd6de31b803643191d55ee2a6ef101a92f43acf6e300991de43641f2564ac82d046fcb7e53ca8b9cecae4c6b339e43f020cc1a SHA512 cb54d995f39877eea0844395e52158ea898f1d3fb17af0b01261f8b359d50ffd5d7b94fba0400e7103543a96670a00b3e5a9c072bc46f7221d390ab81e6ac507
 DIST ffaker-2.11.0.gem 429568 BLAKE2B ed5a9d794caba5ad93c1ac8457ebf89412177fe48c05a66f162f8d2b7a7a3b395e59312ddc444965ec4d9500573a97c97b95a1381d07caca6bb3b3ca97fa3dc2 SHA512 b185adfe34c5d78fe47cedc9d685eb98ed0de7f9a4818fa5ab0f6fe9cad21d04e025b6d2e38e34f463874a5d9007fe0d01e604b316af4850a7a63f50140bbd78
 DIST ffaker-2.12.0.gem 431616 BLAKE2B dc060472749b1081500609e4b6a58310ca00c3bfe2dc8a40dba49bde50a98add33a83cc00136fbe542b1d14ce74ddbab8f737dba4866023bb44d8ad7126151ce SHA512 1763bd2b9ec45903f09d46504ebf333e9879423607dd8d31d6ceb659bab05ac9fd14b99ea2dd3f08c0d61e987d7bab647945f0a7e81f1fe8a2b085b7b571e282
-DIST ffaker-2.9.0.gem 413184 BLAKE2B a48977b2749b60db18d046a0df0b65c1790a4fba5920faaaf6ef93be31cc7defd375379e2e46bbe2b4d2bae8b29f7cace4ecf09fba7d80a6cfacd724edd60564 SHA512 dff411a4d8864817dacb0498ce73a9b350d4e03aa771edb5b69c5e749ba4565dbd24d09215a7397e4567a9cd3ce2baae9b8e4e21cd8db127257364395e481364
-EBUILD ffaker-2.10.0.ebuild 469 BLAKE2B 6cfe531564b3a20b804bbc052b31a438af417c2418f0ec02b9661ea5cc9522748054c3bedbe891574bdcb36d6e1da2de1927dafd9cf52b70c622f884b1ae7387 SHA512 37de5883d978dbf4ecfee805b2e4b8802e809df2c4df5b2939b6c63615962439627d17bf5b588b18928d38b202ecb4ee31dd3555a652547bd52e0c8c8f02ac36
+DIST ffaker-2.13.0.gem 434688 BLAKE2B 7b0b0af41482c85a6502a081a6d78f69a4968aa6bb844cc1eb11e7761e75331b4043319a1221b402d703405275a032a433e28249d2bbd9980ac82ca0e6e74649 SHA512 d5102c8fd754a102257a0223fdcda39d3791e08149ee396098c3e0c8fba50f5cf63249d14cc26305adcfb90319db785819e74fdb4366adfb0fa5701afd4edfc8
 EBUILD ffaker-2.11.0.ebuild 469 BLAKE2B 6cfe531564b3a20b804bbc052b31a438af417c2418f0ec02b9661ea5cc9522748054c3bedbe891574bdcb36d6e1da2de1927dafd9cf52b70c622f884b1ae7387 SHA512 37de5883d978dbf4ecfee805b2e4b8802e809df2c4df5b2939b6c63615962439627d17bf5b588b18928d38b202ecb4ee31dd3555a652547bd52e0c8c8f02ac36
 EBUILD ffaker-2.12.0.ebuild 527 BLAKE2B 353537f33fd96dde1efc5c0ec56f02358dfe952924fc3cec7f869b9c510344d15f2930c3f62a7055c260c768afee09ac54a00a8064991b1b688287bbbc2bd8ad SHA512 f5f1160da7f927b57bcb0a1a9b4054f811064003c3a4fa645810c51254a4fbc14885b73b3b79398db9d76f4ec2153e46392b44e4c615d97df00a4f672881222d
-EBUILD ffaker-2.9.0.ebuild 472 BLAKE2B 65064f58d2b8111b153e74f1a8f7b95567d9fafb4f5521b7de196582751e29da939b08e288800ffd4cc441c48d8f7ef5c3e82d9f65af18c7e02715bee4b2c803 SHA512 0680564ca5a656128df8a9dee0d5e23a085157b605598f6ccf154c6f4592649d030573da563da7402746b1be82f2d402d3705b554b35f5b43f3d743f85a9f341
+EBUILD ffaker-2.13.0.ebuild 527 BLAKE2B 353537f33fd96dde1efc5c0ec56f02358dfe952924fc3cec7f869b9c510344d15f2930c3f62a7055c260c768afee09ac54a00a8064991b1b688287bbbc2bd8ad SHA512 f5f1160da7f927b57bcb0a1a9b4054f811064003c3a4fa645810c51254a4fbc14885b73b3b79398db9d76f4ec2153e46392b44e4c615d97df00a4f672881222d
 MISC metadata.xml 344 BLAKE2B 35517e20c0036d8a175e81240ba0ea29799e0a00ddcc7dbb3b71822c4bd1d2ab64795a967dda9b2c9d207c18ffa090aab11dcfc6fe910e74b60f20413f65c001 SHA512 24ac57014a8aecdcc405060fc2e5f7ad3017cf07d022c55988bf7386bb50a79158dcf88f64e27141a4c44542f60c6d0e3b82d94f99dea71213cf6b914e717ada
diff --git a/dev-ruby/ffaker/ffaker-2.10.0.ebuild b/dev-ruby/ffaker/ffaker-2.13.0.ebuild
index 597e226722af..51f707d245ed 100644
--- a/dev-ruby/ffaker/ffaker-2.10.0.ebuild
+++ b/dev-ruby/ffaker/ffaker-2.13.0.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2019 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"
 
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
 inherit ruby-fakegem
 
@@ -18,3 +17,7 @@ KEYWORDS="~amd64"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/test_image_file/aomit "network"' test/test_image.rb || die
+}
diff --git a/dev-ruby/ffaker/ffaker-2.9.0.ebuild b/dev-ruby/ffaker/ffaker-2.9.0.ebuild
deleted file mode 100644
index df9f13df83a4..000000000000
--- a/dev-ruby/ffaker/ffaker-2.9.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Faster Faker, generates dummy data"
-HOMEPAGE="https://github.com/emmanueloga/ffaker"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"