commit: a7ff1b405cd658f7d4c80a482948585f793af57c Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Jun 21 10:07:34 2025 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Jun 21 10:07:34 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7ff1b40
wxwidgets.eclass: only support WX_GTK_VER="3.2-gtk3" Part-of: https://github.com/gentoo/gentoo/pull/42243 Signed-off-by: David Seifert <soap <AT> gentoo.org> eclass/wxwidgets.eclass | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass index c861189b6551..a558a37189c0 100644 --- a/eclass/wxwidgets.eclass +++ b/eclass/wxwidgets.eclass @@ -34,16 +34,11 @@ _WXWIDGETS_ECLASS=1 # @REQUIRED # @DESCRIPTION: # The SLOT of the x11-libs/wxGTK you're targeting. Needs to be defined before -# inheriting the eclass. Can be either "3.0" or "3.0-gtk3". +# inheriting the eclass. Currently only "3.2-gtk3" is supported. case ${WX_GTK_VER} in - 3.0-gtk3 | 3.2-gtk3) ;; - 3.0) - if [[ ${EAPI} != 7 ]]; then - die "${ECLASS}: GTK 2 no longer supported in EAPI ${EAPI}" - fi - ;; + 3.2-gtk3) ;; "") die "WX_GTK_VER not declared" ;; - *) die "Invalid WX_GTK_VER: must be set to a valid wxGTK SLOT ('3.0', '3.0-gtk3', or '3.2-gtk3')" ;; + *) die "Invalid WX_GTK_VER: must be set to a valid wxGTK SLOT ('3.2-gtk3')" ;; esac readonly WX_GTK_VER @@ -64,14 +59,7 @@ inherit flag-o-matic # # See: https://docs.wxwidgets.org/trunk/overview_debugging.html setup-wxwidgets() { - local w wxtoolkit wxconf - - case ${WX_GTK_VER} in - 3.0-gtk3 | 3.2-gtk3) wxtoolkit=gtk3 ;; - 3.0) wxtoolkit=gtk2 - eqawarn "QA Notice: This package relies on the deprecated GTK 2 slot, which will go away soon (https://bugs.gentoo.org/618642)" - ;; - esac + local w wxtoolkit=gtk3 wxconf if [[ -z ${WX_DISABLE_NDEBUG} ]]; then { in_iuse debug && use debug; } || append-cppflags -DNDEBUG
