summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2008-12-11 12:44:33 +0000
committerVlastimil Babka <caster@gentoo.org>2008-12-11 12:44:33 +0000
commitb6f188675e922fff6c65109a495f1cc2d21a1455 (patch)
tree365237ff1db839df120d18675526f7d4f2f8c0cd /dev-java/ant-core
parentUpdating icon cache after installation, bug 250534 (diff)
downloadhistorical-b6f188675e922fff6c65109a495f1cc2d21a1455.tar.gz
historical-b6f188675e922fff6c65109a495f1cc2d21a1455.tar.bz2
historical-b6f188675e922fff6c65109a495f1cc2d21a1455.zip
Fix building with gcj-jdk.
Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27-gentoo-r1-perfctr x86_64
Diffstat (limited to 'dev-java/ant-core')
-rw-r--r--dev-java/ant-core/ChangeLog5
-rw-r--r--dev-java/ant-core/Manifest4
-rw-r--r--dev-java/ant-core/ant-core-1.7.1-r2.ebuild6
3 files changed, 9 insertions, 6 deletions
diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index eddf9c1de607..200034e81b8f 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for dev-java/ant-core
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.86 2008/11/09 00:19:14 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.87 2008/12/11 12:44:33 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.
+ 11 Dec 2008; Vlastimil Babka <caster@gentoo.org> ant-core-1.7.1-r2.ebuild:
+ Fix building with gcj-jdk.
+
*ant-core-1.7.1-r2 (09 Nov 2008)
09 Nov 2008; Vlastimil Babka <caster@gentoo.org> +files/1.7.1-ant-r1,
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 98c2d4a5191f..2d8831265f71 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -10,6 +10,6 @@ EBUILD ant-core-1.7.0-r1.ebuild 2587 RMD160 948138f4244d6eeab41d8d0c6960498f01e1
EBUILD ant-core-1.7.0-r2.ebuild 2647 RMD160 91738c8636b2c3f78792eac2f2837fc7308df125 SHA1 70e7a762443c0056ebffe884cc5d222fb5f3dd44 SHA256 b87ca01ec3f9255ca6bbe19471919b32ee73fb2d9f139e39a126eb42bccaedc9
EBUILD ant-core-1.7.0.ebuild 2552 RMD160 418c8d927107524c849e1d0ff12861448ef77309 SHA1 2f8509ec164c3d70d9bd5482dbdc2c7038ea9f24 SHA256 607185bb6d56d749d32b38dc740db00f498bafe04656127a582d329304995e4a
EBUILD ant-core-1.7.1-r1.ebuild 2784 RMD160 27a9ffe314536c812577b73312178df543ec0a9f SHA1 5076398f0441cfd93ef00a105037954c06f1212b SHA256 8633fd7d974677e923b062e23a36fab61a7d30acdbaf7783dd13b51279da3319
-EBUILD ant-core-1.7.1-r2.ebuild 2787 RMD160 63bfca31436af61c61613c58e1d27ec003676f79 SHA1 90dc1f8beb755f950bef0f7b6361b897aa8d63b5 SHA256 3ab4497bae0c875387516d16ea9c7403e22c6be4d8591b936d1ed03f4c7232ec
-MISC ChangeLog 26405 RMD160 8d103df6d136a8bb3949f0391415be89c58e8f20 SHA1 33306fa879bea842d904b28cf361694d87f4995a SHA256 6b55a478d59083a96042cbc87fe81daf900d708d1b70fffa77ddd394f4179e64
+EBUILD ant-core-1.7.1-r2.ebuild 2817 RMD160 5dcddb2aae51ce28964c8ddc1ce121d87bc18810 SHA1 f7d8926b02babd69b9770116efe6b12fce59c997 SHA256 a5b72365eaa3cfb952e6319e27eb651e881d65331e7e40f185e6d3fd38f67f67
+MISC ChangeLog 26512 RMD160 dcfc092686fd8a4af8bd85f22c8990b646165668 SHA1 983642b519f0ab0350577a817717b925dfd7d93a SHA256 4a70c08ec4230e4175b52a1be3a7360a6ceaaee378d79527a4480e15f84ff629
MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
diff --git a/dev-java/ant-core/ant-core-1.7.1-r2.ebuild b/dev-java/ant-core/ant-core-1.7.1-r2.ebuild
index 8f742ea1388a..f3e37e7252a6 100644
--- a/dev-java/ant-core/ant-core-1.7.1-r2.ebuild
+++ b/dev-java/ant-core/ant-core-1.7.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 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.7.1-r2.ebuild,v 1.1 2008/11/09 00:19:14 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.7.1-r2.ebuild,v 1.2 2008/12/11 12:44:33 caster Exp $
# don't depend on itself
JAVA_ANT_DISABLE_ANT_CORE_DEP=true
@@ -55,8 +55,8 @@ src_compile() {
bsyscp="-Dbuild.sysclasspath=ignore"
fi
- ./build.sh ${bsyscp} jars-core internal_dist $(use_doc javadocs) \
- || die "build failed"
+ CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars-core internal_dist \
+ $(use_doc javadocs) || die "build failed"
}
src_install() {