diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2015-06-17 09:48:12 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2015-06-17 09:48:12 +0000 |
| commit | 43af3721542c857f1b255888cc9a10711ec2eb45 (patch) | |
| tree | c34f34392f27d54c99521e1544a73edd53b83d5a /eclass | |
| parent | Correct version of compiler in dependencies, bug #552274 (diff) | |
| download | gentoo-2-43af3721542c857f1b255888cc9a10711ec2eb45.tar.gz gentoo-2-43af3721542c857f1b255888cc9a10711ec2eb45.tar.bz2 gentoo-2-43af3721542c857f1b255888cc9a10711ec2eb45.zip | |
Remove eclass dependency on python[xml] and replace with some ugly
grep that should suffice. Closes #552332.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/java-pkg-2.eclass | 23 |
2 files changed, 7 insertions, 22 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 999ae0e36b03..6e7799a0fe0a 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.1669 2015/06/16 21:40:51 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1670 2015/06/17 09:48:12 chewi Exp $ + + 17 Jun 2015; James Le Cuirot <chewi@gentoo.org> java-pkg-2.eclass: + Remove eclass dependency on python[xml] and replace with some ugly grep that + should suffice. Closes #552332. 16 Jun 2015; William Hubbs <williamh@gentoo.org> +golang-vcs.eclass: Add golang-vcs.eclass to retrieve go packages from vcs repositories diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass index 366ef6c005c2..420335527c73 100644 --- a/eclass/java-pkg-2.eclass +++ b/eclass/java-pkg-2.eclass @@ -5,7 +5,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.40 2015/04/28 20:35:40 chewi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.41 2015/06/17 09:48:12 chewi Exp $ # @ECLASS: java-pkg-2.eclass # @MAINTAINER: @@ -96,25 +96,6 @@ java-pkg-2_src_compile() { fi } - -# @FUNCTION: java-pkg-2_supports-test -# @INTERNAL -# @DESCRIPTION: -# test whether a build.xml has a test target. - -java-pkg-2_supports-test() { - python << EOF -from xml.dom.minidom import parse -import sys -dom = parse("${1}") -for elem in dom.getElementsByTagName('target'): - if elem.getAttribute('name') == 'test': - sys.exit(0) -sys.exit(1) -EOF - return $? -} - # @FUNCTION: java-pkg-2_src_test # @DESCRIPTION: # src_test, not exported. @@ -122,7 +103,7 @@ EOF java-pkg-2_src_test() { [[ -e "${EANT_BUILD_XML:=build.xml}" ]] || return - if [[ ${EANT_TEST_TARGET} ]] || java-pkg-2_supports-test ${EANT_BUILD_XML}; then + if [[ ${EANT_TEST_TARGET} ]] || < "${EANT_BUILD_XML}" tr -d "\n" | grep -Eq "<target\b[^>]*\bname=[\"']test[\"']"; then local opts task_re junit_re pkg if [[ ${EANT_TEST_JUNIT_INTO} ]]; then |