Fix empty jar when tests are not run. Reported in bug #346823 by Hendrik Iben <hiben@tzi.de>. Reenable docs.

Package-Manager: portage-2.2.0_alpha2/cvs/Linux x86_64

4 files changed, 19 insertions, 11 deletions

diff --git a/dev-java/commons-math/ChangeLog b/dev-java/commons-math/ChangeLog
index 2cac40f79349..f7b51c549d3d 100644
--- a/dev-java/commons-math/ChangeLog
+++ b/dev-java/commons-math/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/commons-math
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-math/ChangeLog,v 1.5 2010/10/26 16:28:02 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-math/ChangeLog,v 1.6 2010/11/26 20:30:38 serkan Exp $
+
+*commons-math-2.1-r1 (26 Nov 2010)
+
+  26 Nov 2010; Serkan Kaba <serkan@gentoo.org> -commons-math-2.1.ebuild,
+  +commons-math-2.1-r1.ebuild, -files/commons-math-2.1-buildfixes.patch,
+  +files/commons-math-2.1-r1-buildfixes.patch:
+  Fix empty jar when tests are not run. Reported in bug #346823 by Hendrik
+  Iben <hiben@tzi.de>. Reenable docs.
 
   26 Oct 2010; Serkan Kaba <serkan@gentoo.org>
   +files/commons-math-2.1-buildfixes.patch:
diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest
index a056a84ba944..a1577f9dd972 100644
--- a/dev-java/commons-math/Manifest
+++ b/dev-java/commons-math/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX commons-math-2.1-buildfixes.patch 752 RMD160 0bcbf5462de741fbe312b4afe65931da46fd6e01 SHA1 6d05151e6401c43ae35bc0b63f399e9530efd83d SHA256 135bcfa306fc5d836c15d0c2adcf1ece8346a23b428ddc58d17842c6923c56db
+AUX commons-math-2.1-r1-buildfixes.patch 770 RMD160 4ff4565a7d74ba67593eaac623d04652e37e0d61 SHA1 2efda1c89a9b1fa47a695052793d061d6c4318f0 SHA256 5e1c6f770f1e123f45a59c7387ad0607a92721249be74601662c90202a5f82d1
 DIST commons-math-2.0-src.tar.gz 1044286 RMD160 a66ea6d4cf5d7241244894e00a3a92e572239bcf SHA1 b250afa331a467bc3f58445a7029aaa06f216a26 SHA256 5c40855b63e5614fd68f77a45588c92ccd4af2e8162d9ebee3e33e225b04b802
 DIST commons-math-2.1-src.tar.gz 1099423 RMD160 b6a8b99f1c515a9eba8d98e2b96f15a4f644e1be SHA1 cdf298a2704bead85944c3ad96636ede43fccb3b SHA256 f31e098afa916a7f17bd8d8a15163d761ddb54c28d8d64f7f57ce86167f2c48b
 EBUILD commons-math-2.0.ebuild 1061 RMD160 93b2709fb266a9dfeeb3b5130584046c44508a7b SHA1 efa214d9a42ecf79a4d4dcdfddae376b201cb548 SHA256 3dda191af959e6a9110867264a862fdd3a33ee504218da4022b78c90918de558
-EBUILD commons-math-2.1.ebuild 1044 RMD160 12886e070415a2a5413876156930d6b95069ff81 SHA1 de8d59c2457b825a420e1fae2afc88039e2d8d1e SHA256 b285d514bff2a9050850e598e3668e245f8f7f92781dae3298f4e50d7438425f
-MISC ChangeLog 1099 RMD160 4c2da12d029a9b2e79ea5d184cc7523f8f7f9f2e SHA1 553b9647c874a77303ec9c96d9b0826f7fa718ad SHA256 0325ad37479dac6fd9d3238c1001daa8e6a80df40a313bc1121058110ce8b2c7
+EBUILD commons-math-2.1-r1.ebuild 1048 RMD160 3c6d6ce37145e857205e041ff3ca310694341478 SHA1 63941441414c8a746edccaefabfba5fc8b0bd8c4 SHA256 4d3905e1cf2d2fac303614392f601a5621c1ffe9d8fd9745ed5cf5adad03eebb
+MISC ChangeLog 1442 RMD160 31e6415d5c068b13e677eebd68d451e73737d08c SHA1 aaff4341de74454215228de026282dbc9ad8d715 SHA256 de3e679d709e7bbc97111ef6fe0c49e49666f0f170ab04ace4b97b47ea0a6487
 MISC metadata.xml 252 RMD160 39b3ff42eb070f3b0ba0602febeb9f3d6ec0daeb SHA1 f15d4fd691d5e9480a0d5f5565ef9febca15682c SHA256 68dd5ed36b7be999ccbcd7ba5f0a5e9174eb3d13bdfc715d93cbc4d2302a9f62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzHAZsACgkQRh6X64ivZaKofgCcCCcIG25KgLIbgmLsOtEY1KHF
-XNYAn1KPq7dnSyocE3lNgGFWe3vA8ydo
-=+8l5
+iEYEARECAAYFAkzwGPYACgkQRh6X64ivZaIIdQCeNpRJpYHE7yrLJtsGBuacDoLK
+lC4AnjGe/cguEA5RwnDU4tDYODc9bJOd
+=/P/Y
 -----END PGP SIGNATURE-----
diff --git a/dev-java/commons-math/commons-math-2.1.ebuild b/dev-java/commons-math/commons-math-2.1-r1.ebuild
index 436d003175f4..2abde21791e4 100644
--- a/dev-java/commons-math/commons-math-2.1.ebuild
+++ b/dev-java/commons-math/commons-math-2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-math/commons-math-2.1.ebuild,v 1.1 2010/10/24 09:09:34 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-math/commons-math-2.1-r1.ebuild,v 1.1 2010/11/26 20:30:38 serkan Exp $
 
 EAPI="3"
 
@@ -27,7 +27,7 @@ RDEPEND=">=virtual/jre-1.5"
 S="${WORKDIR}/${P}-src"
 
 java_prepare() {
-	epatch "${FILESDIR}"/${P}-buildfixes.patch
+	epatch "${FILESDIR}"/${PF}-buildfixes.patch
 }
 
 src_test() {
@@ -39,6 +39,6 @@ src_test() {
 src_install() {
 	java-pkg_newjar target/${P}.jar ${PN}.jar
 
-#	use doc && java-pkg_dojavadoc dist/docs/api
+	use doc && java-pkg_dojavadoc target/apidocs
 	use source && java-pkg_dosrc src/main/java/org
 }
diff --git a/dev-java/commons-math/files/commons-math-2.1-buildfixes.patch b/dev-java/commons-math/files/commons-math-2.1-r1-buildfixes.patch
index 5c9820902d1e..6d768969e79c 100644
--- a/dev-java/commons-math/files/commons-math-2.1-buildfixes.patch
+++ b/dev-java/commons-math/files/commons-math-2.1-r1-buildfixes.patch
@@ -13,7 +13,7 @@
  <!-- ========== Create Jar ================================================ -->
  
 -  <target name="jar" depends="test" description="Create jar file">
-+  <target name="jar" description="Create jar file">
++  <target name="jar" depends="compile" description="Create jar file">
  
      <mkdir dir="${build.home}/classes/META-INF"/>
      <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>