Rails 4.0.4 version bump.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 58 insertions, 15 deletions

diff --git a/dev-ruby/activemodel/ChangeLog b/dev-ruby/activemodel/ChangeLog
index 70013d8ad5be..3c0f8fba7a75 100644
--- a/dev-ruby/activemodel/ChangeLog
+++ b/dev-ruby/activemodel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/activemodel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/ChangeLog,v 1.70 2014/03/11 20:07:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/ChangeLog,v 1.71 2014/04/05 07:39:34 graaff Exp $
+
+*activemodel-4.0.4 (05 Apr 2014)
+
+  05 Apr 2014; Hans de Graaff <graaff@gentoo.org> +activemodel-4.0.4.ebuild:
+  Rails 4.0.4 version bump.
 
   11 Mar 2014; Johannes Huber <johu@gentoo.org> activemodel-4.0.2.ebuild,
   activemodel-4.0.3.ebuild:
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 5a795ed76fcb..bb745583cee7 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -5,26 +5,18 @@ DIST rails-3.2.16.tgz 3566631 SHA256 8fe61b98496e40d8aaef5f8db217f2aad56c9add1bf
 DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834bb2eaf1516fe63e406d609 SHA512 4ad32d71108d444bd791ffb2fded25deed69a304a4d6497fb12a586e07348bf4cd1a453614eb932a907063ad6166b89f4778742cb5c2c420f17a116e11b964f6 WHIRLPOOL 0b0911120202e3152a74d31f3b7f8a24261f8e163577ad88c12fd85be088871a0f8ed46b305325250bb830f786231ff349e847b2f642cba02905a95a9a022d68
 DIST rails-4.0.2.tgz 3720518 SHA256 cd973b85cfff735da80d8ed4e11421e2242be735d96cbe4d83ac0c4b6ca7c8d1 SHA512 67d7580c0081deeec4271f96caca6d6db8f65864c876a237e7e3f0e8c6e495d299f103dcbe7627385fa4fd3699dac5015e20be90187ef3b2af49352ad9c8d6af WHIRLPOOL 5b496df36ca4de6a4b55951fab2403bd8b31b3505d17d450bf2edf084429a7689c4fdeb8d19d0be40b2d4d0ada8cefd6c3fc104c2428769d2ca8e434d97c6465
 DIST rails-4.0.3.tgz 3721788 SHA256 deed80da9b800789a718f95dde5a0a13f18fe6d0169987165a54e7b6d8edd4f8 SHA512 4ac37e5f2c3992aa33020cb7287c9415a014c475dc176b2b51e6112da8bef3b8626216134c5495a8643a9452c7bd78af9a4e2bc77e9c098f8908335d4a27a918 WHIRLPOOL 52bdd5ad2cfe74976b2565963cddc6cefd51ec95fa4f6ca6cc81fe7444271e734caa0800b3cc7a425be0f7dfa47298079b10cacc5909925072935661cfc78974
+DIST rails-4.0.4.tgz 3742294 SHA256 301c7320cf2609a52c230b72f694a669637e39625bbbc42286903b1ebcbc9816 SHA512 781fc5b19ff20da39793ee99761db476de30d55c6b82af040a8f6c69ee608780c14fb91047cd5dbc1d0ba44d2f1b3e862de45210a2373d98fc9bd2beb526e282 WHIRLPOOL 9535db2609e56e0c161beaf50e798334b6619ffc90c09b7dd54cd7b1e0a04b7095d8a21da99a4c6978390f09f1a43341e9e810d13e0eeb2ee54dfaf04f07a139
 EBUILD activemodel-3.2.16.ebuild 1619 SHA256 b248d27f55598a6c236f957bfc4b5eb432c16019ce64ae3fe365dab5ebae2e27 SHA512 c8c70875dd869cec754d44d2797daf52ffa6bbbabda73d630974f142d588afa759344d170a829c8ecb9ec86cb0518b5f249b3335874f36ff81dc5a647dc7bf36 WHIRLPOOL df898c42b4edf43774cd632745d26ce1adf14e657ae889ec9c41f58fbe1c3c2c370ccbaea9ed56a0f004635a22177a2c1386720c464673c6662d13e0af69ff75
 EBUILD activemodel-3.2.17.ebuild 1619 SHA256 a9598ea217f78bdd18c85786ca7e6a5085fe82abe5ca5d5609ec048924f5274d SHA512 2bf925413d8b010e1edae87fc7e96cd333af398642343be378eff5c01d176c8431e04b4d6ed1c7c3801d18af4a64a70853eec732827888a7ee20b1be74e8a5df WHIRLPOOL 353dc58162cd4c4cce7de06f4ce2ea1430ac4d7054326b43012c185859fa74be634a5ed23f7f73b9b637c8bbb3ef2f7963270744c28ade34a23191f8e66a7b7f
 EBUILD activemodel-4.0.2.ebuild 1290 SHA256 af15cdee91d42f0b6e99c41e312957894dafc8da63e001a2c96371e30242562b SHA512 116206836aaf7d225ce1d13560e8ff55f61a0063f4d48759750896bc7ef43f346959c2ac3808b3b72fd10e5d43c1c3df863f2c6b94468f0e10ebd03b8ba6991a WHIRLPOOL 63c95a78d113166e7bf3df4723ff2363e1804ad4fed4fc8be60944cd6ddfb2b99c9d9de09b46bc1b7dcd9462eb3989be227a6d8345e34506877360ace5f229b1
 EBUILD activemodel-4.0.3.ebuild 1290 SHA256 0166f84217882049578144eab0dabc7e00effdfa1ba6ee788f3c089b8302c343 SHA512 41a76c2e4071d0d1098dcf035fbc5785e932c7996caaf2d251fe70b0722832804bc6233a7b20e486c636e84a2913adb71871b97438401c5a73a1a0bda8c7df0b WHIRLPOOL 63306649343554ad5ea1aa26c6813b0dc7b84c00729d1ba6d9feeecf3594f7ade91a7aa0aada392e24dfcc840b10065315c0cef80b7e65844e28a850446480f1
-MISC ChangeLog 10438 SHA256 61cd791165fd2dabf8ce371b740ac19668f95a988748b221a525da13a5a2542c SHA512 6aec675efd5d5f93318fe7caac4fd2d3ac5810ee61f345d32f8ff37e1d894d065d3f049edbad3f5cc5fa2d5a040c8b0ea8f387ff93722a094de62b2bd5f1b652 WHIRLPOOL 9b3a0f4f450198f8b14507f2f17f987eecc7a102448cab0d8fc6992636ce400ab573ef5d78402aeafa3900685f95ea872b00c3991d46405d237bdad308e2a3c5
+EBUILD activemodel-4.0.4.ebuild 1292 SHA256 ae1377bc9231ba471b6330720738322d975e630cfdd2cd30804c4c23e02a87b6 SHA512 a800cdaf4545acbd0b76da0c906275e821adcc722fc28cd53e6bac670907a11f9e4863778b92e70c6479596de53c2658b20645bf6cd4e9caa1175ec52ccdda50 WHIRLPOOL 12e27609084de66a4146267723ec2b5c7ca128944f628a618fddf934f8b04e0f790468289537caede0285b545a142748bb0c6e5ae983b8ed27b40f9305ba8555
+MISC ChangeLog 10580 SHA256 85a4db40957d4268ce02f459552100624ecb40440ec4390bc02c7ae9c9cde187 SHA512 b0e82bb219d6f198aba62a9b00294fe0af964887a0ddbd59569261518ff66c03d10e847d985e92530f3e05dc5ff4f65aacbb65e7a3f9bc73eceb6bb59f6722a7 WHIRLPOOL e86b5cd8af31f146f43c750cb74b2267c3659cbc8431f6633a6a578ee5710dd90b5f55e8a05f9ba3388934542944f53f69685163bcead54d4c04973098acb19f
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTH20fAAoJEGVpnaTzz9K9xqQQAKG2LTPco4YBhq4Pe0RLocwz
-Kk4U6rIe8kHI0JdR0UKjAk72qlQs7QpY5q4FzvwlrLb2M8+1EnspS4Sil/SsUCJO
-9piuLfvxL/gCcGAfL+a46oU6fCkm/8sMU7pgCVLmTC+S89Pvu7nzlXNO53OYov+t
-QNIumAadq3Dd33fZjwMpjcnsn1T+BucWFpL1X7YwbKtM42U10CLRUaTeSu5gOtzX
-zXODwx4OHqylAX9zGntQgl0iCpyDeDVbfwx0qtVmT9N4908mAHXWd34ZyOD2ReBX
-j0GWEMBrPzaNPz3mW0McKgobRv3SW4hi+w+ixPOW+PhbyzgH+rQ1MzALiLdfSE0n
-ptv7xeO4E8VU78P9jnNifJzylZxhc9kaSxlKjNy+QI8rdWEYvM1J9KzgvW7lYje6
-aVyiSvY07aSCtgCSOJ9aj/kpJ4ARJvVvCZ8fOwwJVn0uxS7CdCupupPaIRK59juM
-OVJ31976FHUlepQTendY8xcmMTTN4fidmAQuhYUnvmHiITRtawfBA9qG/Xoutt+/
-9usCFnrY0BNzLDMYwMOS8FA9t5PLpKMEYDmqHMpYu0BVbXPiIlKZ0aEN2BoLyMti
-ukhr0GupLxmQYMpI8Lx3qm3Ydle26h2IKbGHk1hHgjLXXLsncstAFx0oo++G1q49
-LJZzzqMqry91gSAvGVyD
-=Q+px
+iF4EAREIAAYFAlM/szcACgkQiIP6VqMIqNcu+wD8CV57jhwKyMqdSF345wGtMLaO
+soVy2n8REiGVImyrYosA/15wG5/coh4+O4mJFn37VnL44Ik78M6S3GUrb86RDI95
+=YMxk
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/activemodel/activemodel-4.0.4.ebuild b/dev-ruby/activemodel/activemodel-4.0.4.ebuild
new file mode 100644
index 000000000000..dc5bfd000243
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-4.0.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/activemodel-4.0.4.ebuild,v 1.1 2014/04/05 07:39:34 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="A toolkit for building modeling frameworks like Active Record and Active Resource."
+HOMEPAGE="http://github.com/rails/rails"
+SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1.0:3.1
+	>=dev-ruby/bcrypt-ruby-3.1.7"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.0.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.13.0:0.13
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+
+	# Fix bcrypt dependency since bcrypt uses semantic versioning.
+	sed -i -e '/bcrypt-ruby/ s/3.0.0/3.0/' lib/active_model/secure_password.rb || die
+}