gentoo resync : 30.05.2020

4 files changed, 6 insertions, 105 deletions

diff --git a/dev-ruby/rbpdf/Manifest b/dev-ruby/rbpdf/Manifest
index ad86248922f6..4ea655d51d3c 100644
--- a/dev-ruby/rbpdf/Manifest
+++ b/dev-ruby/rbpdf/Manifest
@@ -1,7 +1,3 @@
-DIST rbpdf-1.19.8.tar.gz 12026547 BLAKE2B 4989bee6f35d74a703539c6d209c14730e2674d94454b1794172f147dd01af20bdea5c4ed3e68a047f7ddad17083d74ea061dc5b0c28e66acdbf56ab1e335dd3 SHA512 e3015e80b26f9de2727ebd1a97ff5fd3937b7e133d9d39c2e1b3e9fe326354ca66ef569fa35bdf4c8b495b40df1ceec26d043e6f86be8ce741068a2c28ff8a28
-DIST rbpdf-1.20.0.tar.gz 12026312 BLAKE2B add83c3bc2fde2dd0b839fedabcc49b40839d17a3c6b4eb0d17f688840a7fae1bef23660bc810176b23042475bf6ba40cac6f08f4f0468ba6f1dcc6ada4520da SHA512 5324bfc115e168a9ec4972aea21539d1e41a3799bf3beaa2cf0764734eb152f6325879ebb0aee80276825842d8c4d15fdc337874b1237342adc425554e96a9d4
 DIST rbpdf-1.20.1.tar.gz 12026190 BLAKE2B 5a468e974bc0a15a9a8f621a6ee635a8cf4f81cc94b88a6bf8afd90c4a665c0892381e903158e66ec4a68676491faa80fd99b7d4ffcf0c86defc4a4114603b08 SHA512 19b4fbd8a0c4650c73ba299721a0fe03a10f223da5e0dd2b97549972ea8f381b2d5b4837369d0667cd325392edae1ec795ec67bc852c9b3588ec0c5e686844d7
-EBUILD rbpdf-1.19.8.ebuild 1280 BLAKE2B 7337beecf56b9882621706b58f8c748fcba94c0cfe9a6a4fd4b27eb448f790f63a2f31df152567a76517274804d40e1270ae8a413e810368f4ee80822b84ab76 SHA512 21c0fc4a8b1e1531653dd58b724b18bf56f453bf14fe6258de5b01223739659970cef48352f2cee03cbcc13e79e1841d1384121115f1db65f676bb50926d885c
-EBUILD rbpdf-1.20.0.ebuild 1130 BLAKE2B a3c32d5223cb99869c4acc1eca9e79eec261ace090ba5c0e682954c35e377ee3cfa2996d4e1898dcddc76071ceaaba7eb5cd455e7f1002fc1491454d6e65c5de SHA512 44e796910ece15746156f52ffaba53c2c0ef31967fd434be569589be3e54b4761a8484c1e37f228200bdae6b4731ccffbc03f558ebb743a72e07a6db97cee9cd
-EBUILD rbpdf-1.20.1.ebuild 1130 BLAKE2B a3c32d5223cb99869c4acc1eca9e79eec261ace090ba5c0e682954c35e377ee3cfa2996d4e1898dcddc76071ceaaba7eb5cd455e7f1002fc1491454d6e65c5de SHA512 44e796910ece15746156f52ffaba53c2c0ef31967fd434be569589be3e54b4761a8484c1e37f228200bdae6b4731ccffbc03f558ebb743a72e07a6db97cee9cd
+EBUILD rbpdf-1.20.1-r2.ebuild 1198 BLAKE2B e1b250da894c41b4bd04fbf214d1c0743f4d9190e1dc9620cd9a9d9697116840f0c62cc3133d6bab4185615628cb62e6cd761c9973822bdc1c88ca192b89a9ed SHA512 b31f94e5f700e3936b5e7452718652e78fbfea440a5d9d20c9d0fc0c9441a810e230888043f3b707731748199869c3ea756b31cd6c40e73dd091cd97ed9da5ee
 MISC metadata.xml 417 BLAKE2B b48fb397e76caa8bfa35675062a6c4026ae44fe43cd305eb51c9470d9dce6654603742954145f3bd063f6ccc6f56162ca9affa6acc6698ac81432e0dde42a070 SHA512 c33c8dded82e45f867b4e93cb3be96cabf42152bfd6aa13f9144fae15b2b4f4b8f503d4aef4af8c2448584c2e71251c958b8dacb14c26da4a6c2b9b3ff442dc4
diff --git a/dev-ruby/rbpdf/rbpdf-1.19.8.ebuild b/dev-ruby/rbpdf/rbpdf-1.19.8.ebuild
deleted file mode 100644
index cec0aa03e682..000000000000
--- a/dev-ruby/rbpdf/rbpdf-1.19.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-# Avoid the complexity of the "rake" recipe and run the tests manually.
-RUBY_FAKEGEM_RECIPE_TEST=none
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby on Rails RBPDF plugin"
-HOMEPAGE="https://github.com/naitoh/rbpdf"
-SRC_URI="https://github.com/naitoh/rbpdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 )"
-ruby_add_rdepend "
-	dev-ruby/htmlentities
-	=dev-ruby/rbpdf-font-1.19*"
-
-all_ruby_prepare() {
-	default
-
-	# This test is enabled automagically in the presence of rmagick, and
-	# then fails.
-	rm -f test/rbpdf_image_rmagick_test.rb \
-		|| die "failed to remove rmagick tests"
-
-	# Loosen very restrictive htmlentities dependency
-	sed -i -e '/htmlentities/ s/=/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	local cmd='gem "test-unit", ">= 3.0"'
-	cmd+=' and '
-	cmd+='require "test/unit"'
-	cmd+=' and '
-	cmd+='Dir["test/rbpdf_*.rb"].each{|f| require("./" +  f)}'
-	${RUBY} -Ilib:.:test -e "${cmd}" || die "test suite failed"
-}
diff --git a/dev-ruby/rbpdf/rbpdf-1.20.0.ebuild b/dev-ruby/rbpdf/rbpdf-1.20.1-r2.ebuild
index 0a1de1e4c101..29f175a27c75 100644
--- a/dev-ruby/rbpdf/rbpdf-1.20.0.ebuild
+++ b/dev-ruby/rbpdf/rbpdf-1.20.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,8 +25,11 @@ IUSE="test"
 
 ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 )"
 ruby_add_rdepend "
+	dev-ruby/actionview
 	dev-ruby/htmlentities
-	=dev-ruby/rbpdf-font-1.19*"
+	=dev-ruby/rbpdf-font-1.19*
+	|| ( dev-ruby/mini_magick dev-ruby/rmagick )
+"
 
 all_ruby_prepare() {
 	default
diff --git a/dev-ruby/rbpdf/rbpdf-1.20.1.ebuild b/dev-ruby/rbpdf/rbpdf-1.20.1.ebuild
deleted file mode 100644
index 0a1de1e4c101..000000000000
--- a/dev-ruby/rbpdf/rbpdf-1.20.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-# Avoid the complexity of the "rake" recipe and run the tests manually.
-RUBY_FAKEGEM_RECIPE_TEST=none
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby on Rails RBPDF plugin"
-HOMEPAGE="https://github.com/naitoh/rbpdf"
-SRC_URI="https://github.com/naitoh/rbpdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 )"
-ruby_add_rdepend "
-	dev-ruby/htmlentities
-	=dev-ruby/rbpdf-font-1.19*"
-
-all_ruby_prepare() {
-	default
-
-	# This test is enabled automagically in the presence of rmagick, and
-	# then fails.
-	rm -f test/rbpdf_image_rmagick_test.rb \
-		|| die "failed to remove rmagick tests"
-}
-
-each_ruby_test() {
-	local cmd='gem "test-unit", ">= 3.0"'
-	cmd+=' and '
-	cmd+='require "test/unit"'
-	cmd+=' and '
-	cmd+='Dir["test/rbpdf_*.rb"].each{|f| require("./" +  f)}'
-	${RUBY} -Ilib:.:test -e "${cmd}" || die "test suite failed"
-}