bump

(Portage version: 2.1.1-r1)

4 files changed, 155 insertions, 1 deletions

diff --git a/net-im/wildfire/ChangeLog b/net-im/wildfire/ChangeLog
index d18cc1791472..3e05e76415ea 100644
--- a/net-im/wildfire/ChangeLog
+++ b/net-im/wildfire/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2006/08/24 00:59:31 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/ChangeLog,v 1.12 2006/10/16 21:00:37 humpback Exp $
+
+*wildfire-3.1.0 (16 Oct 2006)
+
+  16 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/wildfire-3.1.0-for.patch, +wildfire-3.1.0.ebuild:
+  Bumped version. Thanks to all in bug #150724.
 
   24 Aug 2006; Gustavo Felisberto <humpback@gentoo.org>;
   files/init.d/wildfire:
diff --git a/net-im/wildfire/files/digest-wildfire-3.1.0 b/net-im/wildfire/files/digest-wildfire-3.1.0
new file mode 100644
index 000000000000..6df1f3bd1402
--- /dev/null
+++ b/net-im/wildfire/files/digest-wildfire-3.1.0
@@ -0,0 +1,3 @@
+MD5 be66f4d1234359863c2e51744ccb5bdc wildfire_src_3_1_0.tar.gz 2419936
+RMD160 73508152c7e6d7052335891786bf49437ac8fd02 wildfire_src_3_1_0.tar.gz 2419936
+SHA256 2c645660e3687b3e5b2b008f8a6a025a49f77ed313c8da1c43e2971c218ae3dc wildfire_src_3_1_0.tar.gz 2419936
diff --git a/net-im/wildfire/files/wildfire-3.1.0-for.patch b/net-im/wildfire/files/wildfire-3.1.0-for.patch
new file mode 100644
index 000000000000..a74e54666112
--- /dev/null
+++ b/net-im/wildfire/files/wildfire-3.1.0-for.patch
@@ -0,0 +1,46 @@
+diff -uNr wildfire_src-orig/build/build.xml wildfire_src/build/build.xml
+--- wildfire_src-orig/build/build.xml	2006-10-09 11:58:12.000000000 -0700
++++ wildfire_src/build/build.xml	2006-10-15 09:15:03.000000000 -0700
+@@ -278,7 +278,7 @@
+         <!-- Retrieve each plugin -->
+         <!-- Get a list of subdirs of the main plugins dir. This tells us which plugins to make.
+         <subdirinfo dir="${plugin.src.dir}" property="dirlist" ifexists="plugin.xml" except="admin"/>
+-
++        <taskdef classname="net.sf.antcontrib.logic.For" name="for"/>
+         <for list="${dirlist}" param="plugin" trim="true">
+             <sequential>
+                 <xmltask source="${plugin.src.dir}/@{plugin}/plugin.xml" dest="${plugin.src.dir}/@{plugin}/plugins2.xml">
+@@ -688,7 +688,7 @@
+         <delete file="${release.out.dir}/bin/wildfire-dev.sh"/>
+ 
+         <!-- Pack200 processing on JAR files in lib dir -->
+-
++        <taskdef classname="net.sf.antcontrib.logic.For" name="for"/>
+         <for param="jar">
+             <path>
+                 <fileset dir="${release.out.dir}/lib" includes="*.jar" excludes="startup.jar,jdic.jar,mail.jar,activation.jar,bouncycastle.jar" />
+@@ -902,6 +902,7 @@
+     <target name="-plugins-impl" if="dirlist">
+ 
+         <!-- For each plugin in the main src dir, call the 'buildplugin' macro -->
++        <taskdef classname="net.sf.antcontrib.logic.For" name="for"/>
+         <for list="${dirlist}" param="plugin" trim="true">
+             <sequential>
+                 <buildplugin plugin="@{plugin}" pluginsrc="${plugin.src.dir}"/>
+@@ -920,6 +921,7 @@
+     <target name="-plugin-impl-dev-build" if="dirlist2">
+ 
+         <!-- For each list of plugins in the dev dir call the 'buildplugin' macro -->
++        <taskdef classname="net.sf.antcontrib.logic.For" name="for"/>
+         <for list="${dirlist2}" param="plugin" trim="true">
+             <sequential>
+                 <buildplugin plugin="@{plugin}" pluginsrc="${plugin.dev.dir}"/>
+@@ -1105,7 +1107,7 @@
+                  be manually added to this list.
+             -->
+             <property name="pack200.excludes" value="gnujaxp.jar,mail.jar,activation.jar,bouncycastle.jar"/>
+-
++            <taskdef classname="net.sf.antcontrib.logic.For" name="for"/>
+             <for param="jar">
+                 <path>
+                     <fileset dir="${plugin.dev.dest.dir}/@{plugin}/target/lib" includes="*.jar" excludes="${pack200.excludes}"/>
diff --git a/net-im/wildfire/wildfire-3.1.0.ebuild b/net-im/wildfire/wildfire-3.1.0.ebuild
new file mode 100644
index 000000000000..9fc7924e39de
--- /dev/null
+++ b/net-im/wildfire/wildfire-3.1.0.ebuild
@@ -0,0 +1,99 @@
+# 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.1.0.ebuild,v 1.1 2006/10/16 21:00:37 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/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 "
+# Doesn't build against Java 1.6 due to changes in JDBC API
+DEPEND="net-im/jabber-base
+		=virtual/jdk-1.5*
+		dev-java/ant
+		dev-java/ant-contrib
+		>=dev-java/commons-net-1.4"
+
+S=${WORKDIR}/${PN//-/_}_src
+
+pkg_setup() {
+	if [ -f /etc/env.d/98wildfire ]; then
+		einfo "This is an upgrade"
+	else
+		ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
+		ewarn "echo 'CONFIG_PROTECT=\"/opt/wildfire/resources/security/\"' > /etc/env.d/98wildfire "
+		ewarn "For more info see bug #139708"
+		sleep 10
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-for.patch
+	# TODO should replace jars in build/lib with ones packaged by us -nichoj
+}
+
+src_compile() {
+	# Jikes doesn't support -source 1.5
+	java-pkg_filter-compiler jikes
+
+	eant -f build/build.xml jar plugins $(use_doc)
+}
+
+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
+	dodir /etc/env.d/
+	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
+}