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

[James Le Cuirot (chewi)]

chewi       15/07/30 22:17:09

  Modified:             ChangeLog java-utils-2.eclass
  Log:
  Fix JAVA_RM_FILES by simplifying java-utils-2_src_prepare on the basis
  that we won't be committing EAPI 0|1 ebuilds any more.

Revision  Changes    Path
1.1740               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1740&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1740&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1739&r2=1.1740

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1739
retrieving revision 1.1740
diff -u -r1.1739 -r1.1740
--- ChangeLog	30 Jul 2015 20:34:57 -0000	1.1739
+++ ChangeLog	30 Jul 2015 22:17:08 -0000	1.1740
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1739 2015/07/30 20:34:57 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1740 2015/07/30 22:17:08 chewi Exp $
+
+  30 Jul 2015; James Le Cuirot <chewi@g.o> java-utils-2.eclass:
+  Fix JAVA_RM_FILES by simplifying java-utils-2_src_prepare on the basis that
+  we won't be committing EAPI 0|1 ebuilds any more.
 
   30 Jul 2015; Brian Evans <grknight@g.o> mysql-multilib.eclass:
   Revert bad mycmakeargs changes and introduce 3 eclass variables to have extra



1.167                eclass/java-utils-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.167&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.167&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.166&r2=1.167

Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- java-utils-2.eclass	22 Jul 2015 09:20:07 -0000	1.166
+++ java-utils-2.eclass	30 Jul 2015 22:17:08 -0000	1.167
@@ -6,7 +6,7 @@
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.166 2015/07/22 09:20:07 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.167 2015/07/30 22:17:08 chewi Exp $
 
 # @ECLASS: java-utils-2.eclass
 # @MAINTAINER:
@@ -1819,8 +1819,7 @@
 # src_prepare Searches for bundled jars
 # Don't call directly, but via java-pkg-2_src_prepare!
 java-utils-2_src_prepare() {
-	[[ ${EBUILD_PHASE} == prepare ]] &&
-		java-pkg_func-exists java_prepare && java_prepare
+	java-pkg_func-exists java_prepare && java_prepare
 
 	# Check for files in JAVA_RM_FILES array.
 	if [[ ${JAVA_RM_FILES[@]} ]]; then
@@ -1828,15 +1827,13 @@
 		java-pkg_rm_files "${JAVA_RM_FILES[@]}"
 	fi
 
-	# Remember that eant will call this unless called via Portage
-	if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then
+	if is-java-strict; then
 		echo "Searching for bundled jars:"
 		java-pkg_find-normal-jars || echo "None found."
 		echo "Searching for bundled classes (no output if none found):"
 		find "${WORKDIR}" -name "*.class"
 		echo "Search done."
 	fi
-	touch "${T}/java-utils-2_src_prepare-run"
 }
 
 # @FUNCTION: java-utils-2_pkg_preinst
@@ -1879,7 +1876,6 @@
 
 	if [[ ${EBUILD_PHASE} = compile ]]; then
 		java-ant-2_src_configure
-		java-utils-2_src_prepare
 	fi
 
 	if ! has java-ant-2 ${INHERITED}; then