Fix problem with init.d file as reported in #229875

(Portage version: 2.1.4.4)

4 files changed, 32 insertions, 5 deletions

diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index c8de0401baba..eb0e0002c4cf 100644
--- a/dev-ruby/rubygems/ChangeLog
+++ b/dev-ruby/rubygems/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/rubygems
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.94 2008/06/29 06:56:40 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.95 2008/06/29 21:06:53 graaff Exp $
+
+  29 Jun 2008; Hans de Graaff <graaff@gentoo.org> +files/init.d-gem_server2,
+  rubygems-1.1.1.ebuild, rubygems-1.2.0.ebuild:
+  The syntax to start the gem server has changed slightly, as reflected in the
+  updated init.d file, fixing a problem reported in #229875.
 
   29 Jun 2008; Hans de Graaff <graaff@gentoo.org> rubygems-0.9.4-r2.ebuild,
   rubygems-1.1.1.ebuild, rubygems-1.2.0.ebuild:
diff --git a/dev-ruby/rubygems/files/init.d-gem_server2 b/dev-ruby/rubygems/files/init.d-gem_server2
new file mode 100644
index 000000000000..49af38318fda
--- /dev/null
+++ b/dev-ruby/rubygems/files/init.d-gem_server2
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PID=/var/run/gem_server.pid
+
+depend() {
+	need localmount net
+}
+
+start() {
+	ebegin "Starting gem_server"
+	start-stop-daemon --start --chuid nobody --quiet --background --make-pidfile \
+		 --pidfile ${PID} --exec /usr/bin/ruby -- /usr/bin/gem server ${GEM_SERVER_OPTS}
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping gem_server"
+	start-stop-daemon --stop --pidfile ${PID}
+	eend ${?}
+}
diff --git a/dev-ruby/rubygems/rubygems-1.1.1.ebuild b/dev-ruby/rubygems/rubygems-1.1.1.ebuild
index d0e0c55a305c..9a0a0a40bacf 100644
--- a/dev-ruby/rubygems/rubygems-1.1.1.ebuild
+++ b/dev-ruby/rubygems/rubygems-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.1.1.ebuild,v 1.3 2008/06/29 06:56:40 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.1.1.ebuild,v 1.4 2008/06/29 21:06:53 graaff Exp $
 
 inherit ruby
 
@@ -62,7 +62,7 @@ src_install() {
 	doenvd "${FILESDIR}/10rubygems" || die "doenvd 10rubygems failed"
 
 	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server" gem_server || die "newinitd failed"
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
 		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
 	fi
 }
diff --git a/dev-ruby/rubygems/rubygems-1.2.0.ebuild b/dev-ruby/rubygems/rubygems-1.2.0.ebuild
index d1093c0924b2..819570e5901c 100644
--- a/dev-ruby/rubygems/rubygems-1.2.0.ebuild
+++ b/dev-ruby/rubygems/rubygems-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.2.0.ebuild,v 1.2 2008/06/29 06:56:40 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.2.0.ebuild,v 1.3 2008/06/29 21:06:53 graaff Exp $
 
 inherit ruby
 
@@ -62,7 +62,7 @@ src_install() {
 	doenvd "${FILESDIR}/10rubygems" || die "doenvd 10rubygems failed"
 
 	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server" gem_server || die "newinitd failed"
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
 		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
 	fi
 }