[gentoo-dev] [PATCH 1/2] xorg-3.eclass: Disallow EAPI=7

[gentoo-dev] [PATCH 1/2] xorg-3.eclass: Disallow EAPI=7

[Matt Turner]

Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
 eclass/xorg-3.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git ./eclass/xorg-3.eclass ./eclass/xorg-3.eclass
index ee4038533bfd..0d51be294051 100644
--- ./eclass/xorg-3.eclass
+++ ./eclass/xorg-3.eclass
@@ -8,7 +8,7 @@
 # Author: Tomáš Chvátal <scarabeus@gentoo.org>
 # Author: Donnie Berkholz <dberkholz@gentoo.org>
 # Author: Matt Turner <mattst88@gentoo.org>
-# @SUPPORTED_EAPIS: 7 8
+# @SUPPORTED_EAPIS: 8
 # @PROVIDES: multilib-minimal
 # @BLURB: Reduces code duplication in the modularized X11 ebuilds.
 # @DESCRIPTION:
@@ -23,7 +23,7 @@
 # everything else should be automatic.
 
 case ${EAPI} in
-	7|8) ;;
+	8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.45.2

[gentoo-dev] [PATCH 2/2] xorg-3.eclass: Change XORG_TARBALL_SUFFIX default from bz2 to xz

[Matt Turner]

No ebuilds rely on the default being bz2.

Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
These two patches and a follow on patch to remove setting
XORG_TARBALL_SUFFIX="xz" in ebuilds are available in
https://github.com/gentoo/gentoo/pull/39745

 eclass/xorg-3.eclass | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git ./eclass/xorg-3.eclass ./eclass/xorg-3.eclass
index 0d51be294051..2ca5959dd1e7 100644
--- ./eclass/xorg-3.eclass
+++ ./eclass/xorg-3.eclass
@@ -111,9 +111,8 @@ HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/${XORG_MOD
 # @ECLASS_VARIABLE: XORG_TARBALL_SUFFIX
 # @PRE_INHERIT
 # @DESCRIPTION:
-# Most X11 projects provide tarballs as tar.bz2 or tar.xz. This eclass defaults
-# to bz2.
-: "${XORG_TARBALL_SUFFIX:="bz2"}"
+# Most X11 projects provide tarballs as tar.xz. This eclass defaults to xz.
+: "${XORG_TARBALL_SUFFIX:="xz"}"
 
 if [[ ${PV} == *9999* ]]; then
 	: "${EGIT_REPO_URI:="https://gitlab.freedesktop.org/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}.git"}"
-- 
2.45.2