Version bump (thank Coacher): fixes incorrect dependencies reported in bug #451078, stop creating /var/run/redmine (create it in init script) #444936. Drop ldap authentification in case ldap was disabled, bug #413779 wrt Chris Murtagh and Diego Augusto Molina. Fixes trace in case openid is disabled. Fixes multiple security vulnerabilities, #418925 thank Manuel Rüger for report. Added fastercsv dependency reported in bug #453966. Drop old and vulnerable versions.

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xF1989B07

12 files changed, 155 insertions, 1395 deletions

diff --git a/www-apps/redmine/ChangeLog b/www-apps/redmine/ChangeLog
index c201fa382961..6489772c4f09 100644
--- a/www-apps/redmine/ChangeLog
+++ b/www-apps/redmine/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for www-apps/redmine
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.33 2013/01/07 13:39:26 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.34 2013/05/11 21:29:22 pva Exp $
+
+*redmine-2.2.4 (11 May 2013)
+*redmine-1.4.7 (11 May 2013)
+
+  11 May 2013; Peter Volkov <pva@gentoo.org> -redmine-1.3.2.ebuild,
+  -redmine-1.3.3.ebuild, -redmine-1.4.1.ebuild, -redmine-1.4.3.ebuild,
+  -redmine-1.4.5.ebuild, +redmine-1.4.7.ebuild, -redmine-2.1.5.ebuild,
+  -redmine-2.2.0.ebuild, +redmine-2.2.4.ebuild, files/redmine-2.initd,
+  -files/redmine-rubytree-r8214.patch, metadata.xml:
+  Version bump (thank Coacher): fixes incorrect dependencies reported in bug
+  #451078, stop creating /var/run/redmine (create it in init script) #444936.
+  Drop ldap authentification in case ldap was disabled, bug #413779 wrt Chris
+  Murtagh and Diego Augusto Molina. Fixes trace in case openid is disabled.
+  Fixes multiple security vulnerabilities, #418925 thank Manuel Rüger for
+  report. Added fastercsv dependency reported in bug #453966. Drop old and
+  vulnerable versions.
 
 *redmine-2.2.0 (07 Jan 2013)
 *redmine-2.1.5 (07 Jan 2013)
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index e00883de56f0..453611cb3d7c 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -3,40 +3,19 @@ Hash: SHA256
 
 AUX 10_redmine_vhost.conf 343 SHA256 4067d312a5fc8e7f1f98e8917d2e9c296a70a7e9847efaf92a8415d753387435 SHA512 839a01abedd2977f79bde2a55041d4e3e3a72de1e04e2bdc4aa5169b3ec22adce12b2b39d4b991d6e034fcd13fbcd030cba5ecc69ae71a76f7f37d2cdde09edc WHIRLPOOL 7bdb8c8eb7b24b5fa7750f14a5d6d90504b9e95b1c3d07827a1bba320135ff9aca195282bcc86e6964b742cf0dde3690d79065e61fd14145135ab6ff4c10816b
 AUX redmine-1.4.1-bundler.patch 504 SHA256 e3c49d68db8e439d9e9203d7369117bf4c61e322d37752e085d34daf012f3128 SHA512 02a799f692389ba79d58f21b2ff9cc3f0c4bdaf5883b787eaf02d43a687117c69dd57116265a48e5bb6378dac7b2fea7a6abb4e778e97bdba4e67d15c9d0eb7b WHIRLPOOL caafb4228182f736b46253f0542403ae4117549fbfd310c34b5c671d74653529bccf59f7f910a085925a271fa434eddfa46a9281ab477ad945c447de60702f0e
-AUX redmine-2.initd 1335 SHA256 a838196cd2b0982be478ec4651344bdb25f7a487a38a43c85f77d0b9303e6ded SHA512 3cee5e4b162a08acc32af0e163351eedbfd4beca7ad8f1aeb5fcf7845e4cde481d4c21419d1a8a3206f0d0c105d2a271d09bc9a8fb69d2e3fb1e59e21efc4d3c WHIRLPOOL f25dcc1ae799b609bef5b56c1b4a28b91191b3f21a7329ad25ac0162fadc05fc27857ed037fded39b992c06b5ed2408a334963c185a905fb157e5eef87ed43e0
-AUX redmine-rubytree-r8214.patch 8082 SHA256 4fea78ac11b90a44d94bca2f424c0c180ae9d9beb19212b8a88cf157408a5812 SHA512 c292bd850af1ac78252c2b5f4e461756be034933f8d4fc31daafd2c4b3495cd5288810bdc7bbed427dc16eae93d1390afc44ed68c5c068d0f15573f43d68d870 WHIRLPOOL e35fe926db9cb171a06ac81fc85f328538388313690a08bead40f176be040a960a1fb3d5fc3281b42082c8f2801d45a0ba2a3a2275ff2eaff06b763f3d5bb005
+AUX redmine-2.initd 1465 SHA256 aae0042c816550e9de909084fd77331e8cb1fa87e1789c56ce34c0507c586961 SHA512 3cd69bf0bca4936694bbda2afb66998c34959f68d13149a456af5dc8cd43118f09b6347fdcc93531d2830ca3772b28138bcd2d82de31a09e4055f3c813e63c48 WHIRLPOOL 24b6e11b775e4df02b077b8da5d774ea86a3c5715c4b9e1bf554e492b8eae9f06aa93cb985e57d5366b5a4e816c4000fa5b51a418f3f1ec03da6b43ee6ff0254
 AUX redmine.confd 267 SHA256 2ac6b7dfc2d055554b7ee9380fcf1a49a708bbd866987b775507d7a3b30f2d41 SHA512 4e4a700f1540b5e82df6ca610a94adcb08929f5ca75e605e40372b18ccc395515cdd53451ba2b3e3d9bdf129d9052a7218f6323d526c1ffb2540254d279c8d94 WHIRLPOOL fd6e8c63921d7ab2d73b5b15ff91db64ead03e521325871e21a1d165e313a1e56c607e9d9553504ccdef10a917a85ecdd5502527df159012b471803f4063ea00
 AUX redmine.initd 1328 SHA256 18ede107d4aaa4712515e9d70910e48ce508954c682cccd29d8936fee527249a SHA512 19527695226d166983d08fb0283023084a1bada6c8ced248fdde8e74048aa364bcf467c947a33127580f9a95eb67de9faaea651a3c5a61649eac9302b03d6585 WHIRLPOOL a889c9af02e0a36635dadedda96c8c0e7c6cab75273b2202ee12e618b048d3de6b9590d041d6b94e8ff8ae995dc3f0cba68d647c6e33a30319a20c645dee879c
-DIST redmine-1.3.2.tar.gz 6001754 SHA256 35c8300c875e3c8461b5c21fe026ef3820dfd182b3cd467895c84eb147feabfc SHA512 b10117657f1bd424747cd18eb6a0c41e480e8ff3c0778ab3106d8c5f30ee7b0e9d4ab5aaa7ad023dd2c2b9269358e4b94c60d7e68464d1d1608e92ff5ab5bda3 WHIRLPOOL 427c7f2ac9d79b2d503690225dfd3680f7c969005d70ea94766f433ca5331debbd4cd0daa5b6c58a5a4125010ea0ee2b6d4f93e34afe9b64205e3f3203c68ab4
-DIST redmine-1.3.3.tar.gz 6002651 SHA256 5e69f80509f042a44bd3f5666b7df42995e90d74b5de154ec5429d658642d6ce SHA512 f0faf6413c2a311b6b710597d292308346bcf81f3d3a9457d606d281d0c467bea2b6206a3f5959e735ed8eb18e8226cb308d287f6852bb384f0031bb49cd15eb WHIRLPOOL d3ac326ecfb4d9bbd212357b6c6c30d1b0569f8263f3596eddba47a2d48eed7484828a067279cd40fa1e4121ca3bc0273f161afc05f6729cf1d463243ae1948d
-DIST redmine-1.4.1.tar.gz 3651844 SHA256 1f4aeab39c28ebe946fe244aab251e5aca1db1c040f7b2a63db41ac0c589b922 SHA512 04761e41cf974f0763b8fa6c9d5099ee90a7e99346176fed27d07bac64e90c4b5e070b50d03c0d98eaadd41d1eeeecfc74af82f020439e4c4dce86ce17dbbe5c WHIRLPOOL 22522ee32a89b36bb3546c2bd74db02f83f362dd6c88b517d13e8d51d39fdc7b4810d591a51a62efa170d83881ff72314991787b655c2e486d67c5f1d22f6160
-DIST redmine-1.4.3.tar.gz 3666875 SHA256 2f54ba3055234fb93515395d477de385259ef88b144cf382a980257cf14c8bf2 SHA512 c037fdb6734d857cc4c74de7d6099b0355a0e515fbe5a35a2bf4b1b6aaed7e875b421dab55566a8a3a188b25a902d7f777ec3bdb4ff2a12bb93a3d02f87614fe WHIRLPOOL 68cba3f77ffeab287d6bea0441b4f5137a43560b8f04b21f738205be18f14ad3fbe746f9489343937fd5ae447e3fc59d179f2969bc8f66f96132cfe2516b82c4
-DIST redmine-1.4.5.tar.gz 3675485 SHA256 6e47aed0c9b0c0be2f880078ccbefbcb319d8efc7c8c65b811968e8ca97fe085 SHA512 b95e8f4501b40ef129bd6b8a7d2b86ba0771fa8a3de742218402d5213223133189aa7b318ed026d5f6df879e878fbdf8d9a9ccbc5c973907a2dbc92de09b8456 WHIRLPOOL 58cb4a5a34929ec5e7f7af3d2b79c41553fb740fe54e4a76616e691d1bf75b093cbd1780ccb63f397e5c05c1fee1f63b2f0eb38819f2d1b967abc9e47ea0206a
-DIST redmine-2.1.5.tar.gz 3717824 SHA256 6c0919b8645b3ad7be26ebeceb246d28644bc4fca82117d1d470e6903d5c9cdb SHA512 7e63092f79f2e5179e592a944e13d2ad6a612d42708d1f22cebd29d0d8d046b1a827cc6637ea31f0247a29b3002c774757af4ad48c213474052caf2a2d9a709e WHIRLPOOL a544d71433d8008c44af44b6a94e2403dff15a8d54dd83f2d2d9a196742d41b03e608f918f5736a02420b901f80ee99be40c49c9581f00665387ea287b2be476
-DIST redmine-2.2.0.tar.gz 3750916 SHA256 def6701feb247bc86d6fa0e2006832c67c07b41193db0cd2ef7c9368132b9f0c SHA512 9b74c8db74aade743e2f0d48959ff592101af04976d7fa98913afaf79a50bd835c59444911f645100cdce5a85a643a8ea108a4f94f2754fa31aeb60037dab7e7 WHIRLPOOL f5896e62b5b8e0bc75f9aff1056a71cb5a859f8804061182e1a282be6a52499d2b691a16041a2552851e70737f53458a9d81e5050a171f20e70520457b149f23
-EBUILD redmine-1.3.2.ebuild 5733 SHA256 1102ab5c87455232cd70b0a67b72699dee21e316eb4c54beae87043ad9beeb90 SHA512 7922864eae569c5858cdc0324ad78540d87e5ffcbf332240ff58b13536fd11cf95f17f6d112f42dd1c400f5a678e98b0b4dd07fd821688e70205f4fd3c575ec9 WHIRLPOOL 5a475020c1fb839ecf533badc1f0fb3bbc748d2a6e1ad669872069ffda0b5f46c51835fb2ae4e149c6924d4dce650707991a34241c3f652a48ba275f5443e0cd
-EBUILD redmine-1.3.3.ebuild 5733 SHA256 6b76aeaf25b26094182b6bf32d6a347ce4f1963f548cfe749daa7d7f1fa08e1e SHA512 65998641e6938bd0d1fb1c05bb7ed474894c7a4255d790709689d7ddb0f88e32840b47924c2e3f1670314b470c093ac5da4e23159320b41f08e55d5967593692 WHIRLPOOL 147451c824906fb6b49a8d5065055a49415b05f0f09d71eefbb64282ffa527a8401b21c65af852b83ce84dc62d0c2c288a43eee71302af480f4483a4aa3f9395
-EBUILD redmine-1.4.1.ebuild 6286 SHA256 130499717de2e4cc65cb8323662d3f7622bda021b71f7bd686661c0841f03d6a SHA512 d4f259b440ba128c10e004a8eefc8f6c840f7091e99bc64088312037db3b3fd7e4a60677094aa79fb461fa108c771236dfac0ff48527d47bf6f3ee972b8b7064 WHIRLPOOL c6af57559d629da778af149eec8c5cedaf62d8371aacd6c57ae5e0d426ed12efbf0ac58ef507cb6622e6559087926838609d25bddaaedd1c7be0e0db4c7e36b7
-EBUILD redmine-1.4.3.ebuild 6293 SHA256 69070a617e97727edaf104ddeb173044dc7d13c12d3e52d2909e49e748b0c30d SHA512 712d32c2f439fe54fa9b7f7d368cc289adcb53807140e20b894ceb480f1fac0aeefdf7945a909ff46fd436f191f4e44d1a4477260e3056586f1dfaa517e3e356 WHIRLPOOL 5d523a3dcdcd9691f40fbe34958d4ff18f57f7eae75d05aecacf359173a07f481261cb3c0f0ae240259bc56f383b46621057017197118384296a1f2944ed6ff8
-EBUILD redmine-1.4.5.ebuild 6297 SHA256 938ab7cde47c5e2bd24dfc197f7c53c4724b3127c7253388f6e5defa3ed06e5d SHA512 169a24db359d9ed1d685907cd28a6de8d00e27dc77979fa232db1d67f6a9bd0d5aeba908abcb1ce8ae26584a57c8c5deda3f5be7f4bedf7206bf40ee507ef29c WHIRLPOOL bc7863bc89184d4ccc10a0b1fd8896f77bb71b654bb9b271da294265663b9bc221221ec201e34bd3d3f68bce7e805756db5742038efa15d1fa28a3302629a9ff
-EBUILD redmine-2.1.5.ebuild 6568 SHA256 fdd4594757522cf573c78c3bf401e649b11932da64d5c0c994b884a178953de1 SHA512 9864d8c107c72af5af5de23eac58fc311b8d2641f2b52dd5a6b00874009bea30a68cb618ad6371ecbe16430cbee4ff2f5a802eaddaff61df9db68dbf8d4457be WHIRLPOOL b77564181c2803e7c2c2a791e23f76a94d5c3a70089357d763da49ceffaef6708e937263c6f05e149274dffde254ab8301aa6402d8814ad558867fcf1d68e10b
-EBUILD redmine-2.2.0.ebuild 6621 SHA256 7949064867bc8042c33c45ff5a4b36716c4bd3f0bda516f3c7efb211337e1796 SHA512 c330407c615b52da481aacbb9036bfc428df9e424a8768cd87a708ecd994060d55691c50fa31a7b549b2a218e00d2b57cb07f794451cd1ce389caa3bfb59394a WHIRLPOOL 7685418a3906d0188c3b4112d7452601e458e5a24cc6bc5fc1ab8f2cc09992e6acd5fb2729561a63612927670a4c7468b63161b5b961bbf36c92298ef80b767c
-MISC ChangeLog 6398 SHA256 8c78cc4aa5411c1637fd89e48c538c8db3a17154ba8dc1510328de9afdc8c410 SHA512 88e7ae96db0c825223b37d4f24a852525457fdc8a6cbac287868e2c44ed5e3795d0aeb13418aece3b150b5a8ca16a221041ed75fe38c60619746390e6900b07d WHIRLPOOL eab33f5274595087ad3b46bd7cbde395493365f67823904e722fc5ef4ae683d5bfd465cb32399b2ec333af6bbb15703c2c8fd0bd3ab933e11c4339ec79a3a30c
-MISC metadata.xml 398 SHA256 492fedc9e0ee6f7d2aad26b056be8d4f726159417554a5132c5bc3b91ddb68f0 SHA512 49ede1d2d955e02335fb95ef81de1aad003aee360bba1bfc1873e5b1eb7f55d8bee2adbf04bfd1a7d97b1140a3973dcec30e4157ab99c8d1a6394f3f1306af38 WHIRLPOOL 4895566791b46506ed7c9aeea7cba7589ef245c39bbe277542ac79e5abc31950edeb81112b3bc96d3192802848db72e5f6968c02e873ffa7403b96ada3c7fc9f
+DIST redmine-1.4.7.tar.gz 3676293 SHA256 949bd0d88c12f7a77a6a9a47401478a733c9d0c07fea31fa334944e901f26349 SHA512 291d33266542445e1cc8d6a38d342fa098d59c34fb93c59f15531fbe17f33eb19cd5846caa3dbd5c0b358da1bd433098f807aeb2f9c1516aca150409164a6ef8 WHIRLPOOL 401acf393e2900bcc62427565337ddaaea10a2b8dda1b11ea5e28519ddc7356bc6a8823ab4c148afc0a76ae21f3aa2b6a87722c9f47da78c13466225e117a4a4
+DIST redmine-2.2.4.tar.gz 3754826 SHA256 8465eb42865f7b5972a27fd66f08678244a77f7fc495ccb99978fbdbf8968d7f SHA512 d6ed394de71db1b98d22f47e105b698c798d84887161977d264f1629e8d5e917a0f24fd633378c855243609d9b318d81a81dc4d703198f043a24f01fcbdd6024 WHIRLPOOL fcd3c79dfab006f2eade4d9ae3d6d987731a7e21a7c51727fb184291e98364f6be7b96452ebd33419565069a2cc757d5f2b606ba8c2dcca3d4b685067b333f1b
+EBUILD redmine-1.4.7.ebuild 6047 SHA256 447a2225b2ad09fbc12b007e17a37f3a0811bf35ae39bbfd7adeffefec0df9ce SHA512 c01628f87fd687f4cdafb6f349453ae4a517cb449f74a551f815fa88361b29d7983dfc034832b3425fa3ba2757b7f38cc0392308b89690b66317fd01afbc7237 WHIRLPOOL eaeaa968609248745498dab7298d6542451f4f63670167a4c6a1639f4301a722329f114784b9b6859e086d7a5300b27c31963c4dc36b873dfa7b7f0755949d56
+EBUILD redmine-2.2.4.ebuild 6609 SHA256 ad2422537e9cc2f335ef6c752671ac81c71266e527c153d262e64921cf28b13e SHA512 e1d1802b95f59175c7ed079b19488e9c748166d1b818a5cd21c1004686dc92cff49b4ff9b8f0912697ba15ea8360b6564cc5dd615049200c4c45f766520efc29 WHIRLPOOL 281b4addc4b1982ebef3b7711858cff89c88b2e19de6a61177a59f64ca13044aaac14b51dc1e637703cda85111d2d8fcfa2023df84cdd773b69001a746a8490f
+MISC ChangeLog 7271 SHA256 526688fdfd5e17df46929a258bfcee07ddb133b9c5a2f9ae132c7d79605a11c6 SHA512 3bf7d59cfd3c07bc8bcd482325747e9f243ea609adc261d1fcf275819b257378e7e7ee2d5b7d50ff44f53de900763375ba2f259a0da9d6a9dcc5305c5b103d85 WHIRLPOOL 9044fa7418c4345491c2102bbd2fcc69029ce87a34bb7ca4d63a96b8eafd206fac50d2eca09654603c9d609d67f5adcbc13ac0eafab30fc671407fff1e55e304
+MISC metadata.xml 481 SHA256 0f82419399196d2e2a62eb7ece283f198c40b4f01a03571d09e64bc503f159ab SHA512 9863051fb7481b210212810bc0bae3d1475975736f3e03c3443a4e97c271fed45f05f4dbd45e8368fdd8542edbe21c124a11e7cc76e8375d8fabf46f54d0c4fc WHIRLPOOL 2fb2c5294bd490f6c725b725b14cf8a2cd2d72a494176cbdaf6136a5720d65162a0c7e8433ffee6a03a8cb1f25b05240bc1d2d5209bda3141061210646920206
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ6tA6AAoJECaGw+YFKA1plqAP/jp4IOaOSwQwAF/qXAO8C0tD
-vaIxygHF2m0urWyTawAslU9fFMiqDjw/8UJlvjWeqz0VpurXuzqaZcyTuztJpzBh
-tFMfk78Vd5NEAF/BPiQQCW+zZlmPjjdPQnunSzw8it0+rcWSos71yFlP8Lx4OeOQ
-ZeZQG+MKHhSxaVHEfTlFmzbTtEjOARBfzjr7fw3hoknHfadDjBka8hYgRkK7cOa3
-L8tHqJNTGX17MTDQ4qWUbkPvP7YyRwE7iC7O1rFhsazVSl4W4yXOdr+aOKktyY7A
-9cyTj/aL9QhPmxXkW61oC6Wd4XlXaGWuL6UblXejkJEyYgNDi5S6klA2Tb3kTzBr
-cUKF5jTLIRaUREN8EWGw3xV174Jk64MKr3Bknm30WzWfZhc9WfJWbfidceGY/l9C
-FUNY5jU1sASRJAw4NfEQTjcmROvfNe2s1qEislg7oBODcQakdcpaK4kPSBXMxLDa
-NgQpxYmZQzyFfiu6/ofUFDt5ybDg5UGGKmWYRLmejD2DigewBt0UVtjNeJVGAv5E
-KR2gfdSn4pa+pe49TH724EdGGqPn/WYh2QOInS13AmKU3F7kPTeV3S4A3pLd6vid
-ZcEZzJ2V/h1LOa1eFRhdIIwup2xY5M3YbIRm/PbQN+WIuvX0KD5ecq2z7cmhKSJo
-taiHa1Hk0M1msCQ3wafV
-=IBPq
+iF4EAREIAAYFAlGOuD0ACgkQGrk+8vGYmwexBgD+J2iy6lNQqiWyq3Mzwuty3ET5
+4UeaaU5LWUyVBdKIrg4A/Rmw7UsTtFvbVCA238vmndKDhmWjVf49iyIe3AvQQZip
+=I7Im
 -----END PGP SIGNATURE-----
diff --git a/www-apps/redmine/files/redmine-2.initd b/www-apps/redmine/files/redmine-2.initd
index e4aece87f935..1c73258ed3e6 100644
--- a/www-apps/redmine/files/redmine-2.initd
+++ b/www-apps/redmine/files/redmine-2.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/files/redmine-2.initd,v 1.1 2013/01/07 13:39:26 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/files/redmine-2.initd,v 1.2 2013/05/11 21:29:22 pva Exp $
 
 RAILS_ENV=${RAILS_ENV:-production}
 REDMINE_DIR=${REDMINE_DIR:-/var/lib/redmine}
@@ -9,7 +9,7 @@ REDMINE_ADDRESS=${REDMINE_ADDRESS:-localhost}
 REDMINE_PORT=${REDMINE_PORT:-3000}
 REDMINE_USER=${REDMINE_USER:-redmine}
 REDMINE_GROUP=${REDMINE_GROUP:-redmine}
-REDMINE_PIDFILE="${REDMINE_DIR}/tmp/pids/server.pid"
+REDMINE_PIDFILE="/var/run/redmine/server.pid"
 
 depend() {
 	use apache2 git-daemon mysql net postgresql svnserve
@@ -23,6 +23,9 @@ start_pre() {
 		eerror
 		return 1
 	fi
+	if [ ! -d /var/run/redmine ]; then
+		checkpath -q -d -m 0755 -o redmine:redmine /var/run/redmine
+	fi
 }
 
 start() {
@@ -33,6 +36,7 @@ start() {
 		--exec /usr/bin/ruby "${REDMINE_DIR}"/script/rails server -- \
 		--daemon --environment=${RAILS_ENV} \
 		--binding=${REDMINE_ADDRESS} --port=${REDMINE_PORT} \
+		--pid /var/run/redmine/server.pid \
 		${REDMINE_OPTS}
 	eend $?
 }
diff --git a/www-apps/redmine/files/redmine-rubytree-r8214.patch b/www-apps/redmine/files/redmine-rubytree-r8214.patch
deleted file mode 100644
index af325ec63390..000000000000
--- a/www-apps/redmine/files/redmine-rubytree-r8214.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-Index: test/unit/lib/redmine/menu_manager/menu_item_test.rb
-===================================================================
---- test/unit/lib/redmine/menu_manager/menu_item_test.rb	(リビジョン 8213)
-+++ test/unit/lib/redmine/menu_manager/menu_item_test.rb	(リビジョン 8214)
-@@ -114,7 +114,7 @@
- 
-   def test_has_children
-     parent_item = get_menu_item(:test_menu, :parent)
--    assert parent_item.hasChildren?
-+    assert parent_item.children.present?
-     assert_equal 2, parent_item.children.size
-     assert_equal get_menu_item(:test_menu, :child_menu), parent_item.children[0]
-     assert_equal get_menu_item(:test_menu, :child2_menu), parent_item.children[1]
-Index: config/environment.rb
-===================================================================
---- config/environment.rb	(リビジョン 8213)
-+++ config/environment.rb	(リビジョン 8214)
-@@ -54,7 +54,6 @@
-   # It will automatically turn deliveries on
-   config.action_mailer.perform_deliveries = false
- 
--  config.gem 'rubytree', :lib => 'tree'
-   config.gem 'coderay', :version => '~>1.0.0'
- 
-   # Load any local configuration that is kept out of source control
-Index: lib/redmine/menu_manager.rb
-===================================================================
---- lib/redmine/menu_manager.rb	(リビジョン 8213)
-+++ lib/redmine/menu_manager.rb	(リビジョン 8214)
-@@ -15,93 +15,6 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
--require 'tree' # gem install rubytree
--
--# Monkey patch the TreeNode to add on a few more methods :nodoc:
--module TreeNodePatch
--  def self.included(base)
--    base.class_eval do
--      attr_reader :last_items_count
--
--      alias :old_initilize :initialize
--      def initialize(name, content = nil)
--        old_initilize(name, content)
--      	@childrenHash ||= {}
--        @last_items_count = 0
--        extend(InstanceMethods)
--      end
--    end
--  end
--
--  module InstanceMethods
--    # Adds the specified child node to the receiver node.  The child node's
--    # parent is set to be the receiver.  The child is added as the first child in
--    # the current list of children for the receiver node.
--    def prepend(child)
--      raise "Child already added" if @childrenHash.has_key?(child.name)
--
--      @childrenHash[child.name]  = child
--      @children = [child] + @children
--      child.parent = self
--      return child
--
--    end
--
--    # Adds the specified child node to the receiver node.  The child node's
--    # parent is set to be the receiver.  The child is added at the position
--    # into the current list of children for the receiver node.
--    def add_at(child, position)
--      raise "Child already added" if @childrenHash.has_key?(child.name)
--
--      @childrenHash[child.name]  = child
--      @children = @children.insert(position, child)
--      child.parent = self
--      return child
--
--    end
--
--    def add_last(child)
--      raise "Child already added" if @childrenHash.has_key?(child.name)
--
--      @childrenHash[child.name]  = child
--      @children <<  child
--      @last_items_count += 1
--      child.parent = self
--      return child
--
--    end
--
--    # Adds the specified child node to the receiver node.  The child node's
--    # parent is set to be the receiver.  The child is added as the last child in
--    # the current list of children for the receiver node.
--    def add(child)
--      raise "Child already added" if @childrenHash.has_key?(child.name)
--
--      @childrenHash[child.name]  = child
--      position = @children.size - @last_items_count
--      @children.insert(position, child)
--      child.parent = self
--      return child
--
--    end
--
--    # Wrapp remove! making sure to decrement the last_items counter if
--    # the removed child was a last item
--    def remove!(child)
--      @last_items_count -= +1 if child && child.last
--      super
--    end
--
--
--    # Will return the position (zero-based) of the current child in
--    # it's parent
--    def position
--      self.parent.children.index(self)
--    end
--  end
--end
--Tree::TreeNode.send(:include, TreeNodePatch)
--
- module Redmine
-   module MenuManager
-     class MenuError < StandardError #:nodoc:
-@@ -169,7 +82,7 @@
- 
-       def display_main_menu?(project)
-         menu_name = project && !project.new_record? ? :project_menu : :application_menu
--        Redmine::MenuManager.items(menu_name).size > 1 # 1 element is the root
-+        Redmine::MenuManager.items(menu_name).children.present?
-       end
- 
-       def render_menu(menu, project=nil)
-@@ -181,7 +94,7 @@
-       end
- 
-       def render_menu_node(node, project=nil)
--        if node.hasChildren? || !node.child_menus.nil?
-+        if node.children.present? || !node.child_menus.nil?
-           return render_menu_node_with_children(node, project)
-         else
-           caption, url, selected = extract_node_details(node, project)
-@@ -306,13 +219,13 @@
-       end
- 
-       def items(menu_name)
--        @items[menu_name.to_sym] || Tree::TreeNode.new(:root, {})
-+        @items[menu_name.to_sym] || MenuNode.new(:root, {})
-       end
-     end
- 
-     class Mapper
-       def initialize(menu, items)
--        items[menu] ||= Tree::TreeNode.new(:root, {})
-+        items[menu] ||= MenuNode.new(:root, {})
-         @menu = menu
-         @menu_items = items[menu]
-       end
-@@ -398,7 +311,102 @@
-       end
-     end
- 
--    class MenuItem < Tree::TreeNode
-+    class MenuNode
-+      include Enumerable
-+      attr_accessor :parent
-+      attr_reader :last_items_count, :name
-+
-+      def initialize(name, content = nil)
-+        @name = name
-+        @childrenHash ||= {}
-+        @children = []
-+        @last_items_count = 0
-+      end
-+
-+      def children
-+        if block_given?
-+          @children.each {|child| yield child}
-+        else
-+          @children
-+        end
-+      end
-+
-+      # Returns the number of descendants + 1
-+      def size
-+        @children.inject(1) {|sum, node| sum + node.size}
-+      end
-+
-+      def each &block
-+        yield self
-+        children { |child| child.each(&block) }
-+      end
-+
-+      # Adds a child at first position
-+      def prepend(child)
-+        raise "Child already added" if @childrenHash.has_key?(child.name)
-+  
-+        @childrenHash[child.name]  = child
-+        @children = [child] + @children
-+        child.parent = self
-+        return child
-+      end
-+
-+      # Adds a child at given position
-+      def add_at(child, position)
-+        raise "Child already added" if @childrenHash.has_key?(child.name)
-+  
-+        @childrenHash[child.name]  = child
-+        @children = @children.insert(position, child)
-+        child.parent = self
-+        return child
-+      end
-+
-+      # Adds a child as last child
-+      def add_last(child)
-+        raise "Child already added" if @childrenHash.has_key?(child.name)
-+  
-+        @childrenHash[child.name]  = child
-+        @children <<  child
-+        @last_items_count += 1
-+        child.parent = self
-+        return child
-+      end
-+
-+      # Adds a child
-+      def add(child)
-+        raise "Child already added" if @childrenHash.has_key?(child.name)
-+  
-+        @childrenHash[child.name]  = child
-+        position = @children.size - @last_items_count
-+        @children.insert(position, child)
-+        child.parent = self
-+        return child
-+      end
-+      alias :<< :add
-+
-+      # Removes a child
-+      def remove!(child)
-+        @childrenHash.delete(child.name)
-+        @children.delete(child)
-+        @last_items_count -= +1 if child && child.last
-+        child.parent = nil
-+        child
-+      end
-+
-+      # Returns the position for this node in it's parent
-+      def position
-+        self.parent.children.index(self)
-+      end
-+
-+      # Returns the root for this node
-+      def root
-+        root = self
-+        root = root.parent while root.parent
-+        root
-+      end
-+    end
-+
-+    class MenuItem < MenuNode
-       include Redmine::I18n
-       attr_reader :name, :url, :param, :condition, :parent, :child_menus, :last
- 
diff --git a/www-apps/redmine/metadata.xml b/www-apps/redmine/metadata.xml
index 7dbf569a0d17..232c704c46d2 100644
--- a/www-apps/redmine/metadata.xml
+++ b/www-apps/redmine/metadata.xml
@@ -4,6 +4,10 @@
 <maintainer>
 <email>matsuu@gentoo.org</email>
 </maintainer>
+<maintainer>
+<email>pva@gentoo.org</email>
+<name>Peter Volkov</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 <use>
diff --git a/www-apps/redmine/redmine-1.3.2.ebuild b/www-apps/redmine/redmine-1.3.2.ebuild
deleted file mode 100644
index e0c2b70b4e22..000000000000
--- a/www-apps/redmine/redmine-1.3.2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.3.2.ebuild,v 1.2 2012/08/16 03:58:52 flameeyes Exp $
-
-EAPI="3"
-# ruby19: dev-ruby/rack has no ruby19
-# jruby: dev-ruby/rails has no jruby
-# rbx: dev-ruby/rails has no rbx
-#USE_RUBY="ruby18 ree18"
-USE_RUBY="ruby18"
-inherit eutils depend.apache ruby-ng
-
-DESCRIPTION="Redmine is a flexible project management web application written using Ruby on Rails framework"
-HOMEPAGE="http://www.redmine.org/"
-SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-#IUSE="bazaar cvs darcs fastcgi git imagemagick mercurial mysql openid passenger postgres sqlite3 subversion"
-IUSE="fastcgi imagemagick openid passenger"
-
-RDEPEND="$(ruby_implementation_depend ruby18 '>=' -1.8.6)[ssl]"
-
-ruby_add_rdepend "virtual/ruby-ssl
-	virtual/rubygems
-	>=dev-ruby/coderay-1
-	>=dev-ruby/ruby-net-ldap-0.0.4
-	~dev-ruby/i18n-0.4.2
-	>=dev-ruby/rack-1.1:0
-	dev-ruby/rake
-	>=dev-ruby/rails-2.3.14:2.3
-	dev-ruby/activerecord:2.3
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( dev-ruby/rmagick )
-	openid? ( dev-ruby/ruby-openid )
-	passenger? ( www-apache/passenger )"
-
-#RDEPEND="${RDEPEND}
-#	bazaar ( dev-vcs/bazaar )
-#	cvs? ( >=dev-vcs/cvs-1.12 )
-#	darcs? ( dev-vcs/darcs )
-#	git? ( dev-vcs/git )
-#	mercurial? ( dev-vcs/mercurial )
-#	subversion? ( >=dev-vcs/subversion-1.3 )"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-pkg_setup() {
-	enewgroup redmine
-	# home directory is required for SCM.
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -r log files/delete.me || die
-	rm -r vendor/gems/coderay-1.0.0 || die
-	rm -r vendor/plugins/ruby-net-ldap-0.0.4 || die
-	rm -fr vendor/rails || die
-
-	# bug #406605
-	rm .gitignore .hgignore || die
-
-	# bug #399503
-	rm -r vendor/gems/rubytree-0.5.2 || die
-	epatch "${FILESDIR}/${PN}-rubytree-r8214.patch"
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}"
-	echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}"
-	sed -i -e "/RAILS_GEM_VERSION/s/'.*'/'$(best_version dev-ruby/rails:2.3|cut -d- -f3)'/" config/environment.rb || die
-}
-
-all_ruby_install() {
-	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING} || die
-	rm -fr doc || die
-	dodoc README.rdoc || die
-	rm README.rdoc || die
-
-	keepdir /var/log/${PN} || die
-	dosym /var/log/${PN}/ "${REDMINE_DIR}/log" || die
-
-	insinto "${REDMINE_DIR}"
-	doins -r . || die
-	keepdir "${REDMINE_DIR}/files" || die
-	keepdir "${REDMINE_DIR}/public/plugin_assets" || die
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN} || die
-	# for SCM
-	fowners redmine:redmine "${REDMINE_DIR}" || die
-	# bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN} || die
-
-	if use passenger ; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf" || die
-	else
-		newconfd "${FILESDIR}/${PN}.confd" ${PN} || die
-		newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
-		keepdir /var/run/${PN} || die
-		fowners -R redmine:redmine /var/run/${PN} || die
-		dosym /var/run/${PN}/ "${REDMINE_DIR}/tmp/pids" || die
-	fi
-	doenvd "${T}/50${PN}" || die
-}
-
-pkg_postinst() {
-	einfo
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initlize environment:"
-		elog
-		elog "# cd ${EPREFIX}${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-	einfo
-}
-
-pkg_config() {
-	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ] ; then
-		eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml and edit this file in order to configure your database settings for \"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	local RUBY=${RUBY:-ruby18}
-
-	cd "${EPREFIX}${REDMINE_DIR}"
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
-		einfo
-		einfo "Upgrade database."
-		einfo
-
-		einfo "Migrate database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Upgrade the plugin migrations."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate:upgrade_plugin_migrations # || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate_plugins || die
-		einfo "Clear the cache and the existing sessions."
-		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
-	else
-		einfo
-		einfo "Initialize database."
-		einfo
-
-		einfo "Generate a session store secret."
-		${RUBY} -S rake generate_session_store || die
-		einfo "Create the database structure."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Insert default configuration data in database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		einfo
-		einfo "If you use sqlite3. please do not forget to change the ownership of the sqlite files."
-		einfo
-		einfo "# cd \"${EPREFIX}${REDMINE_DIR}\""
-		einfo "# chown redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}
diff --git a/www-apps/redmine/redmine-1.3.3.ebuild b/www-apps/redmine/redmine-1.3.3.ebuild
deleted file mode 100644
index ce822c5c33d7..000000000000
--- a/www-apps/redmine/redmine-1.3.3.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.3.3.ebuild,v 1.2 2012/08/16 03:58:52 flameeyes Exp $
-
-EAPI="3"
-# ruby19: dev-ruby/rack has no ruby19
-# jruby: dev-ruby/rails has no jruby
-# rbx: dev-ruby/rails has no rbx
-#USE_RUBY="ruby18 ree18"
-USE_RUBY="ruby18"
-inherit eutils depend.apache ruby-ng
-
-DESCRIPTION="Redmine is a flexible project management web application written using Ruby on Rails framework"
-HOMEPAGE="http://www.redmine.org/"
-SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-#IUSE="bazaar cvs darcs fastcgi git imagemagick mercurial mysql openid passenger postgres sqlite3 subversion"
-IUSE="fastcgi imagemagick openid passenger"
-
-RDEPEND="$(ruby_implementation_depend ruby18 '>=' -1.8.6)[ssl]"
-
-ruby_add_rdepend "virtual/ruby-ssl
-	virtual/rubygems
-	>=dev-ruby/coderay-1
-	>=dev-ruby/ruby-net-ldap-0.0.4
-	~dev-ruby/i18n-0.4.2
-	>=dev-ruby/rack-1.1:0
-	dev-ruby/rake
-	>=dev-ruby/rails-2.3.14:2.3
-	dev-ruby/activerecord:2.3
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( dev-ruby/rmagick )
-	openid? ( dev-ruby/ruby-openid )
-	passenger? ( www-apache/passenger )"
-
-#RDEPEND="${RDEPEND}
-#	bazaar ( dev-vcs/bazaar )
-#	cvs? ( >=dev-vcs/cvs-1.12 )
-#	darcs? ( dev-vcs/darcs )
-#	git? ( dev-vcs/git )
-#	mercurial? ( dev-vcs/mercurial )
-#	subversion? ( >=dev-vcs/subversion-1.3 )"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-pkg_setup() {
-	enewgroup redmine
-	# home directory is required for SCM.
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -r log files/delete.me || die
-	rm -r vendor/gems/coderay-1.0.0 || die
-	rm -r vendor/plugins/ruby-net-ldap-0.0.4 || die
-	rm -fr vendor/rails || die
-
-	# bug #406605
-	rm .gitignore .hgignore || die
-
-	# bug #399503
-	rm -r vendor/gems/rubytree-0.5.2 || die
-	epatch "${FILESDIR}/${PN}-rubytree-r8214.patch"
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}"
-	echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}"
-	sed -i -e "/RAILS_GEM_VERSION/s/'.*'/'$(best_version dev-ruby/rails:2.3|cut -d- -f3)'/" config/environment.rb || die
-}
-
-all_ruby_install() {
-	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING} || die
-	rm -fr doc || die
-	dodoc README.rdoc || die
-	rm README.rdoc || die
-
-	keepdir /var/log/${PN} || die
-	dosym /var/log/${PN}/ "${REDMINE_DIR}/log" || die
-
-	insinto "${REDMINE_DIR}"
-	doins -r . || die
-	keepdir "${REDMINE_DIR}/files" || die
-	keepdir "${REDMINE_DIR}/public/plugin_assets" || die
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN} || die
-	# for SCM
-	fowners redmine:redmine "${REDMINE_DIR}" || die
-	# bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN} || die
-
-	if use passenger ; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf" || die
-	else
-		newconfd "${FILESDIR}/${PN}.confd" ${PN} || die
-		newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
-		keepdir /var/run/${PN} || die
-		fowners -R redmine:redmine /var/run/${PN} || die
-		dosym /var/run/${PN}/ "${REDMINE_DIR}/tmp/pids" || die
-	fi
-	doenvd "${T}/50${PN}" || die
-}
-
-pkg_postinst() {
-	einfo
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initlize environment:"
-		elog
-		elog "# cd ${EPREFIX}${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-	einfo
-}
-
-pkg_config() {
-	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ] ; then
-		eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml and edit this file in order to configure your database settings for \"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	local RUBY=${RUBY:-ruby18}
-
-	cd "${EPREFIX}${REDMINE_DIR}"
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
-		einfo
-		einfo "Upgrade database."
-		einfo
-
-		einfo "Migrate database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Upgrade the plugin migrations."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate:upgrade_plugin_migrations # || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate_plugins || die
-		einfo "Clear the cache and the existing sessions."
-		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
-	else
-		einfo
-		einfo "Initialize database."
-		einfo
-
-		einfo "Generate a session store secret."
-		${RUBY} -S rake generate_session_store || die
-		einfo "Create the database structure."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Insert default configuration data in database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		einfo
-		einfo "If you use sqlite3. please do not forget to change the ownership of the sqlite files."
-		einfo
-		einfo "# cd \"${EPREFIX}${REDMINE_DIR}\""
-		einfo "# chown redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}
diff --git a/www-apps/redmine/redmine-1.4.1.ebuild b/www-apps/redmine/redmine-1.4.1.ebuild
deleted file mode 100644
index d9bc9fcf6533..000000000000
--- a/www-apps/redmine/redmine-1.4.1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.4.1.ebuild,v 1.2 2012/08/16 03:58:52 flameeyes Exp $
-
-EAPI="3"
-# ruby19: dev-ruby/rack has no ruby19
-# jruby: dev-ruby/rails has no jruby
-# rbx: dev-ruby/rails has no rbx
-#USE_RUBY="ruby18 ree18"
-USE_RUBY="ruby18"
-inherit eutils depend.apache ruby-ng
-
-DESCRIPTION="Redmine is a flexible project management web application written using Ruby on Rails framework"
-HOMEPAGE="http://www.redmine.org/"
-SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-#IUSE="bazaar cvs darcs fastcgi git imagemagick mercurial mysql openid passenger postgres sqlite3 subversion"
-IUSE="fastcgi imagemagick ldap openid passenger"
-
-RDEPEND="$(ruby_implementation_depend ruby18 '>=' -1.8.6)[ssl]"
-
-ruby_add_rdepend "virtual/ruby-ssl
-	virtual/rubygems
-	>=dev-ruby/coderay-1.0.6
-	dev-ruby/i18n:0.4
-	>=dev-ruby/rack-1.1:0
-	>=dev-ruby/tzinfo-0.3.31
-	dev-ruby/rake
-	>=dev-ruby/rails-2.3.14:2.3
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( >=dev-ruby/rmagick-2 )
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.3.1 )
-	openid? ( >=dev-ruby/ruby-openid-2.1.4 )
-	passenger? ( www-apache/passenger )
-	ruby_targets_ruby18? (
-		>=dev-ruby/fastercsv-1.5
-	)"
-#	ruby_targets_ruby18? (
-#		>=dev-ruby/fastercsv-1.5
-#		postgres? ( >=dev-ruby/pg-0.11 )
-#		sqlite3? ( dev-ruby/sqlite3 )
-#		mysql? ( dev-ruby/mysql )
-#	)
-#	ruby_targets_ruby19? (
-#		postgres? ( >=dev-ruby/pg-0.11 )
-#		sqlite3? ( dev-ruby/sqlite3 )
-#		mysql? ( dev-ruby/mysql2:0.2 )
-#	)
-#	ruby_targets_jruby? (
-#		>=dev-ruby/fastercsv-1.5
-#		mysql? ( dev-ruby/activerecord-jdbcmysql-adapter )
-#		postgres? ( dev-ruby/activerecord-jdbcpostgresql-adapter )
-#		sqlite3? ( dev-ruby/activerecord-jdbcsqlite3-adapter )
-#	)
-
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	test? (
-#		>=dev-ruby/shoulda-2.10.3
-#		>=dev-ruby/edavis10-object_daddy
-#		>=dev-ruby/mocha
-#	)"
-
-#RDEPEND="${RDEPEND}
-#	bazaar ( dev-vcs/bazaar )
-#	cvs? ( >=dev-vcs/cvs-1.12 )
-#	darcs? ( dev-vcs/darcs )
-#	git? ( dev-vcs/git )
-#	mercurial? ( dev-vcs/mercurial )
-#	subversion? ( >=dev-vcs/subversion-1.3 )"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-pkg_setup() {
-	enewgroup redmine
-	# home directory is required for SCM.
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -r log files/delete.me || die
-
-	# bug #406605
-	rm .gitignore .hgignore || die
-
-	rm Gemfile config/preinitializer.rb || die
-	epatch "${FILESDIR}/${P}-bundler.patch" || die
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}"
-	echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}"
-}
-
-all_ruby_install() {
-	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING} || die
-	rm -fr doc || die
-	dodoc README.rdoc || die
-	rm README.rdoc || die
-
-	keepdir /var/log/${PN} || die
-	dosym /var/log/${PN}/ "${REDMINE_DIR}/log" || die
-
-	insinto "${REDMINE_DIR}"
-	doins -r . || die
-	keepdir "${REDMINE_DIR}/files" || die
-	keepdir "${REDMINE_DIR}/public/plugin_assets" || die
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN} || die
-	# for SCM
-	fowners redmine:redmine "${REDMINE_DIR}" || die
-	# bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN} || die
-
-	if use passenger ; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf" || die
-	else
-		newconfd "${FILESDIR}/${PN}.confd" ${PN} || die
-		newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
-		keepdir /var/run/${PN} || die
-		fowners -R redmine:redmine /var/run/${PN} || die
-		dosym /var/run/${PN}/ "${REDMINE_DIR}/tmp/pids" || die
-	fi
-	doenvd "${T}/50${PN}" || die
-}
-
-pkg_postinst() {
-	einfo
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initlize environment:"
-		elog
-		elog "# cd ${EPREFIX}${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# chown redmine:redmine config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-	einfo
-}
-
-pkg_config() {
-	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ] ; then
-		eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml and edit this file in order to configure your database settings for \"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	local RUBY=${RUBY:-ruby18}
-
-	cd "${EPREFIX}${REDMINE_DIR}"
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
-		einfo
-		einfo "Upgrade database."
-		einfo
-
-		einfo "Migrate database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Upgrade the plugin migrations."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate:upgrade_plugin_migrations # || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate_plugins || die
-		einfo "Clear the cache and the existing sessions."
-		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
-	else
-		einfo
-		einfo "Initialize database."
-		einfo
-
-		einfo "Generate a session store secret."
-		${RUBY} -S rake generate_session_store || die
-		einfo "Create the database structure."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Insert default configuration data in database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		einfo
-		einfo "If you use sqlite3. please do not forget to change the ownership of the sqlite files."
-		einfo
-		einfo "# cd \"${EPREFIX}${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}
diff --git a/www-apps/redmine/redmine-1.4.3.ebuild b/www-apps/redmine/redmine-1.4.3.ebuild
deleted file mode 100644
index 19ac2a8aa743..000000000000
--- a/www-apps/redmine/redmine-1.4.3.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.4.3.ebuild,v 1.2 2012/08/16 03:58:52 flameeyes Exp $
-
-EAPI="3"
-# ruby19: dev-ruby/rack has no ruby19
-# jruby: dev-ruby/rails has no jruby
-# rbx: dev-ruby/rails has no rbx
-#USE_RUBY="ruby18 ree18"
-USE_RUBY="ruby18"
-inherit eutils depend.apache ruby-ng
-
-DESCRIPTION="Redmine is a flexible project management web application written using Ruby on Rails framework"
-HOMEPAGE="http://www.redmine.org/"
-SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-#IUSE="bazaar cvs darcs fastcgi git imagemagick mercurial mysql openid passenger postgres sqlite3 subversion"
-IUSE="fastcgi imagemagick ldap openid passenger"
-
-RDEPEND="$(ruby_implementation_depend ruby18 '>=' -1.8.6)[ssl]"
-
-ruby_add_rdepend "virtual/ruby-ssl
-	virtual/rubygems
-	>=dev-ruby/coderay-1.0.6
-	dev-ruby/i18n:0.4
-	>=dev-ruby/rack-1.1:0
-	>=dev-ruby/tzinfo-0.3.31
-	dev-ruby/rake
-	>=dev-ruby/rails-2.3.14:2.3
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( >=dev-ruby/rmagick-2 )
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.3.1 )
-	openid? ( >=dev-ruby/ruby-openid-2.1.4 )
-	passenger? ( www-apache/passenger )
-	ruby_targets_ruby18? (
-		>=dev-ruby/fastercsv-1.5
-	)"
-#	ruby_targets_ruby18? (
-#		>=dev-ruby/fastercsv-1.5
-#		postgres? ( >=dev-ruby/pg-0.11 )
-#		sqlite3? ( dev-ruby/sqlite3 )
-#		mysql? ( dev-ruby/mysql )
-#	)
-#	ruby_targets_ruby19? (
-#		postgres? ( >=dev-ruby/pg-0.11 )
-#		sqlite3? ( dev-ruby/sqlite3 )
-#		mysql? ( dev-ruby/mysql2:0.2 )
-#	)
-#	ruby_targets_jruby? (
-#		>=dev-ruby/fastercsv-1.5
-#		mysql? ( dev-ruby/activerecord-jdbcmysql-adapter )
-#		postgres? ( dev-ruby/activerecord-jdbcpostgresql-adapter )
-#		sqlite3? ( dev-ruby/activerecord-jdbcsqlite3-adapter )
-#	)
-
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	test? (
-#		>=dev-ruby/shoulda-2.10.3
-#		>=dev-ruby/edavis10-object_daddy
-#		>=dev-ruby/mocha
-#	)"
-
-#RDEPEND="${RDEPEND}
-#	bazaar ( dev-vcs/bazaar )
-#	cvs? ( >=dev-vcs/cvs-1.12 )
-#	darcs? ( dev-vcs/darcs )
-#	git? ( dev-vcs/git )
-#	mercurial? ( dev-vcs/mercurial )
-#	subversion? ( >=dev-vcs/subversion-1.3 )"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-pkg_setup() {
-	enewgroup redmine
-	# home directory is required for SCM.
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -r log files/delete.me || die
-
-	# bug #406605
-	rm .gitignore .hgignore || die
-
-	rm Gemfile config/preinitializer.rb || die
-	epatch "${FILESDIR}/${PN}-1.4.1-bundler.patch" || die
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}"
-	echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}"
-}
-
-all_ruby_install() {
-	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING} || die
-	rm -fr doc || die
-	dodoc README.rdoc || die
-	rm README.rdoc || die
-
-	keepdir /var/log/${PN} || die
-	dosym /var/log/${PN}/ "${REDMINE_DIR}/log" || die
-
-	insinto "${REDMINE_DIR}"
-	doins -r . || die
-	keepdir "${REDMINE_DIR}/files" || die
-	keepdir "${REDMINE_DIR}/public/plugin_assets" || die
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN} || die
-	# for SCM
-	fowners redmine:redmine "${REDMINE_DIR}" || die
-	# bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN} || die
-
-	if use passenger ; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf" || die
-	else
-		newconfd "${FILESDIR}/${PN}.confd" ${PN} || die
-		newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
-		keepdir /var/run/${PN} || die
-		fowners -R redmine:redmine /var/run/${PN} || die
-		dosym /var/run/${PN}/ "${REDMINE_DIR}/tmp/pids" || die
-	fi
-	doenvd "${T}/50${PN}" || die
-}
-
-pkg_postinst() {
-	einfo
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initlize environment:"
-		elog
-		elog "# cd ${EPREFIX}${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# chown redmine:redmine config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-	einfo
-}
-
-pkg_config() {
-	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ] ; then
-		eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml and edit this file in order to configure your database settings for \"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	local RUBY=${RUBY:-ruby18}
-
-	cd "${EPREFIX}${REDMINE_DIR}"
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
-		einfo
-		einfo "Upgrade database."
-		einfo
-
-		einfo "Migrate database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Upgrade the plugin migrations."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate:upgrade_plugin_migrations # || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate_plugins || die
-		einfo "Clear the cache and the existing sessions."
-		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
-	else
-		einfo
-		einfo "Initialize database."
-		einfo
-
-		einfo "Generate a session store secret."
-		${RUBY} -S rake generate_session_store || die
-		einfo "Create the database structure."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Insert default configuration data in database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		einfo
-		einfo "If you use sqlite3. please do not forget to change the ownership of the sqlite files."
-		einfo
-		einfo "# cd \"${EPREFIX}${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}
diff --git a/www-apps/redmine/redmine-1.4.5.ebuild b/www-apps/redmine/redmine-1.4.7.ebuild
index 5e888a133015..2995fcf50dd3 100644
--- a/www-apps/redmine/redmine-1.4.5.ebuild
+++ b/www-apps/redmine/redmine-1.4.7.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.4.5.ebuild,v 1.1 2013/01/07 13:39:26 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.4.7.ebuild,v 1.1 2013/05/11 21:29:22 pva Exp $
 
-EAPI="3"
-# ruby19: dev-ruby/rack has no ruby19
-# jruby: dev-ruby/rails has no jruby
-# rbx: dev-ruby/rails has no rbx
-#USE_RUBY="ruby18 ree18"
+EAPI="4"
+# rails:2.3 isn't available for ruby19 on Gentoo
+#USE_RUBY="ruby18 ruby19"
 USE_RUBY="ruby18"
 inherit eutils depend.apache ruby-ng
 
@@ -17,23 +15,24 @@ SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2"
 SLOT="0"
-#IUSE="bazaar cvs darcs fastcgi git imagemagick mercurial mysql openid passenger postgres sqlite3 subversion"
-IUSE="fastcgi imagemagick ldap openid passenger"
+# All db-related USEs are ineffective since we depend on rails
+# which depends on activerecord which depends on all ruby's db bindings
+#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
+IUSE="ldap openid imagemagick fastcgi passenger"
 
-RDEPEND="$(ruby_implementation_depend ruby18 '>=' -1.8.6)[ssl]"
+#RDEPEND="$(ruby_implementation_depend jruby '>=' -1.6.7)[ssl]"
 
 ruby_add_rdepend "virtual/ruby-ssl
 	virtual/rubygems
-	>=dev-ruby/coderay-1.0.6
+	>=dev-ruby/rails-2.3.15:2.3
 	dev-ruby/i18n:0.4
-	>=dev-ruby/rack-1.1:0
+	>=dev-ruby/coderay-1.0.6
 	>=dev-ruby/tzinfo-0.3.31
 	dev-ruby/rake
-	>=dev-ruby/rails-2.3.14:2.3
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( >=dev-ruby/rmagick-2 )
 	ldap? ( >=dev-ruby/ruby-net-ldap-0.3.1 )
 	openid? ( >=dev-ruby/ruby-openid-2.1.4 )
+	imagemagick? ( >=dev-ruby/rmagick-2 )
+	fastcgi? ( dev-ruby/fcgi )
 	passenger? ( www-apache/passenger )
 	ruby_targets_ruby18? (
 		>=dev-ruby/fastercsv-1.5
@@ -42,7 +41,7 @@ ruby_add_rdepend "virtual/ruby-ssl
 #		>=dev-ruby/fastercsv-1.5
 #		postgres? ( >=dev-ruby/pg-0.11 )
 #		sqlite3? ( dev-ruby/sqlite3 )
-#		mysql? ( dev-ruby/mysql )
+#		mysql? ( >=dev-ruby/mysql-ruby-2.8.1 )
 #	)
 #	ruby_targets_ruby19? (
 #		postgres? ( >=dev-ruby/pg-0.11 )
@@ -50,6 +49,7 @@ ruby_add_rdepend "virtual/ruby-ssl
 #		mysql? ( dev-ruby/mysql2:0.2 )
 #	)
 #	ruby_targets_jruby? (
+#		dev-ruby/jruby-openssl
 #		>=dev-ruby/fastercsv-1.5
 #		mysql? ( dev-ruby/activerecord-jdbcmysql-adapter )
 #		postgres? ( dev-ruby/activerecord-jdbcpostgresql-adapter )
@@ -58,24 +58,23 @@ ruby_add_rdepend "virtual/ruby-ssl
 
 #ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
 #	test? (
-#		>=dev-ruby/shoulda-2.10.3
+#		!ruby_targets_ruby19? (
+#			>=dev-ruby/shoulda-2.11
+#		)
+#		ruby_targets_ruby19? (
+#			dev-ruby/test-unit
+#		)
+#		ruby_targets_jruby? (
+#			dev-ruby/test-unit
+#		)
 #		>=dev-ruby/edavis10-object_daddy
-#		>=dev-ruby/mocha-0.12.3
+#		=dev-ruby/mocha-0.12*
 #	)"
 
-#RDEPEND="${RDEPEND}
-#	bazaar ( dev-vcs/bazaar )
-#	cvs? ( >=dev-vcs/cvs-1.12 )
-#	darcs? ( dev-vcs/darcs )
-#	git? ( dev-vcs/git )
-#	mercurial? ( dev-vcs/mercurial )
-#	subversion? ( >=dev-vcs/subversion-1.3 )"
-
 REDMINE_DIR="/var/lib/${PN}"
 
 pkg_setup() {
 	enewgroup redmine
-	# home directory is required for SCM.
 	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
 }
 
@@ -86,53 +85,51 @@ all_ruby_prepare() {
 	rm .gitignore .hgignore || die
 
 	rm Gemfile config/preinitializer.rb || die
-	epatch "${FILESDIR}/${PN}-1.4.1-bundler.patch" || die
+	epatch "${FILESDIR}/${PN}-1.4.1-bundler.patch"
 
 	echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}"
 	echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}"
 }
 
 all_ruby_install() {
-	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING} || die
+	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING}
 	rm -fr doc || die
-	dodoc README.rdoc || die
+	dodoc README.rdoc
 	rm README.rdoc || die
 
-	keepdir /var/log/${PN} || die
-	dosym /var/log/${PN}/ "${REDMINE_DIR}/log" || die
+	keepdir /var/log/${PN}
+	dosym /var/log/${PN}/ "${REDMINE_DIR}/log"
 
 	insinto "${REDMINE_DIR}"
-	doins -r . || die
-	keepdir "${REDMINE_DIR}/files" || die
-	keepdir "${REDMINE_DIR}/public/plugin_assets" || die
+	doins -r .
+	keepdir "${REDMINE_DIR}/files"
+	keepdir "${REDMINE_DIR}/public/plugin_assets"
 
 	fowners -R redmine:redmine \
 		"${REDMINE_DIR}/config" \
 		"${REDMINE_DIR}/files" \
 		"${REDMINE_DIR}/public/plugin_assets" \
 		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN} || die
-	# for SCM
-	fowners redmine:redmine "${REDMINE_DIR}" || die
-	# bug #406605
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
 	fperms -R go-rwx \
 		"${REDMINE_DIR}/config" \
 		"${REDMINE_DIR}/files" \
 		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN} || die
+		/var/log/${PN}
 
 	if use passenger ; then
 		has_apache
 		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf" || die
+		doins "${FILESDIR}/10_redmine_vhost.conf"
 	else
-		newconfd "${FILESDIR}/${PN}.confd" ${PN} || die
-		newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
-		keepdir /var/run/${PN} || die
-		fowners -R redmine:redmine /var/run/${PN} || die
-		dosym /var/run/${PN}/ "${REDMINE_DIR}/tmp/pids" || die
+		newconfd "${FILESDIR}/${PN}.confd" ${PN}
+		newinitd "${FILESDIR}/${PN}.initd" ${PN}
 	fi
-	doenvd "${T}/50${PN}" || die
+	doenvd "${T}/50${PN}"
 }
 
 pkg_postinst() {
@@ -161,22 +158,23 @@ pkg_postinst() {
 
 pkg_config() {
 	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ] ; then
-		eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml and edit this file in order to configure your database settings for \"production\" environment."
+		eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml"
+		eerror "then edit this file in order to configure your database settings for \"production\" environment."
 		die
 	fi
 
 	local RAILS_ENV=${RAILS_ENV:-production}
 	local RUBY=${RUBY:-ruby18}
 
-	cd "${EPREFIX}${REDMINE_DIR}"
+	cd "${EPREFIX}${REDMINE_DIR}" || die
 	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
 		einfo
-		einfo "Upgrade database."
+		einfo "Upgrading database."
 		einfo
 
-		einfo "Migrate database."
+		einfo "Migrating database."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Upgrade the plugin migrations."
+		einfo "Upgrading the plugin migrations."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate:upgrade_plugin_migrations # || die
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate_plugins || die
 		einfo "Clear the cache and the existing sessions."
@@ -184,17 +182,17 @@ pkg_config() {
 		${RUBY} -S rake tmp:sessions:clear || die
 	else
 		einfo
-		einfo "Initialize database."
+		einfo "Initializing database."
 		einfo
 
-		einfo "Generate a session store secret."
+		einfo "Generating a session store secret."
 		${RUBY} -S rake generate_session_store || die
-		einfo "Create the database structure."
+		einfo "Creating the database structure."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Insert default configuration data in database."
+		einfo "Populating database with default configuration dat."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
 		einfo
-		einfo "If you use sqlite3. please do not forget to change the ownership of the sqlite files."
+		einfo "If you use sqlite3, please do not forget to change the ownership of the sqlite files."
 		einfo
 		einfo "# cd \"${EPREFIX}${REDMINE_DIR}\""
 		einfo "# chown redmine:redmine db/ db/*.sqlite3"
diff --git a/www-apps/redmine/redmine-2.1.5.ebuild b/www-apps/redmine/redmine-2.1.5.ebuild
deleted file mode 100644
index e883a8570e24..000000000000
--- a/www-apps/redmine/redmine-2.1.5.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-2.1.5.ebuild,v 1.1 2013/01/07 13:39:26 matsuu Exp $
-
-EAPI="3"
-# ruby19: dev-ruby/rack has no ruby19
-# jruby: dev-ruby/rails has no jruby
-# rbx: dev-ruby/rails has no rbx
-#USE_RUBY="ruby18 ree18"
-USE_RUBY="ruby18 ruby19"
-inherit eutils depend.apache ruby-ng
-
-DESCRIPTION="Redmine is a flexible project management web application written using Ruby on Rails framework"
-HOMEPAGE="http://www.redmine.org/"
-SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-#IUSE="bazaar cvs darcs fastcgi git imagemagick mercurial mysql openid passenger postgres sqlite3 subversion"
-IUSE="fastcgi imagemagick ldap openid passenger"
-
-#RDEPEND="$(ruby_implementation_depend ruby18 '>=' -1.8.6)[ssl]"
-
-ruby_add_rdepend "virtual/ruby-ssl
-	virtual/rubygems
-	>=dev-ruby/coderay-1.0.6
-	dev-ruby/i18n:0.6
-	dev-ruby/rake
-	~dev-ruby/rails-3.2.8:3.2
-	>=dev-ruby/jquery-rails-2.0.2
-	dev-ruby/builder:3
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( >=dev-ruby/rmagick-2 )
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.3.1 )
-	openid? (
-		>=dev-ruby/ruby-openid-2.1.4
-		>=dev-ruby/rack-openid-0.2.1
-	)
-	passenger? ( www-apache/passenger )
-	"
-#	ruby_targets_ruby18? (
-#		>=dev-ruby/fastercsv-1.5
-#		postgres? ( >=dev-ruby/pg-0.11 )
-#		sqlite3? ( dev-ruby/sqlite3 )
-#		mysql? ( >=dev-ruby/mysql-ruby-2.8.1 )
-#	)
-#	ruby_targets_ruby19? (
-#		postgres? ( >=dev-ruby/pg-0.11 )
-#		sqlite3? ( dev-ruby/sqlite3 )
-#		mysql? ( dev-ruby/mysql2:0.3 )
-#	)
-#	ruby_targets_jruby? (
-#		dev-ruby/jruby-openssl
-#		>=dev-ruby/fastercsv-1.5
-#		mysql? ( dev-ruby/activerecord-jdbcmysql-adapter )
-#		postgres? ( dev-ruby/activerecord-jdbcpostgresql-adapter )
-#		sqlite3? ( dev-ruby/activerecord-jdbcsqlite3-adapter )
-#	)
-
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	yard
-#	test? (
-#		!ruby_targets_ruby19? (
-#			>=dev-ruby/shoulda-2.11
-#		)
-#		ruby_targets_ruby19? (
-#			dev-ruby/test-unit
-#		)
-#		>=dev-ruby/mocha-0.12.3
-#	)"
-
-#RDEPEND="${RDEPEND}
-#	bazaar ( dev-vcs/bazaar )
-#	cvs? ( >=dev-vcs/cvs-1.12 )
-#	darcs? ( dev-vcs/darcs )
-#	git? ( dev-vcs/git )
-#	mercurial? ( dev-vcs/mercurial )
-#	subversion? ( >=dev-vcs/subversion-1.3 )"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-pkg_setup() {
-	enewgroup redmine
-	# home directory is required for SCM.
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -r log files/delete.me || die
-
-	# bug #406605
-	rm .gitignore .hgignore || die
-
-	rm Gemfile config/preinitializer.rb || die
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}"
-	echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}"
-}
-
-all_ruby_install() {
-	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING} || die
-	rm -fr doc || die
-	dodoc README.rdoc || die
-	rm README.rdoc || die
-
-	keepdir /var/log/${PN} || die
-	dosym /var/log/${PN}/ "${REDMINE_DIR}/log" || die
-
-	insinto "${REDMINE_DIR}"
-	doins -r . || die
-	keepdir "${REDMINE_DIR}/files" || die
-	keepdir "${REDMINE_DIR}/public/plugin_assets" || die
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN} || die
-	# for SCM
-	fowners redmine:redmine "${REDMINE_DIR}" || die
-	# bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN} || die
-
-	if use passenger ; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf" || die
-	else
-		newconfd "${FILESDIR}/${PN}.confd" ${PN} || die
-		newinitd "${FILESDIR}/${PN}-2.initd" ${PN} || die
-		keepdir /var/run/${PN} || die
-		fowners -R redmine:redmine /var/run/${PN} || die
-		dosym /var/run/${PN}/ "${REDMINE_DIR}/tmp/pids" || die
-	fi
-	doenvd "${T}/50${PN}" || die
-}
-
-pkg_postinst() {
-	einfo
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" -o -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ] ; then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initlize environment:"
-		elog
-		elog "# cd ${EPREFIX}${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# chown redmine:redmine config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-	einfo
-}
-
-pkg_config() {
-	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ] ; then
-		eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml and edit this file in order to configure your database settings for \"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	local RUBY=${RUBY:-ruby18}
-
-	cd "${EPREFIX}${REDMINE_DIR}"
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
-		einfo
-		einfo "Generate secret token."
-		einfo
-		rm config/initializers/session_store.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-	fi
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ] ; then
-		einfo
-		einfo "Upgrade database."
-		einfo
-
-		einfo "Migrate database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Upgrade the plugin migrations."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
-		einfo "Clear the cache and the existing sessions."
-		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
-	else
-		einfo
-		einfo "Initialize database."
-		einfo
-
-		einfo "Generate a session store secret."
-		${RUBY} -S rake generate_secret_token || die
-		einfo "Create the database structure."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Insert default configuration data in database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		einfo
-		einfo "If you use sqlite3. please do not forget to change the ownership of the sqlite files."
-		einfo
-		einfo "# cd \"${EPREFIX}${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}
diff --git a/www-apps/redmine/redmine-2.2.0.ebuild b/www-apps/redmine/redmine-2.2.4.ebuild
index 7612b6e0cb4a..0be3f042fb00 100644
--- a/www-apps/redmine/redmine-2.2.0.ebuild
+++ b/www-apps/redmine/redmine-2.2.4.ebuild
@@ -1,12 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-2.2.0.ebuild,v 1.1 2013/01/07 13:39:26 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-2.2.4.ebuild,v 1.1 2013/05/11 21:29:22 pva Exp $
 
-EAPI="3"
-# ruby19: dev-ruby/rack has no ruby19
-# jruby: dev-ruby/rails has no jruby
-# rbx: dev-ruby/rails has no rbx
-#USE_RUBY="ruby18 ree18"
+EAPI="4"
 USE_RUBY="ruby18 ruby19"
 inherit eutils depend.apache ruby-ng
 
@@ -17,28 +13,33 @@ SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2"
 SLOT="0"
-#IUSE="bazaar cvs darcs fastcgi git imagemagick mercurial mysql openid passenger postgres sqlite3 subversion"
-IUSE="fastcgi imagemagick ldap openid passenger"
+# All db-related USEs are ineffective since we depend on rails
+# which depends on activerecord which depends on all ruby's db bindings
+#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
+IUSE="ldap openid imagemagick fastcgi passenger"
 
-#RDEPEND="$(ruby_implementation_depend ruby18 '>=' -1.8.6)[ssl]"
+#RDEPEND="$(ruby_implementation_depend jruby '>=' -1.6.7)[ssl]"
+RDEPEND="
+	ruby_targets_ruby18? (
+		>=dev-ruby/fastercsv-1.5[ruby_targets_ruby18]
+	)"
 
 ruby_add_rdepend "virtual/ruby-ssl
 	virtual/rubygems
-	>=dev-ruby/coderay-1.0.6
-	dev-ruby/i18n:0.6
-	dev-ruby/rake
-	~dev-ruby/rails-3.2.9:3.2
+	>=dev-ruby/rails-3.2.13:3.2
 	>=dev-ruby/jquery-rails-2.0.2
+	dev-ruby/i18n:0.6
+	>=dev-ruby/coderay-1.0.6
 	dev-ruby/builder:3
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( >=dev-ruby/rmagick-2 )
+	dev-ruby/rake
 	ldap? ( >=dev-ruby/ruby-net-ldap-0.3.1 )
 	openid? (
 		>=dev-ruby/ruby-openid-2.1.4
 		>=dev-ruby/rack-openid-0.2.1
 	)
-	passenger? ( www-apache/passenger )
-	"
+	imagemagick? ( >=dev-ruby/rmagick-2 )
+	fastcgi? ( dev-ruby/fcgi )
+	passenger? ( www-apache/passenger )"
 #	ruby_targets_ruby18? (
 #		>=dev-ruby/fastercsv-1.5
 #		postgres? ( >=dev-ruby/pg-0.11 )
@@ -70,22 +71,13 @@ ruby_add_rdepend "virtual/ruby-ssl
 #		ruby_targets_jruby? (
 #			dev-ruby/test-unit
 #		)
-#		>=dev-ruby/mocha-0.12.3
+#		=dev-ruby/mocha-0.12*
 #	)"
 
-#RDEPEND="${RDEPEND}
-#	bazaar ( dev-vcs/bazaar )
-#	cvs? ( >=dev-vcs/cvs-1.12 )
-#	darcs? ( dev-vcs/darcs )
-#	git? ( dev-vcs/git )
-#	mercurial? ( dev-vcs/mercurial )
-#	subversion? ( >=dev-vcs/subversion-1.3 )"
-
 REDMINE_DIR="/var/lib/${PN}"
 
 pkg_setup() {
 	enewgroup redmine
-	# home directory is required for SCM.
 	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
 }
 
@@ -99,54 +91,57 @@ all_ruby_prepare() {
 
 	echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}"
 	echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}"
+
+	# remove openid module in case openid is disabled
+	use openid || rm -r lib/plugins/open_id_authentication || die
+	# remove ldap staff module to avoid #413779
+	use ldap || rm app/models/auth_source_ldap.rb || die
 }
 
 all_ruby_install() {
-	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING} || die
+	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING}
 	rm -fr doc || die
-	dodoc README.rdoc || die
+	dodoc README.rdoc
 	rm README.rdoc || die
 
-	keepdir /var/log/${PN} || die
-	dosym /var/log/${PN}/ "${REDMINE_DIR}/log" || die
+	keepdir /var/log/${PN}
+	dosym /var/log/${PN}/ "${REDMINE_DIR}/log"
 
 	insinto "${REDMINE_DIR}"
-	doins -r . || die
-	keepdir "${REDMINE_DIR}/files" || die
-	keepdir "${REDMINE_DIR}/public/plugin_assets" || die
+	doins -r .
+	keepdir "${REDMINE_DIR}/files"
+	keepdir "${REDMINE_DIR}/public/plugin_assets"
 
 	fowners -R redmine:redmine \
 		"${REDMINE_DIR}/config" \
 		"${REDMINE_DIR}/files" \
 		"${REDMINE_DIR}/public/plugin_assets" \
 		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN} || die
-	# for SCM
-	fowners redmine:redmine "${REDMINE_DIR}" || die
-	# bug #406605
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
 	fperms -R go-rwx \
 		"${REDMINE_DIR}/config" \
 		"${REDMINE_DIR}/files" \
 		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN} || die
+		/var/log/${PN}
 
-	if use passenger ; then
+	if use passenger; then
 		has_apache
 		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf" || die
+		doins "${FILESDIR}/10_redmine_vhost.conf"
 	else
-		newconfd "${FILESDIR}/${PN}.confd" ${PN} || die
-		newinitd "${FILESDIR}/${PN}-2.initd" ${PN} || die
-		keepdir /var/run/${PN} || die
-		fowners -R redmine:redmine /var/run/${PN} || die
-		dosym /var/run/${PN}/ "${REDMINE_DIR}/tmp/pids" || die
+		newconfd "${FILESDIR}/${PN}.confd" ${PN}
+		newinitd "${FILESDIR}/${PN}-2.initd" ${PN}
 	fi
-	doenvd "${T}/50${PN}" || die
+	doenvd "${T}/50${PN}"
 }
 
 pkg_postinst() {
 	einfo
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" -o -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ] ; then
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" -o -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
 		elog "Execute the following command to upgrade environment:"
 		elog
 		elog "# emerge --config \"=${CATEGORY}/${PF}\""
@@ -169,47 +164,53 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ] ; then
-		eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml and edit this file in order to configure your database settings for \"production\" environment."
+	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ]; then
+		eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml"
+		eerror "then edit this file in order to configure your database settings for \"production\" environment."
 		die
 	fi
 
 	local RAILS_ENV=${RAILS_ENV:-production}
-	local RUBY=${RUBY:-ruby18}
+	if [ ! -L /usr/bin/ruby ]; then
+		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
 
-	cd "${EPREFIX}${REDMINE_DIR}"
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
+	cd "${EPREFIX}${REDMINE_DIR}" || die
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ]; then
 		einfo
-		einfo "Generate secret token."
+		einfo "Generating secret token."
 		einfo
 		rm config/initializers/session_store.rb || die
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
 	fi
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ] ; then
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
 		einfo
-		einfo "Upgrade database."
+		einfo "Upgrading database."
 		einfo
 
-		einfo "Migrate database."
+		einfo "Migrating database."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Upgrade the plugin migrations."
+		einfo "Upgrading the plugin migrations."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
 		einfo "Clear the cache and the existing sessions."
 		${RUBY} -S rake tmp:cache:clear || die
 		${RUBY} -S rake tmp:sessions:clear || die
 	else
 		einfo
-		einfo "Initialize database."
+		einfo "Initializing database."
 		einfo
 
-		einfo "Generate a session store secret."
+		einfo "Generating a session store secret."
 		${RUBY} -S rake generate_secret_token || die
-		einfo "Create the database structure."
+		einfo "Creating the database structure."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Insert default configuration data in database."
+		einfo "Populating database with default configuration dat."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
 		einfo
-		einfo "If you use sqlite3. please do not forget to change the ownership of the sqlite files."
+		einfo "If you use sqlite3, please do not forget to change the ownership of the sqlite files."
 		einfo
 		einfo "# cd \"${EPREFIX}${REDMINE_DIR}\""
 		einfo "# chown redmine:redmine db/ db/*.sqlite3"