From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BC235158074 for ; Sat, 21 Jun 2025 10:07:52 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 771A2341F33 for ; Sat, 21 Jun 2025 10:07:52 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 6953D1104D9; Sat, 21 Jun 2025 10:07:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 5BBB81104D9 for ; Sat, 21 Jun 2025 10:07:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1EF3341F33 for ; Sat, 21 Jun 2025 10:07:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5EE69650 for ; Sat, 21 Jun 2025 10:07:49 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1750500454.a7ff1b405cd658f7d4c80a482948585f793af57c.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/wxwidgets.eclass X-VCS-Directories: eclass/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: a7ff1b405cd658f7d4c80a482948585f793af57c X-VCS-Branch: master Date: Sat, 21 Jun 2025 10:07:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2a0fd170-dfaa-4416-9ee6-72d3e2217072 X-Archives-Hash: 6b1392c6d89caa03e59dd420ccbac2e4 commit: a7ff1b405cd658f7d4c80a482948585f793af57c Author: David Seifert gentoo org> AuthorDate: Sat Jun 21 10:07:34 2025 +0000 Commit: David Seifert gentoo 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 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