Removed dev-ruby/rails from RDEPEND, bug #352511. Fixed elog message bug #352588. Removed old versions.

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

8 files changed, 34 insertions, 647 deletions

diff --git a/www-apps/redmine/ChangeLog b/www-apps/redmine/ChangeLog
index 7423802ca6c9..8f31fc07bbbb 100644
--- a/www-apps/redmine/ChangeLog
+++ b/www-apps/redmine/ChangeLog
@@ -1,6 +1,12 @@
 # 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.15 2011/01/17 15:01:28 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.16 2011/01/24 13:41:30 matsuu Exp $
+
+  24 Jan 2011; MATSUU Takuto <matsuu@gentoo.org> -redmine-0.9.6.ebuild,
+  -redmine-1.0.2.ebuild, -redmine-1.0.3.ebuild, -redmine-1.0.4.ebuild,
+  redmine-1.0.5.ebuild, redmine-1.1.0.ebuild:
+  Removed dev-ruby/rails from RDEPEND, bug #352511. Fixed elog message bug
+  #352588. Removed old versions.
 
 *redmine-1.1.0 (17 Jan 2011)
 
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index 699b72c4d3f9..91c7b84135b1 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -4,34 +4,26 @@ 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-0.9.6.tar.gz 4570479 RMD160 4bca5368f6c8e476589bdb70da4526365013a6ae SHA1 68b574e79790c1d5f3fcbc14ffa5d38fedd37a22 SHA256 5d1d0fc38a3b9bd62bfbd4543250b3a931b8805e09546ae1063ef857591683ea
-DIST redmine-1.0.2.tar.gz 4831241 RMD160 06acc821e2facdd6b0a7ede0a74d50d1a6ea32ea SHA1 5d2709e388ada6f78fb3ffb93eb4d4561db0939c SHA256 5e9423e72a015ac5c0c232ce087966aec80878455aebce86e4337e6cf6ac9ad2
-DIST redmine-1.0.3.tar.gz 4837421 RMD160 6379f38634ead24a5706fc0fd4d1e2637af1faf5 SHA1 5d7b1d5c877677b3b9fd338acdfb9f8ccd98003b SHA256 7756ccdd036a0411be7387f7c9b8d9494e0b941d313871eca256d951fe8eb8a3
-DIST redmine-1.0.4.tar.gz 4768883 RMD160 91bc58bb9387bb8835f1e8d88c465a287303249b SHA1 75ea9afa7827bbc4858e77b429fe1d46064164f4 SHA256 030115866274600d13072a9caf0680d2ddc360469bdc69678f1d040d8936aef8
 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
-EBUILD redmine-0.9.6.ebuild 4927 RMD160 006ebe0403f2f054752ae0330ca9a3b98277f4d2 SHA1 62d788ef6875248730869c31429bde8e80cc00cb SHA256 3b1e5a9f288e58e9b9a0fe760389732f0761c550131942431da624a983751dd2
-EBUILD redmine-1.0.2.ebuild 5042 RMD160 821997ef215d9c369a7d6623e56ac408eb550efd SHA1 ae4ef3657b599fdec2523827480c644040b7fbc8 SHA256 fa0e809b444c656dc279537e436e7b5bb46e8c8974738d61895863effa976f53
-EBUILD redmine-1.0.3.ebuild 5042 RMD160 8161d3be364b2e70c899ef24a3a155fa4da29682 SHA1 afcb5fec0a0e2a438e42936f22c243f701504194 SHA256 c07bc5a05519d1e5f4bd6e1fd1becf71f169529ea99ae5672c33151dedaf8f40
-EBUILD redmine-1.0.4.ebuild 5041 RMD160 5d63d496d688fe9cdfdebfa80b56a10c55987a8d SHA1 01e0dfcf3066f2a1530fe84e45817124e54c2c50 SHA256 265f5a562ed5b710e81c966c0f8d1e3a697222523c30f44cbc716a54f84d7d02
-EBUILD redmine-1.0.5.ebuild 5144 RMD160 54537ffb80f692f1b8a7ae8db8d127a2c6f95d24 SHA1 ae8c3a5e9037654161505e807c426b4fef9dfc34 SHA256 71a3a3957bc94c8f02352fe00080539e1fd5b2227977c891caddd736b0d28a73
-EBUILD redmine-1.1.0.ebuild 5179 RMD160 8164326f34d430fbbe3e62f1273bc69926b4881d SHA1 37346bf42987f097f3bda6638e5821156234237c SHA256 5812a2754be466062eba58302f7194d1c1eb3b619d717db33bba01d83ae76fca
-MISC ChangeLog 2665 RMD160 2efce07977b1c477267b1ff9ae9e25f45d47c252 SHA1 ea7f9e723ef8c36710e7c95452ed7b11eb163a0d SHA256 9e884c6a7aec1bf72bc587ff462feafd661834b8280351286465df4f1424cef9
+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
+MISC ChangeLog 2963 RMD160 ff65470c06a7771a06c3283232e98ada02ef80b1 SHA1 cc944feeb1af35c251b44f42af123394a2d6fb8a SHA256 c72d08604cc23bc4e8e15043cca9c9a933a494e0c8c6b0a1ae0a970ee045eb5e
 MISC metadata.xml 639 RMD160 fe34460ce10d91252a65a67953fe04df99140d07 SHA1 f35d46b5ba207fb36dba92127395b48260afe770 SHA256 d80112afbed97dbc584e9864d01df04949f7291cd13849b09fc4ff648c0c27fd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNNFnRAAoJECaGw+YFKA1pZEsP/RsbnNQnECcrQAwS2J/e2YsU
-6ouVPHwGyeyKqNhapIXUARmQGSyWKc+VXl6ayJ/xvsf2/pO8XQm98VmI2gseSpWL
-8AeQEWG4c1Jxyizj8PUwuQA7WWX/vYjd9coRDVx88WOOpgVuZ+pg+f9TeZ06+nX8
-qeW97o+Asb0BTYSW6SFlKc+O+FTAKWP2g6h4+T38CrMinuy8vfBoPj4QAB/Dgxj3
-hR0SKSLVng2/RNbtR3rYFhv+4WfyDvxgYTaW0E2GxONz+fEgUzfzyh2xHwOGaehP
-CY8OtfTLPRs66qe84PAPZ4eDAeit5WoFENrC1aK/qkOoTz1fpo2thrUYkVEKtDUI
-w+ie+NX9aPwb1+zoO5UtNjgf0jojf7Wk9mexWMON4mct1NPGLD23jovmU+oMyOiu
-8518l1Qio+7AMmiO1GASbPLZEK9zo11pPlc29c6QE8mv6u794CfPS468TjF+J1YP
-OBPRd7ONweUZ26LJybpLG41psTJU165/nupH0P4xS4rQR3W3Osh6XrJYwaInmole
-58FB4aRnsmnkOuvHrlBQY6nRd25AGkys96FLYqNHwwKeTrnL8u1MlnV9dISdKQus
-QnvluxuXFaQ2mv9+hhIPNfV1Jmq/SKmCJxZBsRfUEGm08fYqRbkEp6JZ71YmLbhG
-LvIFkmLwPXv6VxbEB9dY
-=AWsg
+iQIcBAEBAgAGBQJNPYGQAAoJECaGw+YFKA1plmMQAJiZkAR+G2NiRVOigSWjjuVD
+sVeirl3JHidk0lQGbzseXDHx4uKOx3GwUxnWcPewu2JX5HliwVpcrZbECWALVfRi
+Ka7w/RBUYRi6lNOBW0po5Uha7uoZCGIVkZWLl6Rvko4VwjrBnUzsvxA5+it4llZC
+XclPhEensdfcZilJ2gHSfrEMcnxJ0kg044P9lbRZb1fQ2ZWTKs+tIeaLNGD+bgha
+bK5pCkONZbBOmj7MLwyXaV99I5NH16EAlqdVUlUUcx18NIqtVBWHeq6/OcCcsGbb
+2sI+f27lxsU64brc23P5e3Ia5vjy0bR633gdOUmMOHbjR8UEk/oiXgUO0HrdL5gU
+nQHUnMpNkh81Lag8jXERonzYfMxE77gVHvpod1jWUD/CeI7PhQhSfkYUhkIJaDuE
+y830pOhmEgni2fk1LxwGJgjdeTgfx5ZpESQPG1GDbCqXgDjGELr5hcFN90kwWZJO
+BeJYoffX6aUVBMKTiI0FtllsAvvld3JOf0pKFQu/RNvxHjNDKqpK4EqLfyDIVEp8
+P+DN3bmGAhDYvvD7oZMAO2gqb7fEYszThn/uyY3leXJKs4rBbTNiJjFXUV8J8GXQ
+2LlNPPVal4LCMObwWaI8fJF82TNkH8SAHP0V1OUHK+V9ba6ovw+eQcqAdy8EnEbX
+cxfAE5LmJjpu/DEcaEdu
+=CKhH
 -----END PGP SIGNATURE-----
diff --git a/www-apps/redmine/redmine-0.9.6.ebuild b/www-apps/redmine/redmine-0.9.6.ebuild
deleted file mode 100644
index b9b35bf1329e..000000000000
--- a/www-apps/redmine/redmine-0.9.6.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-0.9.6.ebuild,v 1.2 2010/07/10 04:54:33 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/rails-2.3.5:2.3
-	>=dev-ruby/coderay-0.7.6.227
-	>=dev-ruby/rubygems-1.3.5
-	>=dev-ruby/ruby-net-ldap-0.0.4"
-#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}"
-}
-
-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}
-
-	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}" rake db:migrate || die
-		einfo "Upgrade the plugin migrations."
-		RAILS_ENV="${RAILS_ENV}" rake db:migrate:upgrade_plugin_migrations # || die
-		RAILS_ENV="${RAILS_ENV}" rake db:migrate_plugins || die
-		einfo "Clear the cache and the existing sessions."
-		rake tmp:cache:clear || die
-		rake tmp:sessions:clear || die
-	else
-		einfo
-		einfo "Initialize database."
-		einfo
-
-		einfo "Generate a session store secret."
-		rake config/initializers/session_store.rb || die
-		einfo "Create the database structure."
-		RAILS_ENV="${RAILS_ENV}" rake db:migrate || die
-		einfo "Insert default configuration data in database."
-		RAILS_ENV="${RAILS_ENV}" 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.0.2.ebuild b/www-apps/redmine/redmine-1.0.2.ebuild
deleted file mode 100644
index 5b86734be0e9..000000000000
--- a/www-apps/redmine/redmine-1.0.2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.0.2.ebuild,v 1.1 2010/10/02 09:32:09 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/rails-2.3.5:2.3
-	>=dev-ruby/coderay-0.7.6.227
-	>=dev-ruby/rubygems-1.3.5
-	>=dev-ruby/ruby-net-ldap-0.0.4"
-#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}"
-}
-
-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.0.3.ebuild b/www-apps/redmine/redmine-1.0.3.ebuild
deleted file mode 100644
index 0edaed592d4d..000000000000
--- a/www-apps/redmine/redmine-1.0.3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.0.3.ebuild,v 1.1 2010/11/04 04:40:36 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/rails-2.3.5:2.3
-	>=dev-ruby/coderay-0.7.6.227
-	>=dev-ruby/rubygems-1.3.5
-	>=dev-ruby/ruby-net-ldap-0.0.4"
-#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}"
-}
-
-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.0.4.ebuild b/www-apps/redmine/redmine-1.0.4.ebuild
deleted file mode 100644
index 8e8ae8726227..000000000000
--- a/www-apps/redmine/redmine-1.0.4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.0.4.ebuild,v 1.1 2010/12/13 15:15:59 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/rails-2.3.5:2.3
-	>=dev-ruby/coderay-0.7.6.227
-	>=dev-ruby/rubygems-1.3.5
-	>=dev-ruby/ruby-net-ldap-0.0.4"
-#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}"
-}
-
-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.0.5.ebuild b/www-apps/redmine/redmine-1.0.5.ebuild
index 567dd0f8a8e1..98ed93f81654 100644
--- a/www-apps/redmine/redmine-1.0.5.ebuild
+++ b/www-apps/redmine/redmine-1.0.5.ebuild
@@ -1,6 +1,6 @@
-# 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/redmine-1.0.5.ebuild,v 1.1 2010/12/25 02:53:46 matsuu Exp $
+# $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"
@@ -15,11 +15,11 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="cvs darcs fastcgi git imagemagick mercurial mysql openid passenger postgres sqlite3 subversion"
 
-ruby_add_rdepend "~dev-ruby/rails-2.3.5:2.3
-	>=dev-ruby/coderay-0.7.6.227
+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
@@ -93,7 +93,7 @@ pkg_postinst() {
 	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 "# emerge --config \"=${CATEGORY}/${PF}\""
 		elog
 		elog "For upgrade instructions take a look at:"
 		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
@@ -103,7 +103,7 @@ pkg_postinst() {
 		elog "# cd ${REDMINE_DIR}"
 		elog "# cp config/database.yml.example config/database.yml"
 		elog "# \${EDITOR} config/database.yml"
-		elog "# emerge --config =${CATEGORY}/${PF}"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
 		elog
 		elog "Installation notes are at official site"
 		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
diff --git a/www-apps/redmine/redmine-1.1.0.ebuild b/www-apps/redmine/redmine-1.1.0.ebuild
index 9c91f01264bd..6beb26389249 100644
--- a/www-apps/redmine/redmine-1.1.0.ebuild
+++ b/www-apps/redmine/redmine-1.1.0.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.0.ebuild,v 1.1 2011/01/17 15:01:28 matsuu Exp $
+# $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"
@@ -15,11 +15,11 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="cvs darcs fastcgi git imagemagick mercurial mysql openid passenger postgres sqlite3 subversion"
 
-ruby_add_rdepend "~dev-ruby/rails-2.3.5:2.3
-	>=dev-ruby/coderay-0.7.6.227
+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
@@ -93,7 +93,7 @@ pkg_postinst() {
 	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 "# emerge --config \"=${CATEGORY}/${PF}\""
 		elog
 		elog "For upgrade instructions take a look at:"
 		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
@@ -103,7 +103,7 @@ pkg_postinst() {
 		elog "# cd ${REDMINE_DIR}"
 		elog "# cp config/database.yml.example config/database.yml"
 		elog "# \${EDITOR} config/database.yml"
-		elog "# emerge --config =${CATEGORY}/${PF}"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
 		elog
 		elog "Installation notes are at official site"
 		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"