From da3adab050eba083f7de9cf53b3b31b8b4a47256 Mon Sep 17 00:00:00 2001 From: Thomas Matthijs Date: Fri, 15 Jul 2005 21:11:50 +0000 Subject: style fixes (Portage version: 2.0.51.22-r1) --- dev-java/lucene/lucene-1.4.1.ebuild | 12 ++++-------- dev-java/lucene/lucene-1.4.3.ebuild | 7 +++---- 2 files changed, 7 insertions(+), 12 deletions(-) (limited to 'dev-java/lucene') diff --git a/dev-java/lucene/lucene-1.4.1.ebuild b/dev-java/lucene/lucene-1.4.1.ebuild index 61b520303ef5..6addb648501e 100644 --- a/dev-java/lucene/lucene-1.4.1.ebuild +++ b/dev-java/lucene/lucene-1.4.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-1.4.1.ebuild,v 1.5 2005/02/03 17:35:26 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-1.4.1.ebuild,v 1.6 2005/07/15 21:11:50 axxo Exp $ inherit java-pkg @@ -9,7 +9,7 @@ HOMEPAGE="http://jakarta.apache.org/lucene" SRC_URI="http://cvs.apache.org/dist/jakarta/lucene/v1.4.1/${P}-src.tar.gz" LICENSE="Apache-1.1" SLOT="1" -KEYWORDS="x86 ~ppc amd64" +KEYWORDS="amd64 ~ppc x86" IUSE="jikes doc junit" DEPEND=">=virtual/jdk-1.2 >=dev-java/ant-1.5 @@ -29,17 +29,13 @@ src_compile() { local antflags="jar-core" use jikes && antflags="${antflags} -Dbuild.compiler=jikes" use doc && antflags="${antflags} javadocs" + use junit && antflags="${antflags} test" ant ${antflags} || die "compilation failed" - - if use junit; then - ant test || die "Junit test failed" - fi } src_install() { dodoc CHANGES.txt README.txt cd build - mv lucene-1.5-rc1-dev.jar ${PN}.jar || die "mv failed" - java-pkg_dojar ${PN}.jar + java-pkg_newjar lucene-1.5-rc1-dev.jar ${PN}.jar use doc && java-pkg_dohtml -r docs/* } diff --git a/dev-java/lucene/lucene-1.4.3.ebuild b/dev-java/lucene/lucene-1.4.3.ebuild index 7b59925cbb20..62efa19d0ac7 100644 --- a/dev-java/lucene/lucene-1.4.3.ebuild +++ b/dev-java/lucene/lucene-1.4.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-1.4.3.ebuild,v 1.2 2005/07/10 20:35:12 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-1.4.3.ebuild,v 1.3 2005/07/15 21:11:50 axxo Exp $ inherit java-pkg @@ -9,7 +9,7 @@ HOMEPAGE="http://jakarta.apache.org/lucene" SRC_URI="mirror://apache/jakarta/lucene/source/${P}-src.tar.gz" LICENSE="Apache-1.1" SLOT="1" -KEYWORDS="~x86 ~ppc ~amd64" +KEYWORDS="~amd64 ~ppc x86" IUSE="doc jikes junit source" DEPEND=">=virtual/jdk-1.2 >=dev-java/ant-1.5 @@ -35,8 +35,7 @@ src_compile() { src_install() { dodoc CHANGES.txt README.txt - mv build/lucene-1.5-rc1-dev.jar ${PN}.jar - java-pkg_dojar ${PN}.jar + java-pkg_newjar build/lucene-1.5-rc1-dev.jar ${PN}.jar use doc && java-pkg_dohtml -r docs/* use source && java-pkg_dosrc src/java/org -- cgit v1.2.3-65-gdbad