Added dev-ruby/rake to dependency, bug #359195. Removed old versions.

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

6 files changed, 23 insertions, 489 deletions

diff --git a/www-apps/redmine/ChangeLog b/www-apps/redmine/ChangeLog
index a5ae7123632d..1a5831e97eba 100644
--- a/www-apps/redmine/ChangeLog
+++ b/www-apps/redmine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/redmine
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.18 2011/03/08 23:48:42 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.19 2011/04/24 01:45:22 matsuu Exp $
+
+  24 Apr 2011; MATSUU Takuto <matsuu@gentoo.org> -redmine-1.0.5.ebuild,
+  -redmine-1.1.0.ebuild, -redmine-1.1.1.ebuild, redmine-1.1.2.ebuild:
+  Added dev-ruby/rake to dependency, bug #359195. Removed old versions.
 
 *redmine-1.1.2 (08 Mar 2011)
 
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index 1c6430487b80..37561bc32510 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -4,30 +4,24 @@ Hash: SHA1
 AUX 10_redmine_vhost.conf 343 RMD160 b4d6188a7579162b5d3ce891cab3ed1b7a1fc2f8 SHA1 e176c667402308b8475bec75890cca3a22d99a42 SHA256 4067d312a5fc8e7f1f98e8917d2e9c296a70a7e9847efaf92a8415d753387435
 AUX redmine.confd 267 RMD160 03b2a3d9d4e156bc0a6bd6969a3ae8800c9a51d9 SHA1 9402fd36df731413ce130e7e63411729de391444 SHA256 2ac6b7dfc2d055554b7ee9380fcf1a49a708bbd866987b775507d7a3b30f2d41
 AUX redmine.initd 1093 RMD160 735df0fd9940fe85ea4fead20702956de9cdd08c SHA1 ee6860c7a51e35cab1ab4d1bd9f346ab3b58f931 SHA256 e0c35d1598654a9d96ad33fb80c67367730639093bdce4df7ea23eed14d90cac
-DIST redmine-1.0.5.tar.gz 4769044 RMD160 a7c987e1d0481351c33040940d9d128c046c3258 SHA1 faed813c2534d732f630d4257e0d3063b4702321 SHA256 c5d9f551e8a548b7ac4f1892c1c7a21adfd2cbcf1b0f889b6e0eac34d5d2865f
-DIST redmine-1.1.0.tar.gz 4823404 RMD160 2204d9cb9d7089d46705b6a9137f381cca92d277 SHA1 ddac05788c99701f0b7ebe0a7196cefb1adbb928 SHA256 21ad962b73504ffa7f7afdc27dac23c4526b1050d106652ab6ac7e066b9a0a17
-DIST redmine-1.1.1.tar.gz 4832494 RMD160 a2fd705bbe9d599bcb57c8d0e952c041975977f7 SHA1 27db7c2d2759d103455e9df2506da8a5dd2131d0 SHA256 2e3657725068f18252c6594c031501a4b969c6031053bc34c4c55d670aae1169
 DIST redmine-1.1.2.tar.gz 4829954 RMD160 399b15166eb7c6f89e2d3ff9809d67679888d846 SHA1 6a711a9f7181a476ff6c67456000e5578734c245 SHA256 3451363c45eae9fd25bc047a62f8e11509e53f8a0bb4749526bb1cb0c8723953
-EBUILD redmine-1.0.5.ebuild 5169 RMD160 b88d60609ac94dca1eddfe2a63bdaa7a0c7b5970 SHA1 21d5db6ea69260be609cfcadfcb31e8ce36139b7 SHA256 4c947c38ab1e90e57ad91ff10230f61a174fef5f2130448d9353bee5ccb8e150
-EBUILD redmine-1.1.0.ebuild 5204 RMD160 d71a0f90fd6e8d19a1183ebec9b9fd13adcfc370 SHA1 6c62d73940abb807fb4e8f5681a813c05f8e1e1e SHA256 54940d7ec7ac7cb7575605006880a78b2cd40d969102deadc4926c4efa3903ca
-EBUILD redmine-1.1.1.ebuild 5189 RMD160 5d0eef4b7445c273ead18c61a0d88e8750b4b1d3 SHA1 4299884b8f701098883a93496b478f2f353c157d SHA256 0d22785a14945512097d94c7b8aa9a3c73b64babfa2544d9c0c9d4d445594b97
-EBUILD redmine-1.1.2.ebuild 5127 RMD160 e492151c42c076b9e68e6cb938e622cc30911d28 SHA1 2fbc9ae41337e443264e0eb62cbf0414fc7a8e0f SHA256 8c65ca427f009627bf03f109cb8f97ea56bf08e5b674c6f3b36af4eb36fa12d7
-MISC ChangeLog 3236 RMD160 e5f6eb4e4d562bf3246b7b8ab5fa3ce3691fbba5 SHA1 abf6a3db0df54d4b638c953dfc949717705a6c75 SHA256 912c9761222a16c0db59016c6079ae130be688b5ce41b171dc4b64027559df3f
+EBUILD redmine-1.1.2.ebuild 5142 RMD160 60f8a4e7f0c176f8cf85448b3da6d0598c87ffe6 SHA1 9971bbdebd891f70ab3940adaa56ea604c1a15e5 SHA256 7975b65b3b498ce51c2d5e1a591ded62798429f190a5d923fca65aab7cd2c52c
+MISC ChangeLog 3451 RMD160 6cd5c861ad8febafe5afb8be97c0fc46045e07c1 SHA1 a67b67a468f4d311bf18f34ff8d13e11971815c6 SHA256 44388241af86e9ad74ad8cce88a527dde7a445cd37ad2b9d0f2eacb7c331ea03
 MISC metadata.xml 639 RMD160 fe34460ce10d91252a65a67953fe04df99140d07 SHA1 f35d46b5ba207fb36dba92127395b48260afe770 SHA256 d80112afbed97dbc584e9864d01df04949f7291cd13849b09fc4ff648c0c27fd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNdsBkAAoJECaGw+YFKA1pKucQAJnZmWNIKrJTLgMeb7V7FEyf
-NnPxgLHmI7qIjKfqn1R6KsoVXMDMmBcL+6MX/erUAyvwxrcVCONL1Cd6T3BiHIIg
-bvr1LPicbhby2104hHXJl0Y0Fu7O1ztU9UX2rZCzGuQaJgKTcIIgy58tQfvMpd9M
-tWWdwcKZW6XR4DQW12lBhNvl5rR2YQmlRCzxmTQvHpiTtJM08oD5La9+gs5IbTwB
-xWhLdegVVr01FEofacsNCgDKMcDGiMlkJYOKwKbFm5IAlrvnWPcYzHDkw/Fh2oe2
-pEtKf5ufbETBkLVoCqrLsoZPKi9HlE3dCPgvH1FhiY5t4Dt4LovvNXNWKiwGUESo
-PvCeyEPPYRyPN6v4iJ+eI4UuypT0Tp1MAeAkQtnkGB1eQJQginTNLPjUeUiV23pg
-ujM2sveiunhgNkO+HDN+buRgwDNGlqhdROWPg1YzYqv105ZKX6DgQpvQoLM6SpKu
-pGg+CmQPbk49rFQUXk6dgvMihXSJhobApvwkP1/xc3ffusYleFqtX3HpObGuuD7l
-H4lUeb5O+aK9MLgTnNJF4BZMevfUzyd85o42K8AX0QSLA59/uFO+9s3+Mk0ewIF9
-Kq8jzv/vqLHKFUgH0TYdjeZIQxR0JAidBuKdMkkjPFCB7Kzkr/4ueciZBjwWmpJf
-tKG/nLTmTdtjaj5/dJdQ
-=4bOe
+iQIcBAEBAgAGBQJNs4C5AAoJECaGw+YFKA1pgtMP/2RWwmn9wCloRde4HTBksP0D
+PFURmXJwg1Jel/g6OXXVsiIPHv82ug6RdIm4WXfGAM2u/5Exg85EZhAPlMr2uixz
+puBloolOJLcndTmmFBQfOddMX8e1bcPzVoGKSKSW8lRZrVqHnk58rtMe9UgJDN9Z
+9btniHf/4IP8BW9FbvCkYlwj1/7AGz9VH/SUeGX0SrB2GY5bEF1NLpsl+04K/0bl
+MXjr3H3MTiL0I0ZeQ8XkBgcCl6jzd6X8phPgJx6j0WMLve2UrRAR/esP0Gss1iIW
+Obmbr4h+LTtlQaNwSJESJAbcGSNrUM3hsH8zM9JVO0wQRk5OYXn1Bz1d5Ox9uZW+
+P5nciwYWUkDXZ/bDbyb6UsWdN5DVdfA2WMNlWeMIVaw0lP/UV299nQdcMU4T+dVD
+9UvKNDA1hFKoZlXMBs7Fwx8LfTEsULxiR8TRDFSjbY48kekKiaCqbTGeVA88wv7s
+SuqzILdvBj6/wURJn8VhHk3gyrxI6QUjuh+4JAFI/aYAp1SdWX3Qxurv7txw+pN7
+fr0mX9y9qs5D1QAjOBmqJ01F07fGSrN2gVEJGNa1804WnlDSnNJQORdOJmWniwwS
+FlS0SBqxqPuXGqE7HZYZ2K1J4oHKeSZ4Ag3w6rusGO3dSxz65vN5KVoeUqRaA4OP
+DvM1+j1djyN/YxKiBY/O
+=rFy3
 -----END PGP SIGNATURE-----
diff --git a/www-apps/redmine/redmine-1.0.5.ebuild b/www-apps/redmine/redmine-1.0.5.ebuild
deleted file mode 100644
index 98ed93f81654..000000000000
--- a/www-apps/redmine/redmine-1.0.5.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.0.5.ebuild,v 1.2 2011/01/24 13:41:30 matsuu Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-inherit eutils confutils 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="cvs darcs fastcgi git imagemagick mercurial mysql openid passenger postgres sqlite3 subversion"
-
-ruby_add_rdepend ">=dev-ruby/coderay-0.7.6.227
-	>=dev-ruby/rubygems-1.3.5
-	>=dev-ruby/ruby-net-ldap-0.0.4
-	~dev-ruby/i18n-0.4.2"
-#ruby_add_rdepend ~dev-ruby/rails-2.3.5:2.3
-#ruby_add_rdepend "dev-ruby/activerecord:2.3[mysql?,postgres?,sqlite3?]"
-ruby_add_rdepend fastcgi dev-ruby/ruby-fcgi
-ruby_add_rdepend imagemagick dev-ruby/rmagick
-ruby_add_rdepend openid dev-ruby/ruby-openid
-#ruby_add_rdepend passenger "=dev-ruby/rack-1.0.1* www-apache/passenger"
-
-RDEPEND="${RDEPEND}
-	passenger? ( =dev-ruby/rack-1.0.1* www-apache/passenger )
-	dev-ruby/activerecord:2.3[mysql?,postgres?,sqlite3?]
-	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() {
-	confutils_require_any mysql postgres sqlite3
-	enewgroup redmine
-	# home directory is required for SCM.
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -fr log files/delete.me || die
-	rm -fr vendor/plugins/coderay-0.7.6.227 || die
-	rm -fr vendor/plugins/ruby-net-ldap-0.0.4 || die
-	#rm -fr vendor/rails || die
-	echo "CONFIG_PROTECT=\"${REDMINE_DIR}/config\"" > "${T}/50${PN}"
-	echo "CONFIG_PROTECT_MASK=\"${REDMINE_DIR}/config/locales\"" >> "${T}/50${PN}"
-}
-
-all_ruby_install() {
-	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING} || die
-	rm -fr doc || 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/environment.rb" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN} || die
-	# for SCM
-	fowners redmine:redmine "${REDMINE_DIR}" || 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 "${ROOT}${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 ${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 "${REDMINE_DIR}/config/database.yml" ] ; then
-		eerror "Copy ${REDMINE_DIR}/config/database.yml.example to ${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 "${REDMINE_DIR}"
-	if [ -e "${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 config/initializers/session_store.rb || 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
-	fi
-
-	if [ ! -e "${REDMINE_DIR}/config/email.yml" ] ; then
-		ewarn
-		ewarn "Copy ${REDMINE_DIR}/config/email.yml.example to ${REDMINE_DIR}/config/email.yml and edit this file to adjust your SMTP settings."
-		ewarn
-	fi
-}
diff --git a/www-apps/redmine/redmine-1.1.0.ebuild b/www-apps/redmine/redmine-1.1.0.ebuild
deleted file mode 100644
index 6beb26389249..000000000000
--- a/www-apps/redmine/redmine-1.1.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.1.0.ebuild,v 1.2 2011/01/24 13:41:30 matsuu Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-inherit eutils confutils 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="cvs darcs fastcgi git imagemagick mercurial mysql openid passenger postgres sqlite3 subversion"
-
-ruby_add_rdepend ">=dev-ruby/coderay-0.7.6.227
-	>=dev-ruby/rubygems-1.3.5
-	>=dev-ruby/ruby-net-ldap-0.0.4
-	~dev-ruby/i18n-0.4.2"
-#ruby_add_rdepend ~dev-ruby/rails-2.3.5:2.3
-#ruby_add_rdepend "dev-ruby/activerecord:2.3[mysql?,postgres?,sqlite3?]"
-ruby_add_rdepend fastcgi dev-ruby/ruby-fcgi
-ruby_add_rdepend imagemagick dev-ruby/rmagick
-ruby_add_rdepend openid dev-ruby/ruby-openid
-#ruby_add_rdepend passenger "=dev-ruby/rack-1.0.1* www-apache/passenger"
-
-RDEPEND="${RDEPEND}
-	passenger? ( =dev-ruby/rack-1.0.1* www-apache/passenger )
-	dev-ruby/activerecord:2.3[mysql?,postgres?,sqlite3?]
-	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() {
-	confutils_require_any mysql postgres sqlite3
-	enewgroup redmine
-	# home directory is required for SCM.
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -fr log files/delete.me || die
-	rm -fr vendor/plugins/coderay-0.7.6.227 || die
-	rm -fr vendor/plugins/ruby-net-ldap-0.0.4 || die
-	#rm -fr vendor/rails || die
-	echo "CONFIG_PROTECT=\"${REDMINE_DIR}/config\"" > "${T}/50${PN}"
-	echo "CONFIG_PROTECT_MASK=\"${REDMINE_DIR}/config/locales ${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
-
-	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/environment.rb" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN} || die
-	# for SCM
-	fowners redmine:redmine "${REDMINE_DIR}" || 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 "${ROOT}${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 ${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 "${REDMINE_DIR}/config/database.yml" ] ; then
-		eerror "Copy ${REDMINE_DIR}/config/database.yml.example to ${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 "${REDMINE_DIR}"
-	if [ -e "${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 config/initializers/session_store.rb || 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
-	fi
-
-	if [ ! -e "${REDMINE_DIR}/config/email.yml" ] ; then
-		ewarn
-		ewarn "Copy ${REDMINE_DIR}/config/email.yml.example to ${REDMINE_DIR}/config/email.yml and edit this file to adjust your SMTP settings."
-		ewarn
-	fi
-}
diff --git a/www-apps/redmine/redmine-1.1.1.ebuild b/www-apps/redmine/redmine-1.1.1.ebuild
deleted file mode 100644
index 4cef9e384bdf..000000000000
--- a/www-apps/redmine/redmine-1.1.1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.1.1.ebuild,v 1.1 2011/01/30 23:37:42 matsuu Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-inherit eutils confutils 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="cvs darcs fastcgi git imagemagick mercurial mysql openid passenger postgres sqlite3 subversion"
-
-ruby_add_rdepend "~dev-ruby/coderay-0.9.7
-	>=dev-ruby/rubygems-1.3.5
-	>=dev-ruby/ruby-net-ldap-0.0.4
-	~dev-ruby/i18n-0.4.2"
-#ruby_add_rdepend ~dev-ruby/rails-2.3.5:2.3
-#ruby_add_rdepend "dev-ruby/activerecord:2.3[mysql?,postgres?,sqlite3?]"
-ruby_add_rdepend fastcgi dev-ruby/ruby-fcgi
-ruby_add_rdepend imagemagick dev-ruby/rmagick
-ruby_add_rdepend openid dev-ruby/ruby-openid
-#ruby_add_rdepend passenger "=dev-ruby/rack-1.0.1* www-apache/passenger"
-
-RDEPEND="${RDEPEND}
-	passenger? ( =dev-ruby/rack-1.0.1* www-apache/passenger )
-	dev-ruby/activerecord:2.3[mysql?,postgres?,sqlite3?]
-	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() {
-	confutils_require_any mysql postgres sqlite3
-	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-0.9.7 || die
-	rm -r vendor/plugins/ruby-net-ldap-0.0.4 || die
-	#rm -fr vendor/rails || die
-	echo "CONFIG_PROTECT=\"${REDMINE_DIR}/config\"" > "${T}/50${PN}"
-	echo "CONFIG_PROTECT_MASK=\"${REDMINE_DIR}/config/locales ${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
-
-	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/environment.rb" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN} || die
-	# for SCM
-	fowners redmine:redmine "${REDMINE_DIR}" || 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 "${ROOT}${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 ${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 "${REDMINE_DIR}/config/database.yml" ] ; then
-		eerror "Copy ${REDMINE_DIR}/config/database.yml.example to ${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 "${REDMINE_DIR}"
-	if [ -e "${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 config/initializers/session_store.rb || 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
-	fi
-
-	if [ ! -e "${REDMINE_DIR}/config/email.yml" ] ; then
-		ewarn
-		ewarn "Copy ${REDMINE_DIR}/config/email.yml.example to ${REDMINE_DIR}/config/email.yml and edit this file to adjust your SMTP settings."
-		ewarn
-	fi
-}
diff --git a/www-apps/redmine/redmine-1.1.2.ebuild b/www-apps/redmine/redmine-1.1.2.ebuild
index 1fb866dba544..e8450b035604 100644
--- a/www-apps/redmine/redmine-1.1.2.ebuild
+++ b/www-apps/redmine/redmine-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.1.2.ebuild,v 1.1 2011/03/08 23:48:42 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.1.2.ebuild,v 1.2 2011/04/24 01:45:22 matsuu Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
@@ -18,7 +18,8 @@ IUSE="cvs darcs fastcgi git imagemagick mercurial mysql openid passenger postgre
 ruby_add_rdepend "~dev-ruby/coderay-0.9.7
 	>=dev-ruby/rubygems-1.3.5
 	>=dev-ruby/ruby-net-ldap-0.0.4
-	~dev-ruby/i18n-0.4.2"
+	~dev-ruby/i18n-0.4.2
+	dev-ruby/rake"
 #ruby_add_rdepend ~dev-ruby/rails-2.3.5:2.3
 #ruby_add_rdepend "dev-ruby/activerecord:2.3[mysql?,postgres?,sqlite3?]"
 ruby_add_rdepend fastcgi dev-ruby/ruby-fcgi