rendered paste bodycvs diff: Diffing .
Index: Manifest
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/wildfire/Manifest,v
retrieving revision 1.6
diff -u -r1.6 Manifest
--- Manifest 4 Jul 2006 13:58:25 -0000 1.6
+++ Manifest 4 Jul 2006 14:52:22 -0000
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
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
@@ -9,16 +6,20 @@
MD5 8cda1f79812150c4d4f3420e13450631 files/init.d/wildfire 748
RMD160 26b18cf4fc0399ab2cf23abea4cbaa21e98b4a80 files/init.d/wildfire 748
SHA256 2b1304662f07c60a74c63b773f6c8b17d26a672b0c3336383984ba4753cd6996 files/init.d/wildfire 748
+AUX wildfire-3.0.0-for.patch 1072 RMD160 2adabfd76ca2c13cc09d312c43377d15cb9b5288 SHA1 2a30136eedfdfeecf0b3208b35ec2351fe1d0073 SHA256 04ba5936dbfbf5ce97fc6164450d9d20e20f39ece544a1bc4e0a2ba05fea147c
+MD5 7b171f5c17124106cacbbaaa04feec4a files/wildfire-3.0.0-for.patch 1072
+RMD160 2adabfd76ca2c13cc09d312c43377d15cb9b5288 files/wildfire-3.0.0-for.patch 1072
+SHA256 04ba5936dbfbf5ce97fc6164450d9d20e20f39ece544a1bc4e0a2ba05fea147c files/wildfire-3.0.0-for.patch 1072
DIST wildfire_src_2_6_2.tar.gz 11621818 RMD160 7cd86f5442f3fc4a01e1fdef8003b9e113804631 SHA1 f73c08df6a336ff803135bd166a5418839ad50f9 SHA256 9e8ff13c37934b56aee7f0471af4faa4a09e998cfec5f18a463d6282580fa1d0
DIST wildfire_src_3_0_0.tar.gz 15861124 RMD160 4a94369be80e463cf3ababb6b3cb9313607e3ee2 SHA1 a9e1357d557d777f08cc517e4368369ca903745c SHA256 86ceba2e13979cb44ca9c508ac2cd08b1dc7d46c63b5fdf57ca06281c11cf5b6
EBUILD wildfire-2.6.2-r2.ebuild 2199 RMD160 d60d97e17b40ba1d5c473cebb5f307bcabb0bd60 SHA1 bc10dd6b563953892ba6f842492db654987a9742 SHA256 9b658313025e749777d1f253ebbc8a59403cdba5d2b720b664a4c34bf2cb0fc2
MD5 6cb4e23be8e9dab063a89a90d79f5ba9 wildfire-2.6.2-r2.ebuild 2199
RMD160 d60d97e17b40ba1d5c473cebb5f307bcabb0bd60 wildfire-2.6.2-r2.ebuild 2199
SHA256 9b658313025e749777d1f253ebbc8a59403cdba5d2b720b664a4c34bf2cb0fc2 wildfire-2.6.2-r2.ebuild 2199
-EBUILD wildfire-3.0.0.ebuild 2196 RMD160 1eb3bfece3241597d866947d0b066181deb05872 SHA1 30b3976bf6c2ab629917054fdd4ad40f126523c2 SHA256 2a6f5de660970b02bb71fa0ca3c1aacdb79e8b2b333419b1e2b88a06a3860aa7
-MD5 6fd2da67b0bc4fae3bc04b3e9fc78284 wildfire-3.0.0.ebuild 2196
-RMD160 1eb3bfece3241597d866947d0b066181deb05872 wildfire-3.0.0.ebuild 2196
-SHA256 2a6f5de660970b02bb71fa0ca3c1aacdb79e8b2b333419b1e2b88a06a3860aa7 wildfire-3.0.0.ebuild 2196
+EBUILD wildfire-3.0.0.ebuild 2119 RMD160 de000729e098a4f95c26580096fe0c52b67ce7ef SHA1 cb3889c9e3e519f213ce3cf6b203134bfb99ec89 SHA256 643df4d5516a4bdfd7bdd6662f3db686be51432917a45742b210c380cfc2e3c1
+MD5 05e20a75ea9fdc1155fee0d1325f3b49 wildfire-3.0.0.ebuild 2119
+RMD160 de000729e098a4f95c26580096fe0c52b67ce7ef wildfire-3.0.0.ebuild 2119
+SHA256 643df4d5516a4bdfd7bdd6662f3db686be51432917a45742b210c380cfc2e3c1 wildfire-3.0.0.ebuild 2119
MISC ChangeLog 1583 RMD160 1d88d3c901d18d291b333e1d763075cf5867cd14 SHA1 a07a22dd20fe32f3a2d22e7f38098289f8d94e75 SHA256 053ed8b7bf871dae11c67a1f2c8b718bdd2b39c839cb5610a51ae2ef9971555e
MD5 9c25f9f4bd3ceab25813dfa538e8a43c ChangeLog 1583
RMD160 1d88d3c901d18d291b333e1d763075cf5867cd14 ChangeLog 1583
@@ -33,10 +34,3 @@
MD5 2adcb06b4d12713f190a58355997e791 files/digest-wildfire-3.0.0 262
RMD160 9fae97d3a894b60d56a6da0636e5524e527a7a88 files/digest-wildfire-3.0.0 262 SHA256 55b90002daef0a1f334c821944810e63635e08fcc2cba98900e16f75de9cbb9a files/digest-wildfire-3.0.0 262
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEqnQF8zY1VwezZiERAknVAJ9eNChtisfpv39DHpV/e/1yPLGvmACdH7xV
-Dl+/yHxNpGp+/rK9NmvOGIU=
-=/X7d
------END PGP SIGNATURE-----
Index: wildfire-3.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/wildfire/wildfire-3.0.0.ebuild,v
retrieving revision 1.1
diff -u -r1.1 wildfire-3.0.0.ebuild
--- wildfire-3.0.0.ebuild 4 Jul 2006 13:50:47 -0000 1.1
+++ wildfire-3.0.0.ebuild 4 Jul 2006 14:52:22 -0000
@@ -19,28 +19,26 @@
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() {
cvs diff: Diffing files
Index: files/wildfire-3.0.0-for.patch
===================================================================
RCS file: files/wildfire-3.0.0-for.patch
diff -N files/wildfire-3.0.0-for.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/wildfire-3.0.0-for.patch 4 Jul 2006 14:52:22 -0000
@@ -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}"/>
cvs diff: Diffing files/conf.d
cvs diff: Diffing files/init.d