summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2007-05-16 19:47:46 +0000
committerVlastimil Babka <caster@gentoo.org>2007-05-16 19:47:46 +0000
commit203f29c05e7484f93db60e743e76a34ba9994152 (patch)
treef90f6d001ee37b134b5157cd3e297863074437a2 /net-im
parent- make rebind and elfls 64bit aware when compiled on 64bit hosts (diff)
downloadgentoo-2-203f29c05e7484f93db60e743e76a34ba9994152.tar.gz
gentoo-2-203f29c05e7484f93db60e743e76a34ba9994152.tar.bz2
gentoo-2-203f29c05e7484f93db60e743e76a34ba9994152.zip
Migrate to split-ant wrt ant-contrib use, upstream now supports ant 1.7.0 - fixes bug #176445. Allow compilation with 1.6 JDK as it's now also supported. Don't call plugins-dev target because it fails and doesn't seem to do anything useful.
(Portage version: 2.1.2.7)
Diffstat (limited to 'net-im')
-rw-r--r--net-im/openfire/ChangeLog8
-rw-r--r--net-im/openfire/openfire-3.3.0.ebuild15
2 files changed, 14 insertions, 9 deletions
diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog
index 70da0c37a6f6..33897e78d8fc 100644
--- a/net-im/openfire/ChangeLog
+++ b/net-im/openfire/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-im/openfire
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.3 2007/05/08 22:46:00 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.4 2007/05/16 19:47:46 caster Exp $
+
+ 16 May 2007; Vlastimil Babka <caster@gentoo.org> openfire-3.3.0.ebuild:
+ Migrate to split-ant wrt ant-contrib use, upstream now supports ant 1.7.0 -
+ fixes bug #176445. Allow compilation with 1.6 JDK as it's now also
+ supported. Don't call plugins-dev target because it fails and doesn't seem
+ to do anything useful.
08 May 2007; Marius Mauch <genone@gentoo.org> openfire-3.3.0.ebuild:
Replacing einfo with ewarn
diff --git a/net-im/openfire/openfire-3.3.0.ebuild b/net-im/openfire/openfire-3.3.0.ebuild
index 28d79480478c..be0a3708909c 100644
--- a/net-im/openfire/openfire-3.3.0.ebuild
+++ b/net-im/openfire/openfire-3.3.0.ebuild
@@ -1,7 +1,9 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.3.0.ebuild,v 1.2 2007/05/08 22:46:00 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.3.0.ebuild,v 1.3 2007/05/16 19:47:46 caster Exp $
+# because of ant-contrib
+WANT_SPLIT_ANT=true
inherit eutils java-pkg-2 java-ant-2
DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
@@ -18,14 +20,10 @@ IUSE="doc"
# For transports
PROVIDE="virtual/jabber-server"
-RDEPEND=" >=virtual/jre-1.5 "
-# Doesn't build against Java 1.6 due to changes in JDBC API
+RDEPEND=">=virtual/jre-1.5"
DEPEND="net-im/jabber-base
- =virtual/jdk-1.5*
- >=dev-java/ant-1.6
- <dev-java/ant-1.7
dev-java/ant-contrib
- >=dev-java/commons-net-1.4"
+ >=virtual/jdk-1.5"
S=${WORKDIR}/${PN//-/_}_src
@@ -52,7 +50,8 @@ src_compile() {
# Jikes doesn't support -source 1.5
java-pkg_filter-compiler jikes
- eant -f build/build.xml openfire plugins plugins-dev $(use_doc)
+ ANT_TASKS="ant-contrib"
+ eant -f build/build.xml openfire plugins $(use_doc)
}
src_install() {