diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2007-11-13 19:36:50 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-11-13 19:36:50 +0000 |
| commit | 5b52881d3c7097503b6ebb21c4c2f1ab19f0d870 (patch) | |
| tree | b70a45161ccd7f27cf6ddea7d875bc0ba6cf8c16 /eclass | |
| parent | Marked ~hppa again (thanks armin76). (diff) | |
| download | historical-5b52881d3c7097503b6ebb21c4c2f1ab19f0d870.tar.gz historical-5b52881d3c7097503b6ebb21c4c2f1ab19f0d870.tar.bz2 historical-5b52881d3c7097503b6ebb21c4c2f1ab19f0d870.zip | |
Make JAVA_PKG_IUSE work with java-pkg-opt-2 too.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-pkg-2.eclass | 9 | ||||
| -rw-r--r-- | eclass/java-pkg-opt-2.eclass | 5 | ||||
| -rw-r--r-- | eclass/java-utils-2.eclass | 3 |
3 files changed, 9 insertions, 8 deletions
diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass index 76b438c4c620..a5b4ddbae3f8 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.24 2007/08/05 08:17:05 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.25 2007/11/13 19:36:50 betelgeuse Exp $ inherit java-utils-2 @@ -20,8 +20,9 @@ inherit java-utils-2 # ------------------------------------------------------------------------------ # @IUSE # -# ebuilds using this eclass can set JAVA_PKG_IUSE and then this eclass -# will automatically add deps for them. +# Use JAVA_PKG_IUSE instead of IUSE for doc, source and examples so that +# the eclass can automatically add the needed dependencies for the java-pkg_do* +# functions. # # ------------------------------------------------------------------------------ IUSE="${JAVA_PKG_IUSE}" @@ -35,8 +36,6 @@ IUSE="${JAVA_PKG_IUSE}" # ------------------------------------------------------------------------------ DEPEND="${JAVA_PKG_E_DEPEND}" -hasq source ${JAVA_PKG_IUSE} && DEPEND="${DEPEND} source? ( app-arch/zip )" - # ------------------------------------------------------------------------------ # @rdepend # diff --git a/eclass/java-pkg-opt-2.eclass b/eclass/java-pkg-opt-2.eclass index b15ecc3969f3..bb2bf28b9799 100644 --- a/eclass/java-pkg-opt-2.eclass +++ b/eclass/java-pkg-opt-2.eclass @@ -10,7 +10,7 @@ # Removed phase hooks because Portage does proper env saving now. # <betelgeuse@gentoo.org> # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-opt-2.eclass,v 1.7 2007/08/05 08:24:30 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-opt-2.eclass,v 1.8 2007/11/13 19:36:50 betelgeuse Exp $ inherit java-utils-2 @@ -33,7 +33,8 @@ RDEPEND="${DEPEND}" # ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------ -IUSE="${JAVA_PKG_OPT_USE}" +# See java-pkg-2.eclass for JAVA_PKG_IUSE documentation +IUSE="${JAVA_PKG_IUSE} ${JAVA_PKG_OPT_USE}" EXPORT_FUNCTIONS pkg_setup diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 1db5c39305bf..4425c1158f0b 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.94 2007/10/04 09:59:29 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.95 2007/11/13 19:36:50 betelgeuse Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -73,6 +73,7 @@ JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7" # so that ebuilds can use new features without depending on specific versions. # ----------------------------------------------------------------------------- JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.33-r1 ${JAVA_PKG_PORTAGE_DEP}" +hasq source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )" # ----------------------------------------------------------------------------- # @variable-external JAVA_PKG_ALLOW_VM_CHANGE |