[gentoo-dev] [PATCH 1/3] xemacs-packages.eclass: Drop backwards compatibility code

[gentoo-dev] [PATCH 1/3] xemacs-packages.eclass: Drop backwards compatibility code

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/xemacs-packages.eclass | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/eclass/xemacs-packages.eclass b/eclass/xemacs-packages.eclass
index 2440ef835291..8f5d3f1b51b2 100644
--- a/eclass/xemacs-packages.eclass
+++ b/eclass/xemacs-packages.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: xemacs-packages.eclass
@@ -40,10 +40,6 @@ S="${WORKDIR}"
 : ${HOMEPAGE:="http://xemacs.org/"}
 : ${LICENSE:="GPL-2+"}
 
-# Backwards compatibility code, to be removed after 2017-05-03
-: ${XEMACS_PKG_CAT:=${PKG_CAT}}
-: ${XEMACS_EXPERIMENTAL:=${EXPERIMENTAL}}
-
 if [[ -n ${XEMACS_EXPERIMENTAL} ]]; then
 	: ${SRC_URI:="http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/${P}-pkg.tar.gz"}
 else
-- 
2.37.2

[gentoo-dev] [PATCH 2/3] xemacs-packages.eclass: Support EAPI 8

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/xemacs-packages.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/xemacs-packages.eclass b/eclass/xemacs-packages.eclass
index 8f5d3f1b51b2..67c9491d575e 100644
--- a/eclass/xemacs-packages.eclass
+++ b/eclass/xemacs-packages.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: xemacs-packages.eclass
 # @MAINTAINER:
 # xemacs@gentoo.org
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: Eclass to support elisp packages distributed by XEmacs.
 # @DESCRIPTION:
 # This eclass supports ebuilds for packages distributed by XEmacs.
@@ -24,8 +24,8 @@
 # in the experimental repository are auto-generated from XEmacs VCS, so
 # they may not be well-tested.
 
-case ${EAPI:-0} in
-	[67]) ;;
+case ${EAPI} in
+	6|7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.37.2

[gentoo-dev] [PATCH 3/3] xemacs-packages.eclass: Whitespace

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/xemacs-packages.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/xemacs-packages.eclass b/eclass/xemacs-packages.eclass
index 67c9491d575e..91621f5f52d3 100644
--- a/eclass/xemacs-packages.eclass
+++ b/eclass/xemacs-packages.eclass
@@ -12,7 +12,7 @@
 # @ECLASS_VARIABLE: XEMACS_PKG_CAT
 # @REQUIRED
 # @DESCRIPTION:
-# The package category that the package is in. Can be either standard,
+# The package category that the package is in.  Can be either standard,
 # mule, or contrib.
 
 # @ECLASS_VARIABLE: XEMACS_EXPERIMENTAL
@@ -20,7 +20,7 @@
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # If set then the package is downloaded from the experimental packages
-# repository, which is the staging area for packages upstream. Packages
+# repository, which is the staging area for packages upstream.  Packages
 # in the experimental repository are auto-generated from XEmacs VCS, so
 # they may not be well-tested.
 
-- 
2.37.2