diff options
| author |   Serkan Kaba <serkan@gentoo.org> | 2010-11-26 20:30:38 +0000 |
|---|---|---|
| committer | Serkan Kaba <serkan@gentoo.org> | 2010-11-26 20:30:38 +0000 |
| commit | 7bd1b731df65cdd8cc6068c63876ac820189f6ae (patch) | |
| tree | dda5ec039ae762aac44e4b5d948e72568a2642a6 /dev-java | |
| parent | stable x86, security bug 346191 (diff) | |
| download | gentoo-2-7bd1b731df65cdd8cc6068c63876ac820189f6ae.tar.gz gentoo-2-7bd1b731df65cdd8cc6068c63876ac820189f6ae.tar.bz2 gentoo-2-7bd1b731df65cdd8cc6068c63876ac820189f6ae.zip | |
Fix empty jar when tests are not run. Reported in bug #346823 by Hendrik Iben <hiben@tzi.de>. Reenable docs.
(Portage version: 2.2.0_alpha2/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/commons-math/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-java/commons-math/commons-math-2.1-r1.ebuild (renamed from dev-java/commons-math/commons-math-2.1.ebuild) | 6 | ||||
| -rw-r--r-- | dev-java/commons-math/files/commons-math-2.1-r1-buildfixes.patch (renamed from dev-java/commons-math/files/commons-math-2.1-buildfixes.patch) | 2 |
3 files changed, 13 insertions, 5 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/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"/> |