summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2012-04-05 17:12:52 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2012-04-05 17:12:52 +0000
commit458f7ee3f043919e7b0b0e1e8387d0f32afc842a (patch)
tree400e7c2a66ebc50dda125574761616564c8cc86c
parentMask kde-base/ksecrets as it's alpha code (diff)
downloadhistorical-458f7ee3f043919e7b0b0e1e8387d0f32afc842a.tar.gz
historical-458f7ee3f043919e7b0b0e1e8387d0f32afc842a.tar.bz2
historical-458f7ee3f043919e7b0b0e1e8387d0f32afc842a.zip
Make sure to fix the spec to allow using mail-2.4.0 or it would fail with bundler.
Package-Manager: portage-2.2.0_alpha99/cvs/Linux x86_64
-rw-r--r--dev-ruby/actionmailer/ChangeLog9
-rw-r--r--dev-ruby/actionmailer/Manifest14
-rw-r--r--dev-ruby/actionmailer/actionmailer-3.1.4-r1.ebuild (renamed from dev-ruby/actionmailer/actionmailer-3.1.4.ebuild)4
3 files changed, 18 insertions, 9 deletions
diff --git a/dev-ruby/actionmailer/ChangeLog b/dev-ruby/actionmailer/ChangeLog
index 9e631e6893a8..b7864d7e750f 100644
--- a/dev-ruby/actionmailer/ChangeLog
+++ b/dev-ruby/actionmailer/ChangeLog
@@ -1,6 +1,13 @@
# 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.182 2012/04/04 11:47:12 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.183 2012/04/05 17:12:52 flameeyes Exp $
+
+*actionmailer-3.1.4-r1 (05 Apr 2012)
+
+ 05 Apr 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+ +actionmailer-3.1.4-r1.ebuild, -actionmailer-3.1.4.ebuild:
+ Make sure to fix the spec to allow using mail-2.4.0 or it would fail with
+ bundler.
*actionmailer-3.1.4 (04 Apr 2012)
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index f0d31f589ce3..ce6a888cd8a7 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
@@ -15,13 +15,13 @@ EBUILD actionmailer-3.0.11-r2.ebuild 1426 RMD160 d76e1921ad9ce12ced1ea54f6879e01
EBUILD actionmailer-3.0.11.ebuild 1149 RMD160 35ae78f3ef12f12de89ac02f70ccbc42f6cc93d4 SHA1 41e18c87a285d6666faebf7cc2d7f1d31ac551e5 SHA256 0d34e174e0edbbb1e784addde4d31cb484ebf6927c61d530ca0317f0c7617dc5
EBUILD actionmailer-3.0.12.ebuild 1420 RMD160 cce6bc2f88f359fc16f3a9edd5453bfdfece458c SHA1 fbfce62a1d526f4e22ebd621a1dc66e18bc0c2c3 SHA256 4c2574dff012891f905e16feb63c32151534c533b3478bc2d5ca426a5c2b2c5d
EBUILD actionmailer-3.1.3.ebuild 1162 RMD160 8f284e4bf349e49ce977c3a5bce3906cb96da17f SHA1 8b2d4cba66728c147c1cc1ca3c7f1a3f757b3e45 SHA256 6464e74a8b1eb60699ec0b2e96c1f116448c43cd1810ec80f29ecc96a15fcba8
-EBUILD actionmailer-3.1.4.ebuild 1162 RMD160 d0990631d8a813435f1b44480c51406647157717 SHA1 27fd392a54798bc605ae4b343ea517e2563fc56d SHA256 bdbfee239d3acbafafc79fc2380662de678c39dc7e3f28a58747e2cac9f03868
-MISC ChangeLog 23961 RMD160 3de36f052cec24ef5d3b4f55e0e660fb9dc8551f SHA1 ec01b48d4e88620ac405152ebfbeb9ac298d6505 SHA256 2faa56edfb7074cd448aa0612d17193c12ca6529ed81f3e6ff3228bd9e866951
+EBUILD actionmailer-3.1.4-r1.ebuild 1242 RMD160 cc67dee874fa1341476b35c247c90b6fe84415e9 SHA1 744c0eb835f1983d212224d33a55241252f1573b SHA256 3e1cdec43c898748755b924fd6eacaae386a211387271852bb147c97af36ee82
+MISC ChangeLog 24207 RMD160 c9eeec920be2b0417daebcc932ae732f625f20b6 SHA1 bfce94d72227696b5408d5cd4596966484a52ba3 SHA256 9feaf9118e792235aefba739a06f02183909995af2208297f7c4c9d81fc9d922
MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iF4EAREIAAYFAk98NMUACgkQiIP6VqMIqNebUwD/ZVJdposIa7WMMYWALempUduY
-0FhaKJShUHFAw6MHb48A/2d8nRBh8rFgvBxui05E9tWQJkIbYzuvbbe/Xomyhuuf
-=hCAS
+iEYEARECAAYFAk990pwACgkQAiZjviIA2Xi1iQCgiih5FNgxABIGfSXbicwbVPny
+Q8EAoJLXffDSvc2G+vNo/ZdofloRd3e3
+=jRR4
-----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionmailer/actionmailer-3.1.4.ebuild b/dev-ruby/actionmailer/actionmailer-3.1.4-r1.ebuild
index c9bc8d68effe..19bc70b867f2 100644
--- a/dev-ruby/actionmailer/actionmailer-3.1.4.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-3.1.4-r1.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.1.4.ebuild,v 1.1 2012/04/04 11:47:12 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/actionmailer-3.1.4-r1.ebuild,v 1.1 2012/04/05 17:12:52 flameeyes Exp $
EAPI=4
USE_RUBY="ruby18 ruby19 ree18"
@@ -34,4 +34,6 @@ all_ruby_prepare() {
# Set test environment to our hand.
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
}