Switch to java-pkg_dojavadoc, add the source use flag and disable unit tests because...

Package-Manager: portage-2.1.2.2

diff --git a/dev-java/jgroups/ChangeLog b/dev-java/jgroups/ChangeLog
index 55f5a4f22c5864aff8f7dc352ddc958c6c3ac0d4..9442080682896af5ed600d97910dd7e07781ee3b 100644 (file)
--- a/dev-java/jgroups/ChangeLog
+++ b/dev-java/jgroups/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jgroups
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/ChangeLog,v 1.14 2006/10/25 03:09:24 nichoj Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/ChangeLog,v 1.15 2007/03/17 13:13:53 betelgeuse Exp $
+
+  17 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
+  jgroups-2.2.7-r2.ebuild:
+  Switch to java-pkg_dojavadoc, add the source use flag and disable unit tests
+  because a lot of them fail.
 
   25 Oct 2006; Joshua Nichols <nichoj@gentoo.org> jgroups-2.2.7-r2.ebuild:
   Fixed failure with USE=doc, bug #152281. Cleanups for how it was migrated.

diff --git a/dev-java/jgroups/Manifest b/dev-java/jgroups/Manifest
index c4d274af097a730fb2f79bb30bb8d6ad0c38bb79..cc091fe37fc2046c0257f854d0a1114c17b2a3b2 100644 (file)
--- a/dev-java/jgroups/Manifest
+++ b/dev-java/jgroups/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST JGroups-2.2.7.src.zip 4294564 RMD160 a04e4b2ee7ab93abe9e5eba13ac3fc19a37a923c SHA1 4709efb6c36173655ea23e475d502f15607ae3b2 SHA256 2d2ab93c7a9f0e5bb9cad9c99b1636e99295b177b65c26145df82b91c5ca208e
 EBUILD jgroups-2.2.7-r1.ebuild 1497 RMD160 ad859186c1f77d5fbbb90cb00f32b040404164ec SHA1 ac0338d522995db9e003e7915c910b0d16c0cafb SHA256 d30da2395ab05e85fa779dc929ce5ba961b1fc3dbf3b09eb078b6547d0eaa21e
 MD5 1cdde47cdabeff2ab39f18fafda9470d jgroups-2.2.7-r1.ebuild 1497
 RMD160 ad859186c1f77d5fbbb90cb00f32b040404164ec jgroups-2.2.7-r1.ebuild 1497
 SHA256 d30da2395ab05e85fa779dc929ce5ba961b1fc3dbf3b09eb078b6547d0eaa21e jgroups-2.2.7-r1.ebuild 1497
-EBUILD jgroups-2.2.7-r2.ebuild 1553 RMD160 9f0d442559333150d6a375d5541e521781d04272 SHA1 7fcc29f06d598d259e911be0024fb0c5c70f6544 SHA256 c94f3fd8c571f03caa3580dab4a6e60c835239e1d805bca79e04e1241b85f893
-MD5 edbdae84fb9faa93e0babf38613b0230 jgroups-2.2.7-r2.ebuild 1553
-RMD160 9f0d442559333150d6a375d5541e521781d04272 jgroups-2.2.7-r2.ebuild 1553
-SHA256 c94f3fd8c571f03caa3580dab4a6e60c835239e1d805bca79e04e1241b85f893 jgroups-2.2.7-r2.ebuild 1553
-MISC ChangeLog 2058 RMD160 925844d71b8298dbe34d31fedc3c301c1b59b3d3 SHA1 7eff5afec5e1444a6376c821f12adf89e0e59729 SHA256 b07f99ebe462ab1d72f553f74e1dcb8e76e45ae4deebe91b12dbfb1476e42dec
-MD5 1f8a4cadef5e7b23ceaf0defe7e0d104 ChangeLog 2058
-RMD160 925844d71b8298dbe34d31fedc3c301c1b59b3d3 ChangeLog 2058
-SHA256 b07f99ebe462ab1d72f553f74e1dcb8e76e45ae4deebe91b12dbfb1476e42dec ChangeLog 2058
+EBUILD jgroups-2.2.7-r2.ebuild 1495 RMD160 1ee855d8fd8861915fbf419710314b03908695ff SHA1 50f5b72368289f3de347b986ca818f294cd7da49 SHA256 632564f2e012ebf3d7798f705e421785fe78de430bbb2200a066248ef5cfe523
+MD5 92862435fafeca722d3fa82d9be21fe3 jgroups-2.2.7-r2.ebuild 1495
+RMD160 1ee855d8fd8861915fbf419710314b03908695ff jgroups-2.2.7-r2.ebuild 1495
+SHA256 632564f2e012ebf3d7798f705e421785fe78de430bbb2200a066248ef5cfe523 jgroups-2.2.7-r2.ebuild 1495
+MISC ChangeLog 2252 RMD160 c6ae17c51743fe1c9098dd1c9b723fd9f203e795 SHA1 62a6d12c55c4ba0286451225811023a7baaff1d5 SHA256 e25378a9cc54376a25504cdffa31e31b53f536fae742fd15f8377c249b3b6c45
+MD5 58846a7ee2ab0d79f132fe08896f7b3e ChangeLog 2252
+RMD160 c6ae17c51743fe1c9098dd1c9b723fd9f203e795 ChangeLog 2252
+SHA256 e25378a9cc54376a25504cdffa31e31b53f536fae742fd15f8377c249b3b6c45 ChangeLog 2252
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -21,3 +24,10 @@ SHA256 92b28975ab315189ecd4f0e0671fcdb91c5763439077a9342819ebe5f4f31df6 files/di
 MD5 c95b83e519d1cab7a4a91744f4964425 files/digest-jgroups-2.2.7-r2 247
 RMD160 c5abb6bc98013efe3144f60dd9fa4adfc01587a5 files/digest-jgroups-2.2.7-r2 247
 SHA256 92b28975ab315189ecd4f0e0671fcdb91c5763439077a9342819ebe5f4f31df6 files/digest-jgroups-2.2.7-r2 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFF++mYcxLzpIGCsLQRArtFAKCNLZfmn2/LAZlMThu5+0h6B0qNvwCeOIPd
+nrMLFx7QyoFU9B37ZMjBT0A=
+=7/45
+-----END PGP SIGNATURE-----

diff --git a/dev-java/jgroups/jgroups-2.2.7-r2.ebuild b/dev-java/jgroups/jgroups-2.2.7-r2.ebuild
index bff5eb249a08c5a08fd9fe9f9aadd84fed12f5f3..1a06091004dee21d2e2f82ba278d472c365b5ea1 100644 (file)
--- a/dev-java/jgroups/jgroups-2.2.7-r2.ebuild
+++ b/dev-java/jgroups/jgroups-2.2.7-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/jgroups-2.2.7-r2.ebuild,v 1.2 2006/10/25 03:09:24 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/jgroups-2.2.7-r2.ebuild,v 1.3 2007/03/17 13:13:53 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -22,19 +22,13 @@ DEPEND=">=virtual/jdk-1.4
        ${RDEPEND}
        >=dev-java/ant-core-1.5
        app-arch/unzip
-       test? ( dev-java/ant )"
+       source? ( app-arch/zip )"
+#test? ( dev-java/ant )
 
-IUSE="doc source test "
+IUSE="doc source"
 
 S=${WORKDIR}/JGroups-${PV}.src
 
-pkg_setup() {
-       java-pkg-2_pkg_setup
-       if use test; then
-               ewarn "WARNING: Running unit tests can take a very long time."
-       fi
-}
-
 src_unpack() {
        unpack ${A}
        cd ${S}/lib
@@ -59,12 +53,14 @@ src_compile() {
 
 src_install() {
        java-pkg_dojar dist/jgroups-core.jar
-       dodoc doc/* CREDITS README
+       dodoc doc/* CREDITS README || die
 
        use doc && java-pkg_dojavadoc dist/javadoc
        use source && java-pkg_dosrc src/*
 }
 
+RESTRICT="test"
+# A lot of these fail
 src_test() {
        eant unittests
 }