Fixed build against newer ant using jdk-7. Thanks to Matt McAdoo for the fix (bug #415619).

Package-Manager: portage-2.2.0_alpha104_p20/cvs/Linux x86_64

4 files changed, 45 insertions, 8 deletions

diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog
index 24c2a05d4f1e..ca1381812e44 100644
--- a/net-im/openfire/ChangeLog
+++ b/net-im/openfire/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/openfire
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.43 2012/03/18 18:39:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.44 2012/05/16 03:34:45 slyfox Exp $
+
+  16 May 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/openfire-3.7.1-buildxml-jdk7.patch, openfire-3.7.1.ebuild:
+  Fixed build against newer ant using jdk-7. Thanks to Matt McAdoo for the fix
+  (bug #415619).
 
   18 Mar 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #118003.
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
index ac58e4da9b30..d4200253e118 100644
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX buildxml-ant.patch 398 RMD160 0cc1640c7e183709733e7dc52bdaadfd7757bad5 SHA1 e4665651beed3f3ba61421e9be97e03777913977 SHA256 d00f33a091377e554ce05c38b51db4c7936d956c333d212d65be105d402213fa
 AUX buildxml.patch 754 RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 SHA1 75909209a42f9befb2854c4852e65d14e7235371 SHA256 55e8ea71dacdb205e960f255ea67fc90602e93fb3a0995485eb2851f6115bdf6
+AUX openfire-3.7.1-buildxml-jdk7.patch 1160 RMD160 f6da4641b1f5610534ea247319b12eea077760dd SHA1 23609e772b69a3d3283b921df80fbcf704674ff1 SHA256 3af692f7b7d0d05db70cdfed54d56611abf9d6229c54e66e1734aee1b5ee1546
 AUX openfire-confd 491 RMD160 60b9dfbda4bebabd3e59d90959b0317a6ed60413 SHA1 2bee73a734d5e9ef8ba17f3074c9eba01b4cec6b SHA256 60f2ef123218338bbcdf2fb99c4f55740dab21f28e80073a157f1d63c99c05f5
 AUX openfire-initd 584 RMD160 1ea7a73873c455e6eec9851c2bcc755bab9aa15c SHA1 fca7d0b06bf7b191b272569c6ae574d9e90cd883 SHA256 3539b261211f13c2644958f97dfebb76a8d46eea526cc9be3e73a993901f4dba
 DIST openfire_src_3_6_1.tar.gz 51130024 RMD160 940fe13d6a2d2da88427eb8a29316aa032d16313 SHA1 b245fb21b59c2ff3185c971f62f50282da12eb8f SHA256 e81a153765e7cb7b67472d4592119dc174008b5c96fca53b4117697ca51c301d
@@ -14,13 +15,13 @@ EBUILD openfire-3.6.1.ebuild 3047 RMD160 50d0b8e2aa139ff9f2d70d3cf791757129c72c8
 EBUILD openfire-3.6.3.ebuild 3047 RMD160 1ef3a8d23f39ae186c7fb4166930cce9dd3786f2 SHA1 52d6ddaee853dbe46956dd33abbfcc214acc9b87 SHA256 53ca0a15f5f30b47d9e82141bc123643bdf91dc1fb44f7f1162eedea95f14da9
 EBUILD openfire-3.6.4.ebuild 3088 RMD160 9d800f62086a9d0cc3b34138d1686f254921f945 SHA1 59bc3945c287c44e8a9a48310589af48f08643e4 SHA256 ee1dce47bd40ec60d0ecc9c4cb78abf15474f027b18f7e0e6b075a55e6b80fd9
 EBUILD openfire-3.7.0.ebuild 2746 RMD160 08a58ddc8f9ce8b10550f5f721ffe8c3b39be87a SHA1 25e6e07e85124f1f8cd76076b30ed3f97c0c984e SHA256 1877250ddbeb75dfa40f316aae0420d4ad952b63ac42390dff71bd0b8e77ac76
-EBUILD openfire-3.7.1.ebuild 2751 RMD160 d79eea1a40775ee4f7d3472525364fa6b9377d57 SHA1 554f7f0fbe9ac08546684b7dafa68c463b545088 SHA256 682798c643eff54c271817a4a92b33984fc734b82b26b542600eb9321354d229
-MISC ChangeLog 11644 RMD160 563e52b59dd2ae85f3380da6a38f1f0a8715f2cd SHA1 959c97faf9346ad3afe21c2aaf19154200cd37b9 SHA256 d5792a7fa0302757e7a2d38c8ae028040e3a6886b7b162c29da5e54574f3c82a
+EBUILD openfire-3.7.1.ebuild 2798 RMD160 dd53759cb457efe0a9fb7981cc9e967899fa8fc9 SHA1 385cba57dd93c95e3aa4a8091f35ddf184656dc8 SHA256 8e3c71ac47aadf472d4b595c82c1dfb9732a3e6f64df0949c8905ec02add4b58
+MISC ChangeLog 11864 RMD160 b60345485337fa72fb81c453c554b8d0ac5ffef7 SHA1 b0ac651c423dc8c9273840e7b55528117283046c SHA256 6dba2282853e21daae7c34f0d3a592da57c58da90b6e7de5839eefbc0f192f7b
 MISC metadata.xml 469 RMD160 d83e20e89b79035c398e8f31751ffa8e56edc199 SHA1 4d23b607190f6b0a0c6c7e4481624bdcfc490d46 SHA256 54c8a314944640dade8e23fe264bdd928732ef9f47e20bedf943ea990b437bfe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9mK98ACgkQCaWpQKGI+9QArACbB6/m1WL/GuJFxVg9ME2BirI5
-0TIAn1i1csxcTVuLM7ztRAssSaIqVjAa
-=LPpr
+iEYEARECAAYFAk+zIZIACgkQcaHudmEf86r30ACdGVtuQ0cFFE9wS74HUP5Gnpgu
+WgYAn0St+XXGxJL5FBcObZKrpzNnBRlG
+=CX+3
 -----END PGP SIGNATURE-----
diff --git a/net-im/openfire/files/openfire-3.7.1-buildxml-jdk7.patch b/net-im/openfire/files/openfire-3.7.1-buildxml-jdk7.patch
new file mode 100644
index 000000000000..fbc4aff81390
--- /dev/null
+++ b/net-im/openfire/files/openfire-3.7.1-buildxml-jdk7.patch
@@ -0,0 +1,30 @@
+Fixes failure when rebuilding build.xml with new ant:
+
+ * Applying buildxml.patch ...
+ * Applying buildxml-ant.patch ...
+>>> Source unpacked in /var/tmp/portage/net-im/openfire-3.7.1/work
+>>> Compiling source in /var/tmp/portage/net-im/openfire-3.7.1/work/openfire_src ...
+Rewriting attributes
+Rewriting ./build/build.xml
+Rewriting ./src/test/throttletest/build/build.xml
+Rewriting ./src/plugins/kraken/build/build.xml
+ * Using following ANT_TASKS: ant-contrib
+Buildfile: openfire-3.7.1/work/openfire_src/build/build.xml
+
+init:
+
+BUILD FAILED
+openfire-3.7.1/work/openfire_src/build/build.xml:221: Must use JDK 1.5.x or higher to build Openfire
+
+Gentoo-bug: https://bugs.gentoo.org/415619
+Author: Matt McAdoo
+--- build/build.xml	2012-05-15 21:15:53.849153950 -0500
++++ build/build.xml	2012-05-15 21:16:23.628271564 -0500
+@@ -234,6 +234,7 @@
+                 <or>
+                     <contains string="${ant.java.version}" substring="1.5"/>
+                     <contains string="${ant.java.version}" substring="1.6"/>
++                    <contains string="${ant.java.version}" substring="1.7"/>
+                 </or>
+             </not>
+         </condition>
diff --git a/net-im/openfire/openfire-3.7.1.ebuild b/net-im/openfire/openfire-3.7.1.ebuild
index b79687ee9255..f61de9c1d803 100644
--- a/net-im/openfire/openfire-3.7.1.ebuild
+++ b/net-im/openfire/openfire-3.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.7.1.ebuild,v 1.1 2011/10/28 12:15:37 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.7.1.ebuild,v 1.2 2012/05/16 03:34:45 slyfox Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -44,6 +44,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/buildxml.patch
 	epatch "${FILESDIR}"/buildxml-ant.patch
+	epatch "${FILESDIR}"/${P}-buildxml-jdk7.patch
 
 	# TODO should replace jars in build/lib with ones packaged by us -nichoj
 }