The eclass java-maven-2.eclass in the java overlay has this line: JAVA_MAVEN_POM_HELPER="/usr/share/javatoolkit/maven-helper.py" According to the dev-java/javatoolkit 0.3.0-r2 version I have installed this location should be: JAVA_MAVEN_POM_HELPER="/usr/lib/javatoolkit/bin/maven-helper.py" Reproducible: Always
I have updated the eclass, yet did not test it so I will not close this bug. Please test and confirm. I, at least, haven't tested maven-helper since the javatoolkit src layout was changed. Hopefully it still works, otherwise I will fix that as well. Index: java-maven-2.eclass =================================================================== --- java-maven-2.eclass (revision 6990) +++ java-maven-2.eclass (working copy) @@ -4,12 +4,13 @@ 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 # The second is via generated build.xml by the maven-ant plugin @@ -89,7 +90,7 @@ 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 @@ # 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.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/java.git/commit/?id=96cd7fc7318dba2b0209c709996638b2213972e7 commit 96cd7fc7318dba2b0209c709996638b2213972e7 Author: Florian Schmaus <flow@gentoo.org> AuthorDate: 2022-07-23 10:39:53 +0000 Commit: Florian Schmaus <flow@gentoo.org> CommitDate: 2022-07-23 10:39:53 +0000 java-maven-2.eclass: fix JAVEN_MAVEN_POM_HELPER path Closes: https://bugs.gentoo.org/237539 Signed-off-by: Florian Schmaus <flow@gentoo.org> eclass/java-maven-2.eclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
