Update i18n to 0.3.7, add (realistic) REE18 and JRuby support.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 123 insertions, 12 deletions

diff --git a/dev-ruby/i18n/ChangeLog b/dev-ruby/i18n/ChangeLog
index 6d8406e6f31e..57f25b5c803c 100644
--- a/dev-ruby/i18n/ChangeLog
+++ b/dev-ruby/i18n/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/i18n
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/ChangeLog,v 1.13 2010/05/23 10:26:58 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/ChangeLog,v 1.14 2010/05/23 21:46:19 flameeyes Exp $
+
+*i18n-0.3.7 (23 May 2010)
+
+  23 May 2010; Diego E. Pettenò <flameeyes@gentoo.org> i18n-0.3.3.ebuild,
+  +i18n-0.3.7.ebuild, +files/i18n-0.3.7-gentoo.patch:
+  Update i18n to 0.3.7, add (realistic) REE18 and JRuby support.
 
   23 May 2010; Alex Legler <a3li@gentoo.org> i18n-0.1.3.ebuild:
   Add REE18 support
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index 33ac676e6c4d..526c6a07e468 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX i18n-0.3.7-gentoo.patch 1070 RMD160 a6d82af6f993bf40bf629b7916aaf7c46a17a19b SHA1 174b6e37e04cfaead97c5ed2f6e8ca0910f499cb SHA256 61702838ddc01f99c58624953a2fa173ea3c511d83cb851d5373faa09ee183d2
 DIST i18n-0.3.3.gem 50688 RMD160 b84574531f633d22b8289a838a77f1922f426176 SHA1 33cc970b6c4839070d6af75b4d80d0264eb0447f SHA256 35c9e4e3a1be3233ef2e7fbdb8006cfcb2aadb2a09234674ad870bb6ac5881c5
 DIST i18n-git-0.1.3.tgz 11670 RMD160 8182335e29cf27d41d11cfc1ea867a2b0e2d68e1 SHA1 8a1604bb37125fd3e410b174958c9702548f0ed6 SHA256 e6615696e2d3a1650233a8c786e65e9ce8ca1e687aadcc6bcf8995948178e03e
+DIST i18n-git-0.3.7.tgz 55933 RMD160 9377a6c5b8036f14b8676f93b78d8af7c7ecf072 SHA1 9c7346742a33d439453caf6383e83a8c4c5639bd SHA256 771fa2909b9c1a4f40e4230ce6dae4783bc72be4d39976d5f2b82f8ea190d957
 EBUILD i18n-0.1.3.ebuild 1271 RMD160 4e3e7f07123eba4dcec12a5ebc0e44c371e81b90 SHA1 8beccbb83846b01c17103b6218c193300c6b404b SHA256 a5102b68df13dacfbbed124397424eaf180a7ba48a2a2510a144c1a1d7234dc4
-EBUILD i18n-0.3.3.ebuild 1108 RMD160 2966d4d4c10db01fdb4e2b7f5d5b336c1f6de35f SHA1 34ec5dd7cfed538682f5e9d46191a61920e1e32b SHA256 affa8b7ca8ecd3313a63c4b274d87591e96f79aaabef61f4edaa4b3b668577cc
-MISC ChangeLog 1805 RMD160 baf70730344e6d76dbcb877b0f8e6d73659e1108 SHA1 5d436632f4ed0056ee0b40db9adc7a9e87aad1c7 SHA256 dc0fcf23928368336be56062b5eee22b8ac715caa98111f50ac5c9baf26e2c8c
+EBUILD i18n-0.3.3.ebuild 1107 RMD160 8025d94922ea08658f2e29ec2372f25c9e1bfddf SHA1 73e2e84f716be55448ea18e4f5ab5151bf40c195 SHA256 9a446f72bb9448d0cf9d45140190c70f7d01688845da19d6631e659f9b002a30
+EBUILD i18n-0.3.7.ebuild 1955 RMD160 bbf297cd7292e18f493ebf5f29c2c891ae24b208 SHA1 7764e20c5e08c4741b61ee765b0101e8637df1f7 SHA256 b9606d754398de642be01a4ff3b712b77067ef604bb8ac671e8e90ec3416fda9
+MISC ChangeLog 2032 RMD160 cc4dbadddeb2fb0a1fd11018576bbd42106e4991 SHA1 dc4a08f2b7a44ebc2408a010554626912be68b06 SHA256 27410d4a670b612f26f5844b61bc1e3103c7c959cb62aebaab83ea8ae3780fe6
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv5AvkACgkQ+tgfDpkAy6AIpQCbBKcBiIIPRFPjg640wXGnDQCv
-HhkAn2pvZ//9jJI4NvGOFEHYFrgdWY7J
-=8O3M
+iEYEARECAAYFAkv5oe8ACgkQAiZjviIA2XifOwCgsixJpV//ai/1FSscpKld/eY9
+QW4AoOOFKjfuNdKfi4QxzMSmx5ZC8pur
+=VXAo
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/i18n/files/i18n-0.3.7-gentoo.patch b/dev-ruby/i18n/files/i18n-0.3.7-gentoo.patch
new file mode 100644
index 000000000000..17fd05bf7430
--- /dev/null
+++ b/dev-ruby/i18n/files/i18n-0.3.7-gentoo.patch
@@ -0,0 +1,32 @@
+diff --git a/test/backend/interpolation_compiler_test.rb b/test/backend/interpolation_compiler_test.rb
+index 5051299..5852b9c 100644
+--- a/test/backend/interpolation_compiler_test.rb
++++ b/test/backend/interpolation_compiler_test.rb
+@@ -104,5 +104,5 @@ class I18nBackendInterpolationCompilerTest < Test::Unit::TestCase
+   end
+   
+   # I kinda don't think this really is a correct behavior
+-  undef :'test interpolation: given no values it does not alter the string'
+-end
+\ No newline at end of file
++  undef_method 'test interpolation: given no values it does not alter the string'
++end
+diff --git a/test/test_setup_requirements.rb b/test/test_setup_requirements.rb
+index d5a2cbe..a057042 100644
+--- a/test/test_setup_requirements.rb
++++ b/test/test_setup_requirements.rb
+@@ -34,6 +34,7 @@ end
+ 
+ def setup_active_record
+   begin
++    require 'sqlite3'
+     require 'active_record'
+     ActiveRecord::Base.connection
+     true
+@@ -63,4 +64,4 @@ def connect_active_record
+       t.boolean :is_proc, :default => false
+     end
+   end
+-end
+\ No newline at end of file
++end
diff --git a/dev-ruby/i18n/i18n-0.3.3.ebuild b/dev-ruby/i18n/i18n-0.3.3.ebuild
index 584edeb57619..b62e2dbb05f6 100644
--- a/dev-ruby/i18n/i18n-0.3.3.ebuild
+++ b/dev-ruby/i18n/i18n-0.3.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/i18n-0.3.3.ebuild,v 1.7 2010/05/23 10:25:11 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/i18n-0.3.3.ebuild,v 1.8 2010/05/23 21:46:19 flameeyes Exp $
 
 EAPI=2
 
-USE_RUBY="ruby18 ree18"
+USE_RUBY="ruby18"
 
 RUBY_FAKEGEM_EXTRAINSTALL="vendor"
 
diff --git a/dev-ruby/i18n/i18n-0.3.7.ebuild b/dev-ruby/i18n/i18n-0.3.7.ebuild
new file mode 100644
index 000000000000..af4df5fd1240
--- /dev/null
+++ b/dev-ruby/i18n/i18n-0.3.7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/i18n-0.3.7.ebuild,v 1.1 2010/05/23 21:46:19 flameeyes Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 jruby ree18"
+
+# doc regeneration seem to need Jeweler, which is not currently
+# available
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.textile CHANGELOG.textile"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Add Internationalization support to your Ruby application."
+HOMEPAGE="http://rails-i18n.org/"
+
+SRC_URI="http://github.com/svenfuchs/${PN}/tarball/v${PV} -> ${PN}-git-${PV}.tgz"
+S="${WORKDIR}/svenfuchs-${PN}-*"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~ppc-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+# Optionally, the testsuite uses the activerecord gem to run some
+# tests; whent hey run, they require sqlite3-ruby, and that is not
+# available on JRuby.
+USE_RUBY="${USE_RUBY/jruby/}" \
+	ruby_add_bdepend "
+			test? (
+				dev-ruby/activerecord
+				dev-ruby/sqlite3-ruby
+				dev-ruby/ruby2ruby
+			)"
+
+# mocha is optionally used by the testsuite, try to increase coverage
+# of testing by depending on it; when mocha is used, though,
+# test-unit:2 cannot be merged at the same time (mocha problem?)
+#
+# One further test dependency would be ruby-cldr
+# (http://rubygems.org/gems/ruby-cldr) but we don't have it in tree
+# yet.
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		!!dev-ruby/test-unit:2
+	)"
+
+src_compile() {
+	# permissions need to be stricter for Ruby-Inline to work properly.
+	chmod 0755 ${WORKDIR/work/homedir} || die "Failed to fix permissions on home"
+	ruby-ng_src_compile
+}
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_test() {
+	# permissions need to be stricter for Ruby-Inline to work properly.
+	chmod 0755 ${WORKDIR/work/homedir} || die "Failed to fix permissions on home"
+	ruby-ng_src_test
+}
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 3646eb8b7b0b..cd310a242b25 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -4,13 +4,14 @@ Hash: SHA1
 DIST json-1.2.2.gem 386048 RMD160 d0451e6b6a781ef840860136cea7513f2e58f9ee SHA1 056c6dd361f2985167f49ef040bc2b119d899179 SHA256 9b0e4c2fcc1d61354106ff803b6d89357584c8969b0028c71070591d04f64012
 DIST json-1.4.3.gem 397824 RMD160 964a5c58e3621e8300650e5d8d62ea34c35f2b12 SHA1 a02bc81d86c3c956e4f2a49e55aa3959b99409d7 SHA256 46f26a861601de5d4332952c51a9cc867f36e4b54bcb496801b949cd8df17e64
 EBUILD json-1.2.2.ebuild 1856 RMD160 499739f879ffea36036712c47ac46fb41838a737 SHA1 4f20149c56ed733a803275bf42b29ba47f5ece0d SHA256 7b0574df356be2aa1c37c4b07f7913c14bfdfdf1aa1cdf77bb7f5f98c6932732
+EBUILD json-1.4.3-r1.ebuild 1871 RMD160 475c85d196475622d3a2d8586b92607f8b83e528 SHA1 8be70624fef563a1cd312ae3e0f52283961e3d51 SHA256 94bb1012d6fe2ddf39897119337904abc3dd127f68e7a4e64405c16a1f4d8646
 EBUILD json-1.4.3.ebuild 1873 RMD160 f0f0601205dfe91cf3dd24dfd43696b7ea5dc850 SHA1 3c357c9ae02b59e42222b0d5d7c96d93a654355d SHA256 e239409220596c99bdf9e136f187c71482530acbe3255470131820ea1eabe9fb
-MISC ChangeLog 4308 RMD160 88b9d7ea430d06a38a83fea4e56c5e00105fd98a SHA1 0fb0e12efebe55dc607036df5f26a248460ce9db SHA256 60d548a9732e67ffc56d8f654ed0102ea78d8d0b5688ca55b7caf047f6c3d715
+MISC ChangeLog 4630 RMD160 8d741a73864413fc397cc975778690f98bf04281 SHA1 b211cb56267dde8e55259a3fafc8e0248ce15ca7 SHA256 c60dee286592c67fde6f802c67941108beb3e216e89912e06eaec61cfc4ae8d7
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv4YLAACgkQ+tgfDpkAy6BbpACeOIes45KHp3zV+WoNbkewHewa
-PlYAn2TgklwpF73klJD5oNUDtLgylUUB
-=hhP7
+iEYEARECAAYFAkv5okoACgkQAiZjviIA2XgbsACgr7sUHdVWTVU2LsUI+sjtQgMB
+kasAn06+nAYUDJ8lnLFivwKKp+83iyZT
+=qgdp
 -----END PGP SIGNATURE-----