Fix configuration.

www-apps/redmine/Manifest

@@ -1,7 +1,4 @@
 AUX 10_redmine_vhost.conf 523 RMD160 080c5afc8cef54f2fbdf24b1ff262cc155d85ac5 SHA1 cac48370ffc7756173c0a759366ee8a7d3d7c716 SHA256 439017a65fabb0bd7cb49abd94864be372b73a4b953e31dc0db8449790406205
-AUX install.sh 156 RMD160 84d0800e4fc9762a1438d721afe63b87899874c5 SHA1 8217fbd04e42e5c455469bd06cf923b2df8e9abc SHA256 115def32b307a837f1fe2677d02ba4f8f0d1b40e19fce1426d334f42d0edc8f5
 AUX openid.patch 11280 RMD160 0bb3b8a5d1a9de9aa70373f1f4a87ee00ce14192 SHA1 2d3a39e3387fc623bfd117c1973b0aa449d94f44 SHA256 dbe97644be53dcc14c82c0dfb13c76ebb8f966c7f3340fab376612fb4a621fe1
-AUX openid_install.sh 259 RMD160 a5b37ce91355a3bd56ee63f1d1f133974e381561 SHA1 b4016d8226cd6615e8c08268c99bf19a97ca16bf SHA256 3fa8bb9f624fa28c157f0346155a66eddadcb44d3a380caf13e0b89c9b0dcf8b
 AUX simple_captcha.patch 1126 RMD160 a5316ed4d9b057eb4b6388c7cd0b4cd5d4d6f990 SHA1 ae8c7b66e6da4240bfae350826742636a1afa31a SHA256 b8e0f65c7ea2743a1c5cdd5e762f7b191a6ea0e9d499ed98c6d2479d3edb5027
-AUX simple_captcha_install.sh 469 RMD160 4897fab0b702e0d784b3cda49cd2288f49cf00f0 SHA1 2ee407104659559917c0c35404f17188cf985220 SHA256 ef77c9c8dd2c7d34974e125bcb88d2d48516f0ed1c5bf3635cbb06bced406e87
-EBUILD redmine-9999.ebuild 4577 RMD160 0e86e5dbe6b973430eb6bedf4891e3cbd0e1114f SHA1 ff4bbae54555c15ff656d5f5c675b4708266cd15 SHA256 eec2dcc3e4dd97026a7854614e09b26448123f17b6ef12b2212fdf7f89f2e3c7
+EBUILD redmine-9999.ebuild 4937 RMD160 c71d85de2f7edb494aa4a3a4121dd68e3439c55d SHA1 385c709f61ad986234a87d732ba8b50b2ca93d92 SHA256 a6c9e03a1fbbe3a735e807322f4cbba56c69c339da9d1feb9542cd429f881521

www-apps/redmine/files/install.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/bash
-BASE=`dirname $0`
-if [[ "$0" != /* ]]
-then
-	BASE=`pwd`/$BASE
-fi
-bash $BASE/simple_captcha_install.sh || exit 1
-bash $BASE/openid_install.sh

www-apps/redmine/files/openid_install.sh

@@ -1,20 +0,0 @@
-#!/usr/bin/bash
-
-REDMINE_DIR=/var/lib/redmine
-
-if [[ $BASE == '' ]]
-then
-	BASE=`dirname $0`
-	if [[ "$0" != /* ]]
-	then
-		BASE=`pwd`/$BASE
-	fi
-fi
-
-if [ -d $REDMINE_DIR ]
-then
-	cd $REDMINE_DIR
-	patch -p0 -i $BASE/openid.patch
-else
-	echo "Redmine not found."
-fi

www-apps/redmine/files/simple_captcha_install.sh

@@ -1,25 +0,0 @@
-#!/usr/bin/bash
-
-REDMINE_DIR="/var/lib/redmine"
-PLUGIN_REP="svn://rubyforge.org/var/svn/expressica/plugins/simple_captcha"
-
-if [[ $BASE == '' ]]
-then
-	BASE=`dirname $0`
-	if [[ "$0" != /* ]]
-	then
-		BASE=`pwd`/$BASE
-	fi
-fi
-echo $BASE
-
-if [ -d $REDMINE_DIR ]
-then
-	cd $REDMINE_DIR
-	ruby script/plugin install $PLUGIN_REP || exit 1
-	rake simple_captcha:setup || exit 1
-	rake db:migrate || exit 1
-	patch -p0 -i $BASE/simple_captcha.patch
-else
-	echo "Redmine not found."
-fi

www-apps/redmine/redmine-9999.ebuild

@@ -64,11 +64,6 @@ src_install() {
 	doins -r . || die
 	keepdir "${REDMINE_DIR}/files"
 
-	if use openid ; then
-		einfo "Install packs special OpenID and Simple Captcha:"
-		bash ${FILESDIR}/install.sh || die
-	fi
-
 	if use mongrel ; then
 		has_apache
 		insinto "${APACHE_VHOSTS_CONFDIR}"
@@ -77,7 +72,6 @@ src_install() {
 		dodir "${REDMINE_DIR}/tmp/pids" || die
 		dosym "${REDMINE_DIR}/config/mongrel_cluster.yml" /etc/mongrel_cluster/redmine.yml || die
 		doinitd /usr/lib/ruby/gems/1.8/gems/mongrel_cluster-1.0.5/resources/mongrel_cluster || die
-		rc-update add mongrel_cluster default
 		fowners -R mongrel:mongrel \
 			"${REDMINE_DIR}/config/environment.rb" \
 			"${REDMINE_DIR}/files" \
@@ -91,6 +85,11 @@ src_install() {
 
 pkg_postinst() {
 
+	if use openid ; then
+		cp ${FILESDIR}/simple_captcha.patch ${REDMINE_DIR}
+		cp ${FILESDIR}/openid.patch ${REDMINE_DIR}
+	fi
+
 	einfo
 	elog "Execute the following command to initlize environment:"
 	elog
@@ -119,7 +118,19 @@ pkg_config() {
 
 	local RAILS_ENV=${RAILS_ENV:-production}
 
+	pwd
+	echo ${FILESDIR}
+
 	cd "${REDMINE_DIR}"
+
+	if use openid ; then
+		einfo "Install packs special OpenID and Simple Captcha:"
+		ruby script/plugin install svn://rubyforge.org/var/svn/expressica/plugins/simple_captcha || die
+		rake simple_captcha:setup || die
+		patch -p0 -i simple_captcha.patch || die
+		patch -p0 -i openid.patch || die
+	fi
+
 	if [ -e "${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
 		einfo
 		einfo "Upgrade database."
@@ -146,6 +157,12 @@ pkg_config() {
 		RAILS_ENV="${RAILS_ENV}" rake redmine:load_default_data || die
 	fi
 	if use mongrel ; then
-		einfo "Configure mongrel rails." mongrel_rails cluster::configure -e production -p 8000 -N 3 -c $REDMINE_DIR --user mongrel --group mongrel
+		einfo "Configure mongrel rails."
+		mongrel_rails cluster::configure -e production -p 8000 -N 3 -c $REDMINE_DIR --user mongrel --group mongrel
+		einfo
+		einfo "Execute the following command to start Redmine:"
+		einfo "# /etc/init.d/mongrel_cluster start"
+		einfo "# /etc/init.d/apache start"
+		einfo
 	fi
 }