/[gentoo-x86]/eclass/java-utils-2.eclass
Gentoo

Diff of /eclass/java-utils-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.109 Revision 1.110
4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org> 4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
5# Copyright (c) 2004-2005, Gentoo Foundation 5# Copyright (c) 2004-2005, Gentoo Foundation
6# 6#
7# Licensed under the GNU General Public License, v2 7# Licensed under the GNU General Public License, v2
8# 8#
9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.109 2008/07/07 16:48:45 betelgeuse Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.110 2008/07/09 21:16:40 betelgeuse Exp $
10 10
11# ----------------------------------------------------------------------------- 11# -----------------------------------------------------------------------------
12# @eclass-begin 12# @eclass-begin
13# @eclass-shortdesc Java Utility eclass 13# @eclass-shortdesc Java Utility eclass
14# @eclass-maintainer java@gentoo.org 14# @eclass-maintainer java@gentoo.org
1743 1743
1744 if [[ -n "${WANT_ANT_TASKS}" ]]; then 1744 if [[ -n "${WANT_ANT_TASKS}" ]]; then
1745 local DEP="" 1745 local DEP=""
1746 for i in ${WANT_ANT_TASKS} 1746 for i in ${WANT_ANT_TASKS}
1747 do 1747 do
1748 if [[ ${i} != ant-* ]]; then 1748 if [[ ${i} = ant-* ]]; then
1749 DEP="${DEP}dev-java/${i} "
1750 elif [[ ${i} = */*:* ]]; then
1751 DEP="${DEP}${i} "
1752 else
1749 echo "Invalid atom in WANT_ANT_TASKS: ${i}" 1753 echo "Invalid atom in WANT_ANT_TASKS: ${i}"
1750 return 1 1754 return 1
1751 fi 1755 fi
1752 DEP="${DEP}dev-java/${i} "
1753 done 1756 done
1754 echo ${DEP} 1757 echo ${DEP}
1755 return 0 1758 return 0
1756 else 1759 else
1757 return 0 1760 return 0
1888 echo "more info." 1891 echo "more info."
1889 fi 1892 fi
1890 fi 1893 fi
1891 done 1894 done
1892 1895
1896 # parse WANT_ANT_TASKS for atoms
1897 local want_ant_tasks
1898 for i in ${WANT_ANT_TASKS}; do
1899 if [[ ${i} = */*:* ]]; then
1900 i=${i#*/}
1901 i=${i%:0}
1902 want_ant_tasks+="${i/:/-} "
1903 else
1904 want_ant_tasks+="${i} "
1905 fi
1906 done
1893 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly 1907 # default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
1894 ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}" 1908 ANT_TASKS="${ANT_TASKS:-${want_ant_tasks% }}"
1895 1909
1896 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set 1910 # override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
1897 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}" 1911 ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
1898 1912
1899 # if ant-tasks is not set by ebuild or forced, use none 1913 # if ant-tasks is not set by ebuild or forced, use none

Legend:
Removed from v.1.109  
changed lines
  Added in v.1.110

  ViewVC Help
Powered by ViewVC 1.1.20