Fix specifications so that they can be used with bundler (required for radiant-1). Also add mocha to the list of test dependencies for 3.0, found while installing the wrong slot.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

6 files changed, 166 insertions, 16 deletions

diff --git a/dev-ruby/activesupport/ChangeLog b/dev-ruby/activesupport/ChangeLog
index 24fd9e4e84dd..e56b1e131418 100644
--- a/dev-ruby/activesupport/ChangeLog
+++ b/dev-ruby/activesupport/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-ruby/activesupport
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.157 2011/11/19 10:53:57 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.158 2011/12/08 19:38:36 flameeyes Exp $
+
+*activesupport-2.3.14-r1 (08 Dec 2011)
+
+  08 Dec 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +activesupport-2.3.14-r1.ebuild,
+  +files/activesupport-2.3.14-unvendorize.patch, activesupport-3.0.11.ebuild:
+  Fix specifications so that they can be used with bundler (required for
+  radiant-1). Also add mocha to the list of test dependencies for 3.0, found
+  while installing the wrong slot.
 
 *activesupport-3.0.11 (19 Nov 2011)
 
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 4005003c645c..4221d5246e4f 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX activesupport-2.3.14-unvendorize.patch 2382 RMD160 ca88404dd5b7c41330c195ef9dbad8b5d5940bbb SHA1 a808b3930308a5e5ae597f2dcffdf40654b51cab SHA256 e9c8c27437a24ec765df9dce35caaa353661bfe51dd50c71007e5be12b092ad1
 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
@@ -9,15 +10,16 @@ AUX activesupport-3.0.3-mocha-0.9.5.patch 666 RMD160 07ff80e8e323e4bc3d1488df11e
 DIST activesupport-2.3.14.gem 431104 RMD160 0ece71e15413b40f53be83ab74013a70e16a4c5b SHA1 4f7d82d8d4eaf80d9eb1638341558cf8a207cc2e SHA256 c5affddb549fa05415f0e467a17bd0fa02925b414d1a5e2835270d7064b455fe
 DIST rails-3.0.10.tgz 3503921 RMD160 73788df5c1efc26cb9afab3142b7e37a7b3f1fd4 SHA1 b0f49b711cd5bada65c5450d8042dbab665fc56a SHA256 233ba73a71eaee5864e1c66d0c3803e8d1abbfab41e2a3e494dde8538b66598b
 DIST rails-3.0.11.tgz 3508633 RMD160 b9669f58f0ea2b362819902eb9fbe244dbcde3a9 SHA1 5d50166da760186430a0f33440c47222cc72d1f8 SHA256 bb8da3b680d9ad5148d64567a2cea2e9b99e0a58fbe37981568633652b00c18f
+EBUILD activesupport-2.3.14-r1.ebuild 1594 RMD160 3f82a5c9ea95693f6c1bcde742751b48919e32e6 SHA1 75c6e033f4862e5eb86c18c2333f8ca12ae886a7 SHA256 bc3867ddb3e94625dc2a62aba8e0eaf9f7392dc7bffdd5caafbf3cd06810d507
 EBUILD activesupport-2.3.14.ebuild 1244 RMD160 57c756401e88405974891feb419f27ee3d45c48e SHA1 9cca430b8e22083f42503d3c4acf953e0357cafc SHA256 062a9d051fc3b0067379b935f9d91a92e0d3463ed53068ad654a47e54c4dc57c
 EBUILD activesupport-3.0.10.ebuild 1411 RMD160 fecff663e2206cb6212636e1292619c3f589381a SHA1 18a84615e1ddc2a348839ee6abe33048aec284a9 SHA256 f590160e221689cda0b1fbc44032111982400bb04d20167789b4ccaf7a549ca0
-EBUILD activesupport-3.0.11.ebuild 1411 RMD160 f8c342265e7013629211bfe08c0b39b943205b96 SHA1 fa015e5d2b4b3aae06fe42160ca3dca494b1aa79 SHA256 126c6f13a19d5ca348694b2ae5d1176468dc49a43228538651727d02ff183484
-MISC ChangeLog 21648 RMD160 47d5a54a3ab6b2626136bea28e6f6e68e7334a6f SHA1 71ee05422c57e9bd36113a59f6014f7efc9d3cf4 SHA256 1da57803b8c2bdb7f8dd20339236b199a0ce3b98d6d1dda37a4477273c12d5d6
+EBUILD activesupport-3.0.11.ebuild 1429 RMD160 c85881e6fb9ddbfb609e7b1b5b7d763486b93320 SHA1 e8098b7033490caa03619584792f76718b27c43a SHA256 ba14bae148148db92e7b9bfb70130a2e50f158aa702a8eeed38ef089da13314d
+MISC ChangeLog 22046 RMD160 cb30b16964ca0246a82f4b5f8a1b78d378328382 SHA1 fd3f5911521bad10fff3937657604315387c9ce2 SHA256 877e9f6ae86a9bef5da240d4af8aa8f5eef19ca134851e2ceb1bf3070a3f85d7
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7HitQACgkQiIP6VqMIqNddLQD+INa/M0tU+Q3gpnT8kC3zjieF
-rrworXP5Y06G0OJrxMcA/2+SyQ4Szx5VKXvNT95nyInZ8+NRtBX6Hnka7xwZami+
-=YEKM
+iEYEARECAAYFAk7hEj0ACgkQAiZjviIA2Xi3dgCgsBIUgNI6brbhVgMgQv2dw9+t
+9AwAnA31tv0bMVUqVoVsue0ocCOkuFDR
+=VhzP
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/activesupport/activesupport-2.3.14-r1.ebuild b/dev-ruby/activesupport/activesupport-2.3.14-r1.ebuild
new file mode 100644
index 000000000000..a0de5bae5292
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-2.3.14-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-2.3.14-r1.ebuild,v 1.1 2011/12/08 19:38:36 flameeyes 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/builder-2.1.2:0 >=dev-ruby/tzinfo-0.3.16 >=dev-ruby/i18n-0.4.1:0.4"
+
+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 the correct slot. It
+	# also edits the metadata file so that the dependencies are added to
+	# the specification, which is required for bundler to pick them up
+	# (which in turn is required by radiant 1.0.0rc3 to
+	# work). Furthermore remove the references to the vendorized copies
+	# from the specification, to be safe.
+	epatch "${FILESDIR}"/${PN}-2.3.14-unvendorize.patch
+	sed -i -e '/\/vendor\//d' ../metadata
+
+	# 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/activesupport-3.0.11.ebuild b/dev-ruby/activesupport/activesupport-3.0.11.ebuild
index 8ec9762babf4..7ff0cd4b3a6f 100644
--- a/dev-ruby/activesupport/activesupport-3.0.11.ebuild
+++ b/dev-ruby/activesupport/activesupport-3.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-3.0.11.ebuild,v 1.1 2011/11/19 10:53:57 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-3.0.11.ebuild,v 1.2 2011/12/08 19:38:36 flameeyes Exp $
 
 EAPI=4
 
@@ -30,7 +30,7 @@ ruby_add_rdepend ">=dev-ruby/memcache-client-1.5.8"
 
 # libxml-ruby and nokogiri are not strictly needed, but there are tests
 # using this code.
-ruby_add_bdepend "test? ( virtual/ruby-test-unit >=dev-ruby/libxml-2.0.0 dev-ruby/nokogiri )"
+ruby_add_bdepend "test? ( virtual/ruby-test-unit >=dev-ruby/libxml-2.0.0 dev-ruby/nokogiri dev-ruby/mocha )"
 
 all_ruby_prepare() {
 	# don't support older mocha versions as the optional codepath
diff --git a/dev-ruby/activesupport/files/activesupport-2.3.14-unvendorize.patch b/dev-ruby/activesupport/files/activesupport-2.3.14-unvendorize.patch
new file mode 100644
index 000000000000..d84f286261c1
--- /dev/null
+++ b/dev-ruby/activesupport/files/activesupport-2.3.14-unvendorize.patch
@@ -0,0 +1,96 @@
+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.4.1'
+-rescue Gem::LoadError
+-  $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.4.1"
+-end
++gem 'i18n', '~> 0.4.1'
+ require 'i18n'
+Index: metadata
+===================================================================
+--- a/../metadata
++++ b/../metadata
+@@ -16,7 +16,55 @@ bindir: bin
+ cert_chain: []
+ 
+ date: 2011-08-16 00:00:00 Z
+-dependencies: []
++dependencies:
++- !ruby/object:Gem::Dependency 
++  name: builder
++  prerelease: false
++  requirement: &id001 !ruby/object:Gem::Requirement 
++    none: false
++    requirements: 
++    - - "~>"
++      - !ruby/object:Gem::Version 
++        hash: 57
++        segments: 
++        - 2
++        - 1
++        - 2
++        version: 2.1.2
++  type: :runtime
++  version_requirements: *id003
++- !ruby/object:Gem::Dependency 
++  name: tzinfo
++  prerelease: false
++  requirement: &id002 !ruby/object:Gem::Requirement 
++    none: false
++    requirements: 
++    - - ">="
++      - !ruby/object:Gem::Version 
++        hash: 57
++        segments: 
++        - 0
++        - 3
++        - 16
++        version: 0.3.16
++  type: :runtime
++  version_requirements: *id003
++- !ruby/object:Gem::Dependency 
++  name: i18n
++  prerelease: false
++  requirement: &id003 !ruby/object:Gem::Requirement 
++    none: false
++    requirements: 
++    - - "~>"
++      - !ruby/object:Gem::Version 
++        hash: 57
++        segments: 
++        - 0
++        - 4
++        - 1
++        version: 0.4.1
++  type: :runtime
++  version_requirements: *id003
+ 
+ description: Utility library which carries commonly used classes and goodies from the Rails framework
+ email: david@loudthinking.com
diff --git a/dev-ruby/radiant/Manifest b/dev-ruby/radiant/Manifest
index a3d6ca378292..f9f02f8fe66d 100644
--- a/dev-ruby/radiant/Manifest
+++ b/dev-ruby/radiant/Manifest
@@ -3,20 +3,20 @@ Hash: SHA1
 
 AUX radiant-0.8.2-migration.patch 1071 RMD160 5a4f44cfd6aa8fb46d77f2d877d0fb86b011e72f SHA1 0eafeb27042f4bbce392cd4668e2303b6f64f2e2 SHA256 d849b3878ca8e101380bcb8675c4f9ab6c88ff3101dc4c624922d53f299273f2
 AUX radiant-0.9.1-unbundled.patch 882 RMD160 33a9547705b8112dae2833b05c9feec1583d0535 SHA1 51e4687b2d6ed507bd962dbc3c81a85602e9835d SHA256 9e030ca41327776786dc1b8efbe9ec9a03a1cadea788df2429e4070a3e2e0020
-AUX radiant-1.0.0_rc3-deps.patch 484 RMD160 db956b26445366ffdc83506b122950941343b3a9 SHA1 51ed30ba88e60c302db7b1fd1e5cdecf41442b27 SHA256 f5ec1353e4097598ee8b69c10bfe215e7340b89324252a8d3959e6ad02fe8060
+AUX radiant-1.0.0_rc3-deps.patch 575 RMD160 fb097d852c9d73a093ebd5c1ae276e8815aa8ab6 SHA1 e8c189041be9df5007e06c919ab61fc140042aa7 SHA256 92b1518ea92007c71de63b0bf8904791db0e6961d3493bce9d76eaafe5a1becc
 DIST radiant-0.8.2.gem 6316544 RMD160 5df88e7eaaa43575c37aa5731cd887eed56e33af SHA1 299973067ef9076b4f32119effba36724c1cd832 SHA256 b39dd89e3fead2d6be69e115c89bc1ac0f95aa72b5d4e05f0c64665627044e13
 DIST radiant-0.9.1.gem 5289984 RMD160 7cce0e4032b5fa099df1651a45e9e2b7fca20400 SHA1 e37056ea9e5e629e15e2db66109907ff151053b9 SHA256 f288f3d00eef84531b507430d1ea8385c42b7c19c1de4eca88741c98637d7a34
 DIST radiant-1.0.0.rc3.gem 906752 RMD160 99ab90730e17111242ffe3d9bd2a63374d6c0d4f SHA1 5db5b7bf2efdd97e5b714cfbf0c150187138750d SHA256 053c603e800e819802c07f9761e7ac936e80ef28387f659e9b82b022b289d5e4
 EBUILD radiant-0.8.2-r1.ebuild 1481 RMD160 581fadb3a59ee83f32367005d778a90d757ffc81 SHA1 d4a1da3ba474f9cab4d38c6feee63422d7600ca2 SHA256 b581694fdff71ddefea026d622c7e1b786714a424ec4dbde0fdff93b09871010
 EBUILD radiant-0.9.1-r2.ebuild 1591 RMD160 059caa1818d1491e7e655c147af7e674532de8d9 SHA1 7f01425af0e99374d94041cfab3bfdea96379e58 SHA256 f444ac56cda0282911fd25a85b7d9a57df91018bd03af9f8b1f77c8b5e5ce97d
 EBUILD radiant-0.9.1-r3.ebuild 1591 RMD160 80e3c102ad4fc2192c15715834f3f745e769d3b2 SHA1 4855c56727d149e0096cadb2fddcc384e1e3c37e SHA256 03b848c7d402b1df44d485d9432a6a5d0d02ec3434d27a4cf9776ee3eeef928d
-EBUILD radiant-1.0.0_rc3.ebuild 1861 RMD160 c71a068493b1787096fd1a07baea984b2a1df832 SHA1 d555def284d3479afc2425260de7b37e2bc0d725 SHA256 33c817d8e2420851f8150ea5e08fbb9fa95287b17718409691c46949a555c231
-MISC ChangeLog 4025 RMD160 6bc19c663531afc3f5c9af36a602e801da8e0536 SHA1 ca7620b9f49247e72493bd22c088832788f1d5cc SHA256 013b05738913978d05d4f41bd49277201f32de49616bca886b76e58f66562524
+EBUILD radiant-1.0.0_rc3-r1.ebuild 1904 RMD160 3a0422fb81e79c62d720f466695b60e8847df318 SHA1 0f11957fc251b786423809a059162d3e2d44e5f1 SHA256 060f1b137323ac195acc2e119d34a5ba40b4ec27ff08bc04324595794171320d
+MISC ChangeLog 4354 RMD160 bb6d8ba0fc58b3945e4b38624d39d87bfcd2fd92 SHA1 6e2fdd65dae1528b93f310a0056410d11cd21211 SHA256 eeca99178b0ab775b5ba126aac1be7e49f8fbf5c73be94a934feda4aeff03eda
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7dLyIACgkQAiZjviIA2Xg55ACfdesJfLKL+CY2QMWII3WJSG/J
-8vMAn2yZP9rNrl4JGoictav9leKPSk31
-=+Frw
+iEYEARECAAYFAk7hEvgACgkQAiZjviIA2Xj+EACg8kG7ZGSrJL6Sze+kUdj8qzc9
+qvAAnjPv94FyslWJXi9SoxuUQrpNNjG2
+=cuSe
 -----END PGP SIGNATURE-----