diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2009-09-07 00:29:47 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2009-09-07 00:29:47 +0000 |
| commit | dbccff20d70a98847b76f88f934963b5ecd9bc1f (patch) | |
| tree | 8627d228c29b7faae44d3fa8d72194cc45adc5d8 /eclass/wxwidgets.eclass | |
| parent | Version bump, securiy bug #283814 (diff) | |
| download | gentoo-2-dbccff20d70a98847b76f88f934963b5ecd9bc1f.tar.gz gentoo-2-dbccff20d70a98847b76f88f934963b5ecd9bc1f.tar.bz2 gentoo-2-dbccff20d70a98847b76f88f934963b5ecd9bc1f.zip | |
Only export pkg_setup in EAPI 0/1. EAPI 2 ebuilds should use USE deps.
Diffstat (limited to 'eclass/wxwidgets.eclass')
| -rw-r--r-- | eclass/wxwidgets.eclass | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass index 5149677e2578..1e1ade00c0b8 100644 --- a/eclass/wxwidgets.eclass +++ b/eclass/wxwidgets.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.27 2009/08/29 00:34:42 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.28 2009/09/07 00:29:47 dirtyepic Exp $ # @ECLASS: wxwidgets.eclass # @MAINTAINER: @@ -40,7 +40,13 @@ inherit eutils multilib -EXPORT_FUNCTIONS pkg_setup +case "${EAPI:-0}" in + 0|1) + EXPORT_FUNCTIONS pkg_setup + ;; + *) + ;; +esac # We do this globally so ebuilds can get sane defaults just by inheriting. They # can be overridden with need-wxwidgets later if need be. @@ -57,12 +63,11 @@ if [[ -z ${WX_CONFIG} ]]; then for wxdebug in release debug; do wxconf="${wxtoolkit}-${wxchar}-${wxdebug}-${WX_GTK_VER}" if [[ -f /usr/$(get_libdir)/wx/config/${wxconf} ]]; then - [[ $wxtoolkit == "base" ]] && WXBASE_DIE=1 # see wxwidgets_pkg_setup + [[ ${wxtoolkit} == "base" ]] && WXBASE_DIE=1 # see wxwidgets_pkg_setup else continue fi WX_CONFIG="/usr/$(get_libdir)/wx/config/${wxconf}" - # TODO: needed for the wx-config wrapper WX_ECLASS_CONFIG="${WX_CONFIG}" break done @@ -84,7 +89,7 @@ fi # If you do need to build against the wxBase libraries, you'll have to use # need-wxwidgets to do so. # -# Note that with an EAPI 2 ebuild you can just DEPEND on x11-libs/wxGTK:2.8[X] +# Note that with an EAPI 2 ebuild you should just DEPEND on x11-libs/wxGTK:2.8[X] # and ignore all this nonsense. wxwidgets_pkg_setup() { |