Bump revision to properly fix support to use the unbundled i18n gem (with the proper slot).

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

4 files changed, 58 insertions, 9 deletions

diff --git a/dev-ruby/activesupport/ChangeLog b/dev-ruby/activesupport/ChangeLog
index 2a20b9e037a6..31d441da6d7f 100644
--- a/dev-ruby/activesupport/ChangeLog
+++ b/dev-ruby/activesupport/ChangeLog
@@ -1,6 +1,14 @@
 # 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.115 2010/01/04 10:50:11 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.116 2010/01/18 19:04:49 flameeyes Exp $
+
+*activesupport-2.3.5-r3 (18 Jan 2010)
+
+  18 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -activesupport-2.3.5-r2.ebuild, +activesupport-2.3.5-r3.ebuild,
+  +files/activesupport-2.3.5-unvendorize.patch:
+  Bump revision to properly fix support to use the unbundled i18n gem (with
+  the proper slot).
 
   04 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   activesupport-2.3.5-r2.ebuild:
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index bda1b26cd63a..3ecc05bc2e0a 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX activesupport-2.3.5-unvendorize.patch 932 RMD160 c01c0abe459cd0ac45eff4c9a367e7e6e57a2851 SHA1 f6d5ba48bafda1d48e30417343e1403ee449cd52 SHA256 3c78bc31d72716ac323d7f1c985dd2f25ea27d7ddcc21729faa3a1e863e2a51d
 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
 EBUILD activesupport-2.2.3.ebuild 517 RMD160 ef8a0d31f8728fd0efeb29a064ffb49f0798ff78 SHA1 6cf9c71c86421eac85dbd44271cc62da1606c8f9 SHA256 0c6338840d9c670c0a9ea79b2436b0243be45af42ee5c732efad2678a0e39c69
 EBUILD activesupport-2.3.5-r1.ebuild 832 RMD160 0247ee810a99be63323c8c3db13448bc0cbacacf SHA1 0192ccb674a42bf53250233de46ae57eb2443239 SHA256 e87d4746c493af52d4e510a53065419b61f64bb40e2a522395af0b042943f058
-EBUILD activesupport-2.3.5-r2.ebuild 867 RMD160 470b4de916504d6cd8f1cc1cfb08739741aa393e SHA1 b71800232075c6d4dba647c6f58d567b0e0daaeb SHA256 8ccb0b81dfe048d0298a14dae9252bba7e19b09f37b6142a25d42ac41d7ae5ca
+EBUILD activesupport-2.3.5-r3.ebuild 1066 RMD160 2c29ee9c6b7683c62285ed8b5e315a2a0c3cc09b SHA1 b8ecad58b2b3325f7f314f4bd6993b6f96f26cf6 SHA256 f27862e1b6744616fd4b657b1fd402c6db5af6b07441a68ab97272e9d1512eff
 EBUILD activesupport-2.3.5.ebuild 541 RMD160 1c5f66cea1b21881e56977497268bf7c66b19969 SHA1 dbfcfcaabb3ff65e6cd91067e03fd459303a7d6f SHA256 16fb09e04c1520f76225bd24205aaeb8907eb5fa8111a860c0e060eac9475c2f
-MISC ChangeLog 15490 RMD160 ae5830ffcb809dbbe9303a39257efc5f096da060 SHA1 a90e648ff7cdcf7b22a3d908db881980b8c23395 SHA256 123599331b21c99e8c2bde9538015ba72d53d81ed26f9b2c98d2e644df0362fe
+MISC ChangeLog 15800 RMD160 180b1ac12c6bfe019d908b1b270b8cbb7b7bc7bd SHA1 a7a37d30adcd61b939198038ff41d3036c56ade3 SHA256 eb052ed59ae4fa2f53113afe8174b1eea14af2f1d0210f81bac5b5ae1adf8425
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktBx+kACgkQNQqtfCuFnePfaQCfe/qrqVT9NxZKszmVEP5qrSvS
-SjcAniMofg7dy4Y4r9mFRq02sBO43J+M
-=xb4A
+iEYEARECAAYFAktUsIcACgkQAiZjviIA2XgC6wCeLnZnKoXGrQJ0qrMXX+HN86TR
+TQkAn2sfLX83ekmVpYZieYPV0gfsB2LF
+=YCYY
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/activesupport/activesupport-2.3.5-r2.ebuild b/dev-ruby/activesupport/activesupport-2.3.5-r3.ebuild
index 320cb22156f7..a116a868e9ac 100644
--- a/dev-ruby/activesupport/activesupport-2.3.5-r2.ebuild
+++ b/dev-ruby/activesupport/activesupport-2.3.5-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.5-r2.ebuild,v 1.2 2010/01/04 10:50:11 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-2.3.5-r3.ebuild,v 1.1 2010/01/18 19:04:49 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18"
@@ -20,10 +20,15 @@ SLOT="2.3"
 KEYWORDS="~amd64 ~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.12 dev-ruby/i18n"
+ruby_add_rdepend ">=dev-ruby/builder-2.1.2 >=dev-ruby/tzinfo-0.3.12 >=dev-ruby/i18n-0.1.3:0.1"
 
 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
 }
diff --git a/dev-ruby/activesupport/files/activesupport-2.3.5-unvendorize.patch b/dev-ruby/activesupport/files/activesupport-2.3.5-unvendorize.patch
new file mode 100644
index 000000000000..c2df9e426e78
--- /dev/null
+++ b/dev-ruby/activesupport/files/activesupport-2.3.5-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.1.3'
+-rescue Gem::LoadError
+-  $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.1.3/lib"
+-end
++gem 'i18n', '~> 0.1.3'
+ require 'i18n'