diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2005-07-15 17:20:19 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2005-07-15 17:20:19 +0000 |
| commit | 67d4fc79b39a2e9fff6b8982adcdb6cfeffbbf0b (patch) | |
| tree | af0cf9b04c9e597431264af2352b8f7ab29d8584 /dev-java/picocontainer/picocontainer-1.0_beta4.ebuild | |
| parent | Stable on amd64. (diff) | |
| download | gentoo-2-67d4fc79b39a2e9fff6b8982adcdb6cfeffbbf0b.tar.gz gentoo-2-67d4fc79b39a2e9fff6b8982adcdb6cfeffbbf0b.tar.bz2 gentoo-2-67d4fc79b39a2e9fff6b8982adcdb6cfeffbbf0b.zip | |
dep/style fixes
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-java/picocontainer/picocontainer-1.0_beta4.ebuild')
| -rw-r--r-- | dev-java/picocontainer/picocontainer-1.0_beta4.ebuild | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild b/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild index 72bbeee8ab96..e66c19cfed14 100644 --- a/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild +++ b/dev-java/picocontainer/picocontainer-1.0_beta4.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/picocontainer/picocontainer-1.0_beta4.ebuild,v 1.9 2005/05/06 09:55:23 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/picocontainer-1.0_beta4.ebuild,v 1.10 2005/07/15 17:20:19 axxo Exp $ inherit java-pkg @@ -11,33 +11,30 @@ LICENSE="PicoContainer" SLOT="1" KEYWORDS="x86 ppc amd64" IUSE="doc" -DEPEND=">=dev-java/ant-1.5 +RDEPEND=">=virtual/jre-1.4" +DEPEND=">=virtual/jdk-1.4 + >=dev-java/ant-1.5 >=dev-java/junit-3.8.1" S=${WORKDIR}/${PN}-1.0-beta-4 src_unpack() { unpack ${A} + cd ${S} # FIXME: patch - cp ${FILESDIR}/build-${PV}.xml ${S}/build.xml - mkdir -p ${S}/target/lib - ( - cd ${S}/target/lib - java-pkg_jar-from ant ant.jar ant-1.5.jar - java-pkg_jar-from ant ant-optional.jar ant-optional-1.5.jar - java-pkg_jar-from junit junit.jar junit-3.8.1.jar - ) + cp ${FILESDIR}/build-${PV}.xml build.xml + mkdir -p target/lib + cd target/lib + java-pkg_jar-from junit junit.jar junit-3.8.1.jar } src_compile() { - ant jar || die - if (use doc) ; then + ant -Dfinal.name=${PN} jar || die + if use doc ; then ant javadoc || die fi - cp target/picocontainer-1.0-SNAPSHOT.jar \ - target/picocontainer-1.0.jar } src_install() { - use doc && ( java-pkg_dohtml -r dist/docs/api ) - java-pkg_dojar target/picocontainer-1.0.jar + use doc && java-pkg_dohtml -r dist/docs/api + java-pkg_dojar target/${PN}.jar } |