we license under gpl2, not gpl2 or later

4 files changed, 53 insertions, 94 deletions

diff --git a/net-misc/omniORB/files/omniORB-4.0.0 b/net-misc/omniORB/files/omniORB-4.0.0
index f679e5518b8f..775e26fa99a7 100644
--- a/net-misc/omniORB/files/omniORB-4.0.0
+++ b/net-misc/omniORB/files/omniORB-4.0.0
@@ -1,28 +1,27 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/files/omniORB-4.0.0,v 1.2 2003/02/14 23:06:53 vapier Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/files/omniORB-4.0.0,v 1.3 2004/03/06 03:38:08 vapier Exp $
 
 depend() {
-    need net
+	need net
 }
 
 start() {
-    if [ ! -d "/var/log/omniORB" ] ; then
-	install -d /var/log/omniORB
-    fi
-    if [ "/var/log/omniORB/omninames*" ] ; then
-	rm -f /var/log/omniORB/omninames*
-    fi
-    ebegin "Starting omniORB"
-    exec /usr/bin/omniNames -start 2809 -logdir /var/log/omniORB \
-    	-errlog /var/log/omniORB/omniORB.errors 1>&2 &
-    eend $? "Error starting omniORB."
+	if [ ! -d "/var/log/omniORB" ] ; then
+		install -d /var/log/omniORB
+	fi
+	if [ "/var/log/omniORB/omninames*" ] ; then
+		rm -f /var/log/omniORB/omninames*
+	fi
+	ebegin "Starting omniORB"
+	exec /usr/bin/omniNames -start 2809 -logdir /var/log/omniORB \
+		-errlog /var/log/omniORB/omniORB.errors 1>&2 &
+	eend $? "Error starting omniORB."
 }
 
 stop() {
-    ebegin "Stopping omniORB"
-    killall omniNames 1>&2
-    eend $? "Error stopping omniORB."
+	ebegin "Stopping omniORB"
+	killall omniNames 1>&2
+	eend $? "Error stopping omniORB."
 }
-
diff --git a/net-misc/omniORB/files/omniORB.305 b/net-misc/omniORB/files/omniORB.305
index b280025ecafa..2b25142c5be6 100644
--- a/net-misc/omniORB/files/omniORB.305
+++ b/net-misc/omniORB/files/omniORB.305
@@ -1,28 +1,27 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/files/omniORB.305,v 1.2 2003/02/14 23:06:59 vapier Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/files/omniORB.305,v 1.3 2004/03/06 03:38:08 vapier Exp $
 
 depend() {
-    need net
+	need net
 }
 
 start() {
-    if [ ! -d "/var/log/omniORB" ] ; then
-	install -d /var/log/omniORB
-    fi
-    if [ "/var/log/omniORB/omninames*" ] ; then
-	rm -f /var/log/omniORB/omninames*
-    fi
-    ebegin "Starting omniORB"
-    exec /usr/bin/omniNames -start 2809 -logdir /var/log/omniORB \
-    	-errlog /var/log/omniORB/omniORB.errors 1>&2 &
-    eend $? "Error starting omniORB."
+	if [ ! -d "/var/log/omniORB" ] ; then
+		install -d /var/log/omniORB
+	fi
+	if [ "/var/log/omniORB/omninames*" ] ; then
+		rm -f /var/log/omniORB/omninames*
+	fi
+	ebegin "Starting omniORB"
+	exec /usr/bin/omniNames -start 2809 -logdir /var/log/omniORB \
+		-errlog /var/log/omniORB/omniORB.errors 1>&2 &
+	eend $? "Error starting omniORB."
 }
 
 stop() {
-    ebegin "Stopping omniORB"
-    killall omniNames 1>&2
-    eend $? "Error stopping omniORB."
+	ebegin "Stopping omniORB"
+	killall omniNames 1>&2
+	eend $? "Error stopping omniORB."
 }
-
diff --git a/net-misc/omniORB/files/omniORB.rc5 b/net-misc/omniORB/files/omniORB.rc5
deleted file mode 100644
index 26f0197d7db8..000000000000
--- a/net-misc/omniORB/files/omniORB.rc5
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-#RCUPDATE:3 4:99:This line is required for script management
-
-. /etc/rc.d/config/functions
-
-SERVICE=omniORB
-EXE1="/usr/bin/omniNames"
-EXE2="/usr/bin/notifd"
-opts="start stop restart"
-
-start() {
-		if [ ! -d "/var/log/omniORB" ] ; then
-		    install -d /var/log/omniORB
-		fi
-		if [ "/var/log/omniORB/omninames*" ] ; then
-		    rm -f /var/log/omniORB/omninames*
-		fi
-		ebegin "Starting ${SERVICE}"
-		exec $EXE1 -start 2809 -logdir /var/log/omniORB -errlog /var/log/omniORB/omniORB.errors 1>&2 &
-		exec $EXE2 -c /etc/omniorb/channel.cfg 1>&2 &
-		eend $? "Error starting ${SERVICE}."
-}
-
-stop() {
-		ebegin "Stopping ${SERVICE}"
-		killall $EXE1 1>&2
-	        killall $EXE2 1>&2
-		eend $? "Error stopping ${SERVICE}."
-}
-
-restart() {
-		stop
-		start
-}
-
-doservice ${@}
-
-
diff --git a/net-misc/omniORB/files/omniORB.rc6 b/net-misc/omniORB/files/omniORB.rc6
index af804492a2ae..7987ca05be31 100644
--- a/net-misc/omniORB/files/omniORB.rc6
+++ b/net-misc/omniORB/files/omniORB.rc6
@@ -1,30 +1,29 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/files/omniORB.rc6,v 1.5 2003/02/14 23:07:05 vapier Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/files/omniORB.rc6,v 1.6 2004/03/06 03:38:08 vapier Exp $
 
 depend() {
-    need net
+	need net
 }
 
 start() {
-    if [ ! -d "/var/log/omniORB" ] ; then
-	install -d /var/log/omniORB
-    fi
-    if [ "/var/log/omniORB/omninames*" ] ; then
-	rm -f /var/log/omniORB/omninames*
-    fi
-    ebegin "Starting omniORB"
-    exec /usr/bin/omniNames -start 2809 -logdir /var/log/omniORB \
-    	-errlog /var/log/omniORB/omniORB.errors 1>&2 &
-    exec /usr/bin/notifd -c /etc/omniorb/channel.cfg 1>&2 &
-    eend $? "Error starting omniORB."
+	if [ ! -d "/var/log/omniORB" ] ; then
+		install -d /var/log/omniORB
+	fi
+	if [ "/var/log/omniORB/omninames*" ] ; then
+		rm -f /var/log/omniORB/omninames*
+	fi
+	ebegin "Starting omniORB"
+	exec /usr/bin/omniNames -start 2809 -logdir /var/log/omniORB \
+		-errlog /var/log/omniORB/omniORB.errors 1>&2 &
+	exec /usr/bin/notifd -c /etc/omniorb/channel.cfg 1>&2 &
+	eend $? "Error starting omniORB."
 }
 
 stop() {
-    ebegin "Stopping omniORB"
-    killall /usr/bin/omniNames 1>&2
-    killall /usr/bin/notifd 1>&2
-    eend $? "Error stopping omniORB."
+	ebegin "Stopping omniORB"
+	killall /usr/bin/omniNames 1>&2
+	killall /usr/bin/notifd 1>&2
+	eend $? "Error stopping omniORB."
 }
-