Version bump, bug #463449, thank Coacher for report. Drop old.

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key F1989B07)

3 files changed, 5 insertions, 70 deletions

diff --git a/www-apps/redmine/files/redmine-1.4.1-bundler.patch b/www-apps/redmine/files/redmine-1.4.1-bundler.patch
deleted file mode 100644
index adef29a24226..000000000000
--- a/www-apps/redmine/files/redmine-1.4.1-bundler.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naurb redmine-1.4.1.orig/config/boot.rb redmine-1.4.1/config/boot.rb
---- redmine-1.4.1.orig/config/boot.rb	2012-04-20 19:01:56.000000000 +0900
-+++ redmine-1.4.1/config/boot.rb	2012-04-25 13:00:01.702911764 +0900
-@@ -41,11 +41,6 @@
-   class Boot
-     def run
-       load_initializer
--      Rails::Initializer.class_eval do
--        def load_gems
--          @bundler_loaded ||= Bundler.require :default, Rails.env
--        end
--      end
-       Rails::Initializer.run(:set_load_path)
-     end
-   end
diff --git a/www-apps/redmine/files/redmine-2.initd b/www-apps/redmine/files/redmine-2.initd
index f4fcdb20512a..e377788b2ccc 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.3 2013/05/13 10:32:29 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/files/redmine-2.initd,v 1.4 2013/09/02 14:13:44 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="/run/redmine/server.pid"
+REDMINE_PIDFILE="/var/run/redmine/server.pid"
 
 depend() {
 	use apache2 git-daemon mysql net postgresql svnserve
@@ -23,9 +23,8 @@ start_pre() {
 		eerror
 		return 1
 	fi
-
-	if [ ! -d /run/redmine ]; then
-		checkpath -q -d -m 0755 -o redmine:redmine /run/redmine
+	if [ ! -d /var/run/redmine ]; then
+		checkpath -q -d -m 0755 -o redmine:redmine /var/run/redmine
 	fi
 }
 
@@ -37,7 +36,7 @@ start() {
 		--exec /usr/bin/ruby "${REDMINE_DIR}"/script/rails server -- \
 		--daemon --environment=${RAILS_ENV} \
 		--binding=${REDMINE_ADDRESS} --port=${REDMINE_PORT} \
-		--pid "${REDMINE_PIDFILE}" \
+		--pid="${REDMINE_PIDFILE}" \
 		${REDMINE_OPTS}
 	eend $?
 }
diff --git a/www-apps/redmine/files/redmine.initd b/www-apps/redmine/files/redmine.initd
deleted file mode 100644
index 49d59301492d..000000000000
--- a/www-apps/redmine/files/redmine.initd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/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.initd,v 1.5 2013/05/13 10:32:29 pva Exp $
-
-RAILS_ENV=${RAILS_ENV:-production}
-REDMINE_DIR=${REDMINE_DIR:-/var/lib/redmine}
-REDMINE_ADDRESS=${REDMINE_ADDRESS:-localhost}
-REDMINE_PORT=${REDMINE_PORT:-3000}
-REDMINE_USER=${REDMINE_USER:-redmine}
-REDMINE_GROUP=${REDMINE_GROUP:-redmine}
-REDMINE_PIDFILE="/run/redmine/server.pid"
-
-depend() {
-	use apache2 git-daemon mysql net postgresql svnserve
-}
-
-start_pre() {
-	if [ ! -e "${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
-		eerror "Execute the following command to initlize environment:"
-		eerror
-		eerror "# emerge --config www-apps/redmine"
-		eerror
-		return 1
-	fi
-
-	if [ ! -d /run/redmine ]; then
-		checkpath -q -d -m 0755 -o redmine:redmine /run/redmine
-	fi
-}
-
-start() {
-	ebegin "Starting redmine"
-	cd "${REDMINE_DIR}"
-	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} \
-		--binding=${REDMINE_ADDRESS} --port=${REDMINE_PORT} \
-		${REDMINE_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping redmine"
-	cd "${REDMINE_DIR}"
-	start-stop-daemon --signal INT --quiet --pidfile "${REDMINE_PIDFILE}"
-	eend $?
-}