diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-07 13:02:51 +0100 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-07 13:02:51 +0100 |
| commit | 44c54da11cbcec2110b6ece6d7c8ab512b5bc5e4 (patch) | |
| tree | e3252cb4257896f52711d7ff2696e00f9680b4e4 | |
| parent | e26dc5c4dfa96629b2fa3ccc51c4ee1eefeada6e (diff) | |
| download | kde-44c54da11cbcec2110b6ece6d7c8ab512b5bc5e4.tar.gz kde-44c54da11cbcec2110b6ece6d7c8ab512b5bc5e4.tar.bz2 kde-44c54da11cbcec2110b6ece6d7c8ab512b5bc5e4.zip | |
Minor updates
| -rw-r--r-- | eclass/cmake-utils.eclass | 26 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 4 |
2 files changed, 13 insertions, 17 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index ca7f08fe094..8d831da1f4f 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -18,21 +18,20 @@ # builds and an implementation of the well-known use_enable and use_with # functions for CMake. +EXPORTED_FUNCTIONS="src_compile src_test src_install" +case ${EAPI:-0} in + 2) EXPORTED_FUNCTIONS="src_configure ${EXPORTED_FUNCTIONS}" ;; + 1|0) ;; + *) die "Unknown EAPI, Bug eclass maintainers." ;; +esac +EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS} + inherit toolchain-funcs multilib flag-o-matic base -DESCRIPTION="Based on the ${ECLASS} eclass" +: ${DESCRIPTION:="Based on the ${ECLASS} eclass"} DEPEND=">=dev-util/cmake-2.4.6" -case ${EAPI} in - 2) - EXPORT_FUNCTIONS src_configure src_compile src_test src_install - ;; - *) - EXPORT_FUNCTIONS src_compile src_test src_install - ;; -esac - # Internal functions used by cmake-utils_use_* _use_me_now() { debug-print-function ${FUNCNAME} "$@" @@ -150,7 +149,7 @@ cmake-utils_use_build() { _use_me_now BUILD "$@" ; } # and -DHAVE_FOO=OFF if it is disabled. cmake-utils_use_has() { _use_me_now HAVE "$@" ; } # for backcompat -cmake-utils_has() { ewarn "ebuild is using deprecated call" ; _use_me_now HAVE "$@" ; } +cmake-utils_has() { ewarn "ebuild is using deprecated call. Inform maintainer." ; _use_me_now HAVE "$@" ; } # @FUNCTION: cmake-utils_use # @USAGE: <USE flag> [flag name] @@ -242,10 +241,7 @@ _EOF_ cmake-utils_src_compile() { debug-print-function ${FUNCNAME} "$@" - case ${EAPI} in - 2) ;; - *) cmake-utils_src_configure ;; - esac + has src_configure ${EXPORTED_FUNCTIONS} || cmake-utils_src_configure cmake-utils_src_make "$@" } diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index c27a2069c47..89559e9c727 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -14,9 +14,9 @@ # @DESCRIPTION: # By default kde4 eclasses wants eapi 2 which might be redefinable to newer # versions. -case ${EAPI} in +case ${EAPI:-0} in 2) : ;; - *) die "No way! EAPI older than 2 is not supported." ;; + *) die "No way! EAPI other than 2 is not supported for now." ;; esac # @ECLASS-VARIABLE: KDEBASE |