bumped

Package-Manager: portage-2.1.3.15

5 files changed, 151 insertions, 5 deletions

diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog
index 16d4b1b99c33..67c4157bc7b4 100644
--- a/net-im/openfire/ChangeLog
+++ b/net-im/openfire/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/openfire
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.11 2007/10/01 18:40:07 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.12 2007/11/06 00:49:03 humpback Exp $
+
+*openfire-3.4.1 (06 Nov 2007)
+
+  06 Nov 2007; Gustavo Felisberto <humpback@gentoo.org>
+  +files/buildxml-3.4.1.patch, +openfire-3.4.1.ebuild:
+  Bump to close #198164
 
 *openfire-3.3.3 (01 Oct 2007)
 
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
index da67daa2fa92..700a758716d2 100644
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@@ -6,6 +6,10 @@ AUX buildxml-3.3.3.patch 754 RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 SHA
 MD5 03fd3398f5d0db0e2ec644c2c2f821de files/buildxml-3.3.3.patch 754
 RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 files/buildxml-3.3.3.patch 754
 SHA256 55e8ea71dacdb205e960f255ea67fc90602e93fb3a0995485eb2851f6115bdf6 files/buildxml-3.3.3.patch 754
+AUX buildxml-3.4.1.patch 754 RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 SHA1 75909209a42f9befb2854c4852e65d14e7235371 SHA256 55e8ea71dacdb205e960f255ea67fc90602e93fb3a0995485eb2851f6115bdf6
+MD5 03fd3398f5d0db0e2ec644c2c2f821de files/buildxml-3.4.1.patch 754
+RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 files/buildxml-3.4.1.patch 754
+SHA256 55e8ea71dacdb205e960f255ea67fc90602e93fb3a0995485eb2851f6115bdf6 files/buildxml-3.4.1.patch 754
 AUX conf.d/openfire 491 RMD160 60b9dfbda4bebabd3e59d90959b0317a6ed60413 SHA1 2bee73a734d5e9ef8ba17f3074c9eba01b4cec6b SHA256 60f2ef123218338bbcdf2fb99c4f55740dab21f28e80073a157f1d63c99c05f5
 MD5 026fe96118d6451e29e72af8538dd8eb files/conf.d/openfire 491
 RMD160 60b9dfbda4bebabd3e59d90959b0317a6ed60413 files/conf.d/openfire 491
@@ -16,6 +20,7 @@ RMD160 60b623193a8e7eb63f9527ba99d517a5f48cf986 files/init.d/openfire 571
 SHA256 89a72c7bac03d932f46c721fd73fe3cc3545892398c2b5f762cda3c25c88f6ac files/init.d/openfire 571
 DIST openfire_src_3_3_2.tar.gz 48712324 RMD160 f1397c0d6f4710e39b0c3d110c70de7834172cb6 SHA1 115e8964dc762f58a308497cc170d6f6355ef137 SHA256 bf8d3a7561d5a569c8fd5e22f384f56c6d6fcabd0a5167240590d873fa0a8377
 DIST openfire_src_3_3_3.tar.gz 54051765 RMD160 d002c9f507e06c8f491238f998b854263c139843 SHA1 f508a61840da06460328a86337fc0423a3aea5c2 SHA256 e52a60f8d9042a9e58b81701d4dead5889caa999d40f6e20bca7eb1c5fef5338
+DIST openfire_src_3_4_1.tar.gz 56221075 RMD160 ed955b8d048504a44064007a001a137b91bcefef SHA1 fda1986113664d3c6f12b06cda7c92b688f2b206 SHA256 ed0e914f9eb260d5be9cdd97fb2ca6d28699478e0da746f5f72b379a0f6c6a01
 EBUILD openfire-3.3.2.ebuild 2772 RMD160 256c7fca8e5db9ac58a61d092edf75e904ca7c20 SHA1 b9896a29be8834234de0e47bb81d2a0c50a4690a SHA256 97e9d0132e4450089e60a5bbf6a31cd906d619e757d5a562ed5086ee5f0400da
 MD5 0c31c586c30b1c81945fe60264bbf51b openfire-3.3.2.ebuild 2772
 RMD160 256c7fca8e5db9ac58a61d092edf75e904ca7c20 openfire-3.3.2.ebuild 2772
@@ -24,10 +29,14 @@ EBUILD openfire-3.3.3.ebuild 2774 RMD160 17b856139587ff9f63a3ba804add45a24db50d4
 MD5 f376c868f5a8292977a1befbb4d9dd73 openfire-3.3.3.ebuild 2774
 RMD160 17b856139587ff9f63a3ba804add45a24db50d4a openfire-3.3.3.ebuild 2774
 SHA256 f669b73ae114f5f3d48d9d99641fe397260676f3d675581257e3f0ac7faf2619 openfire-3.3.3.ebuild 2774
-MISC ChangeLog 6261 RMD160 adccf9c561f1ef29593149e940e40990d09f9826 SHA1 af1a8c16e0072705dc4730e21ec9ccbb38f71430 SHA256 1797024be59dcec12475605d4fb956ad1c4e09cfee6f79bb740e224b9499f3ca
-MD5 b757cba4c20ba4cdbfdd5a2c2cbdb50f ChangeLog 6261
-RMD160 adccf9c561f1ef29593149e940e40990d09f9826 ChangeLog 6261
-SHA256 1797024be59dcec12475605d4fb956ad1c4e09cfee6f79bb740e224b9499f3ca ChangeLog 6261
+EBUILD openfire-3.4.1.ebuild 2774 RMD160 c20101c74b9c46843121e1984e560b201c70b07d SHA1 f3960a0f394fcf13a12db157b3a56bd1b27fb0f9 SHA256 5b30fec8f498add696d52985c4d47ea8c14ba7f5a0f76b8e71b35c4ca32a95eb
+MD5 b098fd5e09a6c12b25917f284451edaa openfire-3.4.1.ebuild 2774
+RMD160 c20101c74b9c46843121e1984e560b201c70b07d openfire-3.4.1.ebuild 2774
+SHA256 5b30fec8f498add696d52985c4d47ea8c14ba7f5a0f76b8e71b35c4ca32a95eb openfire-3.4.1.ebuild 2774
+MISC ChangeLog 6428 RMD160 1f58ccd903554a494fc18b3b0daf63d36b4675dd SHA1 1dca86f8451cc157520282eacdbd202695c8c0cc SHA256 bd53ea694d75f99b5c581aefddcc2fa0a89ef4b48e871088e19d33442760ee81
+MD5 1e70388cefa63eebbadcb1ed0c4c953d ChangeLog 6428
+RMD160 1f58ccd903554a494fc18b3b0daf63d36b4675dd ChangeLog 6428
+SHA256 bd53ea694d75f99b5c581aefddcc2fa0a89ef4b48e871088e19d33442760ee81 ChangeLog 6428
 MISC metadata.xml 481 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 SHA1 feaf705fb8276479cc0f6cca72813eb60b3943a3 SHA256 9965da5e7c0ff80e17e7d673bb35544147e0049ddac59e8f8ba1b1d83971b9e5
 MD5 99126bebaaa8a8b18d1e1ace23623a2b metadata.xml 481
 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 metadata.xml 481
@@ -38,3 +47,6 @@ SHA256 cbddecf76f0b1258b19aab42571e96258c2aa875b4c165570f6de34f28ff1d32 files/di
 MD5 0eb930b325422d29b8fad31ee130999b files/digest-openfire-3.3.3 262
 RMD160 fbbf9f452fe5c0fce3471bbaf81f475c898edb5b files/digest-openfire-3.3.3 262
 SHA256 f8d3905e376a87f124cd0d178682c6c23e88668f53051986ffb11d0955c2d194 files/digest-openfire-3.3.3 262
+MD5 a62b01692f48d5de356e6004176db18f files/digest-openfire-3.4.1 262
+RMD160 2d5ff3cdd645e0c72779e619c6ae647c2d207a83 files/digest-openfire-3.4.1 262
+SHA256 b77dae4a09b7cb1dab864caf6e28e8dde3b916d4e76b12ad5145da1a8029dd25 files/digest-openfire-3.4.1 262
diff --git a/net-im/openfire/files/buildxml-3.4.1.patch b/net-im/openfire/files/buildxml-3.4.1.patch
new file mode 100644
index 000000000000..eb52f286d250
--- /dev/null
+++ b/net-im/openfire/files/buildxml-3.4.1.patch
@@ -0,0 +1,20 @@
+--- build/build.xml	2007-04-13 21:00:32.000000000 +0000
++++ build/build.xml	2007-04-16 23:11:05.000000000 +0000
+@@ -1133,7 +1133,7 @@
+ 
+     </target>
+     <target name="-plugins-impl" if="dirlist">
+-
++	<taskdef classname="net.sf.antcontrib.logic.For" name="for"/>
+         <!-- For each plugin in the main src dir, call the 'buildplugin' macro -->
+         <for list="${dirlist}" param="plugin" trim="true">
+             <sequential>
+@@ -1143,7 +1143,7 @@
+ 
+     </target>
+     <target name="-plugins-impl-dev" if="plugin.dev.dir">
+-
++	<taskdef classname="net.sf.antcontrib.logic.For" name="for"/>
+         <!-- Get a list of plugins in the optional dev dir -->
+         <subdirinfo dir="${plugin.dev.dir}" property="dirlist2" ifexists="plugin.xml"/>
+ 
diff --git a/net-im/openfire/files/digest-openfire-3.4.1 b/net-im/openfire/files/digest-openfire-3.4.1
new file mode 100644
index 000000000000..c4b8b28f49a3
--- /dev/null
+++ b/net-im/openfire/files/digest-openfire-3.4.1
@@ -0,0 +1,3 @@
+MD5 2e100e128e8cc9ddd0d32d5ec85a8527 openfire_src_3_4_1.tar.gz 56221075
+RMD160 ed955b8d048504a44064007a001a137b91bcefef openfire_src_3_4_1.tar.gz 56221075
+SHA256 ed0e914f9eb260d5be9cdd97fb2ca6d28699478e0da746f5f72b379a0f6c6a01 openfire_src_3_4_1.tar.gz 56221075
diff --git a/net-im/openfire/openfire-3.4.1.ebuild b/net-im/openfire/openfire-3.4.1.ebuild
new file mode 100644
index 000000000000..91cac9119465
--- /dev/null
+++ b/net-im/openfire/openfire-3.4.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.4.1.ebuild,v 1.1 2007/11/06 00:49:03 humpback Exp $
+
+# because of ant-contrib
+WANT_SPLIT_ANT=true
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
+HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
+SRC_URI="http://www.igniterealtime.org/builds/openfire/${PN//-/_}_src_${PV//./_}.tar.gz"
+RESTRICT=""
+LICENSE="GPL-2"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+# For transports
+PROVIDE="virtual/jabber-server"
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND="net-im/jabber-base
+		dev-java/ant-contrib
+		>=virtual/jdk-1.5"
+
+S=${WORKDIR}/${PN//-/_}_src
+
+pkg_setup() {
+	if [ -f /etc/env.d/98openfire ]; 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/openfire/resources/security/\"' > /etc/env.d/98openfire "
+		ewarn "For more info see bug #139708"
+		sleep 11
+	fi
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${PN//-/_}_src_${PV//./_}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/buildxml-${PV}.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
+
+	ANT_TASKS="ant-contrib"
+	eant -f build/build.xml openfire plugins $(use_doc)
+}
+
+src_install() {
+	dodir /opt/openfire
+
+	doinitd ${FILESDIR}/init.d/openfire
+	doconfd ${FILESDIR}/conf.d/openfire
+
+	dodir /opt/openfire/conf
+	insinto /opt/openfire/conf
+	newins target/openfire/conf/openfire.xml openfire.xml.sample
+
+	dodir /opt/openfire/logs
+	keepdir /opt/openfire/logs
+
+	dodir /opt/openfire/lib
+	insinto /opt/openfire/lib
+	doins target/openfire/lib/*
+
+	dodir /opt/openfire/plugins
+	insinto /opt/openfire/plugins
+	doins -r target/openfire/plugins/*
+
+	dodir /opt/openfire/resources
+	insinto /opt/openfire/resources
+	doins -r target/openfire/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/openfire/resources/security/"' > ${D}/etc/env.d/98openfire
+}
+
+pkg_postinst() {
+	chown -R jabber:jabber /opt/openfire
+
+	ewarn If this is a new install, please edit /opt/openfire/conf/openfire.xml.sample
+	ewarn and save it as /opt/openfire/conf/openfire.xml
+	ewarn
+	ewarn The following must be be owned or writable by the jabber user.
+	ewarn /opt/openfire/conf/openfire.xml
+	ewarn
+	ewarn If you are upgrading please have a look at the Wildfire to Openfire Upgrade Guide:
+	ewarn http://wiki.igniterealtime.org/display/WILDFIRE/Wildfire+to+Openfire+Upgrade+Guide
+	ewarn
+}