| 1 |
commit: 10127d8936bec4f6e162d9d8a59ebc7bf10c9662 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 6 11:17:08 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 6 11:17:08 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=10127d89 |
| 7 |
|
| 8 |
Move the jsch-agentproxy into java. |
| 9 |
|
| 10 |
Ugly hack, but better than removing lines from ebuilds. |
| 11 |
|
| 12 |
Should put this into some configuration file. |
| 13 |
|
| 14 |
scripts/tree.sh | 12 ------------ |
| 15 |
.../java/org/gentoo/java/ebuilder/maven/MavenParser.java | 2 ++ |
| 16 |
2 files changed, 2 insertions(+), 12 deletions(-) |
| 17 |
|
| 18 |
diff --git a/scripts/tree.sh b/scripts/tree.sh |
| 19 |
index 7df27dc..8fef39d 100755 |
| 20 |
--- a/scripts/tree.sh |
| 21 |
+++ b/scripts/tree.sh |
| 22 |
@@ -83,24 +83,12 @@ gebd() { |
| 23 |
java-ebuilder -p "${POMDIR}"/${M}.pom -e "${ebd}" -g --workdir . \ |
| 24 |
-u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64 \ |
| 25 |
--cache-file "${CACHEDIR}"/cache |
| 26 |
- |
| 27 |
- # empty parent artifacts |
| 28 |
- # FIXME, this should be removed in poms |
| 29 |
- sed -e '/app-maven\/jsch-agentproxy-bin/d' \ |
| 30 |
- -e '/JAVA_GENTOO_CLASSPATH/s|jsch-agentproxy-bin,||' \ |
| 31 |
- -i "${ebd}" |
| 32 |
fi |
| 33 |
|
| 34 |
if [[ -z "${MAVEN_NODEP}" ]] && mfill "${ebd}"; then |
| 35 |
java-ebuilder -p "${POMDIR}"/${M}.pom -e "${ebd}" -g --workdir . \ |
| 36 |
-u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64 \ |
| 37 |
--cache-file "${CACHEDIR}"/cache |
| 38 |
- |
| 39 |
- # empty parent artifacts |
| 40 |
- # FIXME, this should be removed in poms |
| 41 |
- sed -e '/app-maven\/jsch-agentproxy-bin-[0-9]/d' \ |
| 42 |
- -e '/JAVA_GENTOO_CLASSPATH/s|jsch-agentproxy-bin,||' \ |
| 43 |
- -i "${ebd}" |
| 44 |
fi |
| 45 |
|
| 46 |
[[ ${SRC_URI} = *-sources.jar ]] || sed -i "/inherit/s/java-pkg-simple/java-pkg-binjar/" "${ebd}" |
| 47 |
|
| 48 |
diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java |
| 49 |
index ba876f2..6e6435e 100644 |
| 50 |
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java |
| 51 |
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java |
| 52 |
@@ -515,6 +515,8 @@ public class MavenParser { |
| 53 |
switch (reader.getLocalName()) { |
| 54 |
case "artifactId": |
| 55 |
artifactId = reader.getElementText(); |
| 56 |
+ /* jsch.agentproxy is an empty artifact. */ |
| 57 |
+ if (artifactId.equals("jsch.agentproxy")) return; |
| 58 |
break; |
| 59 |
case "groupId": |
| 60 |
groupId = reader.getElementText(); |
Archives