diff options
| -rw-r--r-- | dev-java/cacao/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/cacao/Manifest | 10 | ||||
| -rw-r--r-- | dev-java/cacao/cacao-0.99.4.ebuild | 30 |
3 files changed, 34 insertions, 11 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/Manifest b/dev-java/cacao/Manifest index 787558882139..337129986fa8 100644 --- a/dev-java/cacao/Manifest +++ b/dev-java/cacao/Manifest @@ -4,13 +4,13 @@ Hash: SHA1 AUX 0.93-no-exec-stack.patch 403 RMD160 d2bc6ca0bff8752cef513a05deb1484732d63b09 SHA1 16ae9f71bab51865325c9058a7257690bde2258d SHA256 79097e272e0250f8a40e87f2c6801f9e05e51c755b7f9b2b835c04d51f2af898 AUX cacao.env 620 RMD160 0b36b8e9d9f29ab8ec2f9480afbac27043cf9fac SHA1 b59e72357e4435eca3e4da3add7b1c1adad4bb21 SHA256 156f3291b54c372b619785624aee308ac25d5ae8666eab152db4a45a5aabdd6d DIST cacao-0.99.4.tar.bz2 2876200 RMD160 94aff00e7e9c10cd36f626e86a9ad8100a72d79b SHA1 e786a21c0f3f8fc1394e5a2a7a3e5607116760ec SHA256 1dfc4903dc0172286df4f1740fd0f12749ac81d51c602290b47cbe83d51e1d56 -EBUILD cacao-0.99.4.ebuild 2025 RMD160 8f92e6879a1e1f3ef5607e8d0714a8c1e61def1c SHA1 195f154027b5941363ea814459712b2e9db6ddef SHA256 e8bc121784b993edbb17b1397161e541d83b9533fa5230c17d5c7ae49a40e367 -MISC ChangeLog 2335 RMD160 ded652d08d4b2f0e0eafc7b42abab03779f3a540 SHA1 05114dac557ab1eef51b02cb4c58b5f18ac09e05 SHA256 d38aab4a5117d06368eb84a300d9154488892e75b8ec06140defd7d87c5fc7f3 +EBUILD cacao-0.99.4.ebuild 2429 RMD160 580894ed45b85a368de4e5cc2beeac122e45a93b SHA1 78370ed42411352f7e3c545349ee0f49abd07ff6 SHA256 509f3e60498ee4aef562bd0ca9f6d191140380764230a14555d73dc595604a67 +MISC ChangeLog 2472 RMD160 b4714c0610750202b8eca1302264e3c156cfb4c5 SHA1 e1d154d9c8d6f8583503c00fc2f1e9a11e7d8d7f SHA256 c7459ff944fa047d9f9dae569dc6777133bff5bd74212e988387aebee3efbc52 MISC metadata.xml 364 RMD160 75afe3d567961bdf4084cd1ee368785c46347158 SHA1 86a25ea9b92d0daeffffa4b15ec7cc3df97c5c68 SHA256 4d63397a708380d2d8dbd5c15b9a246c4edb9d63cf630a06d16c3533ad17ab66 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkvvsFsACgkQcxLzpIGCsLQ4+gCdG0RlaNOW0KUu0g0Lut0mULdh -QXkAn1WHm+sXAwG4jVvdmt4/EUQBjfey -=XU8J +iEYEARECAAYFAkv5OX4ACgkQcxLzpIGCsLRnuACff+/RhPt+bYilDGW+k7bYgtRp +HhoAn2VYYagVZ8qSTO56aBRuk/pDDMh2 +=8yk1 -----END PGP SIGNATURE----- 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 |