diff options
| author |   Alistair Bush <ali_bush@gentoo.org> | 2008-09-13 20:39:24 +0000 |
|---|---|---|
| committer | Alistair Bush <ali_bush@gentoo.org> | 2008-09-13 20:39:24 +0000 |
| commit | 369262311109af90eb21d188a4ec5502b74f28a2 (patch) | |
| tree | 9311038b0fc2875767ec79ba44d7aa95febefee9 /eclass | |
| parent | Use JAVA_PKG_IUSE and emake. (diff) | |
| download | java-369262311109af90eb21d188a4ec5502b74f28a2.tar.gz java-369262311109af90eb21d188a4ec5502b74f28a2.tar.bz2 java-369262311109af90eb21d188a4ec5502b74f28a2.zip | |
Fixed lacation of maven-helper.py see #237539
svn path=/java-overlay/; revision=6991
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-maven-2.eclass | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/eclass/java-maven-2.eclass b/eclass/java-maven-2.eclass index 51f2ea02..f86ce171 100644 --- a/eclass/java-maven-2.eclass +++ b/eclass/java-maven-2.eclass @@ -4,11 +4,12 @@ inherit base java-pkg-2 java-ant-2 -JAVA_MAVEN_COMMON_DEPS=">=dev-java/javatoolkit-0.2.0-r5" -DEPEND=">=dev-java/javatoolkit-0.2.0-r3 source? ( app-arch/zip ) -${JAVA_MAVEN_COMMON_DEPS}" -RDEPEND=">=dev-java/javatoolkit-0.2.0-r3 -${JAVA_MAVEN_COMMON_DEPS}" +JAVA_MAVEN_COMMON_DEPS=">=dev-java/javatoolkit-0.3.0-r2" + +DEPEND="source? ( app-arch/zip ) + ${JAVA_MAVEN_COMMON_DEPS}" + +RDEPEND="${JAVA_MAVEN_COMMON_DEPS}" # We provide two ways to build maven based ebuilds. # The first is with maven itself @@ -89,7 +90,7 @@ esac JAVA_MAVEN_SYSTEM_HOME="/usr/share/maven-${JAVA_MAVEN_VERSION}/maven_home" # our pom helper -JAVA_MAVEN_POM_HELPER="/usr/share/javatoolkit/maven-helper.py" +JAVA_MAVEN_POM_HELPER="/usr/lib/javatoolkit/bin/maven-helper.py" # maven 1 and 1.1 share the same repo JAVA_MAVEN_SYSTEM_REPOSITORY="/usr/share/maven-${JAVA_MAVEN_VERSION//1.1/1}/maven_home/gentoo-repo" @@ -226,8 +227,8 @@ java-maven-2-gen_build_xml() { # take a list of patch as arguments java-maven-2_src_unpack() { - if ! has_version ">=dev-java/javatoolkit-0.2.0-r2"; then - die "please upgrade to at least dev-java/javatoolkit-0.2.0-r2" + if ! has_version ">=dev-java/javatoolkit-0.3.0-r2"; then + die "please upgrade to at least dev-java/javatoolkit-0.3.0-r2" fi # unpack time. |