Migrate to split-ant wrt ant-contrib use, upstream now supports ant 1.7.0 - fixes bug #176445. Allow compilation with 1.6 JDK as it's now also supported. Don't call plugins-dev target because it fails and doesn't seem to do anything useful.

Package-Manager: portage-2.1.2.7

3 files changed, 22 insertions, 27 deletions

diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog
index 70da0c37a6f6..33897e78d8fc 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.3 2007/05/08 22:46:00 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.4 2007/05/16 19:47:46 caster Exp $
+
+  16 May 2007; Vlastimil Babka <caster@gentoo.org> openfire-3.3.0.ebuild:
+  Migrate to split-ant wrt ant-contrib use, upstream now supports ant 1.7.0 -
+  fixes bug #176445. Allow compilation with 1.6 JDK as it's now also
+  supported. Don't call plugins-dev target because it fails and doesn't seem
+  to do anything useful.
 
   08 May 2007; Marius Mauch <genone@gentoo.org> openfire-3.3.0.ebuild:
   Replacing einfo with ewarn
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
index bdd97e8e13e4..0fcecc202a30 100644
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX buildxml-3.3.0.patch 754 RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 SHA1 75909209a42f9befb2854c4852e65d14e7235371 SHA256 55e8ea71dacdb205e960f255ea67fc90602e93fb3a0995485eb2851f6115bdf6
 MD5 03fd3398f5d0db0e2ec644c2c2f821de files/buildxml-3.3.0.patch 754
 RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 files/buildxml-3.3.0.patch 754
@@ -14,14 +11,14 @@ MD5 6922c9067f3e3ee6be5b77d38e9104ab files/init.d/openfire 571
 RMD160 60b623193a8e7eb63f9527ba99d517a5f48cf986 files/init.d/openfire 571
 SHA256 89a72c7bac03d932f46c721fd73fe3cc3545892398c2b5f762cda3c25c88f6ac files/init.d/openfire 571
 DIST openfire_src_3_3_0.tar.gz 18793873 RMD160 cf99135734d069a26df0b88f0b8ef316d434a39c SHA1 10b4ae0983211662b566fc0b7a48aee2b2cd6a05 SHA256 1bfff0c896337d5bf44db30e8c570942202ec16edd5b9d53c8d5e72a035c96a4
-EBUILD openfire-3.3.0.ebuild 2824 RMD160 ebe89eccf5305643f602e6fe87a9b5361b3c20a6 SHA1 099e799ffaf9c571d0a8d346e4b7aba0e4a36ed8 SHA256 4bf705efa8cda01d7789646a8251683b874e2d33db7af4ba9743e975b83dafbb
-MD5 a96598dcedb6f8ccb78c7a3c905d9719 openfire-3.3.0.ebuild 2824
-RMD160 ebe89eccf5305643f602e6fe87a9b5361b3c20a6 openfire-3.3.0.ebuild 2824
-SHA256 4bf705efa8cda01d7789646a8251683b874e2d33db7af4ba9743e975b83dafbb openfire-3.3.0.ebuild 2824
-MISC ChangeLog 4809 RMD160 74be64db42eaaa93fa2224c2354956bfeb0f2c7d SHA1 b38782c7ccbff0c14d6aeedcd4bee705c8cb5b8b SHA256 f04fb41b039571ba91360d804ae1183f9e14cc554a8da76fbadc3356525ffaaf
-MD5 c7455e9a7b1b2d64d25df1acdae8140b ChangeLog 4809
-RMD160 74be64db42eaaa93fa2224c2354956bfeb0f2c7d ChangeLog 4809
-SHA256 f04fb41b039571ba91360d804ae1183f9e14cc554a8da76fbadc3356525ffaaf ChangeLog 4809
+EBUILD openfire-3.3.0.ebuild 2750 RMD160 ffa9251953bb971d696d5d8c4084fa4d59df4859 SHA1 29c3cf491b91888ecb8310ea9ad7e53fc718b078 SHA256 1cb03cb0766fd0b45683a171b2d676ea28ee46392ae4740f479dccf43840e9d9
+MD5 dd5e1e9bd800fc32ed1940c0f0783308 openfire-3.3.0.ebuild 2750
+RMD160 ffa9251953bb971d696d5d8c4084fa4d59df4859 openfire-3.3.0.ebuild 2750
+SHA256 1cb03cb0766fd0b45683a171b2d676ea28ee46392ae4740f479dccf43840e9d9 openfire-3.3.0.ebuild 2750
+MISC ChangeLog 5133 RMD160 182975dedfc180a93c70cdb551882133c6a53a16 SHA1 967471308a7e7eff1c9f079196acd4b124f7cf35 SHA256 6a9ab68e4c71e42b247ee752f90f26ddcf55d7ab94f864c8891a79681f10ad68
+MD5 f172c732b74192beeb2f2277ef13127f ChangeLog 5133
+RMD160 182975dedfc180a93c70cdb551882133c6a53a16 ChangeLog 5133
+SHA256 6a9ab68e4c71e42b247ee752f90f26ddcf55d7ab94f864c8891a79681f10ad68 ChangeLog 5133
 MISC metadata.xml 481 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 SHA1 feaf705fb8276479cc0f6cca72813eb60b3943a3 SHA256 9965da5e7c0ff80e17e7d673bb35544147e0049ddac59e8f8ba1b1d83971b9e5
 MD5 99126bebaaa8a8b18d1e1ace23623a2b metadata.xml 481
 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 metadata.xml 481
@@ -29,10 +26,3 @@ SHA256 9965da5e7c0ff80e17e7d673bb35544147e0049ddac59e8f8ba1b1d83971b9e5 metadata
 MD5 ec67ab90a99e394fa50f930e787cff18 files/digest-openfire-3.3.0 262
 RMD160 f49ae087e66da01faa2340a4ec1793f62b10ac9c files/digest-openfire-3.3.0 262
 SHA256 91aa6f5da22b58cb1bbf6d7d00003ca9831c6610a96a54746a7c4a5c10a70d2e files/digest-openfire-3.3.0 262
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFGQP0L6J2i8a8J4okRAiwUAKCnI5MXW3AFQQSwJYSVJk2tV6UclwCfcS3P
-vvn+UaLpdq0YOzilBVN6Bjw=
-=Nd2j
------END PGP SIGNATURE-----
diff --git a/net-im/openfire/openfire-3.3.0.ebuild b/net-im/openfire/openfire-3.3.0.ebuild
index 28d79480478c..be0a3708909c 100644
--- a/net-im/openfire/openfire-3.3.0.ebuild
+++ b/net-im/openfire/openfire-3.3.0.ebuild
@@ -1,7 +1,9 @@
 # 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.2 2007/05/08 22:46:00 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.3.0.ebuild,v 1.3 2007/05/16 19:47:46 caster 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"
@@ -18,14 +20,10 @@ 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
+RDEPEND=">=virtual/jre-1.5"
 DEPEND="net-im/jabber-base
-		=virtual/jdk-1.5*
-		>=dev-java/ant-1.6
-		<dev-java/ant-1.7
 		dev-java/ant-contrib
-		>=dev-java/commons-net-1.4"
+		>=virtual/jdk-1.5"
 
 S=${WORKDIR}/${PN//-/_}_src
 
@@ -52,7 +50,8 @@ src_compile() {
 	# Jikes doesn't support -source 1.5
 	java-pkg_filter-compiler jikes
 
-	eant -f build/build.xml openfire plugins plugins-dev $(use_doc)
+	ANT_TASKS="ant-contrib"
+	eant -f build/build.xml openfire plugins $(use_doc)
 }
 
 src_install() {