diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2015-07-30 22:17:08 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2015-07-30 22:17:08 +0000 |
| commit | 383b764c683ad55cda88463111d983e2d6b76e92 (patch) | |
| tree | 38c0455143900bd181d280e1a08f7a8e3f1757f1 | |
| parent | Add sarama. (diff) | |
| download | gentoo-2-383b764c683ad55cda88463111d983e2d6b76e92.tar.gz gentoo-2-383b764c683ad55cda88463111d983e2d6b76e92.tar.bz2 gentoo-2-383b764c683ad55cda88463111d983e2d6b76e92.zip | |
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.
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/java-utils-2.eclass | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 0482c95f2bc9..0b220490eb50 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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@gentoo.org> 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@gentoo.org> mysql-multilib.eclass: Revert bad mycmakeargs changes and introduce 3 eclass variables to have extra diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index dd2c1393308d..9aff557db63b 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -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 @@ ejunit4() { # 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-utils-2_src_prepare() { 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 @@ eant() { if [[ ${EBUILD_PHASE} = compile ]]; then java-ant-2_src_configure - java-utils-2_src_prepare fi if ! has java-ant-2 ${INHERITED}; then |