| 1 |
caster 10/04/29 08:40:29 |
| 2 |
|
| 3 |
Modified: java-ant-2.eclass |
| 4 |
Log: |
| 5 |
Skip the src_configure of java-ant-2.eclass when java-pkg-opt-2 is inherited and java USE flag is disabled, to prevent bugs like #317673. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.49 eclass/java-ant-2.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-ant-2.eclass?rev=1.49&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-ant-2.eclass?rev=1.49&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-ant-2.eclass?r1=1.48&r2=1.49 |
| 13 |
|
| 14 |
Index: java-ant-2.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v |
| 17 |
retrieving revision 1.48 |
| 18 |
retrieving revision 1.49 |
| 19 |
diff -u -r1.48 -r1.49 |
| 20 |
--- java-ant-2.eclass 12 Feb 2010 23:51:44 -0000 1.48 |
| 21 |
+++ java-ant-2.eclass 29 Apr 2010 08:40:29 -0000 1.49 |
| 22 |
@@ -14,7 +14,7 @@ |
| 23 |
# |
| 24 |
# Licensed under the GNU General Public License, v2 |
| 25 |
# |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.48 2010/02/12 23:51:44 caster Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.49 2010/04/29 08:40:29 caster Exp $ |
| 28 |
|
| 29 |
inherit java-utils-2 |
| 30 |
|
| 31 |
@@ -143,6 +143,11 @@ |
| 32 |
# src_configure rewrites the build.xml files |
| 33 |
# ------------------------------------------------------------------------------ |
| 34 |
java-ant-2_src_configure() { |
| 35 |
+ # if java support is optional, don't perform this when the USE flag is off |
| 36 |
+ if hasq java-pkg-opt-2 ${INHERITED}; then |
| 37 |
+ use ${JAVA_PKG_OPT_USE} || return |
| 38 |
+ fi |
| 39 |
+ |
| 40 |
# eant will call us unless called by Portage |
| 41 |
[[ -e "${T}/java-ant-2_src_configure-run" ]] && return |
Archives