diff options
author | Thomas Matthijs <axxo@gentoo.org> | 2005-07-10 13:41:13 +0000 |
---|---|---|
committer | Thomas Matthijs <axxo@gentoo.org> | 2005-07-10 13:41:13 +0000 |
commit | bdb782db47163c85fe4860c8767606e2e4e948f0 (patch) | |
tree | 97f2db0b0e2c40af1cde4ee2168db88ff765e95a /dev-java | |
parent | dep fix (diff) | |
download | gentoo-2-bdb782db47163c85fe4860c8767606e2e4e948f0.tar.gz gentoo-2-bdb782db47163c85fe4860c8767606e2e4e948f0.tar.bz2 gentoo-2-bdb782db47163c85fe4860c8767606e2e4e948f0.zip |
dep fixes, add source useflag, cleanup
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/commons-modeler/ChangeLog | 5 | ||||
-rw-r--r-- | dev-java/commons-modeler/commons-modeler-1.1.ebuild | 34 |
2 files changed, 23 insertions, 16 deletions
diff --git a/dev-java/commons-modeler/ChangeLog b/dev-java/commons-modeler/ChangeLog index a552ce5a2851..a2a46d181e34 100644 --- a/dev-java/commons-modeler/ChangeLog +++ b/dev-java/commons-modeler/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/commons-modeler # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/ChangeLog,v 1.11 2005/05/29 15:46:30 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/ChangeLog,v 1.12 2005/07/10 13:41:13 axxo Exp $ + + 10 Jul 2005; Thomas Matthijs <axxo@gentoo.org> commons-modeler-1.1.ebuild: + dep fixes, add source useflag, cleanup 29 May 2005; Markus Rothe <corsair@gentoo.org> commons-modeler-1.1.ebuild: Stable on ppc64 diff --git a/dev-java/commons-modeler/commons-modeler-1.1.ebuild b/dev-java/commons-modeler/commons-modeler-1.1.ebuild index f98ee49ee6e9..340727e1dbfd 100644 --- a/dev-java/commons-modeler/commons-modeler-1.1.ebuild +++ b/dev-java/commons-modeler/commons-modeler-1.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/commons-modeler/commons-modeler-1.1.ebuild,v 1.12 2005/05/29 15:46:30 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/commons-modeler-1.1.ebuild,v 1.13 2005/07/10 13:41:13 axxo Exp $ inherit java-pkg @@ -9,41 +9,45 @@ SRC_URI="mirror://apache/jakarta/commons/modeler/source/modeler-1.1-src.tar.gz" HOMEPAGE="http://jakarta.apache.org/commons/modeler/" LICENSE="Apache-1.1" SLOT="0" -DEPEND=">=virtual/jdk-1.4 +RDEPEND=">=virtual/jre-1.4 >=dev-java/jmx-1.2.1 >=dev-java/commons-logging-1.0.3 >=dev-java/commons-digester-1.4.1 - >=dev-java/xalan-2.5.1 + >=dev-java/xalan-2.5.1" +DEPEND=">=virtual/jdk-1.4 + ${RDEPEND} + source? ( app-arch/zip ) jikes? ( dev-java/jikes )" -RDEPEND=">=virtual/jre-1.4" + KEYWORDS="amd64 ppc64 ~sparc x86" -IUSE="doc jikes" +IUSE="doc jikes source" S=${WORKDIR}/${P}-src src_unpack() { - unpack "modeler-${PV}-src.tar.gz" + unpack ${A} cd ${S} # Setup the build environment - echo "commons-digester.jar=`java-config --classpath=commons-digester | sed s/":"/"\n"/g | tail -n 1`" >> build.properties - echo "commons-logging.jar=`java-config --classpath=commons-logging | sed s/":"/"\n"/g | tail -n 1`" >> build.properties - echo "jmx.jar=`java-config --classpath=jmx | sed s/":"/"\n"/g | head -n1`" >> build.properties - echo "jmxtools.jar=`java-config --classpath=jmx | sed s/":"/"\n"/g | tail -n1`" >> build.properties - echo "jaxp.xalan.jar=`java-config --classpath=xalan`" >> build.properties - echo "junit.jar=`java-config --classpath=junit`" >> build.properties + echo "commons-digester.jar=$(java-pkg_getjar commons-digester commons-digester.jar)" >> build.properties + echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties + echo "jmx.jar=$(java-pkg_getjar jmx jmxri.jar)" >> build.properties + echo "jmxtools.jar=$(java-pkg_getjar jmx jmxtools.jar)" >> build.properties + echo "jaxp.xalan.jar=$(java-pkg_getjars xalan)" >> build.properties + echo "junit.jar=$(java-pkg_getjars junit)" >> build.properties mkdir dist } src_compile() { - antflags="prepare jar" + local antflags="prepare jar" use jikes && antflags="${antflags} -Dbuild.compiler=jikes" use doc && antflags="${antflags} javadoc" ant ${antflags} || die "compile problem" } src_install () { - java-pkg_dojar dist/${PN}.jar || die "Unable to install" - dodoc LICENSE.txt RELEASE-NOTES-1.1.txt RELEASE-NOTES.txt + java-pkg_dojar dist/${PN}.jar + dodoc RELEASE-NOTES-1.1.txt RELEASE-NOTES.txt use doc && java-pkg_dohtml -r docs/* + use source && java-pkg_dosrc src/java/* } |