summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2010-02-28 12:02:54 +0000
committerVlastimil Babka <caster@gentoo.org>2010-02-28 12:02:54 +0000
commit85c8047aaf1b8d7f7dce745caea59969d41041d1 (patch)
treebb79333cc7c19f95aac4d41c0a1bd82b4c1ea81a /dev-java
parentAnd inherit multilib, since get_libname is from there, not from toolchain-fun... (diff)
downloadgentoo-2-85c8047aaf1b8d7f7dce745caea59969d41041d1.tar.gz
gentoo-2-85c8047aaf1b8d7f7dce745caea59969d41041d1.tar.bz2
gentoo-2-85c8047aaf1b8d7f7dce745caea59969d41041d1.zip
Fix building with ant 1.8.0, bug #305929.
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/ant-contrib/ChangeLog6
-rw-r--r--dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild4
-rw-r--r--dev-java/ant-contrib/ant-contrib-1.0_beta3.ebuild6
3 files changed, 10 insertions, 6 deletions
diff --git a/dev-java/ant-contrib/ChangeLog b/dev-java/ant-contrib/ChangeLog
index 1362c6e19011..d6683641bdc6 100644
--- a/dev-java/ant-contrib/ChangeLog
+++ b/dev-java/ant-contrib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/ant-contrib
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ChangeLog,v 1.35 2010/01/23 14:39:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ChangeLog,v 1.36 2010/02/28 12:02:54 caster Exp $
+
+ 28 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+ ant-contrib-1.0_beta3.ebuild:
+ Fix building with ant 1.8.0, bug #305929.
23 Jan 2010; Alexis Ballier <aballier@gentoo.org>
ant-contrib-1.0_beta3.ebuild:
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
index 9e3b334bdac0..1d789278d476 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild,v 1.8 2008/03/09 15:15:39 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild,v 1.9 2010/02/28 12:02:54 caster Exp $
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
-DESCRIPTION="The Ant-Contrib project is a collection of tasks (and at one point maybe types and other tools) for Apache Ant."
+DESCRIPTION="A collection of tasks (and at one point maybe types and other tools) for Apache Ant."
HOMEPAGE="http://ant-contrib.sourceforge.net/"
SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
LICENSE="Apache-2.0"
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta3.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta3.ebuild
index 1069f514ed3b..7d9b6dc04a78 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta3.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ant-contrib-1.0_beta3.ebuild,v 1.6 2010/01/23 14:39:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ant-contrib-1.0_beta3.ebuild,v 1.7 2010/02/28 12:02:54 caster Exp $
EAPI=1
JAVA_PKG_IUSE="doc source"
@@ -8,7 +8,7 @@ WANT_ANT_TASKS="ant-ivy"
inherit java-pkg-2 java-ant-2
-DESCRIPTION="The Ant-Contrib project is a collection of tasks (and at one point maybe types and other tools) for Apache Ant."
+DESCRIPTION="A collection of tasks (and at one point maybe types and other tools) for Apache Ant."
HOMEPAGE="http://ant-contrib.sourceforge.net/"
SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
LICENSE="Apache-2.0"
@@ -40,7 +40,7 @@ root.append(et.Element('path',id='compile.classpath'))
skip=['resolve','classpath']
for target in tree.getiterator("target"):
if target.attrib['name'] in skip:
- target.attrib['if'] = 'true'
+ target.attrib['if'] = 'false'
tree.write('build.xml')
EOF