hopefully this fixes the build.xml isue

Package-Manager: portage-2.1.1-r1

2 files changed, 15 insertions, 57 deletions

diff --git a/net-im/wildfire/Manifest b/net-im/wildfire/Manifest
index 63862c312e02..adbf0dea0a04 100644
--- a/net-im/wildfire/Manifest
+++ b/net-im/wildfire/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX build.xml-3.1.0.bz2 9389 RMD160 b6bcd8400003d1f3d3ecf3c5f79381b8671548fd SHA1 4acd5320f2496780f0da006b34869ae27787281f SHA256 1265039d383bf234f72ebcc26b23750d758b7f424b8836c51706bb7334929d25
+MD5 3361efb930c0deec0c33b2369f926a16 files/build.xml-3.1.0.bz2 9389
+RMD160 b6bcd8400003d1f3d3ecf3c5f79381b8671548fd files/build.xml-3.1.0.bz2 9389
+SHA256 1265039d383bf234f72ebcc26b23750d758b7f424b8836c51706bb7334929d25 files/build.xml-3.1.0.bz2 9389
 AUX conf.d/wildfire 491 RMD160 a11202a762cffb01a0d33a69ab65283a5962cfce SHA1 4a41b03dc09f4aa375a0c793a53ff10129cf5432 SHA256 c1b3ba0a0da4854118e4e8debd370d8e2deb7f08a3fe5c4b5c4bedae5428498b
 MD5 3ea87a69285ce987e501c835629b0af3 files/conf.d/wildfire 491
 RMD160 a11202a762cffb01a0d33a69ab65283a5962cfce files/conf.d/wildfire 491
@@ -17,10 +21,6 @@ AUX wildfire-3.0.1-for.patch 1385 RMD160 7d80ea715a68e9e899fd09a92336cfd83be014e
 MD5 ebd3a576709a1bfea3b129029d9fb166 files/wildfire-3.0.1-for.patch 1385
 RMD160 7d80ea715a68e9e899fd09a92336cfd83be014e9 files/wildfire-3.0.1-for.patch 1385
 SHA256 41c374944396ca83bfea30cafcaf0509951c96d9ddb56b973ce326d2abe419a8 files/wildfire-3.0.1-for.patch 1385
-AUX wildfire-3.1.0-for.patch 2112 RMD160 fe917390977a5f7b17efcc5cd63cdb9a26652603 SHA1 6ba30a8949f59635830fde5f7ce0a6ad557a50ab SHA256 fe109d3a810605f536615f6cf42d5e5717e0791250c93189d93d3766a3a33a12
-MD5 b12f3a60bad75ecc84a3072c6db07f49 files/wildfire-3.1.0-for.patch 2112
-RMD160 fe917390977a5f7b17efcc5cd63cdb9a26652603 files/wildfire-3.1.0-for.patch 2112
-SHA256 fe109d3a810605f536615f6cf42d5e5717e0791250c93189d93d3766a3a33a12 files/wildfire-3.1.0-for.patch 2112
 DIST wildfire_src_2_6_2.tar.gz 11621818 RMD160 7cd86f5442f3fc4a01e1fdef8003b9e113804631 SHA256 9e8ff13c37934b56aee7f0471af4faa4a09e998cfec5f18a463d6282580fa1d0
 DIST wildfire_src_3_0_0.tar.gz 15861124 RMD160 4a94369be80e463cf3ababb6b3cb9313607e3ee2 SHA256 86ceba2e13979cb44ca9c508ac2cd08b1dc7d46c63b5fdf57ca06281c11cf5b6
 DIST wildfire_src_3_0_1.tar.gz 12048510 RMD160 3975f0d176f4eeeb91f8c24d022fa26efd8a8465 SHA1 cdcb83e5480cbd7b2892838ec5169a333066f3b2 SHA256 efdd713e3d00699b19fff2ddb35278774fb1781d234153ee80380b94aca3e9a8
@@ -37,14 +37,14 @@ EBUILD wildfire-3.0.1.ebuild 2476 RMD160 f16b6d05ded5ca6e79fc7845f04a7774385f686
 MD5 1e9aeff9253fd3ee335d4f4c444e1422 wildfire-3.0.1.ebuild 2476
 RMD160 f16b6d05ded5ca6e79fc7845f04a7774385f6868 wildfire-3.0.1.ebuild 2476
 SHA256 5d401edc549e1d71a3772d78f09bad750b4e423e1d4c3f9c718f44629770add0 wildfire-3.0.1.ebuild 2476
-EBUILD wildfire-3.1.0.ebuild 2459 RMD160 413259e2d6a03771b630a0661a4de14006be036c SHA1 575bb0a06046bafcf3dfa2328bbc69c1862b2a54 SHA256 df758db3227e5a714c6a3774bd1847d2244e6534ae63b3bcf303ec2d50905efc
-MD5 c5681e9c2d2194a92d28ff1400931209 wildfire-3.1.0.ebuild 2459
-RMD160 413259e2d6a03771b630a0661a4de14006be036c wildfire-3.1.0.ebuild 2459
-SHA256 df758db3227e5a714c6a3774bd1847d2244e6534ae63b3bcf303ec2d50905efc wildfire-3.1.0.ebuild 2459
-MISC ChangeLog 2930 RMD160 066f8c8cb337aeb90fce0eba4b8c14e26c66af24 SHA1 a1592b64142d02323e73f85b3d4e15026eab921e SHA256 ed86c4b1dbbfdb347284b0405b465811b52cde7e9decdda263094fa90f206d2f
-MD5 6c980f5e53e00e253af81219003976ed ChangeLog 2930
-RMD160 066f8c8cb337aeb90fce0eba4b8c14e26c66af24 ChangeLog 2930
-SHA256 ed86c4b1dbbfdb347284b0405b465811b52cde7e9decdda263094fa90f206d2f ChangeLog 2930
+EBUILD wildfire-3.1.0.ebuild 2528 RMD160 3ed76a89108cb0ec2831a22e08c15ee0283164b4 SHA1 e2a3cff28b49a3af498676278eb47d1aecbffb33 SHA256 4628a350527c072f5cecc6af61d4ea66deae2f76bb7a69c1798c880c715ca53b
+MD5 109c02dd2303c5e7e790f50b64916e24 wildfire-3.1.0.ebuild 2528
+RMD160 3ed76a89108cb0ec2831a22e08c15ee0283164b4 wildfire-3.1.0.ebuild 2528
+SHA256 4628a350527c072f5cecc6af61d4ea66deae2f76bb7a69c1798c880c715ca53b wildfire-3.1.0.ebuild 2528
+MISC ChangeLog 3214 RMD160 1d4694a51a892ff66d8bbb333ce9340543a90c15 SHA1 cf377887fd7ff7e20cb1f220acaf5ca44b046bb9 SHA256 5d465d97ad536483d92639c101a52678647543ff60a9b64002e4a80d6612df53
+MD5 bd9f4044fbe26c9a4c29f611d41905c4 ChangeLog 3214
+RMD160 1d4694a51a892ff66d8bbb333ce9340543a90c15 ChangeLog 3214
+SHA256 5d465d97ad536483d92639c101a52678647543ff60a9b64002e4a80d6612df53 ChangeLog 3214
 MISC metadata.xml 481 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 SHA1 feaf705fb8276479cc0f6cca72813eb60b3943a3 SHA256 9965da5e7c0ff80e17e7d673bb35544147e0049ddac59e8f8ba1b1d83971b9e5
 MD5 99126bebaaa8a8b18d1e1ace23623a2b metadata.xml 481
 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 metadata.xml 481
@@ -64,7 +64,7 @@ SHA256 6ef8f2b0ee3f1bd9b296bcdc739faf87c7be31495c6175f68cb2da14b57b2f8b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFNsb18zY1VwezZiERAqMOAKCg9JU3UO0VXOKNHiYgSqAVRN0YsgCeIGMh
-nMZ/TGrvlHAr9phiSVqj3yc=
-=Wnl0
+iD8DBQFFOKk88zY1VwezZiERApW+AKCCuXD2iwgFMtsUzJl36xde7rbWXgCeLyix
+Qd8tQ5oZxnqMTnFnFZ0uLU8=
+=vmv0
 -----END PGP SIGNATURE-----
diff --git a/net-im/wildfire/files/wildfire-3.1.0-for.patch b/net-im/wildfire/files/wildfire-3.1.0-for.patch
deleted file mode 100644
index b5f2ab8ce0a0..000000000000
--- a/net-im/wildfire/files/wildfire-3.1.0-for.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- wildfire_src/build/build.xml.ori	2006-10-19 01:10:50.000000000 +0100
-+++ wildfire_src/build/build.xml	2006-10-19 01:13:23.000000000 +0100
-@@ -279,7 +279,8 @@
-         <!-- Get a list of subdirs of the main plugins dir. This tells us which plugins to make.
-         <subdirinfo dir="${plugin.src.dir}" property="dirlist" ifexists="plugin.xml" except="admin"/>
- 
--        <for list="${dirlist}" param="plugin" trim="true">
-+        <taskdef classname="net.sf.antcontrib.logic.For" name="for"/>
-+	<for list="${dirlist}" param="plugin" trim="true">
-             <sequential>
-                 <xmltask source="${plugin.src.dir}/@{plugin}/plugin.xml" dest="${plugin.src.dir}/@{plugin}/plugins2.xml">
-                     <insert path="/plugin/minWildfireVersion[last()]"  position="after">
-@@ -689,7 +690,8 @@
- 
-         <!-- Pack200 processing on JAR files in lib dir -->
- 
--        <for param="jar">
-+        <taskdef classname="net.sf.antcontrib.logic.For" name="for"/>
-+	<for param="jar">
-             <path>
-                 <fileset dir="${release.out.dir}/lib" includes="*.jar" excludes="startup.jar,jdic.jar,mail.jar,activation.jar,bouncycastle.jar" />
-             </path>
-@@ -902,7 +904,8 @@
-     <target name="-plugins-impl" if="dirlist">
- 
-         <!-- For each plugin in the main src dir, call the 'buildplugin' macro -->
--        <for list="${dirlist}" param="plugin" trim="true">
-+        <taskdef classname="net.sf.antcontrib.logic.For" name="for"/>
-+	<for list="${dirlist}" param="plugin" trim="true">
-             <sequential>
-                 <buildplugin plugin="@{plugin}" pluginsrc="${plugin.src.dir}"/>
-             </sequential>
-@@ -1106,7 +1109,8 @@
-             -->
-             <property name="pack200.excludes" value="gnujaxp.jar,mail.jar,activation.jar,bouncycastle.jar"/>
- 
--            <for param="jar">
-+            <taskdef classname="net.sf.antcontrib.logic.For" name="for"/>
-+	    <for param="jar">
-                 <path>
-                     <fileset dir="${plugin.dev.dest.dir}/@{plugin}/target/lib" includes="*.jar" excludes="${pack200.excludes}"/>
-                 </path>