bump

(Portage version: 2.1.1-r2)

5 files changed, 114 insertions, 3 deletions

diff --git a/net-im/wildfire/ChangeLog b/net-im/wildfire/ChangeLog
index 99b485218a4e..b3dfa605512c 100644
--- a/net-im/wildfire/ChangeLog
+++ b/net-im/wildfire/ChangeLog
@@ -1,6 +1,13 @@
 # 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.15 2006/11/02 23:54:23 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/ChangeLog,v 1.16 2006/11/22 01:43:08 humpback Exp $
+
+*wildfire-3.1.1 (22 Nov 2006)
+
+  22 Nov 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/build.xml-3.1.1.bz2, wildfire-3.1.0.ebuild, +wildfire-3.1.1.ebuild:
+  Bumped after fixing the ebuild to match the new locations of the buuilted
+  wildfire. Thanks to Hod in bug #155482 for reporting this.
 
   02 Nov 2006; Gustavo Felisberto <humpback@gentoo.org>;
   -files/wildfire-3.0.0-for.patch, -files/wildfire-3.0.1-for.patch,
diff --git a/net-im/wildfire/files/build.xml-3.1.1.bz2 b/net-im/wildfire/files/build.xml-3.1.1.bz2
new file mode 100644
index 000000000000..3f23f668c703
--- /dev/null
+++ b/net-im/wildfire/files/build.xml-3.1.1.bz2
diff --git a/net-im/wildfire/files/digest-wildfire-3.1.1 b/net-im/wildfire/files/digest-wildfire-3.1.1
new file mode 100644
index 000000000000..65b3aa7f05e9
--- /dev/null
+++ b/net-im/wildfire/files/digest-wildfire-3.1.1
@@ -0,0 +1,3 @@
+MD5 ba3128f44326b28b99bce86fb7f690ae wildfire_src_3_1_1.tar.gz 13963780
+RMD160 6f215f19eee92151c03b1d1c5fe0020be416a982 wildfire_src_3_1_1.tar.gz 13963780
+SHA256 cbe0e162e1e483adafae65ca01f42ef9a402041f6d6e90e419c0688488b7c831 wildfire_src_3_1_1.tar.gz 13963780
diff --git a/net-im/wildfire/wildfire-3.1.0.ebuild b/net-im/wildfire/wildfire-3.1.0.ebuild
index 2d2ded434778..b77674ef963b 100644
--- a/net-im/wildfire/wildfire-3.1.0.ebuild
+++ b/net-im/wildfire/wildfire-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2006/10/20 10:47:03 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/wildfire-3.1.0.ebuild,v 1.4 2006/11/22 01:43:08 humpback Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -35,7 +35,7 @@ pkg_setup() {
 		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 11
+		sleep 11
 	fi
 }
 
diff --git a/net-im/wildfire/wildfire-3.1.1.ebuild b/net-im/wildfire/wildfire-3.1.1.ebuild
new file mode 100644
index 000000000000..4be2c9a3d826
--- /dev/null
+++ b/net-im/wildfire/wildfire-3.1.1.ebuild
@@ -0,0 +1,101 @@
+# 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.1.ebuild,v 1.1 2006/11/22 01:43:08 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 11
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	cp ${FILESDIR}/build.xml-${PV}.bz2 .
+	bunzip2 build.xml-${PV}.bz2
+	mv build.xml-${PV} build/build.xml
+	# 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 wildfire plugins plugins-dev $(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/wildfire/conf/wildfire.xml wildfire.xml.sample
+
+	dodir /opt/wildfire/logs
+	keepdir /opt/wildfire/logs
+
+	dodir /opt/wildfire/lib
+	insinto /opt/wildfire/lib
+	doins target/wildfire/lib/*
+
+	dodir /opt/wildfire/plugins
+	insinto /opt/wildfire/plugins
+	doins -r target/wildfire/plugins/*
+
+	dodir /opt/wildfire/resources
+	insinto /opt/wildfire/resources
+	doins -r target/wildfire/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
+}