bump

Package-Manager: portage-2.1.1_pre3-r5

5 files changed, 155 insertions, 8 deletions

diff --git a/net-im/wildfire/ChangeLog b/net-im/wildfire/ChangeLog
index c9a223d35333..7c72a96cbed8 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.9 2006/07/22 22:10:22 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/ChangeLog,v 1.10 2006/07/28 00:57:52 humpback Exp $
+
+*wildfire-3.0.1 (28 Jul 2006)
+
+  28 Jul 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/wildfire-3.0.1-for.patch, +wildfire-3.0.1.ebuild:
+  Version bump.
 
   22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   wildfire-3.0.0-r1.ebuild:
diff --git a/net-im/wildfire/Manifest b/net-im/wildfire/Manifest
index d78c0006c291..c561f2091507 100644
--- a/net-im/wildfire/Manifest
+++ b/net-im/wildfire/Manifest
@@ -13,8 +13,13 @@ AUX wildfire-3.0.0-for.patch 1385 RMD160 7d80ea715a68e9e899fd09a92336cfd83be014e
 MD5 ebd3a576709a1bfea3b129029d9fb166 files/wildfire-3.0.0-for.patch 1385
 RMD160 7d80ea715a68e9e899fd09a92336cfd83be014e9 files/wildfire-3.0.0-for.patch 1385
 SHA256 41c374944396ca83bfea30cafcaf0509951c96d9ddb56b973ce326d2abe419a8 files/wildfire-3.0.0-for.patch 1385
+AUX wildfire-3.0.1-for.patch 1385 RMD160 7d80ea715a68e9e899fd09a92336cfd83be014e9 SHA1 d0a52e76d99e2e8bf740274a88525ee2f2fa625b SHA256 41c374944396ca83bfea30cafcaf0509951c96d9ddb56b973ce326d2abe419a8
+MD5 ebd3a576709a1bfea3b129029d9fb166 files/wildfire-3.0.1-for.patch 1385
+RMD160 7d80ea715a68e9e899fd09a92336cfd83be014e9 files/wildfire-3.0.1-for.patch 1385
+SHA256 41c374944396ca83bfea30cafcaf0509951c96d9ddb56b973ce326d2abe419a8 files/wildfire-3.0.1-for.patch 1385
 DIST wildfire_src_2_6_2.tar.gz 11621818 RMD160 7cd86f5442f3fc4a01e1fdef8003b9e113804631 SHA1 f73c08df6a336ff803135bd166a5418839ad50f9 SHA256 9e8ff13c37934b56aee7f0471af4faa4a09e998cfec5f18a463d6282580fa1d0
 DIST wildfire_src_3_0_0.tar.gz 15861124 RMD160 4a94369be80e463cf3ababb6b3cb9313607e3ee2 SHA1 a9e1357d557d777f08cc517e4368369ca903745c SHA256 86ceba2e13979cb44ca9c508ac2cd08b1dc7d46c63b5fdf57ca06281c11cf5b6
+DIST wildfire_src_3_0_1.tar.gz 12048510 RMD160 3975f0d176f4eeeb91f8c24d022fa26efd8a8465 SHA1 cdcb83e5480cbd7b2892838ec5169a333066f3b2 SHA256 efdd713e3d00699b19fff2ddb35278774fb1781d234153ee80380b94aca3e9a8
 EBUILD wildfire-2.6.2-r2.ebuild 2218 RMD160 b0e79aaf493ec8a17b6554f5b32475cbcb725ac8 SHA1 201180130268d69fecc5a3bee7b042bf8b8dc3fb SHA256 c3f9755d91099c3562283675486c2a089d230b8b04cabfeec0296f86488831be
 MD5 773bf9674b7cef784626adb3e6a199ab wildfire-2.6.2-r2.ebuild 2218
 RMD160 b0e79aaf493ec8a17b6554f5b32475cbcb725ac8 wildfire-2.6.2-r2.ebuild 2218
@@ -23,10 +28,14 @@ EBUILD wildfire-3.0.0-r1.ebuild 2479 RMD160 f9ca1b788d4d84c2b59f98fec80a303ffb92
 MD5 5dd27ffef3b1372094829e72bdfaaba1 wildfire-3.0.0-r1.ebuild 2479
 RMD160 f9ca1b788d4d84c2b59f98fec80a303ffb921f13 wildfire-3.0.0-r1.ebuild 2479
 SHA256 dd6f12e7c305ddd22c6e32767f3f17764aa0c70fcd5344826e4ccdae50522c07 wildfire-3.0.0-r1.ebuild 2479
-MISC ChangeLog 2298 RMD160 5442749a1d0803f5d40f823ddd7579a78b34b527 SHA1 33781f5b8eb3f3591432c1b47f1ab3c595298930 SHA256 925d4860b66f5b772a5e7a14a61cd629bfdb13ea2e444353df1afb2c17b6bcc6
-MD5 3af0e3cd4747085845cfa69780598028 ChangeLog 2298
-RMD160 5442749a1d0803f5d40f823ddd7579a78b34b527 ChangeLog 2298
-SHA256 925d4860b66f5b772a5e7a14a61cd629bfdb13ea2e444353df1afb2c17b6bcc6 ChangeLog 2298
+EBUILD wildfire-3.0.1.ebuild 2476 RMD160 5a8469504ff2451c002110065b938275235d0485 SHA1 0bcc30cdb4ef11b78d841e575d344f6762951e4b SHA256 9d59861c82c7ecb48d884b39f9db435feebe480341d71894fa188973dbfed9f8
+MD5 0f149fbaa1eea9a110a69f9e3f4c2429 wildfire-3.0.1.ebuild 2476
+RMD160 5a8469504ff2451c002110065b938275235d0485 wildfire-3.0.1.ebuild 2476
+SHA256 9d59861c82c7ecb48d884b39f9db435feebe480341d71894fa188973dbfed9f8 wildfire-3.0.1.ebuild 2476
+MISC ChangeLog 2463 RMD160 f3c1444d14da5fa9b6ed809562746f88c9398319 SHA1 2e4b4b985bdc4294cb1c5c63a179084abe0edf4a SHA256 215be67c0100b543eedda08392f12af88036ea1a176c5df28dc786aeb41d4d2a
+MD5 bc6dce24b4bee6659c26118147c0cf05 ChangeLog 2463
+RMD160 f3c1444d14da5fa9b6ed809562746f88c9398319 ChangeLog 2463
+SHA256 215be67c0100b543eedda08392f12af88036ea1a176c5df28dc786aeb41d4d2a ChangeLog 2463
 MISC metadata.xml 481 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 SHA1 feaf705fb8276479cc0f6cca72813eb60b3943a3 SHA256 9965da5e7c0ff80e17e7d673bb35544147e0049ddac59e8f8ba1b1d83971b9e5
 MD5 99126bebaaa8a8b18d1e1ace23623a2b metadata.xml 481
 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 metadata.xml 481
@@ -37,10 +46,13 @@ SHA256 eefee1c30250b2f3c78e18df5601cadc8a6055b775b25b3d47ac62bab2c308a6 files/di
 MD5 2adcb06b4d12713f190a58355997e791 files/digest-wildfire-3.0.0-r1 262
 RMD160 9fae97d3a894b60d56a6da0636e5524e527a7a88 files/digest-wildfire-3.0.0-r1 262
 SHA256 55b90002daef0a1f334c821944810e63635e08fcc2cba98900e16f75de9cbb9a files/digest-wildfire-3.0.0-r1 262
+MD5 74c091f255501c4044e02475c37905c8 files/digest-wildfire-3.0.1 262
+RMD160 6cdc02b72a9ff75d741ba42658f4e27c1bcc9984 files/digest-wildfire-3.0.1 262
+SHA256 09eee60b92517f6fd9c3a2e95014fab46803700ec105d4565ff5ec39c1774d6e files/digest-wildfire-3.0.1 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEwqJXgo/w9rxVVVERAhQbAJ4opry4TnILWk5Szsl2G3SlRAXjJwCginjN
-7+JOAV+GsKeue+IogZ6PcVM=
-=14DY
+iD8DBQFEyWEi8zY1VwezZiERApChAJ4y5rOCt9T4R8t6/YSFcqoUsJIcIwCgpVle
+H1mGID9I0qqYx4hQDFeiChE=
+=dBWJ
 -----END PGP SIGNATURE-----
diff --git a/net-im/wildfire/files/digest-wildfire-3.0.1 b/net-im/wildfire/files/digest-wildfire-3.0.1
new file mode 100644
index 000000000000..40b224d54851
--- /dev/null
+++ b/net-im/wildfire/files/digest-wildfire-3.0.1
@@ -0,0 +1,3 @@
+MD5 b9932e25f34e3e6fe74f4dd363e0906e wildfire_src_3_0_1.tar.gz 12048510
+RMD160 3975f0d176f4eeeb91f8c24d022fa26efd8a8465 wildfire_src_3_0_1.tar.gz 12048510
+SHA256 efdd713e3d00699b19fff2ddb35278774fb1781d234153ee80380b94aca3e9a8 wildfire_src_3_0_1.tar.gz 12048510
diff --git a/net-im/wildfire/files/wildfire-3.0.1-for.patch b/net-im/wildfire/files/wildfire-3.0.1-for.patch
new file mode 100644
index 000000000000..a30bb61166e2
--- /dev/null
+++ b/net-im/wildfire/files/wildfire-3.0.1-for.patch
@@ -0,0 +1,27 @@
+diff -ru wildfire_src-orig/build/build.xml wildfire_src/build/build.xml
+--- wildfire_src-orig/build/build.xml	2006-07-06 11:09:43.000000000 -0400
++++ wildfire_src/build/build.xml	2006-07-06 11:10:49.000000000 -0400
+@@ -691,6 +691,7 @@
+ 

+         <!-- 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" />

+@@ -904,6 +905,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}"/>

+@@ -922,6 +924,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}"/>

diff --git a/net-im/wildfire/wildfire-3.0.1.ebuild b/net-im/wildfire/wildfire-3.0.1.ebuild
new file mode 100644
index 000000000000..22fca8de8571
--- /dev/null
+++ b/net-im/wildfire/wildfire-3.0.1.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.1.ebuild,v 1.1 2006/07/28 00:57:52 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
+}
+
+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
+}