bumping and removing older versions

(Portage version: 2.1.3.9)

8 files changed, 14 insertions, 134 deletions

diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog
index 9e3d766c0635..16d4b1b99c33 100644
--- a/net-im/openfire/ChangeLog
+++ b/net-im/openfire/ChangeLog
@@ -1,6 +1,14 @@
 # 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.10 2007/07/17 10:39:58 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.11 2007/10/01 18:40:07 humpback Exp $
+
+*openfire-3.3.3 (01 Oct 2007)
+
+  01 Oct 2007; Gustavo Felisberto <humpback@gentoo.org>
+  -files/buildxml-3.3.0.patch, -files/buildxml-3.3.1.patch,
+  +files/buildxml-3.3.3.patch, -openfire-3.3.0.ebuild,
+  -openfire-3.3.1.ebuild, +openfire-3.3.3.ebuild:
+  Removed older versions and bumped 3.3.2 to 3.3.3 as noted on bug #193590.
 
 *openfire-3.3.2 (17 Jul 2007)
 
diff --git a/net-im/openfire/files/buildxml-3.3.1.patch b/net-im/openfire/files/buildxml-3.3.1.patch
deleted file mode 100644
index eb52f286d250..000000000000
--- a/net-im/openfire/files/buildxml-3.3.1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/buildxml-3.3.0.patch b/net-im/openfire/files/buildxml-3.3.3.patch
index eb52f286d250..eb52f286d250 100644
--- a/net-im/openfire/files/buildxml-3.3.0.patch
+++ b/net-im/openfire/files/buildxml-3.3.3.patch
diff --git a/net-im/openfire/files/digest-openfire-3.3.0 b/net-im/openfire/files/digest-openfire-3.3.0
deleted file mode 100644
index 37ea5441b831..000000000000
--- a/net-im/openfire/files/digest-openfire-3.3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b2c6de82215b62ddcb4804641405a785 openfire_src_3_3_0.tar.gz 18793873
-RMD160 cf99135734d069a26df0b88f0b8ef316d434a39c openfire_src_3_3_0.tar.gz 18793873
-SHA256 1bfff0c896337d5bf44db30e8c570942202ec16edd5b9d53c8d5e72a035c96a4 openfire_src_3_3_0.tar.gz 18793873
diff --git a/net-im/openfire/files/digest-openfire-3.3.1 b/net-im/openfire/files/digest-openfire-3.3.1
deleted file mode 100644
index d0a94095983a..000000000000
--- a/net-im/openfire/files/digest-openfire-3.3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a3f7d8bc58f85c7f6a93764ccaa94bd9 openfire_src_3_3_1.tar.gz 48723953
-RMD160 46c80805bdb90f41f2158751b3de1a498f96e2b7 openfire_src_3_3_1.tar.gz 48723953
-SHA256 ace1324862e3906c457b8a20e918d2ac2af3ef328c8259081103de0e1b16ba95 openfire_src_3_3_1.tar.gz 48723953
diff --git a/net-im/openfire/files/digest-openfire-3.3.3 b/net-im/openfire/files/digest-openfire-3.3.3
new file mode 100644
index 000000000000..19e7015e8a28
--- /dev/null
+++ b/net-im/openfire/files/digest-openfire-3.3.3
@@ -0,0 +1,3 @@
+MD5 e9b01da5dab0eea51f46399857322109 openfire_src_3_3_3.tar.gz 54051765
+RMD160 d002c9f507e06c8f491238f998b854263c139843 openfire_src_3_3_3.tar.gz 54051765
+SHA256 e52a60f8d9042a9e58b81701d4dead5889caa999d40f6e20bca7eb1c5fef5338 openfire_src_3_3_3.tar.gz 54051765
diff --git a/net-im/openfire/openfire-3.3.0.ebuild b/net-im/openfire/openfire-3.3.0.ebuild
deleted file mode 100644
index 74b28446aa5d..000000000000
--- a/net-im/openfire/openfire-3.3.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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.3.0.ebuild,v 1.4 2007/05/28 16:23:31 betelgeuse 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="~x86 ~amd64"
-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
-}
diff --git a/net-im/openfire/openfire-3.3.1.ebuild b/net-im/openfire/openfire-3.3.3.ebuild
index 49763232a114..33ef253ea2e3 100644
--- a/net-im/openfire/openfire-3.3.1.ebuild
+++ b/net-im/openfire/openfire-3.3.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.1.ebuild,v 1.4 2007/06/01 11:05:52 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.3.3.ebuild,v 1.1 2007/10/01 18:40:07 humpback Exp $
 
 # because of ant-contrib
 WANT_SPLIT_ANT=true
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 # For transports