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

[Vlastimil Babka (caster)]

caster      08/10/11 21:07:13

  Modified:             java-pkg-2.eclass java-pkg-opt-2.eclass
                        java-utils-2.eclass
  Log:
  Move the src_prepare export from java-utils-2 to java-pkg-2 and java-pkg-opt-2 (where it's now called only if USE=java).

Revision  Changes    Path
1.30                 eclass/java-pkg-2.eclass

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

Index: java-pkg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- java-pkg-2.eclass	18 Jul 2008 22:53:20 -0000	1.29
+++ java-pkg-2.eclass	11 Oct 2008 21:07:13 -0000	1.30
@@ -5,7 +5,7 @@
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.29 2008/07/18 22:53:20 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.30 2008/10/11 21:07:13 caster Exp $
 
 inherit java-utils-2
 
@@ -50,6 +50,7 @@
 fi
 
 EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst
+[[ "${EAPI:-0}" == "2" ]] && EXPORT_FUNCTIONS src_prepare
 
 # ------------------------------------------------------------------------------
 # @eclass-pkg_setup
@@ -62,6 +63,15 @@
 }
 
 # ------------------------------------------------------------------------------
+# @eclass-src_prepare
+#
+# wrapper for java-utils-2_src_prepare
+# ------------------------------------------------------------------------------
+java-pkg-2_src_prepare() {
+	java-utils-2_src_prepare
+}
+
+# ------------------------------------------------------------------------------
 # @eclass-src_compile
 #
 # Default src_compile for java packages



1.10                 eclass/java-pkg-opt-2.eclass

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

Index: java-pkg-opt-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-pkg-opt-2.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- java-pkg-opt-2.eclass	6 Jan 2008 19:30:24 -0000	1.9
+++ java-pkg-opt-2.eclass	11 Oct 2008 21:07:13 -0000	1.10
@@ -10,7 +10,7 @@
 #       Removed phase hooks because Portage does proper env saving now.
 #       <betelgeuse@g.o>
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-opt-2.eclass,v 1.9 2008/01/06 19:30:24 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-opt-2.eclass,v 1.10 2008/10/11 21:07:13 caster Exp $
 
 inherit java-utils-2
 
@@ -37,9 +37,19 @@
 IUSE="${JAVA_PKG_IUSE} ${JAVA_PKG_OPT_USE}"
 
 EXPORT_FUNCTIONS pkg_setup
+[[ "${EAPI:-0}" == "2" ]] && EXPORT_FUNCTIONS src_prepare
 
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
 java-pkg-opt-2_pkg_setup() {
 	use ${JAVA_PKG_OPT_USE} && java-pkg_init
 }
+
+# ------------------------------------------------------------------------------
+# @eclass-src_prepare
+#
+# wrapper for java-utils-2_src_prepare
+# ------------------------------------------------------------------------------
+java-pkg-opt-2_src_prepare() {
+	use ${JAVA_PKG_OPT_USE} && java-utils-2_src_prepare
+}



1.117                eclass/java-utils-2.eclass

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

Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- java-utils-2.eclass	10 Oct 2008 20:11:46 -0000	1.116
+++ java-utils-2.eclass	11 Oct 2008 21:07:13 -0000	1.117
@@ -6,7 +6,7 @@
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.116 2008/10/10 20:11:46 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.117 2008/10/11 21:07:13 caster Exp $
 
 # -----------------------------------------------------------------------------
 # @eclass-begin
@@ -37,8 +37,6 @@
 # Make sure we use java-config-2
 export WANT_JAVA_CONFIG="2"
 
-[[ "${EAPI:-0}" == "2" ]] && EXPORT_FUNCTIONS src_prepare
-
 # -----------------------------------------------------------------------------
 # @variable-external WANT_ANT_TASKS
 # @variable-default ""
@@ -1808,6 +1806,7 @@
 # @eclass-src_prepare
 #
 # src_prepare Searches for bundled jars
+# Don't call directly, but via java-pkg-2_src_prepare!
 # ------------------------------------------------------------------------------
 
 java-utils-2_src_prepare() {