bump to 3.0.0 and fixed some startup issues

(Portage version: 2.1.1_pre2-r1)

7 files changed, 198 insertions, 2 deletions

diff --git a/net-im/wildfire/ChangeLog b/net-im/wildfire/ChangeLog
index 81cbfe0538ca..f83886bda0bf 100644
--- a/net-im/wildfire/ChangeLog
+++ b/net-im/wildfire/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-im/wildfire
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/ChangeLog,v 1.3 2006/07/04 02:14:19 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/ChangeLog,v 1.4 2006/07/04 13:50:47 humpback Exp $
+
+*wildfire-3.0.0 (04 Jul 2006)
+*wildfire-2.6.2-r2 (04 Jul 2006)
+
+  04 Jul 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  files/conf.d/wildfire, files/init.d/wildfire, -wildfire-2.6.2-r1.ebuild,
+  +wildfire-2.6.2-r2.ebuild, +wildfire-3.0.0.ebuild:
+  Fixed an issue with the new java gen2 stuff where a user can now have a 1.4
+  vm as system but still is abble to start wildfire. The GENTOO_VM in conf.d
+  is the var that must be set to a 1.5 vm. Also bumped to 3.0.0.
 
 *wildfire-2.6.2-r1 (04 Jul 2006)
 
diff --git a/net-im/wildfire/files/conf.d/wildfire b/net-im/wildfire/files/conf.d/wildfire
index 853a3d0a8d4e..bdb62866e648 100644
--- a/net-im/wildfire/files/conf.d/wildfire
+++ b/net-im/wildfire/files/conf.d/wildfire
@@ -5,3 +5,7 @@ WILDFIRE_CLASS="-classpath ${WILDFIRE_LIB}/startup.jar"
 WILDFIRE_JAR="-jar ${WILDFIRE_LIB}/startup.jar"
 WILDFIRE_ARGS="-server ${WILDFIRE_OPTS} ${WILDFIRE_CLASS} ${WILDFIRE_JAR}"
 
+
+#JVM used by the wildfire server. You can see a list of available vm's in /usr/lib/jvm/
+#But remenber that wildfire needs a 1.5 jvm
+GENTOO_VM=sun-jdk-1.5
diff --git a/net-im/wildfire/files/digest-wildfire-2.6.2-r2 b/net-im/wildfire/files/digest-wildfire-2.6.2-r2
new file mode 100644
index 000000000000..1b33c47d7840
--- /dev/null
+++ b/net-im/wildfire/files/digest-wildfire-2.6.2-r2
@@ -0,0 +1,3 @@
+MD5 01f54bc8cb8403b15c4b39c4d951cff6 wildfire_src_2_6_2.tar.gz 11621818
+RMD160 7cd86f5442f3fc4a01e1fdef8003b9e113804631 wildfire_src_2_6_2.tar.gz 11621818
+SHA256 9e8ff13c37934b56aee7f0471af4faa4a09e998cfec5f18a463d6282580fa1d0 wildfire_src_2_6_2.tar.gz 11621818
diff --git a/net-im/wildfire/files/digest-wildfire-3.0.0 b/net-im/wildfire/files/digest-wildfire-3.0.0
new file mode 100644
index 000000000000..13e7bb68b7cc
--- /dev/null
+++ b/net-im/wildfire/files/digest-wildfire-3.0.0
@@ -0,0 +1,3 @@
+MD5 6ca689c8768eb4b1ba2436bb998b4446 wildfire_src_3_0_0.tar.gz 15861124
+RMD160 4a94369be80e463cf3ababb6b3cb9313607e3ee2 wildfire_src_3_0_0.tar.gz 15861124
+SHA256 86ceba2e13979cb44ca9c508ac2cd08b1dc7d46c63b5fdf57ca06281c11cf5b6 wildfire_src_3_0_0.tar.gz 15861124
diff --git a/net-im/wildfire/files/init.d/wildfire b/net-im/wildfire/files/init.d/wildfire
index 29997231a611..6c1401e44b78 100755
--- a/net-im/wildfire/files/init.d/wildfire
+++ b/net-im/wildfire/files/init.d/wildfire
@@ -10,7 +10,7 @@ depend() {
 start() {
 	#source /etc/env.d/java/20sun-jdk-1.5.0.06
 	#WILDFIRE_CMD="${JAVA_HOME}/bin/java"
-	WILDFIRE_CMD=`java-config -J`
+	WILDFIRE_CMD=`GENTOO_VM=${GENTOO_VM} java-config -J`
 
 	ebegin "Starting Wildfire Server"
         start-stop-daemon --chuid jabber --background --make-pidfile --pidfile /var/run/jabber/wildfire.pid --start --startas ${WILDFIRE_CMD} -- ${WILDFIRE_ARGS} > /var/log/wildfire.log 2>&1
diff --git a/net-im/wildfire/wildfire-2.6.2-r2.ebuild b/net-im/wildfire/wildfire-2.6.2-r2.ebuild
new file mode 100644
index 000000000000..8118f9ce53a8
--- /dev/null
+++ b/net-im/wildfire/wildfire-2.6.2-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/wildfire-2.6.2-r2.ebuild,v 1.1 2006/07/04 13:50:47 humpback Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Wildfire Jabber server"
+HOMEPAGE="http://jivesoftware.org/messenger/"
+SRC_URI="http://www.jivesoftware.org/servlet/download/builds/wildfire/${PN//-/_}_src_${PV//./_}.tar.gz"
+RESTRICT=""
+LICENSE="GPL-2"
+
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+IUSE="doc"
+
+# For transports
+PROVIDE="virtual/jabber-server"
+
+RDEPEND=" >=virtual/jre-1.5 "
+DEPEND="net-im/jabber-base
+		>=virtual/jdk-1.5
+		dev-java/ant
+		>=dev-java/commons-net-1.4"
+
+S=${WORKDIR}/${PN//-/_}_src
+
+
+src_compile() {
+	java-pkg_ensure-vm-version-sufficient 1.5
+	#I am preaty shure it does not work with jikes as jikes
+	#gives an error about: Error: "-source" only recognizes Java releases 1.3
+	#(JLS 2 features) and 1.4 (assert statement).
+	java-pkg_filter-compiler jikes
+
+	eant -f build/build.xml || die
+	eant -f build/build.xml jar || die
+
+	einfo
+	einfo "Building plugins..."
+	einfo
+	eant -f build/build.xml plugins || die
+}
+
+src_install() {
+	dodir /opt/wildfire
+
+	doinitd ${FILESDIR}/init.d/wildfire
+	doconfd ${FILESDIR}/conf.d/wildfire
+
+	dodir /opt/wildfire/conf
+	insinto /opt/wildfire/conf
+	newins target/conf/wildfire.xml wildfire.xml.sample
+
+	dodir /opt/wildfire/logs
+	keepdir /opt/wildfire/logs
+
+	dodir /opt/wildfire/lib
+	insinto /opt/wildfire/lib
+	doins target/lib/*
+
+	dodir /opt/wildfire/plugins
+	insinto /opt/wildfire/plugins
+	doins -r target/plugins/*
+
+	dodir /opt/wildfire/resources
+	insinto /opt/wildfire/resources
+	doins -r target/resources/*
+
+	if use doc; then
+		dohtml -r documentation/docs/*
+	fi
+	dodoc documentation/dist/*
+
+	#Protect ssl key on upgrade
+	echo 'CONFIG_PROTECT="/opt/wildfire/resources/security/"' > ${D}/etc/env.d/98wildfire
+}
+
+pkg_postinst() {
+	chown -R jabber:jabber /opt/wildfire
+
+	ewarn If this is a new install, please edit /opt/wildfire/conf/wildfire.xml.sample
+	ewarn and save it as /opt/wildfire/conf/wildfire.xml
+	einfo
+	ewarn The following must be be owned or writable by the jabber user.
+	einfo /opt/wildfire/conf/wildfire.xml
+}
diff --git a/net-im/wildfire/wildfire-3.0.0.ebuild b/net-im/wildfire/wildfire-3.0.0.ebuild
new file mode 100644
index 000000000000..5a4fcaebc5db
--- /dev/null
+++ b/net-im/wildfire/wildfire-3.0.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/wildfire-3.0.0.ebuild,v 1.1 2006/07/04 13:50:47 humpback Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Wildfire Jabber server"
+HOMEPAGE="http://jivesoftware.org/messenger/"
+SRC_URI="http://www.jivesoftware.org/servlet/download/builds/wildfire/${PN//-/_}_src_${PV//./_}.tar.gz"
+RESTRICT=""
+LICENSE="GPL-2"
+
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+IUSE="doc"
+
+# For transports
+PROVIDE="virtual/jabber-server"
+
+RDEPEND=" >=virtual/jre-1.5 "
+DEPEND="net-im/jabber-base
+		>=virtual/jdk-1.5
+		dev-java/ant
+		>=dev-java/commons-net-1.4"
+
+S=${WORKDIR}/${PN//-/_}_src
+
+
+src_compile() {
+	java-pkg_ensure-vm-version-sufficient 1.5
+	#I am preaty shure it does not work with jikes as jikes
+	#gives an error about: Error: "-source" only recognizes Java releases 1.3
+	#(JLS 2 features) and 1.4 (assert statement).
+	java-pkg_filter-compiler jikes
+
+	eant -f build/build.xml || die
+	eant -f build/build.xml jar || die
+
+	einfo
+	einfo "Building plugins..."
+	einfo
+	eant -f build/build.xml plugins || die
+}
+
+src_install() {
+	dodir /opt/wildfire
+
+	doinitd ${FILESDIR}/init.d/wildfire
+	doconfd ${FILESDIR}/conf.d/wildfire
+
+	dodir /opt/wildfire/conf
+	insinto /opt/wildfire/conf
+	newins target/conf/wildfire.xml wildfire.xml.sample
+
+	dodir /opt/wildfire/logs
+	keepdir /opt/wildfire/logs
+
+	dodir /opt/wildfire/lib
+	insinto /opt/wildfire/lib
+	doins target/lib/*
+
+	dodir /opt/wildfire/plugins
+	insinto /opt/wildfire/plugins
+	doins -r target/plugins/*
+
+	dodir /opt/wildfire/resources
+	insinto /opt/wildfire/resources
+	doins -r target/resources/*
+
+	if use doc; then
+		dohtml -r documentation/docs/*
+	fi
+	dodoc documentation/dist/*
+
+	#Protect ssl key on upgrade
+	echo 'CONFIG_PROTECT="/opt/wildfire/resources/security/"' > ${D}/etc/env.d/98wildfire
+}
+
+pkg_postinst() {
+	chown -R jabber:jabber /opt/wildfire
+
+	ewarn If this is a new install, please edit /opt/wildfire/conf/wildfire.xml.sample
+	ewarn and save it as /opt/wildfire/conf/wildfire.xml
+	einfo
+	ewarn The following must be be owned or writable by the jabber user.
+	einfo /opt/wildfire/conf/wildfire.xml
+}