fix 139708

(Portage version: 2.1.1_pre2-r4)

4 files changed, 112 insertions, 2 deletions

diff --git a/net-im/wildfire/ChangeLog b/net-im/wildfire/ChangeLog
index 63537410740b..3de7f941e9e9 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.7 2006/07/06 17:46:51 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/ChangeLog,v 1.8 2006/07/09 14:55:49 humpback Exp $
+
+*wildfire-3.0.0-r1 (09 Jul 2006)
+
+  09 Jul 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  wildfire-2.6.2-r2.ebuild, -wildfire-3.0.0.ebuild,
+  +wildfire-3.0.0-r1.ebuild:
+  Update to handle bug #139708. Thanks to Mike Wohlgemuth for finding this one.
 
   06 Jul 2006; Joshua Nichols <jnichols@gentoo.org>
   files/wildfire-3.0.0-for.patch, wildfire-3.0.0.ebuild:
diff --git a/net-im/wildfire/files/digest-wildfire-3.0.0-r1 b/net-im/wildfire/files/digest-wildfire-3.0.0-r1
new file mode 100644
index 000000000000..13e7bb68b7cc
--- /dev/null
+++ b/net-im/wildfire/files/digest-wildfire-3.0.0-r1
@@ -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/wildfire-2.6.2-r2.ebuild b/net-im/wildfire/wildfire-2.6.2-r2.ebuild
index 8118f9ce53a8..99b779a37668 100644
--- a/net-im/wildfire/wildfire-2.6.2-r2.ebuild
+++ b/net-im/wildfire/wildfire-2.6.2-r2.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-2.6.2-r2.ebuild,v 1.1 2006/07/04 13:50:47 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/wildfire-2.6.2-r2.ebuild,v 1.2 2006/07/09 14:55:49 humpback Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -74,6 +74,7 @@ src_install() {
 	dodoc documentation/dist/*
 
 	#Protect ssl key on upgrade
+	dodir /etc/env.d/
 	echo 'CONFIG_PROTECT="/opt/wildfire/resources/security/"' > ${D}/etc/env.d/98wildfire
 }
 
diff --git a/net-im/wildfire/wildfire-3.0.0-r1.ebuild b/net-im/wildfire/wildfire-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..050fab42d1ad
--- /dev/null
+++ b/net-im/wildfire/wildfire-3.0.0-r1.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.0.0-r1.ebuild,v 1.1 2006/07/09 14:55:49 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 "
+# 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
+}
+
+ant_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
+}