summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Felisberto <humpback@gentoo.org>2006-10-20 10:47:03 +0000
committerGustavo Felisberto <humpback@gentoo.org>2006-10-20 10:47:03 +0000
commit7dd95179ad4d67e8a23d6af31e0f743447eeec5b (patch)
treea6fc35fcaac2922f13de32ddab01fff78644cdab /net-im/wildfire
parentReadded the allthemes SRC_URI, due to Bernd Pachur <valirion@thybaria.de>, Bu... (diff)
downloadgentoo-2-7dd95179ad4d67e8a23d6af31e0f743447eeec5b.tar.gz
gentoo-2-7dd95179ad4d67e8a23d6af31e0f743447eeec5b.tar.bz2
gentoo-2-7dd95179ad4d67e8a23d6af31e0f743447eeec5b.zip
hopefully this fixes the build.xml isue
(Portage version: 2.1.1-r1)
Diffstat (limited to 'net-im/wildfire')
-rw-r--r--net-im/wildfire/ChangeLog8
-rw-r--r--net-im/wildfire/files/build.xml-3.1.0.bz2bin0 -> 9389 bytes
-rw-r--r--net-im/wildfire/wildfire-3.1.0.ebuild8
3 files changed, 12 insertions, 4 deletions
diff --git a/net-im/wildfire/ChangeLog b/net-im/wildfire/ChangeLog
index 01a3460376d5..fb8d5104f7ae 100644
--- a/net-im/wildfire/ChangeLog
+++ b/net-im/wildfire/ChangeLog
@@ -1,6 +1,12 @@
# 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.13 2006/10/18 13:27:09 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/ChangeLog,v 1.14 2006/10/20 10:47:03 humpback Exp $
+
+ 20 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>;
+ +files/build.xml-3.1.0.bz2, -files/wildfire-3.1.0-for.patch,
+ wildfire-3.1.0.ebuild:
+ Removed the for patch and just the include the full build.xml . Having a
+ patch has been causing LOTS of problems with dos/unix files.
18 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>;
files/digest-wildfire-3.1.0, Manifest:
diff --git a/net-im/wildfire/files/build.xml-3.1.0.bz2 b/net-im/wildfire/files/build.xml-3.1.0.bz2
new file mode 100644
index 000000000000..ca68fcb7c626
--- /dev/null
+++ b/net-im/wildfire/files/build.xml-3.1.0.bz2
Binary files differ
diff --git a/net-im/wildfire/wildfire-3.1.0.ebuild b/net-im/wildfire/wildfire-3.1.0.ebuild
index 6fff55db1cbf..2d2ded434778 100644
--- a/net-im/wildfire/wildfire-3.1.0.ebuild
+++ b/net-im/wildfire/wildfire-3.1.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.1.0.ebuild,v 1.2 2006/10/19 00:29:16 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/wildfire-3.1.0.ebuild,v 1.3 2006/10/20 10:47:03 humpback Exp $
inherit eutils java-pkg-2 java-ant-2
@@ -35,14 +35,16 @@ pkg_setup() {
ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
ewarn "echo 'CONFIG_PROTECT=\"/opt/wildfire/resources/security/\"' > /etc/env.d/98wildfire "
ewarn "For more info see bug #139708"
- sleep 11
+ #sleep 11
fi
}
src_unpack() {
unpack ${A}
cd ${S}
- epatch ${FILESDIR}/${P}-for.patch
+ cp ${FILESDIR}/build.xml-${PV}.bz2 .
+ bunzip2 build.xml-${PV}.bz2
+ mv build.xml-${PV} build/build.xml
# TODO should replace jars in build/lib with ones packaged by us -nichoj
}