diff options
| author | Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2008-09-28 19:08:31 +0000 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2008-09-28 19:09:41 +0000 |
| commit | 56ef9ebd56c86e0854e4951d13e6a7ef2eef3a24 (patch) | |
| tree | b46c0029ed78975ca5fae41ce9487686eb1ba187 | |
| parent | 785fc721dff0f254282dd30b8be7ef11eac88b40 (diff) | |
| download | kde-56ef9ebd56c86e0854e4951d13e6a7ef2eef3a24.tar.gz kde-56ef9ebd56c86e0854e4951d13e6a7ef2eef3a24.tar.bz2 kde-56ef9ebd56c86e0854e4951d13e6a7ef2eef3a24.zip | |
Don't export src_configure for EAPI!=2 and added back the missing kde-base/strigi-analyzer to the KDM.
| -rw-r--r-- | eclass/kde4-base.eclass | 11 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 3 |
2 files changed, 11 insertions, 3 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 9900498d6af..7188c2ac417 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -16,7 +16,14 @@ inherit base cmake-utils eutils kde4-functions multilib -EXPORT_FUNCTIONS pkg_setup src_unpack src_configure src_compile src_test src_install pkg_postinst pkg_postrm +case "${EAPI}" in + 2) + EXPORT_FUNCTIONS pkg_setup src_unpack src_configure src_compile src_test src_install pkg_postinst pkg_postrm + ;; + *) + EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_postinst pkg_postrm + ;; +esac # Set the qt dependencies kde4-base_set_qt_dependencies() { @@ -542,7 +549,7 @@ kde4-base_src_unpack() { kde4-base_src_compile() { debug-print-function ${FUNCNAME} "$@" case "${EAPI}" in - 2 | 2_pre3 | 2_pre2 | 2_pre1) + 2) ;; *) kde4-base_src_configure diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index c6b9683cc41..538e5934f6b 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2008 Gentoo Foundation +*# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.4 2008/03/13 17:57:51 ingmar Exp $ @@ -317,6 +317,7 @@ kde-base/kdesdk kde-base/kstartperf kde-base/kdesdk kde-base/kuiviewer kde-base/kdesdk kde-base/lokalize kde-base/kdesdk kde-base/poxml +kde-base/kdesdk kde-base/strigi-analyzer kde-base/kdesdk kde-base/umbrello kde-base/kdetoys kde-base/amor kde-base/kdetoys kde-base/kteatime |