[gentoo-java] WANT_ANT_TASKS accepts full atoms now

["Petteri Räty" <betelgeuse@gentoo.org>]

[-- Attachment #1.1: Type: text/plain, Size: 85 bytes --]

Now you can do like this:
WANT_ANT_TASKS="dev-java/batik:1.6"

Regards,
Petteri

[-- Attachment #1.2: want_ant_tasks.patch --]
[-- Type: text/plain, Size: 1263 bytes --]

Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.109
diff -u -r1.109 java-utils-2.eclass
--- java-utils-2.eclass	7 Jul 2008 16:48:45 -0000	1.109
+++ java-utils-2.eclass	9 Jul 2008 21:14:47 -0000
@@ -1745,11 +1745,14 @@
 		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 @@
 		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}}"

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 260 bytes --]