bump

Package-Manager: portage-2.1.1-r2

6 files changed, 137 insertions, 14 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/Manifest b/net-im/wildfire/Manifest
index 3ab719a2c111..2cac0363b15d 100644
--- a/net-im/wildfire/Manifest
+++ b/net-im/wildfire/Manifest
@@ -5,6 +5,10 @@ AUX build.xml-3.1.0.bz2 9389 RMD160 b6bcd8400003d1f3d3ecf3c5f79381b8671548fd SHA
 MD5 3361efb930c0deec0c33b2369f926a16 files/build.xml-3.1.0.bz2 9389
 RMD160 b6bcd8400003d1f3d3ecf3c5f79381b8671548fd files/build.xml-3.1.0.bz2 9389
 SHA256 1265039d383bf234f72ebcc26b23750d758b7f424b8836c51706bb7334929d25 files/build.xml-3.1.0.bz2 9389
+AUX build.xml-3.1.1.bz2 9211 RMD160 d8d5f4b984b1c2aff35058829774389934d52bb9 SHA1 b648174eac4be3ed1dd2e1111e940f296303394d SHA256 c39ed384ddaa6ae44898641cba04f9c37173cddc75b30fde78fb1143f71ac5bc
+MD5 0a4fe0850e431e66189492079a30f37e files/build.xml-3.1.1.bz2 9211
+RMD160 d8d5f4b984b1c2aff35058829774389934d52bb9 files/build.xml-3.1.1.bz2 9211
+SHA256 c39ed384ddaa6ae44898641cba04f9c37173cddc75b30fde78fb1143f71ac5bc files/build.xml-3.1.1.bz2 9211
 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
@@ -14,14 +18,19 @@ MD5 8543a0e0ed5c360ae0a5f4ac191fb795 files/init.d/wildfire 571
 RMD160 afaa6d826bd732b4195e13d5eb606df3dc976704 files/init.d/wildfire 571
 SHA256 2bc37ba293e67806a83600b46eec26625f6830fd4f0f4677c3b5636be2090c42 files/init.d/wildfire 571
 DIST wildfire_src_3_1_0.tar.gz 17263810 RMD160 0643ae65b761f33ebb3fb5492f13f5d82fadd35d SHA1 e491f51c2270afb9c9924d404f11ff74318bd29f SHA256 aef071a915a127dac1d3b6f488c246e55d0be9233d53caecf79662368c757ee6
-EBUILD wildfire-3.1.0.ebuild 2528 RMD160 3ed76a89108cb0ec2831a22e08c15ee0283164b4 SHA1 e2a3cff28b49a3af498676278eb47d1aecbffb33 SHA256 4628a350527c072f5cecc6af61d4ea66deae2f76bb7a69c1798c880c715ca53b
-MD5 109c02dd2303c5e7e790f50b64916e24 wildfire-3.1.0.ebuild 2528
-RMD160 3ed76a89108cb0ec2831a22e08c15ee0283164b4 wildfire-3.1.0.ebuild 2528
-SHA256 4628a350527c072f5cecc6af61d4ea66deae2f76bb7a69c1798c880c715ca53b wildfire-3.1.0.ebuild 2528
-MISC ChangeLog 3475 RMD160 cd3c427074eae90969a743c168545bd1f21b927b SHA1 f15ab952d15bc1e4bfedd9123749b79f3e1c75ea SHA256 9f5b258266394526e0a4f7c07bbb002e1e222aca1282a16100f40aaa0ccbf401
-MD5 36e3e347b4ef8976fa5c673b3f645069 ChangeLog 3475
-RMD160 cd3c427074eae90969a743c168545bd1f21b927b ChangeLog 3475
-SHA256 9f5b258266394526e0a4f7c07bbb002e1e222aca1282a16100f40aaa0ccbf401 ChangeLog 3475
+DIST wildfire_src_3_1_1.tar.gz 13963780 RMD160 6f215f19eee92151c03b1d1c5fe0020be416a982 SHA1 9aa2a47292a1894cd2c8fa2b997e80b5eb507108 SHA256 cbe0e162e1e483adafae65ca01f42ef9a402041f6d6e90e419c0688488b7c831
+EBUILD wildfire-3.1.0.ebuild 2527 RMD160 04e4105b52c03d267b21cd84dccab52a9feec05b SHA1 da49e05ddec814449764c565f1bac8c0a9ad8978 SHA256 aed11d0a8a41b6136cb083b5cd8d7810f4b88dfdde572db7f741701db2db19fc
+MD5 ecf90e26796c248cb7e27107d67471a8 wildfire-3.1.0.ebuild 2527
+RMD160 04e4105b52c03d267b21cd84dccab52a9feec05b wildfire-3.1.0.ebuild 2527
+SHA256 aed11d0a8a41b6136cb083b5cd8d7810f4b88dfdde572db7f741701db2db19fc wildfire-3.1.0.ebuild 2527
+EBUILD wildfire-3.1.1.ebuild 2581 RMD160 2ce10d0c48ae066dcc1efda033dcd9a57f2f9c71 SHA1 65013b5b4e162a5a4904dd81183bd144a29d08f7 SHA256 7d36aa781db4e9170f4125d79e37dee33a6dc1a954f38bdd0d72333732cf8291
+MD5 1c8345518fc2f0d36389705d5ac60909 wildfire-3.1.1.ebuild 2581
+RMD160 2ce10d0c48ae066dcc1efda033dcd9a57f2f9c71 wildfire-3.1.1.ebuild 2581
+SHA256 7d36aa781db4e9170f4125d79e37dee33a6dc1a954f38bdd0d72333732cf8291 wildfire-3.1.1.ebuild 2581
+MISC ChangeLog 3778 RMD160 e2436a28fdad5efebb34b93de0e51dc3f0742709 SHA1 0e436ec98daae76f629e4002bf3060f065478d2b SHA256 7ad324b065d3cb128c916c65eb22b6118d0040aa55da47af6458e5ded46ed67d
+MD5 da1faac060e1a44e22e7fb59bea0ea75 ChangeLog 3778
+RMD160 e2436a28fdad5efebb34b93de0e51dc3f0742709 ChangeLog 3778
+SHA256 7ad324b065d3cb128c916c65eb22b6118d0040aa55da47af6458e5ded46ed67d ChangeLog 3778
 MISC metadata.xml 481 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 SHA1 feaf705fb8276479cc0f6cca72813eb60b3943a3 SHA256 9965da5e7c0ff80e17e7d673bb35544147e0049ddac59e8f8ba1b1d83971b9e5
 MD5 99126bebaaa8a8b18d1e1ace23623a2b metadata.xml 481
 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 metadata.xml 481
@@ -29,10 +38,13 @@ SHA256 9965da5e7c0ff80e17e7d673bb35544147e0049ddac59e8f8ba1b1d83971b9e5 metadata
 MD5 013bfe8133ec823c52ae6df1e4ba06e9 files/digest-wildfire-3.1.0 262
 RMD160 90741423256a297094f21dd2ec5aa8cf71eca5f5 files/digest-wildfire-3.1.0 262
 SHA256 6ef8f2b0ee3f1bd9b296bcdc739faf87c7be31495c6175f68cb2da14b57b2f8b files/digest-wildfire-3.1.0 262
+MD5 ad63eaf0e3eaeccae4e02f333f0dbbbf files/digest-wildfire-3.1.1 262
+RMD160 3b5dab78af0f4c80c3d76fe96bec79a0d2656232 files/digest-wildfire-3.1.1 262
+SHA256 07bb7dbe5d63821fdef9685c9831e5e7361f314b34e95874fcbf982df8544b12 files/digest-wildfire-3.1.1 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFSoU78zY1VwezZiERApyVAJ40I7fEtRQPVW7dBW5+feZd5gHUeACeKSjZ
-5nDqK4LMp7J5ULjNkIxDRXw=
-=yv50
+iD8DBQFFY6tO8zY1VwezZiERAqVVAJ98RSQ8QSchtZNDLOvegNnOc5WUqACfVbA5
+7dSS7kadkSsvJGYIQLodz6Y=
+=9rNf
 -----END PGP SIGNATURE-----
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
+}