commit: 854a97904d06f51a5d25cab1d20fe2857773a4d0 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat May 1 19:01:56 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat May 1 19:01:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=854a9790
wxwidgets.eclass: Remove dead SLOTs Signed-off-by: David Seifert <soap <AT> gentoo.org> eclass/wxwidgets.eclass | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass index 80c0fc5dea3..09c45ba48a5 100644 --- a/eclass/wxwidgets.eclass +++ b/eclass/wxwidgets.eclass @@ -94,31 +94,17 @@ esac # See: http://docs.wxwidgets.org/trunk/overview_debugging.html setup-wxwidgets() { - local w wxtoolkit wxdebug wxconf + local w wxtoolkit wxconf - case "${WX_GTK_VER}" in - 3.0-gtk3) - wxtoolkit=gtk3 - if [[ -z ${WX_DISABLE_NDEBUG} ]]; then - ( in_iuse debug && use debug ) || append-cppflags -DNDEBUG - fi - ;; - 2.9|3.0) - wxtoolkit=gtk2 - if [[ -z ${WX_DISABLE_NDEBUG} ]]; then - ( in_iuse debug && use debug ) || append-cppflags -DNDEBUG - fi - ;; - 2.8) - wxtoolkit=gtk2 - wxdebug="release-" - has_version x11-libs/wxGTK:${WX_GTK_VER}[debug] && wxdebug="debug-" - ;; - *) - die "Invalid WX_GTK_VER: must be set to a valid wxGTK SLOT" - ;; + case ${WX_GTK_VER} in + 3.0-gtk3) wxtoolkit=gtk3 ;; + 3.0) wxtoolkit=gtk2 ;; esac + if [[ -z ${WX_DISABLE_NDEBUG} ]]; then + { in_iuse debug && use debug; } || append-cppflags -DNDEBUG + fi + # toolkit overrides if has_version "x11-libs/wxGTK:${WX_GTK_VER}[aqua]"; then wxtoolkit="mac" @@ -126,7 +112,7 @@ setup-wxwidgets() { wxtoolkit="base" fi - wxconf="${wxtoolkit}-unicode-${wxdebug}${WX_GTK_VER}" + wxconf="${wxtoolkit}-unicode-${WX_GTK_VER}" for w in "${CHOST:-${CBUILD}}-${wxconf}" "${wxconf}"; do [[ -f ${ESYSROOT:-${EPREFIX}}/usr/$(get_libdir)/wx/config/${w} ]] && wxconf=${w} && break done || die "Failed to find configuration ${wxconf}"
