diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-07-19 22:05:27 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-07-19 22:05:27 +0100 |
| commit | 121ed4eec41fbf03e1998d09eede1bf449da63b9 (patch) | |
| tree | ce9341d77d1507f67d4a3a1472da9011b5baa0a8 /eclass/wxwidgets.eclass | |
| parent | dd762ff83c330186ee2ede002e08b2f780cddd51 (diff) | |
gentoo resync : 19.07.2019
Diffstat (limited to 'eclass/wxwidgets.eclass')
| -rw-r--r-- | eclass/wxwidgets.eclass | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass index 1cd6e49505df..9b37074d3b62 100644 --- a/eclass/wxwidgets.eclass +++ b/eclass/wxwidgets.eclass @@ -4,7 +4,7 @@ # @ECLASS: wxwidgets.eclass # @MAINTAINER: # wxwidgets@gentoo.org -# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 +# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 # @BLURB: Manages build configuration for wxGTK-using packages. # @DESCRIPTION: # This eclass sets up the proper environment for ebuilds using the wxGTK @@ -23,9 +23,11 @@ if [[ -z ${_WXWIDGETS_ECLASS} ]]; then -case ${EAPI} in +inherit flag-o-matic + +case ${EAPI:-0} in 0|1|2|3|4|5) - inherit eutils flag-o-matic multilib + inherit eutils multilib # This was used to set up a sane default for ebuilds so they could # avoid calling need-wxwidgets if they didn't need a particular build. @@ -56,12 +58,9 @@ case ${EAPI} in unset _wxdebug unset _wxconf ;; - 6) - inherit flag-o-matic multilib - ;; - *) - die "EAPI=${EAPI:-0} is not supported" - ;; + 6) inherit multilib ;; # compatibility only, not needed by eclass + 7) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} is not supported" ;; esac # @FUNCTION: setup-wxwidgets @@ -130,10 +129,14 @@ setup-wxwidgets() { echo } -# deprecated -need-wxwidgets() { - setup-wxwidgets -} +case ${EAPI:-0} in + 0|1|2|3|4|5|6) + # deprecated + need-wxwidgets() { + setup-wxwidgets + } + ;; +esac _WXWIDGETS_ECLASS=1 fi |