patch by nicho

(Portage version: 2.1.1_pre2-r1)

3 files changed, 36 insertions, 14 deletions

diff --git a/net-im/wildfire/ChangeLog b/net-im/wildfire/ChangeLog
index f83886bda0bf..5311bef93977 100644
--- a/net-im/wildfire/ChangeLog
+++ b/net-im/wildfire/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/wildfire
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/ChangeLog,v 1.4 2006/07/04 13:50:47 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/ChangeLog,v 1.5 2006/07/04 16:20:55 humpback Exp $
+
+  04 Jul 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/wildfire-3.0.0-for.patch, wildfire-3.0.0.ebuild:
+  Added a patch by nicho to solve some build issues. Also some cleanups.
 
 *wildfire-3.0.0 (04 Jul 2006)
 *wildfire-2.6.2-r2 (04 Jul 2006)
diff --git a/net-im/wildfire/files/wildfire-3.0.0-for.patch b/net-im/wildfire/files/wildfire-3.0.0-for.patch
new file mode 100644
index 000000000000..0a01114824ff
--- /dev/null
+++ b/net-im/wildfire/files/wildfire-3.0.0-for.patch
@@ -0,0 +1,20 @@
+Only in wildfire_src-patched/build: .build.xml.swp
+diff -ru wildfire_src/build/build.xml wildfire_src-patched/build/build.xml
+--- wildfire_src/build/build.xml	2006-06-29 20:19:49.000000000 -0500
++++ wildfire_src-patched/build/build.xml	2006-07-04 09:42:58.000000000 -0500
+@@ -904,6 +904,7 @@
+     <target name="-plugins-impl" if="dirlist">
+ 
+         <!-- For each plugin in the main src dir, call the 'buildplugin' macro -->
++	<taskdef classname="net.sf.antcontrib.logic.For" name="for"/> 
+         <for list="${dirlist}" param="plugin" trim="true">
+             <sequential>
+                 <buildplugin plugin="@{plugin}" pluginsrc="${plugin.src.dir}"/>
+@@ -922,6 +923,7 @@
+     <target name="-plugin-impl-dev-build" if="dirlist2">
+ 
+         <!-- For each list of plugins in the dev dir call the 'buildplugin' macro -->
++	<taskdef classname="net.sf.antcontrib.logic.For" name="for"/> 
+         <for list="${dirlist2}" param="plugin" trim="true">
+             <sequential>
+                 <buildplugin plugin="@{plugin}" pluginsrc="${plugin.dev.dir}"/>
diff --git a/net-im/wildfire/wildfire-3.0.0.ebuild b/net-im/wildfire/wildfire-3.0.0.ebuild
index 5a4fcaebc5db..c720106503e0 100644
--- a/net-im/wildfire/wildfire-3.0.0.ebuild
+++ b/net-im/wildfire/wildfire-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/wildfire-3.0.0.ebuild,v 1.1 2006/07/04 13:50:47 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/wildfire-3.0.0.ebuild,v 1.2 2006/07/04 16:20:55 humpback Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -19,28 +19,26 @@ IUSE="doc"
 PROVIDE="virtual/jabber-server"
 
 RDEPEND=" >=virtual/jre-1.5 "
+# Doesn't build against Java 1.6 due to changes in JDBC API
 DEPEND="net-im/jabber-base
-		>=virtual/jdk-1.5
+		=virtual/jdk-1.5*
 		dev-java/ant
 		>=dev-java/commons-net-1.4"
 
 S=${WORKDIR}/${PN//-/_}_src
 
+ant_src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-for.patch
+	# TODO should replace jars in build/lib with ones packaged by us -nichoj
+}
 
 src_compile() {
-	java-pkg_ensure-vm-version-sufficient 1.5
-	#I am preaty shure it does not work with jikes as jikes
-	#gives an error about: Error: "-source" only recognizes Java releases 1.3
-	#(JLS 2 features) and 1.4 (assert statement).
+	# Jikes doesn't support -source 1.5
 	java-pkg_filter-compiler jikes
 
-	eant -f build/build.xml || die
-	eant -f build/build.xml jar || die
-
-	einfo
-	einfo "Building plugins..."
-	einfo
-	eant -f build/build.xml plugins || die
+	eant -f build/build.xml jar plugins $(use_doc)
 }
 
 src_install() {