gentoo resync : 25.01.2018

3 files changed, 3 insertions, 40 deletions

diff --git a/dev-ruby/prawn/Manifest b/dev-ruby/prawn/Manifest
index 04ec619c85af..0f34e758c7b6 100644
--- a/dev-ruby/prawn/Manifest
+++ b/dev-ruby/prawn/Manifest
@@ -1,5 +1,3 @@
-DIST prawn-2.1.0.tar.gz 4687290 BLAKE2B 25b544078fe540cc3cd7f223e15da92e2b8b3de6751821f24fb81547a49c1bda27a2b0403fd61747294229deb5a693695ceb1939c64dea9b9e1d59aaab2fdf0f SHA512 2fcc3261899e2c88a877901840e49261ff3da1924f3319cc65fa028ec0d550df595c98ae206fd645bcacd983cbd69cafa6ecd33f66f8a516c82ad13578a6796e
 DIST prawn-2.2.0.tar.gz 5215662 BLAKE2B 7130aaa4e9e9de2f15148f9c3a7a713ebb9808047e59fc156566f3a44705055b907284ce6690ff2e803702ddc3eb304b32e8f8c0049badda348bf4242df7e14c SHA512 a714f3cf47439d2603afda66cf4202ab9fdda0b6aaec120fd65df4e29d4b26155d95392487131c16d451ebe8f774aa6d64227670fad7b151cd0a514d3ed40b06
-EBUILD prawn-2.1.0.ebuild 1113 BLAKE2B 7abb58dcc56240ef7159a4f54ed50fcd438e69b494d3bb296eaf5699deeeba2f92bd39b53b6474becb83301670de7695d7553ed2274214886725ef80d46a6d74 SHA512 1f56d75f71137105aa93f4d6d57feda83f7692c34461a84f38715dcd4569567eba48464a785495cf951645f2c1405b0a0457201c45214d2582a3179a9e654b06
-EBUILD prawn-2.2.0.ebuild 899 BLAKE2B ee3d74cf15cc0a9092155130eb76608b0cb65a47e9268e8591a330d834b7e6449c728482e14124f8fe674b20581f5530c8f46899e71d7f97b84ef4ee21c1c40e SHA512 d4d47a782f99474a08ba4a3bff2af2ddc09baf356e3b6d6c2875144d424123a8d906d77ae8da48eed9de6a07f1baa98357e2d85b29c468a6ab2ea4c768ff5dc7
+EBUILD prawn-2.2.0.ebuild 912 BLAKE2B dec3d1149a87141adcdca8d062852eecec5e45c2d0ef8e4bdb3e5854b9f197d0db97a8619651faec78643c517913d92202a799d75a8ce9639df013c2e49e65f6 SHA512 a5b5013f1b818735b4fd080c7ec9d4f37f1430fb909a231f36f346e38bfef225a7790a19b1cec48eeb1134b873f13db74d91e6dea5941271e5a3575318f868ab
 MISC metadata.xml 340 BLAKE2B 4d87947e53d3063f83e9cd52f2c11eaee8b5460d3272302eaa91b93c572bd536e69c38d69dab0f94cef4507a6cadc48f4c81d2b98ca4787a02541657e3f370bd SHA512 ce287fd4dc9d9442611b519fa8c8607b37072965c8d1902f25e9444a375c9b6907850a9d9f3bb3ccae31a7994bae05a6235bada27837dc28fe045c12cde61358
diff --git a/dev-ruby/prawn/prawn-2.1.0.ebuild b/dev-ruby/prawn/prawn-2.1.0.ebuild
deleted file mode 100644
index 7ca5b1a6414c..000000000000
--- a/dev-ruby/prawn/prawn-2.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/pdf-core-0.6.1
-	>=dev-ruby/ttfunk-1.4.0"
-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 failing tests
-	# https://github.com/prawnpdf/prawn/pull/693
-	# https://github.com/prawnpdf/prawn/issues/603
-	sed -i -e "/should process UTF-8 chars/,+9 s/^/#/" spec/line_wrap_spec.rb || die
-	sed -i -e "/shrink_to_fit with special utf-8 text/,+12 s/^/#/" spec/text_spec.rb || die
-}
diff --git a/dev-ruby/prawn/prawn-2.2.0.ebuild b/dev-ruby/prawn/prawn-2.2.0.ebuild
index b62d908568e7..e898bbb6be5e 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ 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 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/pdf-core-0.7.0