Merge updates from master

eclass/optfeature.eclass

@@ -4,17 +4,17 @@
 # @ECLASS: optfeature.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
-# @SUPPORTED_EAPIS: 7 8
+# @SUPPORTED_EAPIS: 7 8 9
 # @BLURB: Advertise optional functionality that might be useful to users
 
-case ${EAPI} in
-	7|8) ;;
-	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
-esac
-
 if [[ -z ${_OPTFEATURE_ECLASS} ]]; then
 _OPTFEATURE_ECLASS=1
 
+case ${EAPI} in
+	7|8|9) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
 # @ECLASS_VARIABLE: _OPTFEATURE_DEFAULT_HEADER
 # @INTERNAL
 # @DESCRIPTION:

skel.ebuild

@@ -11,7 +11,9 @@
 # The PMS contains specifications for all EAPIs. Eclasses will test for this
 # variable if they need to use features that are not universal in all EAPIs.
 # If an eclass doesn't support latest EAPI, use the previous EAPI instead.
-EAPI=8
+# If your package is a (direct or indirect) dependency of Portage, use the
+# same EAPI as the latest Portage version.
+EAPI=9
 
 
 # inherit lists eclasses to inherit functions from. For example, an ebuild