From: Ulrich Müller <ulm@gentoo.org>
Date: Fri, 12 Jul 2019 10:40:22 +0000 (+0200)
Subject: wxwidgets.eclass: Support EAPI 7.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dc77fa87a193f0665a47b8440020a4d20144b013;p=gentoo.git

wxwidgets.eclass: Support EAPI 7.

Don't inherit multilib, which apparently was needed only for get_libdir
(and should have been removed for EAPI 6 already).

Drop deprecated need-wxwidgets function.

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---

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