diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2010-03-19 09:16:22 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2010-03-19 09:16:22 +0000 |
| commit | 223f553c09d2dbaab8017852a1713860361a44d0 (patch) | |
| tree | 77931b6298855853fdbe4ba9bc72e7d034672592 /dev-java | |
| parent | amd64 stable, bug 308379 (diff) | |
| download | gentoo-2-223f553c09d2dbaab8017852a1713860361a44d0.tar.gz gentoo-2-223f553c09d2dbaab8017852a1713860361a44d0.tar.bz2 gentoo-2-223f553c09d2dbaab8017852a1713860361a44d0.zip | |
Add upstream svn patches to fix ant -diagnostics without xerces/xalan and workaround for sigbus with gcj. Upstream bugs #48782 and #48894.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/ant-core/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-java/ant-core/ant-core-1.8.0-r2.ebuild (renamed from dev-java/ant-core/ant-core-1.8.0.ebuild) | 15 |
2 files changed, 17 insertions, 7 deletions
diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog index da29addfbe7e..556b36cba7ed 100644 --- a/dev-java/ant-core/ChangeLog +++ b/dev-java/ant-core/ChangeLog @@ -1,11 +1,18 @@ # ChangeLog for dev-java/ant-core # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.102 2010/02/28 14:35:43 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.103 2010/03/19 09:16:22 caster Exp $ # Ant-core blocks lower/older versions of ant-tasks, # since it will not run when there is a version mismatch betwean the 2 packages # Please unemerge ant-tasks when updating ant-core. +*ant-core-1.8.0-r2 (19 Mar 2010) + + 19 Mar 2010; Vlastimil Babka <caster@gentoo.org> -ant-core-1.8.0.ebuild, + +ant-core-1.8.0-r2.ebuild: + Add upstream svn patches to fix ant -diagnostics without xerces/xalan and + workaround for sigbus with gcj. Upstream bugs #48782 and #48894. + *ant-core-1.8.0-r1 (28 Feb 2010) *ant-core-1.7.1-r5 (28 Feb 2010) diff --git a/dev-java/ant-core/ant-core-1.8.0.ebuild b/dev-java/ant-core/ant-core-1.8.0-r2.ebuild index 3f4317813bae..fe13c3423703 100644 --- a/dev-java/ant-core/ant-core-1.8.0.ebuild +++ b/dev-java/ant-core/ant-core-1.8.0-r2.ebuild @@ -1,26 +1,26 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.8.0.ebuild,v 1.1 2010/02/21 00:34:34 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.8.0-r2.ebuild,v 1.1 2010/03/19 09:16:22 caster Exp $ -EAPI="2" +EAPI="3" # don't depend on itself JAVA_ANT_DISABLE_ANT_CORE_DEP=true # rewriting build.xml files for the testcases has no reason atm JAVA_PKG_BSFIX_ALL=no JAVA_PKG_IUSE="doc source" -inherit java-pkg-2 java-ant-2 +inherit eutils java-pkg-2 java-ant-2 prefix MY_P="apache-ant-${PV}" DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files." HOMEPAGE="http://ant.apache.org/" SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2 - mirror://gentoo/ant-${PV}-gentoo.tar.bz2" + mirror://gentoo/ant-${PV}-gentoo-r2.tar.bz2" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" DEPEND=">=virtual/jdk-1.4 @@ -34,6 +34,9 @@ src_prepare() { # remove bundled xerces rm -v lib/*.jar || die + EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches/" + eprefixify "${WORKDIR}/ant" + # use our split-ant build.xml mv -f "${WORKDIR}/build.xml" . || die @@ -78,7 +81,7 @@ src_install() { doins -r dist/etc dosym /usr/share/${PN}/etc /usr/share/ant/etc - echo "ANT_HOME=\"/usr/share/ant\"" > "${T}/20ant" + echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant" doenvd "${T}/20ant" || die "failed to install env.d file" dodoc NOTICE README WHATSNEW KEYS || die |