| 1 |
caster 10/02/01 09:38:45 |
| 2 |
|
| 3 |
Modified: java-ant-2.eclass java-pkg-2.eclass |
| 4 |
java-pkg-opt-2.eclass |
| 5 |
Log: |
| 6 |
Add EAPI=3 support for java eclasses. Bug #303061 and patch thanks to Ulrich Müller <ulm@g.o>. |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.47 eclass/java-ant-2.eclass |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-ant-2.eclass?rev=1.47&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-ant-2.eclass?rev=1.47&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-ant-2.eclass?r1=1.46&r2=1.47 |
| 14 |
|
| 15 |
Index: java-ant-2.eclass |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v |
| 18 |
retrieving revision 1.46 |
| 19 |
retrieving revision 1.47 |
| 20 |
diff -u -r1.46 -r1.47 |
| 21 |
--- java-ant-2.eclass 8 Nov 2009 20:39:30 -0000 1.46 |
| 22 |
+++ java-ant-2.eclass 1 Feb 2010 09:38:44 -0000 1.47 |
| 23 |
@@ -14,7 +14,7 @@ |
| 24 |
# |
| 25 |
# Licensed under the GNU General Public License, v2 |
| 26 |
# |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.46 2009/11/08 20:39:30 caster Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.47 2010/02/01 09:38:44 caster Exp $ |
| 29 |
|
| 30 |
inherit java-utils-2 |
| 31 |
|
| 32 |
@@ -132,7 +132,10 @@ |
| 33 |
# default: off |
| 34 |
# ------------------------------------------------------------------------------ |
| 35 |
|
| 36 |
-[[ "${EAPI:-0}" = "2" ]] && EXPORT_FUNCTIONS src_configure |
| 37 |
+case "${EAPI:-0}" in |
| 38 |
+ 0|1) : ;; |
| 39 |
+ *) EXPORT_FUNCTIONS src_configure ;; |
| 40 |
+esac |
| 41 |
|
| 42 |
# ------------------------------------------------------------------------------ |
| 43 |
# @eclass-src_configure |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
1.35 eclass/java-pkg-2.eclass |
| 48 |
|
| 49 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-pkg-2.eclass?rev=1.35&view=markup |
| 50 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-pkg-2.eclass?rev=1.35&content-type=text/plain |
| 51 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-pkg-2.eclass?r1=1.34&r2=1.35 |
| 52 |
|
| 53 |
Index: java-pkg-2.eclass |
| 54 |
=================================================================== |
| 55 |
RCS file: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v |
| 56 |
retrieving revision 1.34 |
| 57 |
retrieving revision 1.35 |
| 58 |
diff -u -r1.34 -r1.35 |
| 59 |
--- java-pkg-2.eclass 2 Sep 2009 21:41:29 -0000 1.34 |
| 60 |
+++ java-pkg-2.eclass 1 Feb 2010 09:38:44 -0000 1.35 |
| 61 |
@@ -5,7 +5,7 @@ |
| 62 |
# |
| 63 |
# Licensed under the GNU General Public License, v2 |
| 64 |
# |
| 65 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.34 2009/09/02 21:41:29 betelgeuse Exp $ |
| 66 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.35 2010/02/01 09:38:44 caster Exp $ |
| 67 |
|
| 68 |
inherit java-utils-2 |
| 69 |
|
| 70 |
@@ -49,8 +49,10 @@ |
| 71 |
SRC_URI="mirror://apache/${PN/-///}/source/${P}-src.tar.gz" |
| 72 |
fi |
| 73 |
|
| 74 |
-EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst |
| 75 |
-[[ "${EAPI:-0}" == "2" ]] && EXPORT_FUNCTIONS src_prepare |
| 76 |
+case "${EAPI:-0}" in |
| 77 |
+ 0|1) EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst ;; |
| 78 |
+ *) EXPORT_FUNCTIONS pkg_setup src_prepare src_compile pkg_preinst ;; |
| 79 |
+esac |
| 80 |
|
| 81 |
# ------------------------------------------------------------------------------ |
| 82 |
# @eclass-pkg_setup |
| 83 |
|
| 84 |
|
| 85 |
|
| 86 |
1.14 eclass/java-pkg-opt-2.eclass |
| 87 |
|
| 88 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-pkg-opt-2.eclass?rev=1.14&view=markup |
| 89 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-pkg-opt-2.eclass?rev=1.14&content-type=text/plain |
| 90 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-pkg-opt-2.eclass?r1=1.13&r2=1.14 |
| 91 |
|
| 92 |
Index: java-pkg-opt-2.eclass |
| 93 |
=================================================================== |
| 94 |
RCS file: /var/cvsroot/gentoo-x86/eclass/java-pkg-opt-2.eclass,v |
| 95 |
retrieving revision 1.13 |
| 96 |
retrieving revision 1.14 |
| 97 |
diff -u -r1.13 -r1.14 |
| 98 |
--- java-pkg-opt-2.eclass 25 Feb 2009 17:41:16 -0000 1.13 |
| 99 |
+++ java-pkg-opt-2.eclass 1 Feb 2010 09:38:44 -0000 1.14 |
| 100 |
@@ -10,7 +10,7 @@ |
| 101 |
# Removed phase hooks because Portage does proper env saving now. |
| 102 |
# <betelgeuse@g.o> |
| 103 |
# |
| 104 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-opt-2.eclass,v 1.13 2009/02/25 17:41:16 serkan Exp $ |
| 105 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-opt-2.eclass,v 1.14 2010/02/01 09:38:44 caster Exp $ |
| 106 |
|
| 107 |
inherit java-utils-2 |
| 108 |
|
| 109 |
@@ -36,8 +36,10 @@ |
| 110 |
# See java-pkg-2.eclass for JAVA_PKG_IUSE documentation |
| 111 |
IUSE="${JAVA_PKG_IUSE} ${JAVA_PKG_OPT_USE}" |
| 112 |
|
| 113 |
-EXPORT_FUNCTIONS pkg_setup pkg_preinst |
| 114 |
-[[ "${EAPI:-0}" == "2" ]] && EXPORT_FUNCTIONS src_prepare |
| 115 |
+case "${EAPI:-0}" in |
| 116 |
+ 0|1) EXPORT_FUNCTIONS pkg_setup pkg_preinst ;; |
| 117 |
+ *) EXPORT_FUNCTIONS pkg_setup src_prepare pkg_preinst ;; |
| 118 |
+esac |
| 119 |
|
| 120 |
# ------------------------------------------------------------------------------ |
| 121 |
# ------------------------------------------------------------------------------ |
Archives