diff options
author | Gustavo Felisberto <humpback@gentoo.org> | 2006-07-04 16:20:55 +0000 |
---|---|---|
committer | Gustavo Felisberto <humpback@gentoo.org> | 2006-07-04 16:20:55 +0000 |
commit | 9d936e5527c2fb8dd5cb5ca0a4ec7d16281fb50e (patch) | |
tree | 269da70de86eae305040ead07c37bf11329b2917 /net-im | |
parent | mask changed on xulrunner (diff) | |
download | historical-9d936e5527c2fb8dd5cb5ca0a4ec7d16281fb50e.tar.gz historical-9d936e5527c2fb8dd5cb5ca0a4ec7d16281fb50e.tar.bz2 historical-9d936e5527c2fb8dd5cb5ca0a4ec7d16281fb50e.zip |
patch by nicho
Package-Manager: portage-2.1.1_pre2-r1
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/wildfire/ChangeLog | 6 | ||||
-rw-r--r-- | net-im/wildfire/Manifest | 26 | ||||
-rw-r--r-- | net-im/wildfire/files/wildfire-3.0.0-for.patch | 20 | ||||
-rw-r--r-- | net-im/wildfire/wildfire-3.0.0.ebuild | 24 |
4 files changed, 51 insertions, 25 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/Manifest b/net-im/wildfire/Manifest index b69d3864e3ca..f7ffaa54c1fb 100644 --- a/net-im/wildfire/Manifest +++ b/net-im/wildfire/Manifest @@ -9,20 +9,24 @@ AUX init.d/wildfire 748 RMD160 26b18cf4fc0399ab2cf23abea4cbaa21e98b4a80 SHA1 822 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 1058 RMD160 aedf8e8df6b2dbc101e77a784e5c7af027d9e5d4 SHA1 e3fa8498d3732161539d773ab0397c8e1a0ec97d SHA256 207d13d4a0f2b169f34f6c9d127388a6f72d76ef909d7931d81f600160525cbd +MD5 3355d016ecb280ccf1a7ba62615082df files/wildfire-3.0.0-for.patch 1058 +RMD160 aedf8e8df6b2dbc101e77a784e5c7af027d9e5d4 files/wildfire-3.0.0-for.patch 1058 +SHA256 207d13d4a0f2b169f34f6c9d127388a6f72d76ef909d7931d81f600160525cbd files/wildfire-3.0.0-for.patch 1058 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 -MISC ChangeLog 1583 RMD160 1d88d3c901d18d291b333e1d763075cf5867cd14 SHA1 a07a22dd20fe32f3a2d22e7f38098289f8d94e75 SHA256 053ed8b7bf871dae11c67a1f2c8b718bdd2b39c839cb5610a51ae2ef9971555e -MD5 9c25f9f4bd3ceab25813dfa538e8a43c ChangeLog 1583 -RMD160 1d88d3c901d18d291b333e1d763075cf5867cd14 ChangeLog 1583 -SHA256 053ed8b7bf871dae11c67a1f2c8b718bdd2b39c839cb5610a51ae2ef9971555e ChangeLog 1583 +EBUILD wildfire-3.0.0.ebuild 2119 RMD160 12a5d45ee2e15dc3d73dc82ece8fe9b91e1f9409 SHA1 3f118557c74b15be408cbc29e055a6a67b733d94 SHA256 04c3a48b37cf4d6384cdaf5e884cfb5f8230d9049bce32a5e6f8f6683463044a +MD5 3e5bd8a81fad767daae0c180d2ff4322 wildfire-3.0.0.ebuild 2119 +RMD160 12a5d45ee2e15dc3d73dc82ece8fe9b91e1f9409 wildfire-3.0.0.ebuild 2119 +SHA256 04c3a48b37cf4d6384cdaf5e884cfb5f8230d9049bce32a5e6f8f6683463044a wildfire-3.0.0.ebuild 2119 +MISC ChangeLog 1772 RMD160 5f28bd670533b527b0656c7bffe94d902c3efce9 SHA1 f6e4486cdf62ae050d05c8f05a429f1d58b56c12 SHA256 c7d076ce9619b2800852436571e3148b41a98dbbeb873b29b8acc78171cce828 +MD5 a6ac8647e0d359cc38d180420947bab8 ChangeLog 1772 +RMD160 5f28bd670533b527b0656c7bffe94d902c3efce9 ChangeLog 1772 +SHA256 c7d076ce9619b2800852436571e3148b41a98dbbeb873b29b8acc78171cce828 ChangeLog 1772 MISC metadata.xml 481 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 SHA1 feaf705fb8276479cc0f6cca72813eb60b3943a3 SHA256 9965da5e7c0ff80e17e7d673bb35544147e0049ddac59e8f8ba1b1d83971b9e5 MD5 99126bebaaa8a8b18d1e1ace23623a2b metadata.xml 481 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 metadata.xml 481 @@ -36,7 +40,7 @@ SHA256 55b90002daef0a1f334c821944810e63635e08fcc2cba98900e16f75de9cbb9a files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEqnQF8zY1VwezZiERAknVAJ9eNChtisfpv39DHpV/e/1yPLGvmACdH7xV -Dl+/yHxNpGp+/rK9NmvOGIU= -=/X7d +iD8DBQFEqpWA8zY1VwezZiERAhfDAJ42iC4qvDw8Es70e2OgLXygwctJqgCgn4il +3x/P0pgnb0b6Dqt4dw13Dt4= +=ZQlM -----END PGP SIGNATURE----- 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() { |