Fix building with ant 1.8, bug #305929.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog
index 1fed2e408d4f8341e5bd53a60d88d2e2373faaaa..9c68169398e7a41f12cca8850bfef3233af3fd0d 100644 (file)
--- a/net-im/openfire/ChangeLog
+++ b/net-im/openfire/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/openfire
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.35 2009/05/22 19:47:16 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.36 2010/06/27 21:46:33 caster Exp $
+
+  27 Jun 2010; Vlastimil Babka <caster@gentoo.org> openfire-3.6.4.ebuild,
+  +files/buildxml-ant.patch:
+  Fix building with ant 1.8, bug #305929.
 
   22 May 2009; Markus Meier <maekke@gentoo.org> openfire-3.6.4.ebuild:
   amd64 stable, bug #266129

diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
index 684f291cd82808af5f03ebd2c5b7c13105213c6f..bd769317a82c558d4861e055ce5a485284480d40 100644 (file)
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@@ -1,3 +1,4 @@
+AUX buildxml-ant.patch 398 RMD160 0cc1640c7e183709733e7dc52bdaadfd7757bad5 SHA1 e4665651beed3f3ba61421e9be97e03777913977 SHA256 d00f33a091377e554ce05c38b51db4c7936d956c333d212d65be105d402213fa
 AUX buildxml.patch 754 RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 SHA1 75909209a42f9befb2854c4852e65d14e7235371 SHA256 55e8ea71dacdb205e960f255ea67fc90602e93fb3a0995485eb2851f6115bdf6
 AUX openfire-confd 491 RMD160 60b9dfbda4bebabd3e59d90959b0317a6ed60413 SHA1 2bee73a734d5e9ef8ba17f3074c9eba01b4cec6b SHA256 60f2ef123218338bbcdf2fb99c4f55740dab21f28e80073a157f1d63c99c05f5
 AUX openfire-initd 571 RMD160 60b623193a8e7eb63f9527ba99d517a5f48cf986 SHA1 264ab08172d7559b79a927395ca32926e9da4cf8 SHA256 89a72c7bac03d932f46c721fd73fe3cc3545892398c2b5f762cda3c25c88f6ac
@@ -6,6 +7,6 @@ DIST openfire_src_3_6_3.tar.gz 51181483 RMD160 1ffe1b4c379cb92faa9ce184d9dfb2edf
 DIST openfire_src_3_6_4.tar.gz 51183844 RMD160 1b83a08db6dc5e4b78dfac5b8f1edad510c33432 SHA1 2578dbde4c9337d687d93575b2e95632bdc2e90b SHA256 8f5c3334da449e2fb1bdabe2bdd46db1fd96a4dc7b3e34a870401fa90819ea99
 EBUILD openfire-3.6.1.ebuild 3100 RMD160 70f18078c288e2fa6483687ee661edf23005d10e SHA1 22dafa4686f4b441d46a179828cf4d00be9b8525 SHA256 94ad24297f6aab73a08adffd3e3459b5f0536bd302ebbd0da9f6deae51eb6090
 EBUILD openfire-3.6.3.ebuild 3100 RMD160 631f842573b0b3535fd3e43ba3f0cae78c925522 SHA1 1ee8042fcfe13b858408cfd40cd296a0d558caaa SHA256 ceb9ae5ef6f866b0dc8068bd2ecb5ab4a44858bc36e80707d5111a184450ad8b
-EBUILD openfire-3.6.4.ebuild 3100 RMD160 8f6a7ec36078a82e67d81d401f3a3c4194284635 SHA1 76bcc80e3ec9a2740cde218304a0efabf5f7e84d SHA256 b12107b561e325608c4cd15c4120929bfe960c855799312dfb281c2bd950dd81
-MISC ChangeLog 10396 RMD160 d95a30aaabb635053a18a5d09ac0471f8d1635d9 SHA1 3d30760b830e1b54b9c1ad44475ac19be6a10cc5 SHA256 6887c0448af2a0ede9f5f8b083a0d3770bcef5f41bf960b661dec574145b5b33
+EBUILD openfire-3.6.4.ebuild 3141 RMD160 242b0cc4e17847e1ada24908b2b1adac31d22861 SHA1 6a87d5310a0936d2b62e904f5ac71fd317292328 SHA256 a775b5d0de1f7597d6210da0492a2676bcd97f93941017ee23b1b7913fe7384d
+MISC ChangeLog 10542 RMD160 5151beb720cd2142b9735a3ccf46b93ed3bd9857 SHA1 dd6efd3c5d7e14f8ef1bd38a101e435229dd93ee SHA256 228321712ec381a68868fd4b1362096ae55a4d47e9c95a0cbdfead7ea8398be0
 MISC metadata.xml 451 RMD160 f13ea23502663a93dc747530f24cc39990fdb360 SHA1 9b3f52dad5c84b7fc78dfce5ca3a0611622655cd SHA256 5e1a11856ef90d986ae42faa142bcbfac2054d2cc3565b9daa0ff20a90731893

diff --git a/net-im/openfire/files/buildxml-ant.patch b/net-im/openfire/files/buildxml-ant.patch
new file mode 100644 (file)
index 0000000..e93cb11
--- /dev/null
+++ b/net-im/openfire/files/buildxml-ant.patch
@@ -0,0 +1,10 @@
+--- build/build.xml    2010-06-27 23:37:11.000000000 +0200
++++ build/build.xml    2010-06-27 23:37:29.000000000 +0200
+@@ -235,7 +235,6 @@
+                 </or>
+             </not>
+         </condition>
+-        <fail if="ant.not.ok" message="Must use Ant 1.6.x or 1.7.x to build Openfire"/>
+         <fail if="java.not.ok" message="Must use JDK 1.5.x or higher to build Openfire"/>
+ 
+         <tstamp/>

diff --git a/net-im/openfire/openfire-3.6.4.ebuild b/net-im/openfire/openfire-3.6.4.ebuild
index b859051d0533e29cb476eb479f654ecdab886d7f..c34fa6574ba89a03379a19b07b04f3250bae6ee8 100644 (file)
--- a/net-im/openfire/openfire-3.6.4.ebuild
+++ b/net-im/openfire/openfire-3.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.6.4.ebuild,v 1.3 2009/05/22 19:47:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.6.4.ebuild,v 1.4 2010/06/27 21:46:33 caster Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -46,6 +46,7 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
        epatch "${FILESDIR}"/buildxml.patch
+       epatch "${FILESDIR}"/buildxml-ant.patch
 
        # TODO should replace jars in build/lib with ones packaged by us -nichoj
 }