some rc5/rc6 initscript cleanup work. also, added an -r5 which will *should* stop X from being pulled into emerge system when xfree is not in the profile/packages file. Hmm, hoping drobbins can decide what the proper fix is here.

6 files changed, 15 insertions, 20 deletions

diff --git a/sys-libs/gpm/files/digest-gpm-1.19.3-r5 b/sys-libs/gpm/files/digest-gpm-1.19.3-r5
new file mode 100644
index 000000000000..493f00000502
--- /dev/null
+++ b/sys-libs/gpm/files/digest-gpm-1.19.3-r5
@@ -0,0 +1,2 @@
+MD5 69337348611578f680dc8e2224296878 devfs.patch
+MD5 dbfc33e0d52d008eeec1c8f93885e3f9 gpm-1.19.3.tar.gz
diff --git a/sys-libs/gpm/files/gpm-1.19.3-r4 b/sys-libs/gpm/files/gpm-1.19.3-r4
deleted file mode 100644
index 46e382588366..000000000000
--- a/sys-libs/gpm/files/gpm-1.19.3-r4
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-PIDFILE=/var/run/gpm.pid
-EXE=/usr/sbin/gpm
-
-start() {
-		ebegin "Starting ${SERVICE}"
-     		start-stop-daemon --start --quiet --exec ${EXE} -- -m ${MOUSEDEV} -t ${MOUSE}
-		eend ${?} "Started ${SERVICE}." "Error starting ${SERVICE}."
-}
-
-stop() {
-		ebegin "Stopping ${SERVICE}"
-		start-stop-daemon --stop --quiet --pidfile ${PIDFILE} --exec ${EXE}
-		eend ${?} "Stopped ${SERVICE}." "Error stopping ${SERVICE}."
-}
-
-restart() {
-		stop
-		start
-}
diff --git a/sys-libs/gpm/files/gpm-run-1.19.3-r3 b/sys-libs/gpm/files/gpm-run
index ca5e87e11dac..ca5e87e11dac 100755..100644
--- a/sys-libs/gpm/files/gpm-run-1.19.3-r3
+++ b/sys-libs/gpm/files/gpm-run
diff --git a/sys-libs/gpm/files/gpm-1.19.3-r3 b/sys-libs/gpm/files/gpm.rc5
index d70040518a64..d70040518a64 100755..100644
--- a/sys-libs/gpm/files/gpm-1.19.3-r3
+++ b/sys-libs/gpm/files/gpm.rc5
diff --git a/sys-libs/gpm/files/gpm.rc6 b/sys-libs/gpm/files/gpm.rc6
new file mode 100644
index 000000000000..e460100fe6ef
--- /dev/null
+++ b/sys-libs/gpm/files/gpm.rc6
@@ -0,0 +1,13 @@
+#!/sbin/runscript
+
+start() {
+    ebegin "Starting gpm"
+    start-stop-daemon --start --quiet --exec /usr/sbin/gpm -- -m ${MOUSEDEV} -t ${MOUSE}
+    eend ${?}
+}
+
+stop() {
+    ebegin "Stopping gpm"
+    start-stop-daemon --stop --quiet --pidfile /var/run/gpm.pid
+    eend ${?}
+}
diff --git a/sys-libs/gpm/files/svc-gpm-1.19.3-r3 b/sys-libs/gpm/files/svc-gpm
index 5918c37469f9..5918c37469f9 100755..100644
--- a/sys-libs/gpm/files/svc-gpm-1.19.3-r3
+++ b/sys-libs/gpm/files/svc-gpm