[gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass

[Petteri Raty (betelgeuse)]

betelgeuse    09/03/27 20:58:57

  Modified:             java-utils-2.eclass
  Log:
  run java_prepare before bundled jar check and use EBUILD_PHASE to detect when to run it

Revision  Changes    Path
1.125                eclass/java-utils-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.125&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.125&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.124&r2=1.125

Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- java-utils-2.eclass	27 Mar 2009 19:40:38 -0000	1.124
+++ java-utils-2.eclass	27 Mar 2009 20:58:57 -0000	1.125
@@ -6,7 +6,7 @@
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.124 2009/03/27 19:40:38 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.125 2009/03/27 20:58:57 betelgeuse Exp $
 
 # -----------------------------------------------------------------------------
 # @eclass-begin
@@ -1810,6 +1810,9 @@
 # ------------------------------------------------------------------------------
 
 java-utils-2_src_prepare() {
+	[[ ${EBUILD_PHASE} == prepare ]] &&
+		java-pkg_func-exists java_prepare && java_prepare
+
 	# Remember that eant will call this unless called via Portage
 	if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then
 		echo "Searching for bundled jars:"
@@ -1817,7 +1820,6 @@
 		echo "Searching for bundled classes (no output if none found):"
 		find "${WORKDIR}" -name "*.class"
 		echo "Search done."
-		java-pkg_func-exists "java_prepare" && java_prepare
 	fi
 	touch "${T}/java-utils-2_src_prepare-run"
 }