Bump for Rails 2.3.8. Drop hppa/ppc/ppc64/x86-fbsd keywords due to new unkeyworded dependency.

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

4 files changed, 88 insertions, 5 deletions

diff --git a/dev-ruby/activesupport/ChangeLog b/dev-ruby/activesupport/ChangeLog
index 6fef3c8ee361..c14822de0132 100644
--- a/dev-ruby/activesupport/ChangeLog
+++ b/dev-ruby/activesupport/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/activesupport
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.120 2010/05/23 10:36:02 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.121 2010/05/31 05:55:46 graaff Exp $
+
+*activesupport-2.3.8 (31 May 2010)
+
+  31 May 2010; Hans de Graaff <graaff@gentoo.org>
+  +activesupport-2.3.8.ebuild, +files/activesupport-2.3.8-unvendorize.patch:
+  Bump for Rails 2.3.8. Drop hppa/ppc/ppc64/x86-fbsd keywords due to new
+  unkeyworded dependency.
 
   23 May 2010; Alex Legler <a3li@gentoo.org> activesupport-2.3.5-r1.ebuild:
   Add REE18 support
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 148d198b75a3..b211ae8bd467 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -3,18 +3,21 @@ Hash: SHA1
 
 AUX activesupport-2.3.5-mocha-0.9.5.patch 1031 RMD160 3d1099384c92f06cb398c92057e679dc2284a7c9 SHA1 943b2439d7eee11084f017dca93880dc772f89cc SHA256 238be71abfb03ca232d5c80c480da4e8f1ed8f8da6cfd89f7a64513b82cfd811
 AUX activesupport-2.3.5-unvendorize.patch 932 RMD160 c01c0abe459cd0ac45eff4c9a367e7e6e57a2851 SHA1 f6d5ba48bafda1d48e30417343e1403ee449cd52 SHA256 3c78bc31d72716ac323d7f1c985dd2f25ea27d7ddcc21729faa3a1e863e2a51d
+AUX activesupport-2.3.8-unvendorize.patch 928 RMD160 01d6a482bb69c674efa6d25fbd22e6d5b4edc71c SHA1 e7eabc83f24ca28112d42c93cb5d497b5d057b8a SHA256 77a1efb59d27b57a84e07030b6820a8e7bd6e698bef67d023b65ae966936e381
 DIST activesupport-2.2.3.gem 395776 RMD160 88df17d282f4d5762b016fd604c71af320e30efd SHA1 20440dbe7b3ece4aaf63e52ec83f4ddb3f89e576 SHA256 8b5fcec82a49853ddde1208a2a8b005a8c6d2e103895b28b94e243397e03522e
 DIST activesupport-2.3.5.gem 410624 RMD160 1b1da0c5cd19fd1390d18b8878bd716bf5d371a8 SHA1 fb2673b4d093f1586cc1c8fbbaa7e822b185e6d1 SHA256 9a2502e629388ac325f52e98fbb39d6ed12f79eaf38d9125565cd32e8dc9a9a2
+DIST activesupport-2.3.8.gem 425472 RMD160 789015a083106f782db3d0a15b73372a784dcaeb SHA1 597b299099788378223d2a22d34e122dcb90b763 SHA256 89a7587b25bc312aa07638543f42ef34c974d026c4ccdc0367e9376e3233f661
 EBUILD activesupport-2.2.3.ebuild 517 RMD160 ef8a0d31f8728fd0efeb29a064ffb49f0798ff78 SHA1 6cf9c71c86421eac85dbd44271cc62da1606c8f9 SHA256 0c6338840d9c670c0a9ea79b2436b0243be45af42ee5c732efad2678a0e39c69
 EBUILD activesupport-2.3.5-r1.ebuild 833 RMD160 0d94a7f56bfa959eed07570c09ca99071e53c663 SHA1 41d140f9e14723ed7d932ecc75a0e15fd0ed884c SHA256 28e75ea7ecfb7aa613d25679e6eb4cf9318a2c60832d335a71bc330822d8374f
 EBUILD activesupport-2.3.5-r4.ebuild 1198 RMD160 9813e84b5b16e57e00b9c5dc3400d925aa6d2e31 SHA1 3efd9edbf670be47d211ded0cead7bf22220e5cb SHA256 9135d85e5467036806117873ac531ebef70b86c33c0bf021961c57c4f5f0fe3a
 EBUILD activesupport-2.3.5.ebuild 540 RMD160 4ccec83ad0cae6717feeb59b85f3b5acd2ac3d1f SHA1 70282f29483550dc9b61ba26f8f63d3703f1ba6b SHA256 112ad5c89a99d18f6ab4d9e9aa84bd4c7fd6e332d94ac738511d28def06952f9
-MISC ChangeLog 16391 RMD160 5c20364198b20fed3fc8f3fc831263b6b6995d30 SHA1 2978539e47c8351a8b4bc3a8c88e154f2a5bc5ee SHA256 bef26d80e5a18ca5d8d00821a28a7dfdb63fab94f5348bd05386619792aff0ba
+EBUILD activesupport-2.3.8.ebuild 1222 RMD160 1e343580f3b8e3f8da157a2fc96383c97ca44765 SHA1 746a70e73b5d334288fed0567ea1fc9062a26cb9 SHA256 3a66ce2ca115eeade0125b5997826283ec212ac4bd9910a2b71344c2c3adc96a
+MISC ChangeLog 16656 RMD160 ed4aa6f33abdc63284a28393faefbee86350876c SHA1 5167ec1bcb039ee897047285226bfbf4c8dd4d5b SHA256 c929e721b5d2c161c141dd218a34a16798201ed7f6e23fcc1cf954e6479d954e
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv5BRkACgkQ+tgfDpkAy6AtIACfdjVCRE7Y6WazfxYU7Lx+AiV2
-Xr4AnjDKahn0hZDP6L6lBGyUD+JXQZtN
-=CK4K
+iEYEARECAAYFAkwDT20ACgkQeM7EJeUH71NeUgCfWpuRRDJBwdpJ5mTRU/otc/1F
+nZ4An0CyNfTjS+uYFPsDnBK6WdCHiB+w
+=kny8
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/activesupport/activesupport-2.3.8.ebuild b/dev-ruby/activesupport/activesupport-2.3.8.ebuild
new file mode 100644
index 000000000000..d6d917da09d9
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-2.3.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-2.3.8.ebuild,v 1.1 2010/05/31 05:55:46 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ree18 jruby"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="http://rubyforge.org/projects/activesupport/"
+
+LICENSE="MIT"
+SLOT="2.3"
+KEYWORDS="~amd64 ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/builder-2.1.2 >=dev-ruby/tzinfo-0.3.16 >=dev-ruby/i18n-0.3.3:0.3"
+
+all_ruby_prepare() {
+	# Remove the bundled packages!
+	rm -r lib/active_support/vendor/{tzinfo,builder,i18n}-* \
+		|| die "failed to remove vendor packages"
+
+	# This patch removes the fallback to local vendorized gems, as
+	# well as fixing the dependencies for i18n to use only the 0.1
+	# slot.
+	epatch "${FILESDIR}"/${P}-unvendorize.patch
+
+	# don't support older mocha versions as the optional codepath
+	# breaks JRuby
+	epatch "${FILESDIR}"/${PN}-2.3.5-mocha-0.9.5.patch
+}
diff --git a/dev-ruby/activesupport/files/activesupport-2.3.8-unvendorize.patch b/dev-ruby/activesupport/files/activesupport-2.3.8-unvendorize.patch
new file mode 100644
index 000000000000..866611857449
--- /dev/null
+++ b/dev-ruby/activesupport/files/activesupport-2.3.8-unvendorize.patch
@@ -0,0 +1,35 @@
+Index: activesupport-2.3.5/lib/active_support/vendor.rb
+===================================================================
+--- activesupport-2.3.5.orig/lib/active_support/vendor.rb
++++ activesupport-2.3.5/lib/active_support/vendor.rb
+@@ -1,11 +1,7 @@
+ # Prefer gems to the bundled libs.
+ require 'rubygems'
+ 
+-begin
+-  gem 'builder', '~> 2.1.2'
+-rescue Gem::LoadError
+-  $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2"
+-end
++gem 'builder', '~> 2.1.2'
+ require 'builder'
+ 
+ begin
+@@ -14,15 +10,7 @@ rescue Gem::LoadError
+   $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.7.4"
+ end
+ 
+-begin
+-  gem 'tzinfo', '~> 0.3.12'
+-rescue Gem::LoadError
+-  $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.12"
+-end
++gem 'tzinfo', '~> 0.3.12'
+ 
+-begin
+-  gem 'i18n', '>= 0.3.3'
+-rescue Gem::LoadError
+-  $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.3.7"
+-end
++gem 'i18n', '~> 0.3.3'
+ require 'i18n'