RESTRICT test because they fail.

Package-Manager: portage-2.1.4.4

diff --git a/dev-java/jaxme/Manifest b/dev-java/jaxme/Manifest
index df40bca1f8f2ce4777d5a3299ae056e572b7e4fa..88ef8485086912839f29cb4351ef4ca100e6d7a2 100644 (file)
--- a/dev-java/jaxme/Manifest
+++ b/dev-java/jaxme/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX jaxme-0.3.1-base64.diff 1197 RMD160 c6dab9441ee23f0d6977842379ce4801450bef21 SHA1 5e06765d5dcdc921b5d2be107c9dfe2c417c546c SHA256 47e26e354f17af945728c70ea5a5c715f7f373e46a59a0a4567f12c63127fbde
 AUX jaxme-0.3.1-gentoo.patch 1771 RMD160 2c4d51b162bb87599e7c50b28bfd99dee37e5d96 SHA1 b5bc9691a0ba611e2f46b5bf854442b016cd0e2d SHA256 833974df6973940936e74919c9629bc17138805bf4dd54d53916334bb01c91fa
 DIST ws-jaxme-0.3.1-src.tar.gz 3058903 RMD160 cd994b5fd9a15473ed7390b8911601b794f76cd0 SHA1 4ba5fd76cbda407c0b32af2e3235dab66a8b0a00 SHA256 9f02b233849ec10cda455c51d5bda46929f5fcbed237c5a5a760a19eb59e852c
-EBUILD jaxme-0.3.1-r4.ebuild 2192 RMD160 0ddc0776bcdffd59dafdb2206148103d9cd68183 SHA1 d64e182a55db1e9c5a0ae7a2ea1ed31a8ee3455a SHA256 fea8a70bffab2fb973391226400b6ff98a04382627daa66412a638df05aaca7e
+EBUILD jaxme-0.3.1-r4.ebuild 2370 RMD160 f216f440952e1723038ef06059674a2f93370e5a SHA1 c72383ed4d14a890459ffddaeabf4fe61c4bf2d5 SHA256 1e2912b7aaa1643fa274c89766dcd38508e3fe8fa8265f6486b1ac63b729cae5
 MISC ChangeLog 3858 RMD160 5d715040d6670ff6a648c56198e4f3a4fe1a3952 SHA1 2f67c587042f8b87679699a1b9e78976746a98bb SHA256 e13b7b27096ab40c49a3d6cb660c9147b0f705b8551fee196936ea0c5b3ab4e6
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH1ay+cxLzpIGCsLQRAmMMAJ4z2vAv6YDxob76US5l0Ik7wGRXQQCeOqRM
+043mk3nWI9HvRRPCXdQAQG8=
+=L1JP
+-----END PGP SIGNATURE-----

diff --git a/dev-java/jaxme/jaxme-0.3.1-r4.ebuild b/dev-java/jaxme/jaxme-0.3.1-r4.ebuild
index 9136ded51b3d91bdb19a5972c22becb3796f75cd..642fd4a1a346ede49719552463ebe8a075b1963c 100644 (file)
--- a/dev-java/jaxme/jaxme-0.3.1-r4.ebuild
+++ b/dev-java/jaxme/jaxme-0.3.1-r4.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/jaxme/jaxme-0.3.1-r4.ebuild,v 1.3 2008/01/10 09:51:13 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.3.1-r4.ebuild,v 1.4 2008/03/10 21:48:41 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -27,6 +27,7 @@ COMMON_DEP="
 RDEPEND=">=virtual/jre-1.4
        ${COMMON_DEP}"
 # FIXME doesn't like to compile with Java 1.6
+# test? ( dev-java/ant-junit )
 DEPEND="|| (
                =virtual/jdk-1.5*
                =virtual/jdk-1.4*
@@ -38,6 +39,9 @@ S="${WORKDIR}/${MY_P}"
 # We do it later
 JAVA_PKG_BSFIX="off"
 
+# They fail atm. Our version is outdated so let's see how new versions do
+RESTRICT="test"
+
 src_unpack() {
        unpack ${A}
 
@@ -48,8 +52,9 @@ src_unpack() {
        epatch "${FILESDIR}/${P}-base64.diff"
 
        java-pkg_filter-compiler jikes
+       rm -v src/documentation/lib/*.jar || die
        cd "${S}/prerequisites"
-       rm *.jar
+       rm -v *.jar || die
        java-pkg_jarfrom junit
        java-pkg_jarfrom log4j log4j.jar log4j-1.2.8.jar
        java-pkg_jarfrom gnu-crypto gnu-crypto.jar
@@ -69,9 +74,8 @@ src_unpack() {
        done
 }
 
-src_compile() {
-       eant $(use_doc -Dbuild.apidocs=dist/doc/api javadoc) jar
-}
+EANT_EXTRA_ARGS="-Dbuild.apidocs=dist/doc/api"
+EANT_TEST_ANT_TASKS="hsqldb"
 
 src_install() {
        java-pkg_dojar dist/*.jar