bump to 3.0.0 and fixed some startup issues

(Portage version: 2.1.1_pre2-r1)
 (Signed Manifest commit)

3 files changed, 30 insertions, 113 deletions

diff --git a/net-im/wildfire/Manifest b/net-im/wildfire/Manifest
index 57c55cb5fc32..b69d3864e3ca 100644
--- a/net-im/wildfire/Manifest
+++ b/net-im/wildfire/Manifest
@@ -1,34 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX conf.d/wildfire 336 RMD160 a0bfbbeb060e4d51388469cb4b15f2a1cb00dcbc SHA1 8c66a75d4bc757036e2fe97ea11ee4b43f2891e1 SHA256 0d6733009e1f89bb674fea50e766559362705f778c03d0c5dc26f3069fe5cd04
-MD5 cc9538269817cbdc88ff005dfae1b4a1 files/conf.d/wildfire 336
-RMD160 a0bfbbeb060e4d51388469cb4b15f2a1cb00dcbc files/conf.d/wildfire 336
-SHA256 0d6733009e1f89bb674fea50e766559362705f778c03d0c5dc26f3069fe5cd04 files/conf.d/wildfire 336
-AUX init.d/wildfire 725 RMD160 9ba294aa94e189cb9e3662f535142a5259bfa014 SHA1 5ad03a32272253d5a897ab538331115cf2d4d091 SHA256 1862b98d46c5d0e9a3d006ae734f70ac4ce4e4f156bba2d84535c73ed9ca0974
-MD5 e9cb458e29a1f36a5c5ad48ee271e1cf files/init.d/wildfire 725
-RMD160 9ba294aa94e189cb9e3662f535142a5259bfa014 files/init.d/wildfire 725
-SHA256 1862b98d46c5d0e9a3d006ae734f70ac4ce4e4f156bba2d84535c73ed9ca0974 files/init.d/wildfire 725
+AUX conf.d/wildfire 491 RMD160 a11202a762cffb01a0d33a69ab65283a5962cfce SHA1 4a41b03dc09f4aa375a0c793a53ff10129cf5432 SHA256 c1b3ba0a0da4854118e4e8debd370d8e2deb7f08a3fe5c4b5c4bedae5428498b
+MD5 3ea87a69285ce987e501c835629b0af3 files/conf.d/wildfire 491
+RMD160 a11202a762cffb01a0d33a69ab65283a5962cfce files/conf.d/wildfire 491
+SHA256 c1b3ba0a0da4854118e4e8debd370d8e2deb7f08a3fe5c4b5c4bedae5428498b files/conf.d/wildfire 491
+AUX init.d/wildfire 748 RMD160 26b18cf4fc0399ab2cf23abea4cbaa21e98b4a80 SHA1 8223434ca4f6f4b426ccdf0c9195fb08640e632f SHA256 2b1304662f07c60a74c63b773f6c8b17d26a672b0c3336383984ba4753cd6996
+MD5 8cda1f79812150c4d4f3420e13450631 files/init.d/wildfire 748
+RMD160 26b18cf4fc0399ab2cf23abea4cbaa21e98b4a80 files/init.d/wildfire 748
+SHA256 2b1304662f07c60a74c63b773f6c8b17d26a672b0c3336383984ba4753cd6996 files/init.d/wildfire 748
 DIST wildfire_src_2_6_2.tar.gz 11621818 RMD160 7cd86f5442f3fc4a01e1fdef8003b9e113804631 SHA1 f73c08df6a336ff803135bd166a5418839ad50f9 SHA256 9e8ff13c37934b56aee7f0471af4faa4a09e998cfec5f18a463d6282580fa1d0
-EBUILD wildfire-2.6.2-r1.ebuild 2199 RMD160 181833e94eb6717fb7a60aa6d01487e857015396 SHA1 0c0e917fc6525610288c3d16c78b974c1a900439 SHA256 852bb90343cedca8f91b6078272fa76cd55091f6cf3968b1afbbd206cd24576d
-MD5 0139855ff5ab418196fa2e9d5aa44764 wildfire-2.6.2-r1.ebuild 2199
-RMD160 181833e94eb6717fb7a60aa6d01487e857015396 wildfire-2.6.2-r1.ebuild 2199
-SHA256 852bb90343cedca8f91b6078272fa76cd55091f6cf3968b1afbbd206cd24576d wildfire-2.6.2-r1.ebuild 2199
-MISC ChangeLog 1113 RMD160 104440ac16d65873b750957f67c3503200e8cb85 SHA1 458ea405c08547775b0d73a2089f06d0571deea3 SHA256 417043585295b86322efa87692c6d37b76de1e9088f8dd028b8448fd4878e898
-MD5 8b2ce2319934ba6fc7e7348a3995c9c2 ChangeLog 1113
-RMD160 104440ac16d65873b750957f67c3503200e8cb85 ChangeLog 1113
-SHA256 417043585295b86322efa87692c6d37b76de1e9088f8dd028b8448fd4878e898 ChangeLog 1113
+DIST wildfire_src_3_0_0.tar.gz 15861124 RMD160 4a94369be80e463cf3ababb6b3cb9313607e3ee2 SHA1 a9e1357d557d777f08cc517e4368369ca903745c SHA256 86ceba2e13979cb44ca9c508ac2cd08b1dc7d46c63b5fdf57ca06281c11cf5b6
+EBUILD wildfire-2.6.2-r2.ebuild 2199 RMD160 d60d97e17b40ba1d5c473cebb5f307bcabb0bd60 SHA1 bc10dd6b563953892ba6f842492db654987a9742 SHA256 9b658313025e749777d1f253ebbc8a59403cdba5d2b720b664a4c34bf2cb0fc2
+MD5 6cb4e23be8e9dab063a89a90d79f5ba9 wildfire-2.6.2-r2.ebuild 2199
+RMD160 d60d97e17b40ba1d5c473cebb5f307bcabb0bd60 wildfire-2.6.2-r2.ebuild 2199
+SHA256 9b658313025e749777d1f253ebbc8a59403cdba5d2b720b664a4c34bf2cb0fc2 wildfire-2.6.2-r2.ebuild 2199
+EBUILD wildfire-3.0.0.ebuild 2196 RMD160 1eb3bfece3241597d866947d0b066181deb05872 SHA1 30b3976bf6c2ab629917054fdd4ad40f126523c2 SHA256 2a6f5de660970b02bb71fa0ca3c1aacdb79e8b2b333419b1e2b88a06a3860aa7
+MD5 6fd2da67b0bc4fae3bc04b3e9fc78284 wildfire-3.0.0.ebuild 2196
+RMD160 1eb3bfece3241597d866947d0b066181deb05872 wildfire-3.0.0.ebuild 2196
+SHA256 2a6f5de660970b02bb71fa0ca3c1aacdb79e8b2b333419b1e2b88a06a3860aa7 wildfire-3.0.0.ebuild 2196
+MISC ChangeLog 1583 RMD160 1d88d3c901d18d291b333e1d763075cf5867cd14 SHA1 a07a22dd20fe32f3a2d22e7f38098289f8d94e75 SHA256 053ed8b7bf871dae11c67a1f2c8b718bdd2b39c839cb5610a51ae2ef9971555e
+MD5 9c25f9f4bd3ceab25813dfa538e8a43c ChangeLog 1583
+RMD160 1d88d3c901d18d291b333e1d763075cf5867cd14 ChangeLog 1583
+SHA256 053ed8b7bf871dae11c67a1f2c8b718bdd2b39c839cb5610a51ae2ef9971555e ChangeLog 1583
 MISC metadata.xml 481 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 SHA1 feaf705fb8276479cc0f6cca72813eb60b3943a3 SHA256 9965da5e7c0ff80e17e7d673bb35544147e0049ddac59e8f8ba1b1d83971b9e5
 MD5 99126bebaaa8a8b18d1e1ace23623a2b metadata.xml 481
 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 metadata.xml 481
 SHA256 9965da5e7c0ff80e17e7d673bb35544147e0049ddac59e8f8ba1b1d83971b9e5 metadata.xml 481
-MD5 d0164b0e043a73e2ae569278afe40e80 files/digest-wildfire-2.6.2-r1 262
-RMD160 8a07aecd7abbef7b956bcda940eedeb309e0ca85 files/digest-wildfire-2.6.2-r1 262
-SHA256 eefee1c30250b2f3c78e18df5601cadc8a6055b775b25b3d47ac62bab2c308a6 files/digest-wildfire-2.6.2-r1 262
+MD5 d0164b0e043a73e2ae569278afe40e80 files/digest-wildfire-2.6.2-r2 262
+RMD160 8a07aecd7abbef7b956bcda940eedeb309e0ca85 files/digest-wildfire-2.6.2-r2 262
+SHA256 eefee1c30250b2f3c78e18df5601cadc8a6055b775b25b3d47ac62bab2c308a6 files/digest-wildfire-2.6.2-r2 262
+MD5 2adcb06b4d12713f190a58355997e791 files/digest-wildfire-3.0.0 262
+RMD160 9fae97d3a894b60d56a6da0636e5524e527a7a88 files/digest-wildfire-3.0.0 262
+SHA256 55b90002daef0a1f334c821944810e63635e08fcc2cba98900e16f75de9cbb9a files/digest-wildfire-3.0.0 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEqc8d8zY1VwezZiERApYaAJsEtWCSv8C8C6j160UIiSG0dAo+6gCfQ1zG
-37EiN0XxWCK0RE3bUvasX2Y=
-=817B
+iD8DBQFEqnQF8zY1VwezZiERAknVAJ9eNChtisfpv39DHpV/e/1yPLGvmACdH7xV
+Dl+/yHxNpGp+/rK9NmvOGIU=
+=/X7d
 -----END PGP SIGNATURE-----
diff --git a/net-im/wildfire/files/digest-wildfire-2.6.2-r1 b/net-im/wildfire/files/digest-wildfire-2.6.2-r1
deleted file mode 100644
index 1b33c47d7840..000000000000
--- a/net-im/wildfire/files/digest-wildfire-2.6.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/wildfire-2.6.2-r1.ebuild b/net-im/wildfire/wildfire-2.6.2-r1.ebuild
deleted file mode 100644
index 23b05d6ec497..000000000000
--- a/net-im/wildfire/wildfire-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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-r1.ebuild,v 1.1 2006/07/04 02:14:19 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
-}