diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2005-12-25 23:52:14 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2005-12-25 23:52:14 +0000 |
| commit | b93d2abec766fc794cedec89dc939ed46ae264bb (patch) | |
| tree | 37821c8fdc5344e1373890d0de33f321589baa59 /eclass | |
| parent | Loosened xerces dependency. (diff) | |
| download | java-b93d2abec766fc794cedec89dc939ed46ae264bb.tar.gz java-b93d2abec766fc794cedec89dc939ed46ae264bb.tar.bz2 java-b93d2abec766fc794cedec89dc939ed46ae264bb.zip | |
Updated commons-jelly-tags eclass and packages.
svn path=/gentoo-java-experimental/; revision=1699
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/commons-jelly-tags.eclass | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/eclass/commons-jelly-tags.eclass b/eclass/commons-jelly-tags.eclass index 816069b9..a872e5c8 100644 --- a/eclass/commons-jelly-tags.eclass +++ b/eclass/commons-jelly-tags.eclass @@ -36,11 +36,12 @@ INHERITED="$INHERITED $ECLASS" DECRIPTION="An Executable XML Java Elements Framework" HOMEPAGE="http://jakarta.apache.org/commons/jelly/" -#SRC_URI="mirror://gentoo/${P}.tar.bz2 mirror://gentoo/commons-jelly-tags-1.0-gentoo.patch.bz2" +SLOT=${SLOT:=${PV}} +JELLY_PATCH_VERSION=${JELLY_PATCH_VERSION:="1.0"} SRC_URI="http://gentooexperimental.org/distfiles/${P}.tar.bz2 - http://gentooexperimental.org/distfiles/commons-jelly-tags-${SLOT}-gentoo.patch.bz2" + http://gentooexperimental.org/distfiles/commons-jelly-tags-${JELLY_PATCH_VERSION}-gentoo.patch.bz2" -LDEPEND="dev-java/commons-jelly +COMMON_DEPS="dev-java/commons-jelly =dev-java/commons-beanutils-1.6* dev-java/commons-collections =dev-java/commons-jexl-1.0* @@ -51,15 +52,15 @@ LDEPEND="dev-java/commons-jelly =dev-java/xerces-2* dev-java/junit" -RDEPEND="virtual/jre - ${LDEPEND}" -DEPEND="virtual/jdk +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEPS}" +DEPEND=">=virtual/jdk-1.4 dev-java/ant-core dev-java/ant-tasks - jikes? (dev-java/jikes) - ${LDEPEND}" -SLOT="${PV}" -IUSE="doc jikes" + jikes? ( dev-java/jikes ) + source? ( app-arch/zip ) + ${COMMON_DEPS}" +IUSE="doc jikes source" LICENSE="Apache-2.0" PATCHES="${PATCHES:=${WORKDIR}/commons-jelly-tags-1.0-gentoo.patch}" @@ -87,11 +88,16 @@ commons-jelly-tags_fix-common-jars() { } commons-jelly-tags_src_unpack() { - # use base to unpack and apply PATCHES - base_src_unpack + unpack ${A} + cd ${S} - mkdir -p target/lib - cd target/lib + # apply PATCHES + for patch in ${PATCHES}; do + epatch ${patch} + done + + mkdir -p ${S}/target/lib + cd ${S}/target/lib # populate the lib dir with dependencies commons-jelly-tags_fix-common-jars @@ -117,6 +123,7 @@ commons-jelly-tags_src_install() { # done java-pkg_dojar target/*.jar use doc && java-pkg_dohtml -r dist/docs/api + use source && java-pkg_dosrc src/java/* } commons-jelly-tags_src_test() { |