Merge updates from master

20 files changed, 61 insertions, 152 deletions

diff --git a/dev-ruby/ascii85/Manifest b/dev-ruby/ascii85/Manifest
index 9a75a9fa89c0..fb602c2a6d64 100644
--- a/dev-ruby/ascii85/Manifest
+++ b/dev-ruby/ascii85/Manifest
@@ -1,2 +1 @@
-DIST Ascii85-1.0.2.gem 10752 BLAKE2B 1a38fb0d04eefcd73028aeb166169bf04dced4695eaa3ab8d5add8233bb898780b896101558f7db248aeb4cd9c58edaf36b67085ba0b2cb06bb32b312e576c56 SHA512 e2437948697dd46c646e55a361b74ad5069b261809a0e374eee1f3e755d07bbc45d85fc8ab6d620eceeeb020e6ff23224703cba0ce4ddf37f8a5a96289efd74b
 DIST Ascii85-1.0.3.gem 11776 BLAKE2B e08bbc089546dd3b91ff5fd85b8652dd6f5c06025c29ac67004bd7d4c7bb8fc38c77b604dd5a884970b05041e173f37eaf895f0bb9ac1947ce70e4f0cc54906c SHA512 b324ff06ea0cd46a679619a2bfca9f05c30ece9f0342f8a8d097841f3fb4dbb29cf4b6f6832742c50fe5a51895a9048308981be296466422269ce34c4d936f5c
diff --git a/dev-ruby/ascii85/ascii85-1.0.2-r2.ebuild b/dev-ruby/ascii85/ascii85-1.0.2-r2.ebuild
deleted file mode 100644
index 8e40be003b2d..000000000000
--- a/dev-ruby/ascii85/ascii85-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.txt"
-
-RUBY_FAKEGEM_NAME="Ascii85"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Methods for encoding/decoding Adobe's binary-to-text encoding of the same name"
-HOMEPAGE="https://github.com/datawraith/ascii85gem"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-}
diff --git a/dev-ruby/brass/brass-1.2.1.ebuild b/dev-ruby/brass/brass-1.2.1.ebuild
index 0eb149da64c2..46b16477acb3 100644
--- a/dev-ruby/brass/brass-1.2.1.ebuild
+++ b/dev-ruby/brass/brass-1.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/hashery/hashery-2.1.2.ebuild b/dev-ruby/hashery/hashery-2.1.2.ebuild
index d796af277932..b731048a5765 100644
--- a/dev-ruby/hashery/hashery-2.1.2.ebuild
+++ b/dev-ruby/hashery/hashery-2.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="yard"
diff --git a/dev-ruby/lemon/lemon-0.9.1.ebuild b/dev-ruby/lemon/lemon-0.9.1.ebuild
index 72337f4e3f48..97994539bf7f 100644
--- a/dev-ruby/lemon/lemon-0.9.1.ebuild
+++ b/dev-ruby/lemon/lemon-0.9.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="yard"
diff --git a/dev-ruby/pdf-core/pdf-core-0.7.0.ebuild b/dev-ruby/pdf-core/pdf-core-0.7.0.ebuild
index 15965f164eee..bcafc4c99db1 100644
--- a/dev-ruby/pdf-core/pdf-core-0.7.0.ebuild
+++ b/dev-ruby/pdf-core/pdf-core-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/pdf-core/pdf-core-0.8.1.ebuild b/dev-ruby/pdf-core/pdf-core-0.8.1.ebuild
index 355127426864..895667a68127 100644
--- a/dev-ruby/pdf-core/pdf-core-0.8.1.ebuild
+++ b/dev-ruby/pdf-core/pdf-core-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# 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"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/pdf-inspector/pdf-inspector-1.3.0.ebuild b/dev-ruby/pdf-inspector/pdf-inspector-1.3.0.ebuild
index f24647aaca82..6c8763aeac90 100644
--- a/dev-ruby/pdf-inspector/pdf-inspector-1.3.0.ebuild
+++ b/dev-ruby/pdf-inspector/pdf-inspector-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# 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"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/pdf-reader/Manifest b/dev-ruby/pdf-reader/Manifest
index 4d5c1cef52d9..87f0aa5142b2 100644
--- a/dev-ruby/pdf-reader/Manifest
+++ b/dev-ruby/pdf-reader/Manifest
@@ -1,5 +1,3 @@
 DIST pdf-reader-1.4.1.tar.gz 10236680 BLAKE2B 86fb137c65b47717e758473b94ddbbf52def3ae0edaecd7b5eb3f0d880f664c9ff6097221f43d64247b006ed18220f4f9a469d6b8574592750a1d8a468ce7ddb SHA512 aaa53dafc2d58dc591f708941907ecf14b1ee73362a7bd6d34659103d51effa90888560733747ca1bfe3d217cb6834109e06b024f40a95214880ca42f54054e5
-DIST pdf-reader-2.2.0.tar.gz 10976940 BLAKE2B 1323310319e841f1498adc9f88cef9a3dd624482310f81bfc471e95df16113df931d76d6023fe1830c4e678e65b54a57fdbca6af2c91cbd2ea00d0b96c785917 SHA512 e8e58a64f3a474752b5b49cde0b48cf99c09c1aaafbf539eba87c74394e060c2a09d911a250e11b32833ed3e905dd2b5ed5b75bdf71115b07e6bb0001fc59329
-DIST pdf-reader-2.2.1.tar.gz 10977334 BLAKE2B ee972dcfecd8beb46c55a38e493825fb248409abad04d7040cac0fde63206b3c13fb99ce5214ead88d6cc998a7abe5ac9889cb05389d23780ad7f4edfb33fdec SHA512 3032c1b9286d967f48867d3c81ddb6478e4876af0accaaf2b2b7fdf29709425b788c09af87b4953d6483ca11a5ebce6b9fa8d83d2274eb91173e06df1801dfde
 DIST pdf-reader-2.3.0.tar.gz 11012191 BLAKE2B 9c6f7a06ac831f1916c3f578319651aa65dff6fece65647493130a16f2137b98c78a3d73aac56066a28ca7fec16fcc37628aa778f72391912f88fd928c3cf364 SHA512 df50fffba868df470481ad8dd5ca46014702d4b5b60784240f1bb8a7e8df4c5ffa889b6f9ae25f836f5592678a387462bb6673ca145f03f41e2dbf24d85ea79c
 DIST pdf-reader-2.4.0.tar.gz 11025697 BLAKE2B 6886090ce7e293280db434ab7a8e866f11fa8debad3767ea5fee337f481a8695c98bc9dbd46e7e29b132f7f9675a0ce13b957962189bcffe46d37d826e9a2bef SHA512 965b016f8d71e46f1f483c48470049b2ae7eebe72b8e7ae9e50a7ebbf6e72e409e84bf4a6e612f6b76713afd6b38f7fc7f24ae5e898d12fa8f65e3878575c090
diff --git a/dev-ruby/pdf-reader/pdf-reader-1.4.1-r2.ebuild b/dev-ruby/pdf-reader/pdf-reader-1.4.1-r2.ebuild
index c08c992db30c..1f4965e0b905 100644
--- a/dev-ruby/pdf-reader/pdf-reader-1.4.1-r2.ebuild
+++ b/dev-ruby/pdf-reader/pdf-reader-1.4.1-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 GITHUB_USER=yob
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/pdf-reader/pdf-reader-2.2.0.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.2.0.ebuild
deleted file mode 100644
index 90de5f68f2c9..000000000000
--- a/dev-ruby/pdf-reader/pdf-reader-2.2.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GITHUB_USER=yob
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO"
-
-RUBY_FAKEGEM_GEMSPEC="pdf-reader.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
-HOMEPAGE="https://github.com/yob/pdf-reader/"
-
-# We cannot use the gem distributions because they don't contain the
-# tests' data, we have to rely on the git tags.
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND+=" !!<dev-ruby/pdf-reader-1.4.1-r2"
-
-ruby_add_rdepend ">=dev-ruby/afm-0.2.1 =dev-ruby/afm-0.2*
-	=dev-ruby/ascii85-1*
-	=dev-ruby/hashery-2*
-	dev-ruby/ttfunk:*
-	dev-ruby/ruby-rc4"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/pdf-reader/pdf-reader-2.2.1.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.2.1.ebuild
deleted file mode 100644
index 11c2509b1e60..000000000000
--- a/dev-ruby/pdf-reader/pdf-reader-2.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GITHUB_USER=yob
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO"
-
-RUBY_FAKEGEM_GEMSPEC="pdf-reader.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
-HOMEPAGE="https://github.com/yob/pdf-reader/"
-
-# We cannot use the gem distributions because they don't contain the
-# tests' data, we have to rely on the git tags.
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND+=" !!<dev-ruby/pdf-reader-1.4.1-r2"
-
-ruby_add_rdepend ">=dev-ruby/afm-0.2.1 =dev-ruby/afm-0.2*
-	=dev-ruby/ascii85-1*
-	=dev-ruby/hashery-2*
-	dev-ruby/ttfunk:*
-	dev-ruby/ruby-rc4"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/pdf-reader/pdf-reader-2.4.0.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.4.0.ebuild
index 11c2509b1e60..3ca3e271d785 100644
--- a/dev-ruby/pdf-reader/pdf-reader-2.4.0.ebuild
+++ b/dev-ruby/pdf-reader/pdf-reader-2.4.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 GITHUB_USER=yob
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/prawn/Manifest b/dev-ruby/prawn/Manifest
index fa0294f1b912..6ac4d7580323 100644
--- a/dev-ruby/prawn/Manifest
+++ b/dev-ruby/prawn/Manifest
@@ -1 +1,2 @@
 DIST prawn-2.2.0.tar.gz 5215662 BLAKE2B 7130aaa4e9e9de2f15148f9c3a7a713ebb9808047e59fc156566f3a44705055b907284ce6690ff2e803702ddc3eb304b32e8f8c0049badda348bf4242df7e14c SHA512 a714f3cf47439d2603afda66cf4202ab9fdda0b6aaec120fd65df4e29d4b26155d95392487131c16d451ebe8f774aa6d64227670fad7b151cd0a514d3ed40b06
+DIST prawn-2.2.2.tar.gz 5215413 BLAKE2B a906491b60e68de0308fec74131286d3f3c868a38dad9a4cf2ce28424cd746f96b530c7e9ea49a74af58d63a7ed9669f2b110dd8dff315c4943272e3a6b822b3 SHA512 8bd47f80d7873f9435eac7f42015b2ca87f703b5d091ec0e9710f2d4b26e3c7b83aad03de3bf44ca5d5fe07a2bf9af32c59d479373543459576e7a0088715a1b
diff --git a/dev-ruby/prawn/prawn-2.2.0.ebuild b/dev-ruby/prawn/prawn-2.2.0.ebuild
index 1f8468811515..2c79d14fef66 100644
--- a/dev-ruby/prawn/prawn-2.2.0.ebuild
+++ b/dev-ruby/prawn/prawn-2.2.0.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=6
@@ -19,7 +19,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "=dev-ruby/pdf-core-0.7*
-	>=dev-ruby/ttfunk-1.5"
+	>=dev-ruby/ttfunk-1.5:*"
 ruby_add_bdepend "test? ( dev-ruby/coderay
 	>=dev-ruby/pdf-inspector-1.2.1
 	>=dev-ruby/pdf-reader-1.2
diff --git a/dev-ruby/prawn/prawn-2.2.2.ebuild b/dev-ruby/prawn/prawn-2.2.2.ebuild
new file mode 100644
index 000000000000..84bad0b2234d
--- /dev/null
+++ b/dev-ruby/prawn/prawn-2.2.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_GEMSPEC="prawn.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Fast, Nimble PDF Generation For Ruby"
+HOMEPAGE="http://prawn.majesticseacreature.com/"
+SRC_URI="https://github.com/prawnpdf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="|| ( GPL-2 Ruby )"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "=dev-ruby/pdf-core-0.7*
+	>=dev-ruby/ttfunk-1.5:*"
+ruby_add_bdepend "test? ( dev-ruby/coderay
+	>=dev-ruby/pdf-inspector-1.2.1
+	>=dev-ruby/pdf-reader-1.2
+	)"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile spec/spec_helper.rb || die
+
+	# Remove test that needs unpackaged dependency
+	rm -f spec/manual_spec.rb || die
+}
diff --git a/dev-ruby/qed/qed-2.9.2.ebuild b/dev-ruby/qed/qed-2.9.2.ebuild
index 796cc4fc924a..039cef0b6c66 100644
--- a/dev-ruby/qed/qed-2.9.2.ebuild
+++ b/dev-ruby/qed/qed-2.9.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="yard"
diff --git a/dev-ruby/rubytest-cli/rubytest-cli-0.2.0.ebuild b/dev-ruby/rubytest-cli/rubytest-cli-0.2.0.ebuild
index 85f05110b7e9..b9718f19d648 100644
--- a/dev-ruby/rubytest-cli/rubytest-cli-0.2.0.ebuild
+++ b/dev-ruby/rubytest-cli/rubytest-cli-0.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="yard"
diff --git a/dev-ruby/rubytest/rubytest-0.8.1.ebuild b/dev-ruby/rubytest/rubytest-0.8.1.ebuild
index c6a683a6c147..f60bb73560cb 100644
--- a/dev-ruby/rubytest/rubytest-0.8.1.ebuild
+++ b/dev-ruby/rubytest/rubytest-0.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="yard"
diff --git a/net-vpn/libreswan/libreswan-3.30.ebuild b/net-vpn/libreswan/libreswan-3.30.ebuild
index 430bcc8201af..bf8f6a939631 100644
--- a/net-vpn/libreswan/libreswan-3.30.ebuild
+++ b/net-vpn/libreswan/libreswan-3.30.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 	dev-libs/libevent:0=
 	dev-libs/nspr
 	>=dev-libs/nss-3.42
+	>=sys-kernel/linux-headers-4.19
 	caps? ( sys-libs/libcap-ng )
 	curl? ( net-misc/curl )
 	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns )