Add upstream svn patches to fix ant -diagnostics without xerces/xalan and workaround for sigbus with gcj. Upstream bugs #48782 and #48894.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 20 insertions, 10 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/Manifest b/dev-java/ant-core/Manifest
index af52d616c3f9..5d7f74428a7e 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,12 +1,12 @@
 DIST ant-1.7.1-gentoo-r1.tar.bz2 17259 RMD160 8286750e7a8c3d12b21bbf453a566302209c166f SHA1 6853208f0641db5a3b30d00ae3cca4defb6ca1fa SHA256 f0a395c56445a794e1715ea91429596b785310f0ad8c055d21438c78338fd13c
 DIST ant-1.7.1-gentoo-r2.tar.bz2 19360 RMD160 6b70ee7db0a8ef5b358103b6236485b6d749ac6e SHA1 df1a4198dc36abb1b08aecf291f31517258da186 SHA256 21f5b949ca2f177f8dbbe72419a70ddc017c4abbfea67af4a829e37c0e93f03c
 DIST ant-1.8.0-gentoo-r1.tar.bz2 15287 RMD160 94129189dfe9524303423be2b7cb2fdd603eafa6 SHA1 bed437ab8ba870bb2f8ecff467d10eeb4707d5db SHA256 772136465912518e417e237bea62c331ad71c6b92a9f95000fbc77a1a623ffb9
-DIST ant-1.8.0-gentoo.tar.bz2 13993 RMD160 7cb9e22b7d6a5648e00ba8954fb8ffe61a02f0f4 SHA1 85b3187e80ee8e96aaf3bfb756ce00c2da6eaaba SHA256 12edd6ccfe9f4add90024e82ba1fc6dda141a04d97d800b860347c3d21007acb
+DIST ant-1.8.0-gentoo-r2.tar.bz2 15144 RMD160 28764cc9867b63336316b3795d58cd2393375606 SHA1 d679682cca96e51c00e564282f0757d6d9fd9f83 SHA256 4e20d8a99060fc094c47fed13ddf3cb7d6e8c118d2acd3a7c9a7d7e2456336ac
 DIST apache-ant-1.7.1-src.tar.bz2 6979386 RMD160 09ff510a9801c734689db23e66ccf353b7361824 SHA1 8a468d3ce1e84739a78f779770416a8bd502eaf5 SHA256 4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6
 DIST apache-ant-1.8.0-src.tar.bz2 7122981 RMD160 8cabc5302330b5321a33e7da416de1df3627287a SHA1 f7bb4c58967cebd499b250bda0ae862d496260e1 SHA256 b1da647175784c9e0113b8e76643c89123396b5f1d0ad54417390a92e02e6786
 EBUILD ant-core-1.7.1-r4.ebuild 2915 RMD160 7bc3ae4fb02a10a27ede4dce37506d12b4d250db SHA1 1e1485aec5f8e75db694c48f73b07363e3dcb75f SHA256 bcbbf9c1d14b84de6bebd949f95cc2c32dae7ffe82c911756d5c770d31497110
 EBUILD ant-core-1.7.1-r5.ebuild 3057 RMD160 41c31655cfb44bf8226644b985cd5a84d6ab442f SHA1 1baed01e724ed18f2030080e2fb5c984575956c5 SHA256 c28ce76f105ab8358358d65e39f587132f0902dc1a6dacb840c723861e5e0c08
 EBUILD ant-core-1.8.0-r1.ebuild 3059 RMD160 bede6dd0ee7b495af28ee82ffed89074e48add29 SHA1 63a05ee6e0aade5d7469223c76d6eb4b2b5441e2 SHA256 d6c2beacd648a7258c63c00dc661aa53f6118eff62774b6e833959a647e5e452
-EBUILD ant-core-1.8.0.ebuild 2811 RMD160 fc878251a1d83ef90508a9e0bb0b1e409b04c22a SHA1 f3444cddab3c257bb62df4dd5575bac17d22eaba SHA256 6eeb816d5cf1fd8263e3bd79e9ae1cb72d06a8e148106374dca635e90fadbbfc
-MISC ChangeLog 29059 RMD160 2608fe8bb1cc1a82c02ff55687c52263e3e3c723 SHA1 a2783b1dea66b63a51324a33230d610beed9a67f SHA256 aeceb070756b4883b7514d295e6900110332fe03c0424e9755931e1a58ff823b
+EBUILD ant-core-1.8.0-r2.ebuild 3059 RMD160 aac4d55fb55b0ebe28ec5ab6e5dbaa7aaf81e73b SHA1 2427bb66c9ef250e8212f64875e60688d7c5a5bb SHA256 9a31181351ae5e958f4734042a597fb1ff8c6be425b03ee099e166faa498efc6
+MISC ChangeLog 29341 RMD160 5d69dd16d04b8b0571e1f1341f2169b023a19e4b SHA1 595c8a1d6cd6ff406122ce2b8e17e1d9edc56457 SHA256 e70737c7389b25a8718cef47389382596f55b89f714359c2efde2048a9e85fe4
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
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