Fixed dependency. Fixed initd files. Removed old versions.

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

6 files changed, 32 insertions, 336 deletions

diff --git a/www-apps/redmine/ChangeLog b/www-apps/redmine/ChangeLog
index ae1b5f3524df..0783dc900ea9 100644
--- a/www-apps/redmine/ChangeLog
+++ b/www-apps/redmine/ChangeLog
@@ -1,6 +1,13 @@
 # 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.22 2011/07/27 16:24:53 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.23 2011/09/29 00:40:09 matsuu Exp $
+
+*redmine-1.2.1-r1 (29 Sep 2011)
+
+  29 Sep 2011; MATSUU Takuto <matsuu@gentoo.org> -redmine-1.1.2.ebuild,
+  -redmine-1.2.0.ebuild, -redmine-1.2.1.ebuild, +redmine-1.2.1-r1.ebuild,
+  files/redmine.initd:
+  Fixed dependency. Fixed initd files. Removed old versions.
 
 *redmine-1.2.1 (27 Jul 2011)
 
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index 23b9b5102a98..1c0bd8178ae0 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -1,25 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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.1.2.tar.gz 4829954 RMD160 399b15166eb7c6f89e2d3ff9809d67679888d846 SHA1 6a711a9f7181a476ff6c67456000e5578734c245 SHA256 3451363c45eae9fd25bc047a62f8e11509e53f8a0bb4749526bb1cb0c8723953
+AUX redmine.initd 1092 RMD160 bf656e18a7c03f096459dd66ba149dbcf632b9b3 SHA1 c4aa4daf30a286b665d821da123bb0117c7dd202 SHA256 c89d411280db50c9f57867ec79e1c13c73d241e5e6f7a833b1b84d94d1029595
 DIST redmine-1.1.3.tar.gz 4837121 RMD160 cb1a750ee6d5532dcead4de9b48a5d24b852db6a SHA1 6d8eb536a8bad6404a092b1f1efd9292759a2442 SHA256 9e8a914852dc4262e2718d44fc6a06ce6e943d715921b8d8d48bf87e432f5a46
-DIST redmine-1.2.0.tar.gz 5926919 RMD160 18b4f41611dee4154daf9dbfd4e1b25e953ac3f3 SHA1 dae9c47c531b653d9a9018a21ba35f80a3c15981 SHA256 18c26a614c7fb4091eaf4e00c74c64f3d87c041309dba73c361317318c62ce12
 DIST redmine-1.2.1.tar.gz 9633744 RMD160 a2bf5237dc5f68560dc16dc707e7f59a461dcafb SHA1 5458fb394cfeffb5fb832db589f49fc10fa2c07f SHA256 16fb74b95c3b523bbdca7d71bcad1ffcc08c1e6b10552da9c3452e29179de221
-EBUILD redmine-1.1.2.ebuild 5142 RMD160 60f8a4e7f0c176f8cf85448b3da6d0598c87ffe6 SHA1 9971bbdebd891f70ab3940adaa56ea604c1a15e5 SHA256 7975b65b3b498ce51c2d5e1a591ded62798429f190a5d923fca65aab7cd2c52c
 EBUILD redmine-1.1.3.ebuild 5142 RMD160 abf246b1431f5c202897e5f800436907f6e5d141 SHA1 a239d722095a5fd38729e5919b3f54cb6f42257a SHA256 2eb00cea2817d5c9b4a3760d182319d329e91b4e19412f491a2446add87d9e08
-EBUILD redmine-1.2.0.ebuild 5246 RMD160 fa1b40b81a02374eaca42472fab6051f772e2d13 SHA1 684152fa0bcca8599b5067083476ffbc0690dffe SHA256 7e50ea2ff93dcb4bd450ff6aab29d9e54686d90065f76fbeaca7426e6e56e581
-EBUILD redmine-1.2.1.ebuild 5377 RMD160 b75029ee52de1227070075809f4123430682c136 SHA1 c230df614af405d36c1ffb5afb14e970d65ab0b8 SHA256 86325e1d03488bfcdd7ea88df46a0d8e5f53b829ac119ca9cc9bca126524bd19
-MISC ChangeLog 3883 RMD160 51559c3003ae5291d5beb662acd1821e386e4555 SHA1 aac18ea73c4c1ea51c697cda77e0aa5324d03930 SHA256 38630117ac0ff1f8aa78be82d09d8af140995d4bf93fbe386112514ab6bee6ce
+EBUILD redmine-1.2.1-r1.ebuild 5383 RMD160 30ba2fea50912b84557b1fd016802f4f07ea5c77 SHA1 330c3f3de88cc9a08a5c8eda1dcfc9386d58e40d SHA256 b50c6f6af7cabbf1963bfcee09a2d00342ba15503afee409de5f90e915812dd4
+MISC ChangeLog 4147 RMD160 37c4c0b78e56c05594d09c800ca375351b50fba5 SHA1 c59eb8e2ed5ff668f869c79745b990aa89854823 SHA256 d3ace407f2da556c730f70cc36310dbd109cfa3adfeecef560a995cdb2810e2d
 MISC metadata.xml 618 RMD160 f79e44b9a0dabbe58db6623b335f12cc2a70fd7f SHA1 9308b667a2be99c124948dfcd82de67a301422b6 SHA256 a4a25fbf4e75e2853c36057c5dc8f4c4e77bff791f732dbe61e298df2d670a10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59tlkACgkQfXuS5UK5QB0ItAP7BC7XhZujejpOhablRB49JwjK
-N1EkZvrTNPgrTb2uyT+EHbSldC6tTNZAHyieYXjbe8oh/dSU7BA7VsgZ1OX4/i5a
-RzYH6HjKTTBh2isnXFFVuuQvtWvjQGNFCatiJ+LFJcx3gcXrLlHtLTAj3CHb3kS6
-MDD2eFoiNLaCv3/7XCY=
-=zNYW
+iQIcBAEBAgAGBQJOg759AAoJECaGw+YFKA1pqhIP+wTMX1jIA1ahnSNJ2KLUNI7c
+uL8fGGX5Ygq5aEfED6htV5xoPTXhsowVugTH6170VfIA2rbFYK5+Mv6DDDBIJf2Q
+TzcFgEtTmqcjY7c5JoAwSR+a7yO5WyXs2nnrucXWMXXa6Zf4BgtkkaK/ns1v04zh
+2lryb9rWf6XNLxLJ/eyK94VvpNDcKEUEhbKOSkWPGyQ/TaZD6KwvhTCx3iVgTQ9T
+U51y57oVV7D378XuJKEE0FNTFmRZheaPA62gmEH7efAmo8jgaZzl3rLkyDJM/Ug8
+Q4fb8v4umGho4VW5xXQ9MA8RqbI5oB+CaNNA1P9HEy7QDKg6EMPlXZ+PbJ7Juz9j
+nSqko7t1+d2B3DpOlzXyHP42Z8aRSLIu2lfCDw0lJLdsH8I2MhdC64MF/9zcRRnC
+5C8df351Xd2fE9ZiDrpmUXRJhU6wyLfFMs/hXyN4w46qT4wEwTAPxL6B40tNhOc3
+dKUMTTLZxWV9tAe1ml4IUAvn4WFVHS7WtxxQTT0aK95tcgmnzqhEkPU8JOBHoSlD
+CnUFV/knAmJNJRO+7pEncRR3qlwaXTIokVCECnGbv36TpamTj6uf+9hMxO6RlXJO
+EA6+lVl3CpJZy5FJ2Q9d45eXi6leq4qt7xhKA17dte9RUrMabkl2cgI0dpofotPz
+1UY6SEDvbFwTftSU3Egy
+=QSeC
 -----END PGP SIGNATURE-----
diff --git a/www-apps/redmine/files/redmine.initd b/www-apps/redmine/files/redmine.initd
index aa8949aa2bd9..b185aeaaf003 100644
--- a/www-apps/redmine/files/redmine.initd
+++ b/www-apps/redmine/files/redmine.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/files/redmine.initd,v 1.2 2010/12/25 02:53:46 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/files/redmine.initd,v 1.3 2011/09/29 00:40:09 matsuu Exp $
 
 RAILS_ENV=${RAILS_ENV:-production}
 REDMINE_DIR=${REDMINE_DIR:-/var/lib/redmine}
@@ -18,7 +18,7 @@ depend() {
 start() {
 	ebegin "Starting redmine"
 	cd "${REDMINE_DIR}"
-	start-stop-daemon --start --quiet --chuid ${REDMINE_USER}:${REDMINE_GROUP} \
+	start-stop-daemon --start --quiet --user ${REDMINE_USER}:${REDMINE_GROUP} \
 		--pidfile "${REDMINE_PIDFILE}" \
 		--exec /usr/bin/ruby "${REDMINE_DIR}"/script/server -- \
 		--daemon --environment=${RAILS_ENV} \
diff --git a/www-apps/redmine/redmine-1.1.2.ebuild b/www-apps/redmine/redmine-1.1.2.ebuild
deleted file mode 100644
index e8450b035604..000000000000
--- a/www-apps/redmine/redmine-1.1.2.ebuild
+++ /dev/null
@@ -1,156 +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.2.ebuild,v 1.2 2011/04/24 01:45:22 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
-	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
-ruby_add_rdepend imagemagick dev-ruby/rmagick
-ruby_add_rdepend openid dev-ruby/ruby-openid
-ruby_add_rdepend passenger www-apache/passenger
-
-RDEPEND="${RDEPEND}
-	~dev-ruby/rack-1.0.1
-	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.2.0.ebuild b/www-apps/redmine/redmine-1.2.0.ebuild
deleted file mode 100644
index defcc335b9e9..000000000000
--- a/www-apps/redmine/redmine-1.2.0.ebuild
+++ /dev/null
@@ -1,159 +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.2.0.ebuild,v 1.1 2011/06/04 06:54:28 matsuu Exp $
-
-EAPI="3"
-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="bazaar cvs darcs fastcgi git imagemagick mercurial mysql openid passenger postgres sqlite3 subversion"
-IUSE="fastcgi imagemagick mysql openid passenger postgres sqlite3"
-
-RDEPEND="$(ruby_implementation_depend ruby18 '>=' -1.8.6)[ssl]"
-
-ruby_add_rdepend "~dev-ruby/coderay-0.9.7
-	>=dev-ruby/rubygems-1.3.7
-	>=dev-ruby/ruby-net-ldap-0.0.4
-	~dev-ruby/i18n-0.4.2
-	~dev-ruby/rack-1.1.0
-	dev-ruby/rake"
-ruby_add_rdepend ~dev-ruby/rails-2.3.11: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 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() {
-	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 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
-	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.2.1.ebuild b/www-apps/redmine/redmine-1.2.1-r1.ebuild
index adbf139cdfd5..76877b409dac 100644
--- a/www-apps/redmine/redmine-1.2.1.ebuild
+++ b/www-apps/redmine/redmine-1.2.1-r1.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.2.1.ebuild,v 1.1 2011/07/27 16:24:53 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.2.1-r1.ebuild,v 1.1 2011/09/29 00:40:09 matsuu Exp $
 
 EAPI="3"
 USE_RUBY="ruby18"
@@ -24,8 +24,8 @@ ruby_add_rdepend "~dev-ruby/coderay-0.9.7
 	~dev-ruby/i18n-0.4.2
 	~dev-ruby/rack-1.1.0
 	dev-ruby/rake"
-ruby_add_rdepend ~dev-ruby/rails-2.3.11:2.3
-ruby_add_rdepend "~dev-ruby/activerecord-2.3.11:2.3[mysql?,postgres?,sqlite3?]"
+#ruby_add_rdepend ~dev-ruby/rails-2.3.11:2.3
+#ruby_add_rdepend "~dev-ruby/activerecord-2.3.11: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
@@ -52,7 +52,7 @@ 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
+	#rm -fr vendor/rails || 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}"
 }