Version bump + fixes. Closes #45556

10 files changed, 87 insertions, 5 deletions

diff --git a/dev-java/openjms-bin/ChangeLog b/dev-java/openjms-bin/ChangeLog
index 1a3bbd6e6d63..49201d46cc21 100644
--- a/dev-java/openjms-bin/ChangeLog
+++ b/dev-java/openjms-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/openjms-bin
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms-bin/ChangeLog,v 1.6 2004/03/19 01:06:08 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms-bin/ChangeLog,v 1.7 2004/03/27 06:35:49 zx Exp $
+
+  30 Mar 2004; Chris Aniszczyk <zx@gentoo.org> openjms-bin-0.7.5-r3.ebuild,
+  files/10openjms-0.7.6, files/conf, files/0.7.6/10openjms-0.7.6,
+  files/0.7.6/conf, files/0.7.6/rc2:
+  Version bump + ebuild fixes. Closes #45556
 
   18 Mar 2004; Chris Aniszczyk <zx@gentoo.org> metadata.xml,
   openjms-bin-0.7.5-r1.ebuild, openjms-bin-0.7.5-r2.ebuild,
diff --git a/dev-java/openjms-bin/Manifest b/dev-java/openjms-bin/Manifest
index b18978582e09..aa7bdb31bf8b 100644
--- a/dev-java/openjms-bin/Manifest
+++ b/dev-java/openjms-bin/Manifest
@@ -1,4 +1,5 @@
-MD5 7e82a6093e431337062ee59e1cd14314 openjms-bin-0.7.5-r3.ebuild 784
+MD5 8c742c91e1a43e79c572f95648937d50 openjms-bin-0.7.6.ebuild 727
+MD5 70af09ed9dca1e32e9b26ea4f3c2a206 openjms-bin-0.7.5-r3.ebuild 787
 MD5 9373bc9701f6dfdd28a0d89bf0797db5 ChangeLog 1206
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 42fa91f02427c73b570e4907058ea05e files/rc 535
@@ -6,3 +7,4 @@ MD5 463cee3ced345a76c84d5a3acfcc2d81 files/rc2 777
 MD5 b7476bad5b940d9e264bf03b1392cf5f files/conf 27
 MD5 1461aa95027a29b9282a711045a06058 files/digest-openjms-bin-0.7.5-r3 63
 MD5 1c1f7f56172148c05424af03c5a42148 files/10openjms-0.7.5 43
+MD5 9c74a5db584b416d78128a5762185258 files/digest-openjms-bin-0.7.6 66
diff --git a/dev-java/openjms-bin/files/0.7.6/10openjms-0.7.6 b/dev-java/openjms-bin/files/0.7.6/10openjms-0.7.6
new file mode 100644
index 000000000000..ab4ed71a978d
--- /dev/null
+++ b/dev-java/openjms-bin/files/0.7.6/10openjms-0.7.6
@@ -0,0 +1 @@
+CONFIG_PROTECT="/opt/openjms/config"
diff --git a/dev-java/openjms-bin/files/0.7.6/conf b/dev-java/openjms-bin/files/0.7.6/conf
new file mode 100644
index 000000000000..e62a1eaa56db
--- /dev/null
+++ b/dev-java/openjms-bin/files/0.7.6/conf
@@ -0,0 +1 @@
+JMSDIR=/opt/openjms/
diff --git a/dev-java/openjms-bin/files/0.7.6/rc2 b/dev-java/openjms-bin/files/0.7.6/rc2
new file mode 100644
index 000000000000..54acb916d130
--- /dev/null
+++ b/dev-java/openjms-bin/files/0.7.6/rc2
@@ -0,0 +1,41 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+}
+
+check_config() {
+	[ -n "${JMSDIR}" ] || return 1 
+	if [ -z "${JAVA_HOME}" ]; then
+		JAVA_HOME="$(/usr/bin/java-config --jre-home)"
+		if [ -z "${JAVA_HOME}" ]; then
+			JAVA_HOME="$(/usr/bin/java-config --jdk-home)"
+		fi
+	fi
+	export JAVA_HOME
+	[ -n "${JAVA_HOME}" ] || return 1
+}
+
+# See how we were called.
+start() {
+	check_config || return 1
+	ebegin "Starting JMS server"
+	cd ${JMSDIR}/bin
+	./startjms.sh > /var/log/openjms.log 2>&1 &
+	sleep 5
+	if ps ax|grep '[o]rg\.exolab\.jms\.server\.JmsServer' > /dev/null; then
+		eend 0
+	else
+		eend 1
+	fi
+}
+stop() {
+	check_config || return 1
+	ebegin "Stopping JMS server"
+	cd ${JMSDIR}/bin
+	if ./shutdown.sh 2>&1 |grep '[Ff]ailed' > /dev/null; then
+		eend 1
+	else
+		eend 0
+	fi
+}
diff --git a/dev-java/openjms-bin/files/10openjms-0.7.6 b/dev-java/openjms-bin/files/10openjms-0.7.6
new file mode 100644
index 000000000000..75789cb56989
--- /dev/null
+++ b/dev-java/openjms-bin/files/10openjms-0.7.6
@@ -0,0 +1 @@
+CONFIG_PROTECT="/opt/openjms-0.7.5/config"
diff --git a/dev-java/openjms-bin/files/conf b/dev-java/openjms-bin/files/conf
index eed0adf5cf25..5a003d25ff2a 100644
--- a/dev-java/openjms-bin/files/conf
+++ b/dev-java/openjms-bin/files/conf
@@ -1 +1 @@
-JMSDIR=/opt/openjms-0.7.5/
+JMSDIR=/opt/openjms-0.7.6/
diff --git a/dev-java/openjms-bin/files/digest-openjms-bin-0.7.6 b/dev-java/openjms-bin/files/digest-openjms-bin-0.7.6
new file mode 100644
index 000000000000..a7deac483d15
--- /dev/null
+++ b/dev-java/openjms-bin/files/digest-openjms-bin-0.7.6
@@ -0,0 +1 @@
+MD5 e374842d41526b30dd117edccd842d5e openjms-0.7.6.tar.gz 9996237
diff --git a/dev-java/openjms-bin/openjms-bin-0.7.5-r3.ebuild b/dev-java/openjms-bin/openjms-bin-0.7.5-r3.ebuild
index b6202bb65b1b..74199f29f24f 100644
--- a/dev-java/openjms-bin/openjms-bin-0.7.5-r3.ebuild
+++ b/dev-java/openjms-bin/openjms-bin-0.7.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms-bin/openjms-bin-0.7.5-r3.ebuild,v 1.1 2004/01/16 03:41:22 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms-bin/openjms-bin-0.7.5-r3.ebuild,v 1.2 2004/03/27 06:35:49 zx Exp $
 
 SLOT=0
 LICENSE="GPL-2"
@@ -8,7 +8,7 @@ DESCRIPTION="Open Java Messaging System"
 DEPEND="virtual/glibc"
 RDEPEND="virtual/jdk"
 KEYWORDS="~x86"
-SRC_URI="mirror://sourceforge/${PN/-bin/}/${P/-bin/}.tgz"
+SRC_URI="mirror://sourceforge/${PN/-bin/}/${P/-bin/}.tar.gz"
 
 src_unpack() {
 	einfo "Nothing to unpack"
diff --git a/dev-java/openjms-bin/openjms-bin-0.7.6.ebuild b/dev-java/openjms-bin/openjms-bin-0.7.6.ebuild
new file mode 100644
index 000000000000..e3c3622fc41f
--- /dev/null
+++ b/dev-java/openjms-bin/openjms-bin-0.7.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms-bin/openjms-bin-0.7.6.ebuild,v 1.1 2004/03/27 06:35:49 zx Exp $
+
+SLOT="0"
+LICENSE="GPL-2"
+DESCRIPTION="Open Java Messaging System"
+DEPEND="virtual/glibc"
+RDEPEND="virtual/jdk"
+KEYWORDS="~x86"
+SRC_URI="mirror://sourceforge/${PN/-bin/}/${P/-bin/}.tar.gz"
+IUSE="doc"
+
+S=${WORKDIR}/${PN/-bin/}-${PV}
+
+src_compile() { :; }
+
+src_install() {
+	dodir /opt/${PN/-bin/}
+	cp -r {bin,config,lib} ${D}/opt/${PN/-bin/}/
+	use doc && cp -r {docs,src} ${D}/opt/${PN/-bin/}/
+
+	fperms 755 /opt/${PN/-bin/}/bin/*
+	insinto /etc/env.d/
+	newins ${FILESDIR}/${PV}/10${P/-bin/} 10${PN/-bin/}
+	exeinto /etc/init.d/
+	newexe ${FILESDIR}/${PV}/rc2 openjms
+	insinto /etc/conf.d
+	newins ${FILESDIR}/${PV}/conf openjms
+}