Fix gemspec so that it loads fine with bundler when mail 2.3 is installed.

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

3 files changed, 17 insertions, 9 deletions

diff --git a/dev-ruby/actionmailer/ChangeLog b/dev-ruby/actionmailer/ChangeLog
index 654114f9e5a5..d6b630804e9c 100644
--- a/dev-ruby/actionmailer/ChangeLog
+++ b/dev-ruby/actionmailer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/actionmailer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.178 2012/01/20 10:06:40 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.179 2012/02/25 13:18:12 flameeyes Exp $
+
+*actionmailer-3.0.11-r2 (25 Feb 2012)
+
+  25 Feb 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +actionmailer-3.0.11-r2.ebuild, -actionmailer-3.0.11-r1.ebuild:
+  Fix gemspec so that it loads fine with bundler when mail 2.3 is installed.
 
 *actionmailer-3.0.11-r1 (20 Jan 2012)
 
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 04dcefc9ba8a..6fe60ace184a 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX actionmailer-2.3.10-rails3.patch 431 RMD160 9c68052473169ed9892b613c8bd69aa43229b4d6 SHA1 1bc3be9b16f7c759119646a87e68fadedf181d41 SHA256 4eec1446601ffef54a0e8e210ed53b1d72676ab035cf0ab1d8844f11b5611cde
 AUX actionmailer-2.3.9-require-uri.patch 507 RMD160 5097fb23ba4a8c4b0409ddd54cdfa179fe09d2e3 SHA1 999549e67b20f7eedd66d4bf59cdc9e19c55b462 SHA256 8aa2121eecea068632f38cc03cedf694e22896f1e57dd9bca912585c5fb14efe
@@ -9,15 +9,15 @@ DIST rails-3.0.11.tgz 3508633 RMD160 b9669f58f0ea2b362819902eb9fbe244dbcde3a9 SH
 DIST rails-3.1.3.tgz 3638313 RMD160 9453e35f16d2c4e7f594e62643d023c887000094 SHA1 7e0bda73ac54cff5b84f33417d1ffdab1493336b SHA256 412c8a3ae4e0d5283ace45a2ee95127418d6b70fb1a954087b09755ab3a25e99
 EBUILD actionmailer-2.3.14.ebuild 947 RMD160 c37a900f01d52602716c8d5c36a744430e9e6fb4 SHA1 324e614b615d39d35a4c29497aa0d32eeb1493ec SHA256 d57f0e239dfeee671f8c9f14fb7a7d903d17b08e6faf438862eb5d073f847c02
 EBUILD actionmailer-3.0.10.ebuild 1149 RMD160 45781dfdcc03f0425ef2ab90d400de26759a0b87 SHA1 5050f1d6a392bb7f57d024879299c3ffe6658ea6 SHA256 06bdd25f78a211d537b6d1f2f6a14e0fe061d0ffb72d86450a96f93e59ca4ef1
-EBUILD actionmailer-3.0.11-r1.ebuild 1349 RMD160 693f5112b68db15bba4dbefd7f5702f2233c02b5 SHA1 ded9366f566cafca53c91ea2f5cb9c6c4d72c26b SHA256 8e2a897d6a78e49f25ac22a80c840bbf5bf8b0fccf6850dd4dc1572b77d0d89a
+EBUILD actionmailer-3.0.11-r2.ebuild 1426 RMD160 d76e1921ad9ce12ced1ea54f6879e0197513c97f SHA1 d76d5653d5c2261a0e1914b4dfb12593c0c7ae1e SHA256 6307c8ad981266aebfcdf0d06b281b6e25aa6b27d9dc13734565356301396863
 EBUILD actionmailer-3.0.11.ebuild 1149 RMD160 35ae78f3ef12f12de89ac02f70ccbc42f6cc93d4 SHA1 41e18c87a285d6666faebf7cc2d7f1d31ac551e5 SHA256 0d34e174e0edbbb1e784addde4d31cb484ebf6927c61d530ca0317f0c7617dc5
 EBUILD actionmailer-3.1.3.ebuild 1156 RMD160 5eba66d21f28c55aef23f2b66965a40b3fbe111e SHA1 92f9a8da9f10945491c7b43a066a3136fd73f13d SHA256 4b09bc07ea67848a9aaf5a6e61f84d05878eda8585149787fc971ab33b5db5ee
-MISC ChangeLog 23197 RMD160 d91900440ea31a3708b1928c2398c5ff93f1d07a SHA1 96cbbf62fbe1889b79ca50592cb540f9e0977384 SHA256 504eabefa9516886d47cf09f8334e6177ff16c8dac260f1b94d75ec7eecf1a74
+MISC ChangeLog 23439 RMD160 ef6743a922517561c5ae22b43adb1ac88234b1c1 SHA1 5dbf663bb41606cdbea806751546a618bd834faf SHA256 b0480b31801ebc67a7aa0d1cc4feb87c452c5db8f5e7b1a63a3f0f30df4b6f2b
 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)
 
-iF4EAREIAAYFAk8ZPL4ACgkQiIP6VqMIqNd0CAD/QSHWD3+vaA2wdePTx6w9cnE6
-dTO7TXMtt2/MreajVTYA/iFn6jbKWFGM3tuU6C7ZpBHzwsazsu6E8xYlB/AekaKE
-=smFt
+iEYEARECAAYFAk9I31AACgkQAiZjviIA2Xi/lQCg17TXsIqp9aRmFsxEN+Nr09Bc
+WzUAnRzl9DC7vjWIGFg/GwEk274WAzmd
+=Y+RH
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionmailer/actionmailer-3.0.11-r1.ebuild b/dev-ruby/actionmailer/actionmailer-3.0.11-r2.ebuild
index dea1adadc20b..a785d154e8ab 100644
--- a/dev-ruby/actionmailer/actionmailer-3.0.11-r1.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-3.0.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/actionmailer-3.0.11-r1.ebuild,v 1.1 2012/01/20 10:06:40 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/actionmailer-3.0.11-r2.ebuild,v 1.1 2012/02/25 13:18:12 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ree18"
@@ -35,6 +35,8 @@ all_ruby_prepare() {
 	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
 	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
 
+	sed -i -e '/dependency.*mail/s:~>:>=:' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
 	# Rename private method to avoid conflict with the simple_format
 	# TextHelper. Already fixed in Rails 3.1.
 	sed -i -e 's/simple_format/format_paragraph/' lib/action_mailer/mail_helper.rb || die