From d162ba1860a88062f4cd61f8b52fc303ba0b2991 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 7 Aug 2021 00:16:33 +0100
Subject: gentoo resync : 07.08.2021

---
 eclass/wxwidgets.eclass | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'eclass/wxwidgets.eclass')

diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass
index 4357e7367cc7..273e6ac72d41 100644
--- a/eclass/wxwidgets.eclass
+++ b/eclass/wxwidgets.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: wxwidgets.eclass
 # @MAINTAINER:
 # wxwidgets@gentoo.org
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Manages build configuration for wxGTK-using packages.
 # @DESCRIPTION:
 # This eclass sets up the proper environment for ebuilds using the wxGTK
@@ -21,10 +21,9 @@
 # The configuration chosen is based on the version required and the flags
 # wxGTK was built with.
 
-case ${EAPI:-0} in
-	[0-6]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
-	7)     ;;
-	*)     die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
+case ${EAPI} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 if [[ -z ${_WXWIDGETS_ECLASS} ]]; then
@@ -37,9 +36,14 @@ _WXWIDGETS_ECLASS=1
 # 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".
 case ${WX_GTK_VER} in
-	3.0|3.0-gtk3) ;;
-	"")           die "WX_GTK_VER not declared" ;;
-	*)            die "Invalid WX_GTK_VER: must be set to a valid wxGTK SLOT ('3.0' or '3.0-gtk3')" ;;
+	3.0-gtk3) ;;
+	3.0)
+		if [[ ${EAPI} != 7 ]]; then
+			die "${ECLASS}: GTK 2 no longer supported in EAPI ${EAPI}"
+		fi
+		;;
+	"") die "WX_GTK_VER not declared" ;;
+	*)  die "Invalid WX_GTK_VER: must be set to a valid wxGTK SLOT ('3.0' or '3.0-gtk3')" ;;
 esac
 readonly WX_GTK_VER
 
-- 
cgit v1.2.3