diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2008-07-09 21:16:40 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2008-07-09 21:16:40 +0000 |
| commit | 2c68abd38f8d35ddf376355eeb08f3da5fb60237 (patch) | |
| tree | 8a4b184ba80b95d9c288736f8538d21032ad194e /eclass | |
| parent | Fixed HOMEPAGE and SRC_URI (see bug #231147). (diff) | |
| download | historical-2c68abd38f8d35ddf376355eeb08f3da5fb60237.tar.gz historical-2c68abd38f8d35ddf376355eeb08f3da5fb60237.tar.bz2 historical-2c68abd38f8d35ddf376355eeb08f3da5fb60237.zip | |
Extend WANT_ANT_TASKS to accept full pkg atoms.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 5b777d3b3433..5960c7878aac 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -6,7 +6,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.109 2008/07/07 16:48:45 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.110 2008/07/09 21:16:40 betelgeuse Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -1745,11 +1745,14 @@ java-pkg_ant-tasks-depend() { local DEP="" for i in ${WANT_ANT_TASKS} do - if [[ ${i} != ant-* ]]; then + if [[ ${i} = ant-* ]]; then + DEP="${DEP}dev-java/${i} " + elif [[ ${i} = */*:* ]]; then + DEP="${DEP}${i} " + else echo "Invalid atom in WANT_ANT_TASKS: ${i}" return 1 fi - DEP="${DEP}dev-java/${i} " done echo ${DEP} return 0 @@ -1890,8 +1893,19 @@ eant() { fi done + # parse WANT_ANT_TASKS for atoms + local want_ant_tasks + for i in ${WANT_ANT_TASKS}; do + if [[ ${i} = */*:* ]]; then + i=${i#*/} + i=${i%:0} + want_ant_tasks+="${i/:/-} " + else + want_ant_tasks+="${i} " + fi + done # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly - ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}" + ANT_TASKS="${ANT_TASKS:-${want_ant_tasks% }}" # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}" |