diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2010-05-23 14:18:49 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2010-05-23 14:18:49 +0000 |
| commit | 962bee35424c02be57b035bc4f4cdb9c5f6bdf30 (patch) | |
| tree | 87cca7eaa52973f1c4076f807a744016fb068b04 /dev-java | |
| parent | alpha/amd64/ia64/ppc/sparc/x86 stable (bug #314567). (diff) | |
| download | gentoo-2-962bee35424c02be57b035bc4f4cdb9c5f6bdf30.tar.gz gentoo-2-962bee35424c02be57b035bc4f4cdb9c5f6bdf30.tar.bz2 gentoo-2-962bee35424c02be57b035bc4f4cdb9c5f6bdf30.zip | |
Fix tests to find junit4. They still fail. See bug #321189.
(Portage version: 2.2_rc67/cvs/Linux i686)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/cacao/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/cacao/cacao-0.99.4.ebuild | 30 |
2 files changed, 29 insertions, 6 deletions
diff --git a/dev-java/cacao/ChangeLog b/dev-java/cacao/ChangeLog index cf2e375800a4..b42716d893a1 100644 --- a/dev-java/cacao/ChangeLog +++ b/dev-java/cacao/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/cacao # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/ChangeLog,v 1.19 2010/05/16 08:43:29 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/ChangeLog,v 1.20 2010/05/23 14:18:49 betelgeuse Exp $ + + 23 May 2010; Petteri Räty <betelgeuse@gentoo.org> cacao-0.99.4.ebuild: + Fix tests to find junit4. They still fail. See bug #321189. 16 May 2010; Petteri Räty <betelgeuse@gentoo.org> cacao-0.99.4.ebuild: Update HOMEPAGE. Fixes bug #319791. diff --git a/dev-java/cacao/cacao-0.99.4.ebuild b/dev-java/cacao/cacao-0.99.4.ebuild index 1f8f7822b0b0..996334430047 100644 --- a/dev-java/cacao/cacao-0.99.4.ebuild +++ b/dev-java/cacao/cacao-0.99.4.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/cacao-0.99.4.ebuild,v 1.4 2010/05/16 08:43:30 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/cacao-0.99.4.ebuild,v 1.5 2010/05/23 14:18:49 betelgeuse Exp $ EAPI=2 +AUTOTOOLS_AUTO_DEPEND="no" -inherit eutils flag-o-matic java-vm-2 +inherit autotools eutils flag-o-matic java-pkg-2 java-vm-2 DESCRIPTION="Cacao Java Virtual Machine" HOMEPAGE="http://cacaovm.org/" @@ -12,16 +13,31 @@ SRC_URI="http://www.complang.tuwien.ac.at/cacaojvm/download/${P}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="" +IUSE="test" CLASSPATH_SLOT=0.98 -DEPEND=" +COMMON_DEPEND=" dev-java/gnu-classpath:${CLASSPATH_SLOT} app-admin/eselect-ecj " -RDEPEND="${DEPEND}" +RDEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND} + test? ( + dev-java/junit:4 + ${AUTOTOOLS_DEPEND} + ) +" CLASSPATH_DIR=/usr/gnu-classpath-${CLASSPATH_SLOT} +src_prepare() { + if use test; then + sed -ie "s:/usr/share/java/junit4.jar:$(java-config -p junit-4):" \ + ./tests/regression/bugzilla/Makefile.am \ + ./tests/regression/base/Makefile.am || die "sed failed" + eautoreconf + fi +} + src_configure() { # A compiler can be forced with the JAVAC variable if needed unset JAVAC @@ -33,6 +49,10 @@ src_configure() { --with-java-runtime-library-prefix=${CLASSPATH_DIR} } +src_compile() { + default +} + src_install() { emake DESTDIR="${D}" install || die "make install failed" dodir /usr/bin |