Fixed failure with USE=doc, bug #152281. Cleanups for how it was migrated.

Package-Manager: portage-2.1.2_pre3-r4

3 files changed, 25 insertions, 21 deletions

diff --git a/dev-java/jgroups/ChangeLog b/dev-java/jgroups/ChangeLog
index 38cee5d85054..55f5a4f22c58 100644
--- a/dev-java/jgroups/ChangeLog
+++ b/dev-java/jgroups/ChangeLog
@@ -1,6 +1,9 @@
 # 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.13 2006/09/14 19:50:08 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/ChangeLog,v 1.14 2006/10/25 03:09:24 nichoj Exp $
+
+  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.
 
   14 Sep 2006; Joshua Nichols <nichoj@gentoo.org> jgroups-2.2.7-r1.ebuild:
   Removed unnecessary pkg_setup.
diff --git a/dev-java/jgroups/Manifest b/dev-java/jgroups/Manifest
index 29ccf79b9cf0..c4d274af097a 100644
--- a/dev-java/jgroups/Manifest
+++ b/dev-java/jgroups/Manifest
@@ -3,14 +3,14 @@ EBUILD jgroups-2.2.7-r1.ebuild 1497 RMD160 ad859186c1f77d5fbbb90cb00f32b04040416
 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 1641 RMD160 0157f6234ba5ebaa4ee9a5dd7fd20de8de1404f5 SHA1 90eed99a4e1699b2b34afdac98952919541d422a SHA256 7b12c6c89e758741a45aa6f14c7dccc2b43fc702b8f8516f4c64d0971d9f7720
-MD5 2ba320ea9e1a9df8bd640a53ea875619 jgroups-2.2.7-r2.ebuild 1641
-RMD160 0157f6234ba5ebaa4ee9a5dd7fd20de8de1404f5 jgroups-2.2.7-r2.ebuild 1641
-SHA256 7b12c6c89e758741a45aa6f14c7dccc2b43fc702b8f8516f4c64d0971d9f7720 jgroups-2.2.7-r2.ebuild 1641
-MISC ChangeLog 1905 RMD160 d6725e16c75570e013cb59a9b009c6424e2bd133 SHA1 23b091211e3510ed42b04cc5536bad396d32e711 SHA256 3f24b54d3a7621d4391ccca79d1473161690d586db72324e6867141120f683e2
-MD5 1550d140ade4b9abcba94a55cd83f663 ChangeLog 1905
-RMD160 d6725e16c75570e013cb59a9b009c6424e2bd133 ChangeLog 1905
-SHA256 3f24b54d3a7621d4391ccca79d1473161690d586db72324e6867141120f683e2 ChangeLog 1905
+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
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
diff --git a/dev-java/jgroups/jgroups-2.2.7-r2.ebuild b/dev-java/jgroups/jgroups-2.2.7-r2.ebuild
index 71b68493cb81..bff5eb249a08 100644
--- 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
 # 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.1 2006/08/15 10:01:18 nelchael Exp $
+# $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 $
 
 inherit java-pkg-2 java-ant-2
 
@@ -22,14 +22,17 @@ DEPEND=">=virtual/jdk-1.4
 	${RDEPEND}
 	>=dev-java/ant-core-1.5
 	app-arch/unzip
-	junit? ( dev-java/ant-tasks )"
+	test? ( dev-java/ant )"
 
-IUSE="doc junit source"
+IUSE="doc source test "
 
 S=${WORKDIR}/JGroups-${PV}.src
 
 pkg_setup() {
-	use junit && ewarn "WARNING: Running unit tests can take a long time."
+	java-pkg-2_pkg_setup
+	if use test; then
+		ewarn "WARNING: Running unit tests can take a very long time."
+	fi
 }
 
 src_unpack() {
@@ -51,19 +54,17 @@ src_unpack() {
 }
 
 src_compile() {
-	local antflags="compile-1.4 jgroups-core.jar"
-	use doc && antflags="${antflags} javadoc"
-	use junit && antflags="${antflags} unittests"
-	eant ${antflags} || die "build failed"
+	eant compile-1.4 jgroups-core.jar $(use_doc)
 }
 
 src_install() {
 	java-pkg_dojar dist/jgroups-core.jar
 	dodoc doc/* CREDITS README
 
-	if use doc ; then
-		cd dist
-		java-pkg_dohtml -r javadoc
-	fi
+	use doc && java-pkg_dojavadoc dist/javadoc
 	use source && java-pkg_dosrc src/*
 }
+
+src_test() {
+	eant unittests
+}