diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2005-07-12 12:07:58 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2005-07-12 12:07:58 +0000 |
| commit | 81b482ad25d5f2d62becbff60952b3ea5f8a80fa (patch) | |
| tree | ba4bfbb267f7fb3138fdeb8ed1aacb112bb87abd /dev-java | |
| parent | style fixes (diff) | |
| download | gentoo-2-81b482ad25d5f2d62becbff60952b3ea5f8a80fa.tar.gz gentoo-2-81b482ad25d5f2d62becbff60952b3ea5f8a80fa.tar.bz2 gentoo-2-81b482ad25d5f2d62becbff60952b3ea5f8a80fa.zip | |
style/dep fixes
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/commons-jexl/commons-jexl-1.0.ebuild | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/dev-java/commons-jexl/commons-jexl-1.0.ebuild b/dev-java/commons-jexl/commons-jexl-1.0.ebuild index ae8bc5f1fc8a..b50ca7ad8ffb 100644 --- a/dev-java/commons-jexl/commons-jexl-1.0.ebuild +++ b/dev-java/commons-jexl/commons-jexl-1.0.ebuild @@ -1,17 +1,18 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jexl/commons-jexl-1.0.ebuild,v 1.2 2005/05/18 20:20:30 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jexl/commons-jexl-1.0.ebuild,v 1.3 2005/07/12 12:07:58 axxo Exp $ inherit java-pkg eutils DESCRIPTION="Expression language engine, can be embedded in applications and frameworks." HOMEPAGE="http://jakarta.apache.org/commons/jexl" SRC_URI="mirror://apache/java-repository/${PN}/distributions/${P}-src.tar.gz" -DEPEND="dev-java/ant - dev-java/commons-logging +RDEPEND=">=virtual/jre-1.4 + dev-java/commons-logging" +DEPEND="${RDEPEND} jikes? ( >=dev-java/jikes-1.21 ) junit? ( dev-java/ant >=dev-java/junit-3.8 >=virtual/jdk-1.4 ) !junit? ( dev-java/ant-core >=virtual/jdk-1.3 )" -RDEPEND=">=virtual/jdk-1.3" + LICENSE="Apache-2.0" SLOT="1.0" KEYWORDS="x86 amd64 ~ppc" @@ -24,10 +25,8 @@ src_unpack() { epatch ${FILESDIR}/${P}-gentoo.diff mkdir -p target/lib && cd target/lib - java-pkg_jar-from junit junit.jar + use junit && java-pkg_jar-from junit junit.jar java-pkg_jar-from commons-logging - java-pkg_jar-from ant-core ant.jar - java-pkg_jar-from ant-core optional.jar ant-optional.jar } src_compile() { @@ -39,8 +38,7 @@ src_compile() { } src_install() { - mv target/${P}*.jar ${PN}.jar - java-pkg_dojar ${PN}.jar + java-pkg_newjar target/${P}*.jar ${PN}.jar if use doc; then dodoc RELEASE-NOTES.txt |