gentoo resync : 18.08.2019

3 files changed, 6 insertions, 63 deletions

diff --git a/dev-ruby/rbpdf/Manifest b/dev-ruby/rbpdf/Manifest
index a1b7228be567..e793413ccfcd 100644
--- a/dev-ruby/rbpdf/Manifest
+++ b/dev-ruby/rbpdf/Manifest
@@ -1,7 +1,5 @@
-DIST rbpdf-1.19.6.tar.gz 12026339 BLAKE2B 8ec388e65f110773b9a7c160a9bccbb1beb6f3ad0bbe2393a7b91087e1d2b3cbdfb03284737f6763cee6cfa947d68532cde8f4b684b004dfc92f300510a1f5c0 SHA512 192dae84ef2a44cfc7bde38e776ade1aab95e812f55ba1848c20be4a2e65231c97330859cf14b1d3bfd7aa158a1ea561602723e9e96e275ecc771ca781901271
-DIST rbpdf-1.19.7.tar.gz 12026440 BLAKE2B be785f7f810c11c64efcc2ef896486dcc3d13b506badc3527abe18065c82ff32a025eda3fd925c9ac0da5c99d0300f2d76fbcf52d444bec46ebdf533b0180234 SHA512 6d4f01760511f117f2ddda87cde26ddd0e47c6245692d80fe84a9ff5cde9759b7803dcfbd328ff9af9e59f6bca9f210d8bcb66f66f288acb512f58920fb5e7d8
 DIST rbpdf-1.19.8.tar.gz 12026547 BLAKE2B 4989bee6f35d74a703539c6d209c14730e2674d94454b1794172f147dd01af20bdea5c4ed3e68a047f7ddad17083d74ea061dc5b0c28e66acdbf56ab1e335dd3 SHA512 e3015e80b26f9de2727ebd1a97ff5fd3937b7e133d9d39c2e1b3e9fe326354ca66ef569fa35bdf4c8b495b40df1ceec26d043e6f86be8ce741068a2c28ff8a28
-EBUILD rbpdf-1.19.6.ebuild 1307 BLAKE2B 9c87bb17ce8033a755f9b3a8991340111adafa43eab6a3bddb8a1cdd76a2afcbc479515e6bcfb9ea80b099d6b3b72347d67cbbb0c5b1738dcc46d51bac7cedaf SHA512 3a9c6aafcb558c88b274cc2243def2139fb0e07617e939bc1f0823baaa67b1760597445a1ae3b5ea871723c47fd31625cbc5a81f624359ae4e4c74d7c59cd54b
-EBUILD rbpdf-1.19.7.ebuild 1307 BLAKE2B ef4976b492a44d70aa4e305897fbde08eb420010d9b49ca963fd7dfa4a77c6b0a8d8c2f64869c4bb3920dbcf7644c18f1fe44493bf5aa94e89c50790db87c5b3 SHA512 fd351d15fc789e4984690124e094d9b85efdb36999a6dfc492393a12a62da22a3e187fe15dbee720dba206e3676e238a4e101f448269579f88881a2155a465c7
+DIST rbpdf-1.20.0.tar.gz 12026312 BLAKE2B add83c3bc2fde2dd0b839fedabcc49b40839d17a3c6b4eb0d17f688840a7fae1bef23660bc810176b23042475bf6ba40cac6f08f4f0468ba6f1dcc6ada4520da SHA512 5324bfc115e168a9ec4972aea21539d1e41a3799bf3beaa2cf0764734eb152f6325879ebb0aee80276825842d8c4d15fdc337874b1237342adc425554e96a9d4
 EBUILD rbpdf-1.19.8.ebuild 1280 BLAKE2B 7337beecf56b9882621706b58f8c748fcba94c0cfe9a6a4fd4b27eb448f790f63a2f31df152567a76517274804d40e1270ae8a413e810368f4ee80822b84ab76 SHA512 21c0fc4a8b1e1531653dd58b724b18bf56f453bf14fe6258de5b01223739659970cef48352f2cee03cbcc13e79e1841d1384121115f1db65f676bb50926d885c
+EBUILD rbpdf-1.20.0.ebuild 1130 BLAKE2B a3c32d5223cb99869c4acc1eca9e79eec261ace090ba5c0e682954c35e377ee3cfa2996d4e1898dcddc76071ceaaba7eb5cd455e7f1002fc1491454d6e65c5de SHA512 44e796910ece15746156f52ffaba53c2c0ef31967fd434be569589be3e54b4761a8484c1e37f228200bdae6b4731ccffbc03f558ebb743a72e07a6db97cee9cd
 MISC metadata.xml 417 BLAKE2B b48fb397e76caa8bfa35675062a6c4026ae44fe43cd305eb51c9470d9dce6654603742954145f3bd063f6ccc6f56162ca9affa6acc6698ac81432e0dde42a070 SHA512 c33c8dded82e45f867b4e93cb3be96cabf42152bfd6aa13f9144fae15b2b4f4b8f503d4aef4af8c2448584c2e71251c958b8dacb14c26da4a6c2b9b3ff442dc4
diff --git a/dev-ruby/rbpdf/rbpdf-1.19.6.ebuild b/dev-ruby/rbpdf/rbpdf-1.19.6.ebuild
deleted file mode 100644
index 90dafc43b89e..000000000000
--- a/dev-ruby/rbpdf/rbpdf-1.19.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-# 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="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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*"
-
-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.19.7.ebuild b/dev-ruby/rbpdf/rbpdf-1.20.0.ebuild
index 30a493bea857..0a1de1e4c101 100644
--- a/dev-ruby/rbpdf/rbpdf-1.19.7.ebuild
+++ b/dev-ruby/rbpdf/rbpdf-1.20.0.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby23 ruby24 ruby25"
+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"
@@ -19,13 +18,13 @@ 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="LGPL-2.1+"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 )"
-ruby_add_rdepend "dev-ruby/actionview:*
+ruby_add_rdepend "
 	dev-ruby/htmlentities
 	=dev-ruby/rbpdf-font-1.19*"
 
@@ -36,9 +35,6 @@ all_ruby_prepare() {
 	# 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() {