Add ruby19. Backport relevant upstream patches for it.

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

6 files changed, 134 insertions, 6 deletions

diff --git a/dev-ruby/prawn-core/ChangeLog b/dev-ruby/prawn-core/ChangeLog
index 97adb7a54db7..e23a71341cd8 100644
--- a/dev-ruby/prawn-core/ChangeLog
+++ b/dev-ruby/prawn-core/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/prawn-core
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/prawn-core/ChangeLog,v 1.7 2011/09/21 06:29:13 graaff Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/prawn-core/ChangeLog,v 1.8 2012/01/14 10:50:47 graaff Exp $
+
+*prawn-core-0.8.4-r2 (14 Jan 2012)
+
+  14 Jan 2012; Hans de Graaff <graaff@gentoo.org> +prawn-core-0.8.4-r2.ebuild,
+  +files/prawn-core-0.8.4-ruby18-tests.patch,
+  +files/prawn-core-0.8.4-ruby19-document.patch,
+  +files/prawn-core-0.8.4-ruby19-tests.patch:
+  Add ruby19. Backport relevant upstream patches for it.
 
   21 Sep 2011; Hans de Graaff <graaff@gentoo.org> -prawn-core-0.8.4.ebuild:
   Remove old version.
diff --git a/dev-ruby/prawn-core/Manifest b/dev-ruby/prawn-core/Manifest
index b15f7189111e..bf8fccccc8e8 100644
--- a/dev-ruby/prawn-core/Manifest
+++ b/dev-ruby/prawn-core/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX prawn-core-0.8.4-ruby18-tests.patch 970 RMD160 683d382f723d397a2a75951f2fdfb239a30291f5 SHA1 76f7cbb98e121c78ee7a3b9b6f955534e4b3e869 SHA256 d3c87dbd71f5079e4083367f314102749f113f3fcb2d5a26c853697cfa6420f4
+AUX prawn-core-0.8.4-ruby19-document.patch 731 RMD160 a61a58403cbcfc94c509ea297be35c6060d3a4c4 SHA1 5a02b0c7d8a9205ff8a1967de6ec35194a0760ff SHA256 ceed2b2c639dea884dbc1ebc08da6d734a89ef60c6546298556a5f1e0561eccf
+AUX prawn-core-0.8.4-ruby19-tests.patch 863 RMD160 537aa341b9f16357db440e9f8780f7f6e9c704a8 SHA1 a5020e395f1d990606e77394d799ac70a65d7819 SHA256 38d074522a58731ae20758e95030703ab90974a4033c117c4403132128bf26be
 DIST prawn-core-0.8.4.gem 4484096 RMD160 c27658533ed45418439ff1826b641f1c272afb03 SHA1 39aac1a02a436ca2cc87812a5488131c29c53c27 SHA256 4d74d1ddc2e56120548a7b427a98771d78fdc9a00c667e1a0729b2749100bd76
 EBUILD prawn-core-0.8.4-r1.ebuild 1168 RMD160 0b9a51bd488b854cf3b46b47ff2c25884d5a35b9 SHA1 72a97745fddde53027bc433299c3e3630014e845 SHA256 87de94ccdddd78fc40996cf69fe9997227b6955318012e93dfd2ca98d60c7ef9
-MISC ChangeLog 1173 RMD160 ad4ca4972624089f79cd5f5fd2a1d540d82e8a83 SHA1 decc0f4ba39825a5b0cd06a1722d911eba215953 SHA256 1d2ef7f6f9425fdbd074b7c2b4c05ba9937c488b5bd92d3b32ab0189c0dad2e0
+EBUILD prawn-core-0.8.4-r2.ebuild 1343 RMD160 a22bc4572c3887859b61a4653f100b28ed43af46 SHA1 fc3df44674f447fc4dc0b43adcce07c57bc201fd SHA256 5dd8cabf22395f3593a47d3d2e1bb551ba918e4039b5e81deec054906f85d0a3
+MISC ChangeLog 1487 RMD160 89f2e8c50e582e67e3eefd62dc45123f44b383d2 SHA1 8ff209196ab4cbd22bc847bf00186e675b01aed1 SHA256 69c4c1b6c0cf52ef4cf5f84a12b1359b41082a7fee63de4d4f5b244ddbc36f5f
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk55hD4ACgkQiIP6VqMIqNdGdwD/S96wvpzosJmzdQds+jky5kma
-EKy1t1eLnMGjDzXNQW8A/joC+Sdi04n+W+MGwmm0VB75yqia+UGV7rnXbx0gWhj9
-=vU5t
+iF4EAREIAAYFAk8RXhIACgkQiIP6VqMIqNf8ZQD/aL8UKxiAsL/d7ADSrfYZgFqr
+4g5evAQP3KX3+E8oY24BAIYQ8GgDbx7OP9aDTfMo5qfKuyRlzmlSO9JJPhoj7z5U
+=ASDg
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/prawn-core/files/prawn-core-0.8.4-ruby18-tests.patch b/dev-ruby/prawn-core/files/prawn-core-0.8.4-ruby18-tests.patch
new file mode 100644
index 000000000000..4838e08a10da
--- /dev/null
+++ b/dev-ruby/prawn-core/files/prawn-core-0.8.4-ruby18-tests.patch
@@ -0,0 +1,24 @@
+commit c9cae80223b3cbbfe4c6d8647c44b7b4f0f0fcf4
+Author: Brad Ediger <brad.ediger@madriska.com>
+Date:   Thu Jan 20 16:49:59 2011 -0600
+
+    Green that test for those Ruby 1.8 users, too
+
+diff --git a/spec/font_spec.rb b/spec/font_spec.rb
+index 2b3368a..5ee3a78 100644
+--- a/spec/font_spec.rb
++++ b/spec/font_spec.rb
+@@ -224,8 +224,11 @@ describe "TTF fonts" do
+   
+   it "should encode text without kerning by default" do
+     @activa.encode_text("To").should == [[0, "To"]]
+-    @activa.encode_text("Télé").should == 
+-      [[0, "T\216l\216".force_encoding("US-ASCII")]]
++
++    tele = (RUBY_VERSION < '1.9') ? "T\216l\216" :
++      "T\216l\216".force_encoding("US-ASCII")
++    @activa.encode_text("Télé").should == [[0, tele]]
++
+     @activa.encode_text("Technology").should == [[0, "Technology"]]
+     @activa.encode_text("Technology...").should == [[0, "Technology..."]]
+     @activa.encode_text("Teχnology...").should == [[0, "Te"], [1, "!"], [0, "nology..."]]
diff --git a/dev-ruby/prawn-core/files/prawn-core-0.8.4-ruby19-document.patch b/dev-ruby/prawn-core/files/prawn-core-0.8.4-ruby19-document.patch
new file mode 100644
index 000000000000..ae606c408b2e
--- /dev/null
+++ b/dev-ruby/prawn-core/files/prawn-core-0.8.4-ruby19-document.patch
@@ -0,0 +1,28 @@
+commit 44ec153bf6212044fd8d2e3f59cb509cc30f8318
+Author: Gregory <seacreature@anatta.local>
+Date:   Tue Jun 8 18:21:16 2010 -0400
+
+    Fix some minor 1.9.2 issues
+
+diff --git a/spec/document_spec.rb b/spec/document_spec.rb
+index 7707e56..71d5751 100644
+--- a/spec/document_spec.rb
++++ b/spec/document_spec.rb
+@@ -374,9 +374,14 @@ end
+ 
+ describe "The :optimize_objects option" do
+   before(:all) do
+-    @wasteful_doc = lambda do
+-      transaction { start_new_page; text "Hidden text"; rollback }
+-      text "Hello world"
++    @wasteful_doc = lambda do |pdf|
++      pdf.transaction do 
++        pdf.start_new_page
++        pdf.text "Hidden text"
++        pdf.rollback 
++      end
++
++      pdf.text "Hello world"
+     end
+   end
+ 
diff --git a/dev-ruby/prawn-core/files/prawn-core-0.8.4-ruby19-tests.patch b/dev-ruby/prawn-core/files/prawn-core-0.8.4-ruby19-tests.patch
new file mode 100644
index 000000000000..5b28b33635a7
--- /dev/null
+++ b/dev-ruby/prawn-core/files/prawn-core-0.8.4-ruby19-tests.patch
@@ -0,0 +1,20 @@
+commit 6adb8ceb844f57f50dcfa6e457a2cd37b933d40e
+Author: Brad Ediger <brad.ediger@madriska.com>
+Date:   Thu Jan 20 16:46:37 2011 -0600
+
+    Green font_spec test for 1.9.2p136
+
+diff --git a/spec/font_spec.rb b/spec/font_spec.rb
+index 9304b01..2b3368a 100644
+--- a/spec/font_spec.rb
++++ b/spec/font_spec.rb
+@@ -224,7 +224,8 @@ describe "TTF fonts" do
+   
+   it "should encode text without kerning by default" do
+     @activa.encode_text("To").should == [[0, "To"]]
+-    @activa.encode_text("Télé").should == [[0, "T\216l\216"]]
++    @activa.encode_text("Télé").should == 
++      [[0, "T\216l\216".force_encoding("US-ASCII")]]
+     @activa.encode_text("Technology").should == [[0, "Technology"]]
+     @activa.encode_text("Technology...").should == [[0, "Technology..."]]
+     @activa.encode_text("Teχnology...").should == [[0, "Te"], [1, "!"], [0, "nology..."]]
diff --git a/dev-ruby/prawn-core/prawn-core-0.8.4-r2.ebuild b/dev-ruby/prawn-core/prawn-core-0.8.4-r2.ebuild
new file mode 100644
index 000000000000..679130c32d3a
--- /dev/null
+++ b/dev-ruby/prawn-core/prawn-core-0.8.4-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/prawn-core/prawn-core-0.8.4-r2.ebuild,v 1.1 2012/01/14 10:50:47 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RUBY_FAKEGEM_DOCDIR="doc/html"
+RUBY_FAKEGEM_EXTRADOC="HACKING README"
+
+# ttfunk and pdf-inspector are vendored. These packages are maintained
+# separately upstream but never released, so we now keep on using
+# these vendored versions.
+RUBY_FAKEGEM_EXTRAINSTALL="data vendor"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Fast, Nimble PDF Generation For Ruby"
+HOMEPAGE="http://prawn.majesticseacreature.com/"
+
+LICENSE="|| ( GPL-2 Ruby )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples"
+
+ruby_add_bdepend test "dev-ruby/test-spec dev-ruby/mocha >=dev-ruby/pdf-reader-0.8"
+
+USE_RUBY="ruby19" ruby_add_bdepend "test? ( dev-ruby/test-unit:0 )"
+
+# Older versions of prawn install the same files, but in site_ruby
+# which gets found before the newer gem install path that prawn-core
+# uses.
+RDEPEND="!<dev-ruby/prawn-0.7"
+
+RUBY_PATCHES=( "${P}-ruby19-tests.patch" "${P}-ruby18-tests.patch" "${P}-ruby19-document.patch" )
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples || die "Installing examples failed."
+	fi
+}