[gentoo-dev] [PATCH 01/41] ada.eclass: drop EAPI 6 support

[gentoo-dev] [PATCH 01/41] ada.eclass: drop EAPI 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/ada.eclass | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/eclass/ada.eclass b/eclass/ada.eclass
index bf4cd0c59bc..98f00972c54 100644
--- a/eclass/ada.eclass
+++ b/eclass/ada.eclass
@@ -6,7 +6,7 @@
 # Ada team <ada@gentoo.org>
 # @AUTHOR:
 # Tupone Alfredo <tupone@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: An eclass for Ada packages
 # @DESCRIPTION:
 # This eclass set the IUSE and REQUIRED_USE to request the ADA_TARGET
@@ -23,16 +23,9 @@
 #
 # Mostly copied from python-single-r1.eclass
 
-case "${EAPI:-0}" in
-	0|1|2|3|4|5)
-		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
-		;;
-	6|7|8)
-		# EAPI=5 is required for sane USE_EXPAND dependencies
-		;;
-	*)
-		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
-		;;
+case ${EAPI} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 EXPORT_FUNCTIONS pkg_setup
-- 
2.39.0

[gentoo-dev] [PATCH 02/41] alternatives.eclass: drop EAPI 5, 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/alternatives.eclass | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/eclass/alternatives.eclass b/eclass/alternatives.eclass
index 155a2457bbd..2489fc67359 100644
--- a/eclass/alternatives.eclass
+++ b/eclass/alternatives.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: alternatives.eclass
@@ -6,7 +6,7 @@
 # maintainer-needed@gentoo.org
 # @AUTHOR:
 # Alastair Tse <liquidx@gentoo.org> (03 Oct 2003)
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Creates symlink to the latest version of multiple slotted packages.
 # @DESCRIPTION:
 # When a package is SLOT'ed, very often we need to have a symlink to the
@@ -42,12 +42,10 @@
 # consider using this unless you are want to do something special.
 
 case ${EAPI} in
-	[5-7]) ;;
-	*)     die "EAPI=${EAPI:-0} is not supported" ;;
+	7) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-EXPORT_FUNCTIONS pkg_postinst pkg_postrm
-
 if [[ -z ${_ALTERNATIVES_ECLASS} ]]; then
 _ALTERNATIVES_ECLASS=1
 
@@ -95,8 +93,7 @@ alternatives_makesym() {
 	# usage: alternatives_makesym <resulting symlink> [alternative targets..]
 	# make sure it is in the prefix, allow it already to be in the prefix
 	SYMLINK=${EPREFIX}/${1#${EPREFIX}}
-	# this trick removes the trailing / from ${ROOT}
-	pref=${ROOT%/}
+	pref=${ROOT}
 	shift
 	ALTERNATIVES=$@
 
@@ -154,3 +151,5 @@ alternatives_pkg_postrm() {
 }
 
 fi
+
+EXPORT_FUNCTIONS pkg_postinst pkg_postrm
-- 
2.39.0

[gentoo-dev] [PATCH 03/41] ant-tasks.eclass: drop EAPI 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/ant-tasks.eclass | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index a11716bf2b6..98a35dd40c4 100644
--- a/eclass/ant-tasks.eclass
+++ b/eclass/ant-tasks.eclass
@@ -1,4 +1,4 @@
-# Copyright 2007-2021 Gentoo Authors
+# Copyright 2007-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ant-tasks.eclass
@@ -6,22 +6,16 @@
 # java@gentoo.org
 # @AUTHOR:
 # Vlastimil Babka <caster@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 7
 # @PROVIDES: java-utils-2
 # @BLURB: Eclass for building dev-java/ant-* packages
 # @DESCRIPTION:
 # This eclass provides functionality and default ebuild variables for building
 # dev-java/ant-* packages easily.
 
-case "${EAPI:-0}" in
-	0|1|2|3|4|5)
-		die "ant-tasks.eclass: EAPI ${EAPI} is too old."
-		;;
-	6|7)
-		;;
-	*)
-		die "ant-tasks.eclass: EAPI ${EAPI} is not supported yet."
-		;;
+case ${EAPI} in
+	7) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 # we set ant-core dep ourselves, restricted
@@ -29,7 +23,6 @@ JAVA_ANT_DISABLE_ANT_CORE_DEP=true
 # rewriting build.xml for are the testcases has no reason atm
 JAVA_PKG_BSFIX_ALL=no
 inherit java-pkg-2 java-ant-2
-[[ ${EAPI:-0} -eq 6 ]] && inherit eapi7-ver
 
 EXPORT_FUNCTIONS src_unpack src_compile src_install
 
-- 
2.39.0

[gentoo-dev] [PATCH 04/41] apache-2.eclass: drop EAPI 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/apache-2.eclass | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index 71fcb542869..5e1f4a0be4a 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -3,8 +3,8 @@
 
 # @ECLASS: apache-2.eclass
 # @MAINTAINER:
-# polynomial-c@gentoo.org
-# @SUPPORTED_EAPIS: 6 7
+# maintainer-needed@gentoo.org
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Provides a common set of functions for apache-2.x ebuilds
 # @DESCRIPTION:
 # This eclass handles apache-2.x ebuild functions such as LoadModule generation
@@ -16,10 +16,9 @@ inherit autotools flag-o-matic lua-single multilib ssl-cert toolchain-funcs
 [[ ${CATEGORY}/${PN} != www-servers/apache ]] \
 	&& die "Do not use this eclass with anything else than www-servers/apache ebuilds!"
 
-case ${EAPI:-0} in
-	0|1|2|3|4|5|6)
-		die "This eclass is banned for EAPI<7"
-	;;
+case ${EAPI} in
+	7) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 # settings which are version specific go in here:
@@ -388,7 +387,7 @@ setup_modules() {
 # This internal function generates the LoadModule lines for httpd.conf based on
 # the current module selection and MODULE_DEFINES
 generate_load_module() {
-	local def= endit=0 m= mod_lines= mod_dir="${ED%/}/usr/$(get_libdir)/apache2/modules"
+	local def= endit=0 m= mod_lines= mod_dir="${ED}/usr/$(get_libdir)/apache2/modules"
 
 	if use static; then
 		sed -i -e "/%%LOAD_MODULE%%/d" \
@@ -675,23 +674,23 @@ apache-2_src_install() {
 	# drop in a convenient link to the manual
 	if use doc ; then
 		sed -i -e "s:VERSION:${PVR}:" \
-			"${ED%/}/etc/apache2/modules.d/00_apache_manual.conf" \
+			"${ED}/etc/apache2/modules.d/00_apache_manual.conf" \
 			|| die
 		docompress -x /usr/share/doc/${PF}/manual # 503640
 	else
-		rm -f "${ED%/}/etc/apache2/modules.d/00_apache_manual.conf" \
+		rm -f "${ED}/etc/apache2/modules.d/00_apache_manual.conf" \
 			|| die
-		rm -Rf "${ED%/}/usr/share/doc/${PF}/manual" || die
+		rm -rf "${ED}/usr/share/doc/${PF}/manual" || die
 	fi
 
 	# the default icons and error pages get stored in
 	# /usr/share/apache2/{error,icons}
 	dodir /usr/share/apache2
-	mv -f "${ED%/}/var/www/localhost/error" \
-		"${ED%/}/usr/share/apache2/error" || die
-	mv -f "${ED%/}/var/www/localhost/icons" \
-		"${ED%/}/usr/share/apache2/icons" || die
-	rm -rf "${ED%/}/var/www/localhost/" || die
+	mv -f "${ED}/var/www/localhost/error" \
+		"${ED}/usr/share/apache2/error" || die
+	mv -f "${ED}/var/www/localhost/icons" \
+		"${ED}/usr/share/apache2/icons" || die
+	rm -rf "${ED}/var/www/localhost/" || die
 
 	# set some sane permissions for suexec
 	if use suexec ; then
-- 
2.39.0

[gentoo-dev] [PATCH 05/41] aspell-dict-r1.eclass: drop EAPI 7 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/aspell-dict-r1.eclass | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/eclass/aspell-dict-r1.eclass b/eclass/aspell-dict-r1.eclass
index 4d2df961993..170edb4cacd 100644
--- a/eclass/aspell-dict-r1.eclass
+++ b/eclass/aspell-dict-r1.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: aspell-dict-r1.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Seemant Kulleen <seemant@gentoo.org> (original author)
 # David Seifert <soap@gentoo.org> (-r1 author)
-# @SUPPORTED_EAPIS: 7 8
+# @SUPPORTED_EAPIS: 8
 # @BLURB: An eclass to streamline the construction of ebuilds for new Aspell dictionaries.
 # @DESCRIPTION:
 # The aspell-dict-r1 eclass is designed to streamline the construction of ebuilds for
@@ -36,18 +36,13 @@ readonly ASPELL_SPELLANG=${PN/aspell-/}
 # This value is used to construct SRC_URI strings.
 # If the value needs to be overridden, it needs to be overridden before inheriting the eclass.
 
-case ${EAPI:-0} in
-	[7-8])
-		;;
-	*)
-		die "${ECLASS}: EAPI ${EAPI:-0} not supported"
-		;;
+case ${EAPI} in
+	8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-EXPORT_FUNCTIONS src_configure src_install
-
-if [[ ! ${_ASPELL_DICT_R1} ]]; then
-_ASPELL_DICT_R1=1
+if [[ ! ${_ASPELL_DICT_R1_ECLASS} ]]; then
+_ASPELL_DICT_R1_ECLASS=1
 
 # Most of those aspell packages have an idiosyncratic versioning scheme,
 # where the last separating version separator is replaced by a '-'.
@@ -86,3 +81,5 @@ aspell-dict-r1_src_install() {
 }
 
 fi
+
+EXPORT_FUNCTIONS src_configure src_install
-- 
2.39.0

[gentoo-dev] [PATCH 06/41] bazel.eclass: drop EAPI 7 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/bazel.eclass | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/eclass/bazel.eclass b/eclass/bazel.eclass
index 3a8992972d4..8897ea175a8 100644
--- a/eclass/bazel.eclass
+++ b/eclass/bazel.eclass
@@ -6,25 +6,20 @@
 # Jason Zaman <perfinion@gentoo.org>
 # @AUTHOR:
 # Jason Zaman <perfinion@gentoo.org>
-# @SUPPORTED_EAPIS: 7 8
+# @SUPPORTED_EAPIS: 8
 # @BLURB: Utility functions for packages using Bazel Build
 # @DESCRIPTION:
 # A utility eclass providing functions to run the Bazel Build system.
 #
 # This eclass does not export any phase functions.
 
-case "${EAPI:-0}" in
-	0|1|2|3|4|5|6)
-		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
-		;;
-	7|8)
-		;;
-	*)
-		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
-		;;
+case ${EAPI} in
+	8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 if [[ ! ${_BAZEL_ECLASS} ]]; then
+_BAZEL_ECLASS=1
 
 inherit multiprocessing toolchain-funcs
 
@@ -222,5 +217,4 @@ bazel_load_distfiles() {
 	fi
 }
 
-_BAZEL_ECLASS=1
 fi
-- 
2.39.0

[gentoo-dev] [PATCH 07/41] docs.eclass: drop EAPI 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/docs.eclass | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/eclass/docs.eclass b/eclass/docs.eclass
index 5a63044a864..ed1558bc9a8 100644
--- a/eclass/docs.eclass
+++ b/eclass/docs.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Author: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
 # Based on the work of: Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: A simple eclass to build documentation.
 # @DESCRIPTION:
 # A simple eclass providing basic functions and variables to build
@@ -57,15 +57,9 @@
 # ...
 # @CODE
 
-case "${EAPI:-0}" in
-	0|1|2|3|4|5)
-		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
-		;;
-	6|7|8)
-		;;
-	*)
-		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
-		;;
+case ${EAPI} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 # @ECLASS_VARIABLE: DOCS_BUILDER
@@ -152,7 +146,8 @@ esac
 # will initialize a dummy git repository before compiling. A dependency
 # on dev-vcs/git is automatically added.
 
-if [[ ! ${_DOCS} ]]; then
+if [[ ! ${_DOCS_ECLASS} ]]; then
+_DOCS_ECLASS=1
 
 # For the python based DOCS_BUILDERS we need to inherit any python eclass
 case ${DOCS_BUILDER} in
@@ -423,11 +418,7 @@ esac
 
 [[ ${DOCS_INITIALIZE_GIT} ]] && DOCS_DEPEND+=" dev-vcs/git "
 
-if [[ ${EAPI} != 6 ]]; then
-	BDEPEND+=" doc? ( ${DOCS_DEPEND} )"
-else
-	DEPEND+=" doc? ( ${DOCS_DEPEND} )"
-fi
+BDEPEND+=" doc? ( ${DOCS_DEPEND} )"
 
 # If this is a python package using distutils-r1
 # then put the compile function in the specific
@@ -437,5 +428,4 @@ if [[ ${_DISTUTILS_R1} && ( ${DOCS_BUILDER}="mkdocs" || ${DOCS_BUILDER}="sphinx"
 	python_compile_all() { docs_compile; }
 fi
 
-_DOCS=1
 fi
-- 
2.39.0

[gentoo-dev] [PATCH 08/41] dotnet.eclass: drop EAPI 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/dotnet.eclass | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/eclass/dotnet.eclass b/eclass/dotnet.eclass
index 319fde89311..b92b9c1b405 100644
--- a/eclass/dotnet.eclass
+++ b/eclass/dotnet.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: dotnet.eclass
 # @MAINTAINER:
 # maintainer-needed@gentoo.org
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 7
 # @BLURB: common settings and functions for mono and dotnet related packages
 # @DESCRIPTION:
 # The dotnet eclass contains common environment settings that are useful for
@@ -13,18 +13,15 @@
 # of dotnet packages.
 
 case ${EAPI} in
-	6)
-		inherit eapi7-ver multilib
-		DEPEND="dev-lang/mono"
-		;;
-	7)
-		BDEPEND="dev-lang/mono"
-		;;
-	*)
-		die "${ECLASS}: EAPI ${EAPI:-0} not supported"
-		;;
+	7) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
+if [[ ! ${_DOTNET_ECLASS} ]]; then
+_DOTNET_ECLASS=1
+
+BDEPEND="dev-lang/mono"
+
 inherit mono-env
 
 # @ECLASS_VARIABLE: USE_DOTNET
@@ -145,4 +142,6 @@ dotnet_multilib_comply() {
 	fi
 }
 
+fi
+
 EXPORT_FUNCTIONS pkg_setup
-- 
2.39.0

[gentoo-dev] [PATCH 09/41] dune.eclass: drop EAPI 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/dune.eclass | 54 +++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/eclass/dune.eclass b/eclass/dune.eclass
index 1061461b699..a7c0a0b652f 100644
--- a/eclass/dune.eclass
+++ b/eclass/dune.eclass
@@ -8,12 +8,20 @@
 # ML <ml@gentoo.org>
 # @AUTHOR:
 # Rafael Kitover <rkitover@gmail.com>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Provides functions for installing Dune packages.
 # @DESCRIPTION:
 # Provides dependencies on Dune and OCaml and default src_compile, src_test and
 # src_install for Dune-based packages.
 
+case ${EAPI} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
+if [[ ! ${_DUNE_ECLASS} ]]; then
+_DUNE_ECLASS=1
+
 # @ECLASS_VARIABLE: DUNE_PKG_NAME
 # @PRE_INHERIT
 # @DESCRIPTION:
@@ -21,28 +29,20 @@
 # Set before inheriting the eclass.
 : ${DUNE_PKG_NAME:=${PN}}
 
-case ${EAPI:-0} in
-	6|7|8) ;;
-	*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
-esac
-
 inherit multiprocessing
 
 # Do not complain about CFLAGS etc since ml projects do not use them.
 QA_FLAGS_IGNORED='.*'
 
-EXPORT_FUNCTIONS src_compile src_test src_install
-
-RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:="
-case ${EAPI:-0} in
-	6)
-		DEPEND="${RDEPEND} dev-ml/dune"
-		;;
-	*)
-		BDEPEND="dev-ml/dune dev-lang/ocaml"
-		DEPEND="${RDEPEND}"
-		;;
-esac
+RDEPEND="
+	>=dev-lang/ocaml-4:=[ocamlopt?]
+	dev-ml/dune:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-ml/dune
+	dev-lang/ocaml
+"
 
 dune_src_compile() {
 	ebegin "Building"
@@ -72,9 +72,9 @@ dune-install() {
 	[[ ${#pkgs[@]} -eq 0 ]] && pkgs=( "${DUNE_PKG_NAME}" )
 
 	local -a myduneopts=(
-		--prefix="${ED%/}/usr"
-		--libdir="${D%/}$(ocamlc -where)"
-		--mandir="${ED%/}/usr/share/man"
+		--prefix="${ED}/usr"
+		--libdir="${D}$(ocamlc -where)"
+		--mandir="${ED}/usr/share/man"
 	)
 
 	local pkg
@@ -84,10 +84,10 @@ dune-install() {
 		eend $? || die
 
 		# Move docs to the appropriate place.
-		if [ -d "${ED%/}/usr/doc/${pkg}" ] ; then
-			mkdir -p "${ED%/}/usr/share/doc/${PF}/" || die
-			mv "${ED%/}/usr/doc/${pkg}" "${ED%/}/usr/share/doc/${PF}/" || die
-			rm -rf "${ED%/}/usr/doc" || die
+		if [[ -d "${ED}/usr/doc/${pkg}" ]] ; then
+			mkdir -p "${ED}/usr/share/doc/${PF}/" || die
+			mv "${ED}/usr/doc/${pkg}" "${ED}/usr/share/doc/${PF}/" || die
+			rm -rf "${ED}/usr/doc" || die
 		fi
 	done
 }
@@ -95,3 +95,7 @@ dune-install() {
 dune_src_install() {
 	dune-install ${1:-${DUNE_PKG_NAME}}
 }
+
+fi
+
+EXPORT_FUNCTIONS src_compile src_test src_install
-- 
2.39.0

[gentoo-dev] [PATCH 10/41] fcaps.eclass: drop EAPI 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/fcaps.eclass | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
index d1860f5ac9a..349e72a63af 100644
--- a/eclass/fcaps.eclass
+++ b/eclass/fcaps.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: fcaps.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: function to set POSIX file-based capabilities
 # @DESCRIPTION:
 # This eclass provides a function to set file-based capabilities on binaries.
@@ -30,8 +30,8 @@
 # @CODE
 
 case ${EAPI} in
-	6|7|8) ;;
-	*) die "EAPI ${EAPI:-0} is unsupported" ;;
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 if [[ -z ${_FCAPS_ECLASS} ]]; then
@@ -41,8 +41,8 @@ IUSE="+filecaps"
 
 # Since it is needed in pkg_postinst() it must be in IDEPEND
 case ${EAPI} in
-	7) BDEPEND="filecaps? ( sys-libs/libcap )" ;& # fallthrough
-	6) RDEPEND="filecaps? ( sys-libs/libcap )" ;;
+	7) BDEPEND="filecaps? ( sys-libs/libcap )"
+	   RDEPEND="filecaps? ( sys-libs/libcap )" ;;
 	*) IDEPEND="filecaps? ( sys-libs/libcap )" ;;
 esac
 
-- 
2.39.0

[gentoo-dev] [PATCH 11/41] java-osgi.eclass: drop EAPI 5, 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/java-osgi.eclass | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/eclass/java-osgi.eclass b/eclass/java-osgi.eclass
index 2043cbfb2d8..7019fab7b20 100644
--- a/eclass/java-osgi.eclass
+++ b/eclass/java-osgi.eclass
@@ -1,4 +1,4 @@
-# Copyright 2007-2021 Gentoo Authors
+# Copyright 2007-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: java-osgi.eclass
@@ -6,7 +6,7 @@
 # java@gentoo.org
 # @AUTHOR:
 # Java maintainers <java@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @PROVIDES: java-utils-2
 # @BLURB: Java OSGi eclass
 # @DESCRIPTION:
@@ -15,8 +15,8 @@
 # in their manifests. Currently this is used only by Eclipse-3.3 - later we
 # could extend this so that Gentoo Java system would be fully OSGi compliant.
 
-case ${EAPI:-0} in
-	[5678]) ;;
+case ${EAPI} in
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -28,12 +28,9 @@ inherit java-utils-2
 # @ECLASS_VARIABLE: _OSGI_T
 # @INTERNAL
 # @DESCRIPTION:
-# We define _OSGI_T so that it does not contain a slash at the end.
-# According to Paludis guys, there is currently a proposal for EAPIs that
-# would require all variables to end with a slash.
-_OSGI_T="${T/%\//}"
+_OSGI_T="${T}"
 
-# must get Diego to commit something like this to portability.eclass
+# TODO add to portability.eclass
 _canonicalise() {
 	if type -p realpath > /dev/null; then
 		realpath "${@}"
-- 
2.39.0

[gentoo-dev] [PATCH 12/41] java-virtuals-2.eclass: drop EAPI 5-7 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/java-virtuals-2.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/java-virtuals-2.eclass b/eclass/java-virtuals-2.eclass
index d827342e9ba..842fbe0cc07 100644
--- a/eclass/java-virtuals-2.eclass
+++ b/eclass/java-virtuals-2.eclass
@@ -6,14 +6,14 @@
 # java@gentoo.org
 # @AUTHOR:
 # Original Author: Alistair John Bush <ali_bush@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 8
 # @BLURB: Java virtuals eclass
 # @DESCRIPTION:
 # To provide a default (and only) src_install function for ebuilds in the
 # java-virtuals category.
 
-case ${EAPI:-0} in
-	[5678]) ;;
+case ${EAPI} in
+	8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.39.0

[gentoo-dev] [PATCH 13/41] libretro-core.eclass: drop EAPI 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/libretro-core.eclass | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/eclass/libretro-core.eclass b/eclass/libretro-core.eclass
index e4f7221a540..55d7e9f1151 100644
--- a/eclass/libretro-core.eclass
+++ b/eclass/libretro-core.eclass
@@ -1,4 +1,4 @@
-# Copyright 2018-2021 Gentoo Authors
+# Copyright 2018-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: libretro-core.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Cecil Curry <leycec@gmail.com>
 # Craig Andrews <candrews@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Simplify libretro core ebuilds
 # @DESCRIPTION:
 # The libretro eclass is designed to streamline the construction of
@@ -34,6 +34,11 @@
 # SLOT="0"
 # @CODE
 
+case ${EAPI} in
+	7) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
 if [[ -z ${_LIBRETRO_CORE_ECLASS} ]]; then
 _LIBRETRO_CORE_ECLASS=1
 
@@ -78,14 +83,6 @@ else
 fi
 inherit flag-o-matic toolchain-funcs
 
-case "${EAPI:-0}" in
-	6|7)
-		EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install
-		;;
-	*)
-		die "EAPI=${EAPI} is not supported" ;;
-esac
-
 # @FUNCTION: libretro-core_src_unpack
 # @DESCRIPTION:
 # The libretro-core src_unpack function which is exported.
@@ -210,3 +207,5 @@ libretro-core_src_install() {
 }
 
 fi # end _LIBRETRO_CORE_ECLASS guard
+
+EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install
-- 
2.39.0

[gentoo-dev] [PATCH 14/41] linux-mod.eclass: drop EAPI 6 support

[David Seifert]

* eutils.eclass functionality was not used in EAPI 7.

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/linux-mod.eclass | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
index ff2294f1e4e..f1fad3231a9 100644
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # John Mylchreest <johnm@gentoo.org>,
 # Stefan Schweizer <genstef@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @PROVIDES: linux-info
 # @BLURB: It provides the functionality required to install external modules against a kernel source tree.
 # @DESCRIPTION:
@@ -149,12 +149,8 @@
 # @DESCRIPTION:
 # It's a read-only variable. It contains the extension of the kernel modules.
 
-case ${EAPI:-0} in
-	[67])
-		inherit eutils
-		;;
-	8)
-		;;
+case ${EAPI} in
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -170,10 +166,6 @@ case ${MODULES_OPTIONAL_USE_IUSE_DEFAULT:-n} in
   *) _modules_optional_use_iuse_default='+' ;;
 esac
 
-[[ -n "${_modules_optional_use_iuse_default}" ]] && case ${EAPI:-0} in
-	0) die "EAPI=${EAPI} is not supported with MODULES_OPTIONAL_USE_IUSE_DEFAULT due to lack of IUSE defaults" ;;
-esac
-
 IUSE="dist-kernel
 	${MODULES_OPTIONAL_USE:+${_modules_optional_use_iuse_default}}${MODULES_OPTIONAL_USE}"
 SLOT="0"
@@ -257,8 +249,8 @@ update_depmod() {
 move_old_moduledb() {
 	debug-print-function ${FUNCNAME} $*
 
-	local OLDDIR="${ROOT%/}"/usr/share/module-rebuild
-	local NEWDIR="${ROOT%/}"/var/lib/module-rebuild
+	local OLDDIR="${ROOT}"/usr/share/module-rebuild
+	local NEWDIR="${ROOT}"/var/lib/module-rebuild
 
 	if [[ -f "${OLDDIR}"/moduledb ]]; then
 		[[ ! -d "${NEWDIR}" ]] && mkdir -p "${NEWDIR}"
@@ -275,7 +267,7 @@ move_old_moduledb() {
 update_moduledb() {
 	debug-print-function ${FUNCNAME} $*
 
-	local MODULEDB_DIR="${ROOT%/}"/var/lib/module-rebuild
+	local MODULEDB_DIR="${ROOT}"/var/lib/module-rebuild
 	move_old_moduledb
 
 	if [[ ! -f "${MODULEDB_DIR}"/moduledb ]]; then
@@ -295,7 +287,7 @@ update_moduledb() {
 remove_moduledb() {
 	debug-print-function ${FUNCNAME} $*
 
-	local MODULEDB_DIR="${ROOT%/}"/var/lib/module-rebuild
+	local MODULEDB_DIR="${ROOT}"/var/lib/module-rebuild
 	move_old_moduledb
 
 	if grep -qs ${CATEGORY}/${PN}-${PVR} "${MODULEDB_DIR}"/moduledb ; then
@@ -742,10 +734,10 @@ linux-mod_src_install() {
 # It checks what to do after having merged the package.
 linux-mod_pkg_preinst() {
 	debug-print-function ${FUNCNAME} $*
-	[ -n "${MODULES_OPTIONAL_USE}" ] && use !${MODULES_OPTIONAL_USE} && return
+	[[ -n ${MODULES_OPTIONAL_USE} ]] && use !${MODULES_OPTIONAL_USE} && return
 
-	[ -d "${D%/}/lib/modules" ] && UPDATE_DEPMOD=true || UPDATE_DEPMOD=false
-	[ -d "${D%/}/lib/modules" ] && UPDATE_MODULEDB=true || UPDATE_MODULEDB=false
+	[[ -d ${D}/lib/modules ]] && UPDATE_DEPMOD=true || UPDATE_DEPMOD=false
+	[[ -d ${D}/lib/modules ]] && UPDATE_MODULEDB=true || UPDATE_MODULEDB=false
 }
 
 # @FUNCTION: linux-mod_pkg_postinst
-- 
2.39.0

[gentoo-dev] [PATCH 15/41] llvm.eclass: canonicalize eclass structure

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/llvm.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/llvm.eclass b/eclass/llvm.eclass
index b4347163fac..e334de4b86f 100644
--- a/eclass/llvm.eclass
+++ b/eclass/llvm.eclass
@@ -58,12 +58,13 @@
 
 case ${EAPI} in
 	7|8) ;;
-	*) die "EAPI=${EAPI:-0} not supported";;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 EXPORT_FUNCTIONS pkg_setup
 
 if [[ ! ${_LLVM_ECLASS} ]]; then
+_LLVM_ECLASS=1
 
 # make sure that the versions installing straight into /usr/bin
 # are uninstalled
@@ -278,5 +279,4 @@ llvm_pkg_setup() {
 	fi
 }
 
-_LLVM_ECLASS=1
 fi
-- 
2.39.0

[gentoo-dev] [PATCH 16/41] mozcoreconf-v6.eclass: drop EAPI 6, 7 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/mozcoreconf-v6.eclass | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/eclass/mozcoreconf-v6.eclass b/eclass/mozcoreconf-v6.eclass
index 45069777340..ecf1c1f6720 100644
--- a/eclass/mozcoreconf-v6.eclass
+++ b/eclass/mozcoreconf-v6.eclass
@@ -1,10 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-#
+
 # @ECLASS: mozcoreconf-v6.eclass
 # @MAINTAINER:
 # Mozilla team <mozilla@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 8
 # @BLURB: core options and configuration functions for mozilla
 # @DESCRIPTION:
 #
@@ -15,7 +15,13 @@
 # This is an eclass-generated variable that defines the rpath that the mozilla
 # product will be installed in.  Read-only
 
-if [[ ! ${_MOZCORECONF} ]]; then
+case ${EAPI} in
+	8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
+if [[ ! ${_MOZCORECONF_V6_ECLASS} ]]; then
+_MOZCORECONF_V6_ECLASS=1
 
 inherit toolchain-funcs flag-o-matic python-any-r1
 
@@ -23,18 +29,6 @@ BDEPEND="virtual/pkgconfig
 	dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)]
 	${PYTHON_DEPS}"
 
-case "${EAPI:-0}" in
-	6)
-		inherit multilib versionator
-		DEPEND+=" ${BDEPEND}"
-		;;
-	7|8)
-		;;
-	*)
-		die "EAPI ${EAPI} is not supported, contact eclass maintainers"
-		;;
-esac
-
 IUSE="${IUSE} custom-cflags custom-optimization"
 
 # @FUNCTION: mozconfig_annotate
@@ -275,5 +269,4 @@ mozconfig_final() {
 	echo
 }
 
-_MOZCORECONF=1
 fi
-- 
2.39.0

[gentoo-dev] [PATCH 17/41] mozextension.eclass: drop EAPI 0-7 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/mozextension.eclass | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/eclass/mozextension.eclass b/eclass/mozextension.eclass
index 25089aaeaf9..692aa816d8e 100644
--- a/eclass/mozextension.eclass
+++ b/eclass/mozextension.eclass
@@ -1,13 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-#
 
 # @ECLASS: mozextension.eclass
 # @MAINTAINER:
 # Mozilla team <mozilla@gentoo.org>
+# @SUPPORTED_EAPIS: 8
 # @BLURB: Install extensions for use in Mozilla products.
 
-if [[ ! ${_MOZEXTENSION} ]]; then
+case ${EAPI} in
+	8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
+if [[ ! ${_MOZEXTENSION_ECLASS} ]]; then
+_MOZEXTENSION_ECLASS=1
 
 # @ECLASS_VARIABLE: MOZEXTENSION_TARGET
 # @DESCRIPTION:
@@ -17,7 +23,7 @@ if [[ ! ${_MOZEXTENSION} ]]; then
 # paths specified in the eclass.
 : ${MOZEXTENSION_TARGET:=""}
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 mozversion_extension_location() {
 	case ${PN} in
@@ -117,8 +123,7 @@ xpi_copy() {
 		insinto "${MOZILLA_FIVE_HOME}"/extensions
 	fi
 
-	newins "${DISTDIR%/}"/${x##*/}.xpi ${emid}.xpi
+	newins "${DISTDIR}"/${x##*/}.xpi ${emid}.xpi
 }
 
-_MOZEXTENSION=1
 fi
-- 
2.39.0

[gentoo-dev] [PATCH 18/41] mozlinguas-v2.eclass: drop EAPI 6, 7 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/mozlinguas-v2.eclass | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/eclass/mozlinguas-v2.eclass b/eclass/mozlinguas-v2.eclass
index 155b894edc5..063430e1cb7 100644
--- a/eclass/mozlinguas-v2.eclass
+++ b/eclass/mozlinguas-v2.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: mozlinguas-v2.eclass
@@ -7,25 +7,22 @@
 # @AUTHOR:
 # Nirbheek Chauhan <nirbheek@gentoo.org>
 # Ian Stakenvicius <axs@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 8
 # @BLURB: Handle language packs for mozilla products
 # @DESCRIPTION:
 # Sets IUSE according to MOZ_LANGS (language packs available). Also exports
 # src_unpack, src_compile and src_install for use in ebuilds, and provides
 # supporting functions for langpack generation and installation.
 
-inherit mozextension
-
-case "${EAPI:-0}" in
-	6)
-		inherit eapi7-ver ;;
-	7|8)
-		;;
-	*)
-		die "EAPI ${EAPI} is not supported, contact eclass maintainers" ;;
+case ${EAPI} in
+	8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-EXPORT_FUNCTIONS src_unpack src_compile src_install
+if [[ ! ${_MOZLINGUAS_V2_ECLASS} ]]; then
+_MOZLINGUAS_V2_ECLASS=1
+
+inherit mozextension
 
 # @ECLASS_VARIABLE: MOZ_LANGS
 # @DEFAULT_UNSET
@@ -402,3 +399,7 @@ mozlinguas_src_install() {
 mozlinguas-v2_src_install() {
 	mozlinguas_src_install
 }
+
+fi
+
+EXPORT_FUNCTIONS src_unpack src_compile src_install
-- 
2.39.0

[gentoo-dev] [PATCH 19/41] ninja-utils.eclass: drop EAPI 5, 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/ninja-utils.eclass | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/eclass/ninja-utils.eclass b/eclass/ninja-utils.eclass
index 9be502fa8ad..eb2fb62f6c3 100644
--- a/eclass/ninja-utils.eclass
+++ b/eclass/ninja-utils.eclass
@@ -8,7 +8,7 @@
 # @AUTHOR:
 # Michał Górny <mgorny@gentoo.org>
 # Mike Gilbert <floppym@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: common bits to run dev-util/ninja builder
 # @DESCRIPTION:
 # This eclass provides a single function -- eninja -- that can be used
@@ -19,7 +19,7 @@
 # Meson).
 
 case ${EAPI} in
-	5|6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -76,16 +76,13 @@ get_NINJAOPTS() {
 # @USAGE: [<args>...]
 # @DESCRIPTION:
 # Call Ninja, passing the NINJAOPTS (or converted MAKEOPTS), followed
-# by the supplied arguments. This function dies if ninja fails. Starting
-# with EAPI 6, it also supports being called via 'nonfatal'.
+# by the supplied arguments. This function dies if ninja fails.  It
+# also supports being called via 'nonfatal'.
 eninja() {
-	local nonfatal_args=()
-	[[ ${EAPI} != 5 ]] && nonfatal_args+=( -n )
-
 	[[ -n "${NINJA_DEPEND}" ]] || ewarn "Unknown value '${NINJA}' for \${NINJA}"
 	set -- "${NINJA}" -v $(get_NINJAOPTS) "$@"
 	echo "$@" >&2
-	"$@" || die "${nonfatal_args[@]}" "${*} failed"
+	"$@" || die -n "${*} failed"
 }
 
 fi
-- 
2.39.0

[gentoo-dev] [PATCH 20/41] php-ext-pecl-r3.eclass: drop EAPI 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/php-ext-pecl-r3.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/php-ext-pecl-r3.eclass b/eclass/php-ext-pecl-r3.eclass
index b1b9429e8a2..11ae34429fb 100644
--- a/eclass/php-ext-pecl-r3.eclass
+++ b/eclass/php-ext-pecl-r3.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: php-ext-pecl-r3.eclass
 # @MAINTAINER:
 # Gentoo PHP team <php-bugs@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @PROVIDES: php-ext-source-r3
 # @BLURB: A uniform way to install PECL extensions
 # @DESCRIPTION:
@@ -13,7 +13,7 @@
 # see https://pecl.php.net/
 
 case ${EAPI:-0} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.39.0

[gentoo-dev] [PATCH 21/41] php-ext-source-r3.eclass: drop EAPI 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/php-ext-source-r3.eclass | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/eclass/php-ext-source-r3.eclass b/eclass/php-ext-source-r3.eclass
index b60d5528d52..7179ab756f6 100644
--- a/eclass/php-ext-source-r3.eclass
+++ b/eclass/php-ext-source-r3.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: php-ext-source-r3.eclass
 # @MAINTAINER:
 # Gentoo PHP team <php-bugs@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Compile and install standalone PHP extensions.
 # @DESCRIPTION:
 # A unified interface for compiling and installing standalone PHP
@@ -12,11 +12,9 @@
 
 inherit autotools
 
-case ${EAPI:-0} in
-	6) inherit eapi7-ver ;;
+case ${EAPI} in
 	7|8) ;;
-	*)
-		die "${ECLASS} is not compatible with EAPI=${EAPI}"
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 # @ECLASS_VARIABLE: PHP_EXT_NAME
@@ -128,14 +126,17 @@ unset _php_slot _php_target
 # the USE-conditional if PHP_EXT_OPTIONAL_USE is non-null.
 REQUIRED_USE+=") ${PHP_EXT_OPTIONAL_USE:+ )}"
 PHPDEPEND+=" ${PHP_EXT_OPTIONAL_USE:+ )}"
-TOOLDEPS="sys-devel/m4 sys-devel/libtool"
+TOOLDEPS="
+	sys-devel/m4
+	sys-devel/libtool
+"
 
 RDEPEND="${PHPDEPEND}"
-
-case ${EAPI:-0} in
-	6) DEPEND="${TOOLDEPS} ${PHPDEPEND}" ;;
-	7|8) DEPEND="${PHPDEPEND}" ; BDEPEND="${TOOLDEPS} ${PHPDEPEND}" ;;
-esac
+DEPEND="${PHPDEPEND}"
+BDEPEND="
+	${TOOLDEPS}
+	${PHPDEPEND}
+"
 
 unset PHPDEPEND TOOLDEPS
 
-- 
2.39.0

[gentoo-dev] [PATCH 22/41] postgres.eclass: drop EAPI 5, 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/postgres.eclass | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/eclass/postgres.eclass b/eclass/postgres.eclass
index 8e204e2ade8..e94ab56a40a 100644
--- a/eclass/postgres.eclass
+++ b/eclass/postgres.eclass
@@ -1,14 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EXPORT_FUNCTIONS pkg_setup
-
 # @ECLASS: postgres.eclass
 # @MAINTAINER:
 # PostgreSQL <pgsql-bugs@gentoo.org>
 # @AUTHOR:
 # Aaron W. Swenson <titanofold@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 7
 # @BLURB: An eclass for PostgreSQL-related packages
 # @DESCRIPTION:
 # This eclass provides common utility functions that many
@@ -16,12 +14,14 @@ EXPORT_FUNCTIONS pkg_setup
 # currently selected PostgreSQL slot is within a range, adding a system
 # user to the postgres system group, and generating dependencies.
 
-
-case ${EAPI:-0} in
-	5|6|7) ;;
-	*) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
+case ${EAPI} in
+	7) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
+if [[ ! ${_POSTGRES_ECLASS} ]]; then
+_POSTGRES_ECLASS=1
+
 # @ECLASS_VARIABLE: _POSTGRES_ALL_VERSIONS
 # @INTERNAL
 # @DESCRIPTION:
@@ -159,3 +159,7 @@ postgres_pkg_setup() {
 
 	elog "PostgreSQL Target: ${best_slot}"
 }
+
+fi
+
+EXPORT_FUNCTIONS pkg_setup
-- 
2.39.0

[gentoo-dev] [PATCH 23/41] postgres-multi.eclass: drop EAPI 5, 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/postgres-multi.eclass | 38 ++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/eclass/postgres-multi.eclass b/eclass/postgres-multi.eclass
index 9dcf22e64a1..d93df851cd2 100644
--- a/eclass/postgres-multi.eclass
+++ b/eclass/postgres-multi.eclass
@@ -1,16 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-inherit multibuild postgres
-EXPORT_FUNCTIONS pkg_setup src_prepare src_compile src_install src_test
-
-
 # @ECLASS: postgres-multi.eclass
 # @MAINTAINER:
 # PostgreSQL <pgsql-bugs@gentoo.org>
 # @AUTHOR:
 # Aaron W. Swenson <titanofold@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 7
 # @PROVIDES: multibuild postgres
 # @BLURB: An eclass to build PostgreSQL-related packages against multiple slots
 # @DESCRIPTION:
@@ -18,12 +14,15 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_compile src_install src_test
 # build and install for one or more PostgreSQL slots as specified by
 # POSTGRES_TARGETS use flags.
 
-
-case ${EAPI:-0} in
-	5|6|7) ;;
-	*) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
+case ${EAPI} in
+	7) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
+if [[ ! ${_POSTGRES_MULTI_ECLASS} ]]; then
+_POSTGRES_MULTI_ECLASS=1
+
+inherit multibuild postgres
 
 # @ECLASS_VARIABLE: POSTGRES_COMPAT
 # @PRE_INHERIT
@@ -147,10 +146,7 @@ postgres-multi_src_prepare() {
 		fi
 	done
 
-	case ${EAPI:-0} in
-		0|1|2|3|4|5) epatch_user ;;
-		6|7) eapply_user ;;
-	esac
+	eapply_user
 
 	local MULTIBUILD_VARIANT
 	local MULTIBUILD_VARIANTS=("${_POSTGRES_INTERSECT_SLOTS[@]}")
@@ -164,6 +160,13 @@ postgres-multi_src_compile() {
 	postgres-multi_foreach emake
 }
 
+# @FUNCTION: postgres-multi_src_test
+# @DESCRIPTION:
+# Runs `emake installcheck' in each build directory.
+postgres-multi_src_test() {
+	postgres-multi_foreach emake installcheck
+}
+
 # @FUNCTION: postgres-multi_src_install
 # @DESCRIPTION:
 # Runs `emake install DESTDIR="${D}"' in each build directory.
@@ -171,9 +174,6 @@ postgres-multi_src_install() {
 	postgres-multi_foreach emake install DESTDIR="${D}"
 }
 
-# @FUNCTION: postgres-multi_src_test
-# @DESCRIPTION:
-# Runs `emake installcheck' in each build directory.
-postgres-multi_src_test() {
-	postgres-multi_foreach emake installcheck
-}
+fi
+
+EXPORT_FUNCTIONS pkg_setup src_prepare src_compile src_install src_test
-- 
2.39.0

[gentoo-dev] [PATCH 24/41] python-any-r1.eclass: drop EAPI 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/docs.eclass             |  2 +-
 eclass/python-any-r1.eclass    | 21 ++++++++-------------
 eclass/python-r1.eclass        |  2 +-
 eclass/python-single-r1.eclass |  2 +-
 eclass/scons-utils.eclass      |  4 ++--
 eclass/waf-utils.eclass        |  4 ++--
 6 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/eclass/docs.eclass b/eclass/docs.eclass
index ed1558bc9a8..859e8048893 100644
--- a/eclass/docs.eclass
+++ b/eclass/docs.eclass
@@ -153,7 +153,7 @@ _DOCS_ECLASS=1
 case ${DOCS_BUILDER} in
 	"sphinx"|"mkdocs")
 		# We need the python_gen_any_dep function
-		if [[ ! ${_PYTHON_R1} && ! ${_PYTHON_ANY_R1} && ! ${_PYTHON_SINGLE_R1} ]]; then
+		if [[ ! ${_PYTHON_R1} && ! ${_PYTHON_ANY_R1_ECLASS} && ! ${_PYTHON_SINGLE_R1} ]]; then
 			die "distutils-r1, python-r1, python-single-r1 or python-any-r1 needs to be inherited to use python based documentation builders"
 		fi
 		;;
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index 558f725f74b..bec15f7ca0b 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Author: Michał Górny <mgorny@gentoo.org>
 # Based on work of: Krzysztof Pawlik <nelchael@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @PROVIDES: python-utils-r1
 # @BLURB: An eclass for packages having build-time dependency on Python.
 # @DESCRIPTION:
@@ -38,13 +38,13 @@
 # For more information, please see the Python Guide:
 # https://projects.gentoo.org/python/guide/
 
-case "${EAPI:-0}" in
-	[0-5]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
-	[6-8]) ;;
-	*)     die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
+case ${EAPI} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ ! ${_PYTHON_ANY_R1} ]]; then
+if [[ ! ${_PYTHON_ANY_R1_ECLASS} ]]; then
+_PYTHON_ANY_R1_ECLASS=1
 
 if [[ ${_PYTHON_R1} ]]; then
 	die 'python-any-r1.eclass can not be used with python-r1.eclass.'
@@ -54,10 +54,6 @@ fi
 
 inherit python-utils-r1
 
-fi
-
-EXPORT_FUNCTIONS pkg_setup
-
 # @ECLASS_VARIABLE: PYTHON_COMPAT
 # @REQUIRED
 # @DESCRIPTION:
@@ -205,8 +201,6 @@ _python_any_set_globals() {
 _python_any_set_globals
 unset -f _python_any_set_globals
 
-if [[ ! ${_PYTHON_ANY_R1} ]]; then
-
 # @FUNCTION: python_gen_any_dep
 # @USAGE: <dependency-block>
 # @DESCRIPTION:
@@ -348,5 +342,6 @@ python-any-r1_pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && python_setup
 }
 
-_PYTHON_ANY_R1=1
 fi
+
+EXPORT_FUNCTIONS pkg_setup
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index caa37bc54ae..bc10e83cf78 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -45,7 +45,7 @@ if [[ ! ${_PYTHON_R1} ]]; then
 
 if [[ ${_PYTHON_SINGLE_R1} ]]; then
 	die 'python-r1.eclass can not be used with python-single-r1.eclass.'
-elif [[ ${_PYTHON_ANY_R1} ]]; then
+elif [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then
 	die 'python-r1.eclass can not be used with python-any-r1.eclass.'
 fi
 
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 740c3283d1b..59673d2a5bf 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -52,7 +52,7 @@ if [[ ! ${_PYTHON_SINGLE_R1} ]]; then
 
 if [[ ${_PYTHON_R1} ]]; then
 	die 'python-single-r1.eclass can not be used with python-r1.eclass.'
-elif [[ ${_PYTHON_ANY_R1} ]]; then
+elif [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then
 	die 'python-single-r1.eclass can not be used with python-any-r1.eclass.'
 fi
 
diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass
index acb51300f34..9fc048cadcd 100644
--- a/eclass/scons-utils.eclass
+++ b/eclass/scons-utils.eclass
@@ -95,7 +95,7 @@ inherit multiprocessing
 
 SCONS_DEPEND=">=dev-util/scons-${SCONS_MIN_VERSION}"
 
-if [[ ${_PYTHON_ANY_R1} ]]; then
+if [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then
 	# when using python-any-r1, use any-of dep API
 	BDEPEND="$(python_gen_any_dep "${SCONS_DEPEND}[\${PYTHON_USEDEP}]")"
 
@@ -137,7 +137,7 @@ escons() {
 	if [[ ! ${EPYTHON} ]]; then
 		eerror "EPYTHON is unset while calling escons. This most likely means that"
 		eerror "the ebuild did not call the appropriate eclass function before calling scons."
-		if [[ ${_PYTHON_ANY_R1} ]]; then
+		if [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then
 			eerror "Please ensure that python-any-r1_pkg_setup is called in pkg_setup()."
 		elif [[ ${_PYTHON_SINGLE_R1} ]]; then
 			eerror "Please ensure that python-single-r1_pkg_setup is called in pkg_setup()."
diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
index 3ff74db0d79..e08515e4502 100644
--- a/eclass/waf-utils.eclass
+++ b/eclass/waf-utils.eclass
@@ -41,7 +41,7 @@ waf-utils_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	local fail
-	if [[ ! ${_PYTHON_ANY_R1} && ! ${_PYTHON_SINGLE_R1} && ! ${_PYTHON_R1} ]]; then
+	if [[ ! ${_PYTHON_ANY_R1_ECLASS} && ! ${_PYTHON_SINGLE_R1} && ! ${_PYTHON_R1} ]]; then
 		eerror "Using waf-utils.eclass without any python-r1 suite eclass is not supported."
 		eerror "Please make sure to configure and inherit appropriate -r1 eclass."
 		eerror "For more information and examples, please see:"
@@ -51,7 +51,7 @@ waf-utils_src_configure() {
 		if [[ ! ${EPYTHON} ]]; then
 			eerror "EPYTHON is unset while calling waf-utils. This most likely means that"
 			eerror "the ebuild did not call the appropriate eclass function before calling waf."
-			if [[ ${_PYTHON_ANY_R1} ]]; then
+			if [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then
 				eerror "Please ensure that python-any-r1_pkg_setup is called in pkg_setup()."
 			elif [[ ${_PYTHON_SINGLE_R1} ]]; then
 				eerror "Please ensure that python-single-r1_pkg_setup is called in pkg_setup()."
-- 
2.39.0

[gentoo-dev] [PATCH 25/41] python-r1.eclass: drop EAPI 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/docs.eclass             |  2 +-
 eclass/mate.eclass             |  2 +-
 eclass/python-any-r1.eclass    |  2 +-
 eclass/python-r1.eclass        | 27 ++++++++-------------------
 eclass/python-single-r1.eclass |  2 +-
 eclass/scons-utils.eclass      |  2 +-
 eclass/waf-utils.eclass        |  2 +-
 7 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/eclass/docs.eclass b/eclass/docs.eclass
index 859e8048893..f4663c3575f 100644
--- a/eclass/docs.eclass
+++ b/eclass/docs.eclass
@@ -153,7 +153,7 @@ _DOCS_ECLASS=1
 case ${DOCS_BUILDER} in
 	"sphinx"|"mkdocs")
 		# We need the python_gen_any_dep function
-		if [[ ! ${_PYTHON_R1} && ! ${_PYTHON_ANY_R1_ECLASS} && ! ${_PYTHON_SINGLE_R1} ]]; then
+		if [[ ! ${_PYTHON_R1_ECLASS} && ! ${_PYTHON_ANY_R1_ECLASS} && ! ${_PYTHON_SINGLE_R1} ]]; then
 			die "distutils-r1, python-r1, python-single-r1 or python-any-r1 needs to be inherited to use python based documentation builders"
 		fi
 		;;
diff --git a/eclass/mate.eclass b/eclass/mate.eclass
index 66b4cf44624..c1886648140 100644
--- a/eclass/mate.eclass
+++ b/eclass/mate.eclass
@@ -45,7 +45,7 @@ DEPEND=">=mate-base/mate-common-${MATE_BRANCH}"
 # This function should only be used if the ebuild also inherits the
 # python-r1 eclass
 mate_py_cond_func_wrap() {
-	if [[ ! ${_PYTHON_R1} ]]; then
+	if [[ ! ${_PYTHON_R1_ECLASS} ]]; then
 		die "This function requires the inheritence of the python-r1 eclass"
 	fi
 	if use python; then
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index bec15f7ca0b..7474ef0474b 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -46,7 +46,7 @@ esac
 if [[ ! ${_PYTHON_ANY_R1_ECLASS} ]]; then
 _PYTHON_ANY_R1_ECLASS=1
 
-if [[ ${_PYTHON_R1} ]]; then
+if [[ ${_PYTHON_R1_ECLASS} ]]; then
 	die 'python-any-r1.eclass can not be used with python-r1.eclass.'
 elif [[ ${_PYTHON_SINGLE_R1} ]]; then
 	die 'python-any-r1.eclass can not be used with python-single-r1.eclass.'
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index bc10e83cf78..52822c5f47b 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Author: Michał Górny <mgorny@gentoo.org>
 # Based on work of: Krzysztof Pawlik <nelchael@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @PROVIDES: multibuild python-utils-r1
 # @BLURB: A common, simple eclass for Python packages.
 # @DESCRIPTION:
@@ -30,18 +30,13 @@
 # For more information, please see the Python Guide:
 # https://projects.gentoo.org/python/guide/
 
-case "${EAPI:-0}" in
-	[0-5])
-		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
-		;;
-	[6-8])
-		;;
-	*)
-		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
-		;;
+case ${EAPI} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ ! ${_PYTHON_R1} ]]; then
+if [[ ! ${_PYTHON_R1_ECLASS} ]]; then
+_PYTHON_R1_ECLASS=1
 
 if [[ ${_PYTHON_SINGLE_R1} ]]; then
 	die 'python-r1.eclass can not be used with python-single-r1.eclass.'
@@ -49,11 +44,8 @@ elif [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then
 	die 'python-r1.eclass can not be used with python-any-r1.eclass.'
 fi
 
-[[ ${EAPI} == 6 ]] && inherit eqawarn
 inherit multibuild python-utils-r1
 
-fi
-
 # @ECLASS_VARIABLE: PYTHON_COMPAT
 # @REQUIRED
 # @DESCRIPTION:
@@ -244,8 +236,6 @@ _python_set_globals() {
 _python_set_globals
 unset -f _python_set_globals
 
-if [[ ! ${_PYTHON_R1} ]]; then
-
 # @FUNCTION: _python_validate_useflags
 # @INTERNAL
 # @DESCRIPTION:
@@ -636,7 +626,7 @@ python_foreach_impl() {
 			eqawarn "instead."
 			_DISTUTILS_FOREACH_IMPL_WARNED=1
 
-			if ! has "${EAPI}" 6 7 8; then
+			if ! has "${EAPI}" 7 8; then
 				die "Calling python_foreach_impl from distutils-r1 is banned in EAPI ${EAPI}"
 			fi
 		fi
@@ -805,10 +795,9 @@ python_replicate_script() {
 	local f
 	for f; do
 		local dosym=dosym
-		[[ ${EAPI} == [67] ]] && dosym=dosym8
+		[[ ${EAPI} == 7 ]] && dosym=dosym8
 		"${dosym}" -r /usr/lib/python-exec/python-exec2 "${f#${ED}}"
 	done
 }
 
-_PYTHON_R1=1
 fi
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 59673d2a5bf..790477c1472 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -50,7 +50,7 @@ esac
 
 if [[ ! ${_PYTHON_SINGLE_R1} ]]; then
 
-if [[ ${_PYTHON_R1} ]]; then
+if [[ ${_PYTHON_R1_ECLASS} ]]; then
 	die 'python-single-r1.eclass can not be used with python-r1.eclass.'
 elif [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then
 	die 'python-single-r1.eclass can not be used with python-any-r1.eclass.'
diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass
index 9fc048cadcd..619230ecca6 100644
--- a/eclass/scons-utils.eclass
+++ b/eclass/scons-utils.eclass
@@ -108,7 +108,7 @@ elif [[ ${_PYTHON_SINGLE_R1} ]]; then
 	BDEPEND="
 		$(python_gen_cond_dep "${SCONS_DEPEND}[\${PYTHON_USEDEP}]")
 		${PYTHON_DEPS}"
-elif [[ ${_PYTHON_R1} ]]; then
+elif [[ ${_PYTHON_R1_ECLASS} ]]; then
 	# when using python-r1, you need to depend on scons yourself
 	# (depending on whether you need any-r1 or full -r1 API)
 	# -- since this is a breaking API change, it applies to EAPI 7+ only
diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
index e08515e4502..61994e73bed 100644
--- a/eclass/waf-utils.eclass
+++ b/eclass/waf-utils.eclass
@@ -41,7 +41,7 @@ waf-utils_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	local fail
-	if [[ ! ${_PYTHON_ANY_R1_ECLASS} && ! ${_PYTHON_SINGLE_R1} && ! ${_PYTHON_R1} ]]; then
+	if [[ ! ${_PYTHON_ANY_R1_ECLASS} && ! ${_PYTHON_SINGLE_R1} && ! ${_PYTHON_R1_ECLASS} ]]; then
 		eerror "Using waf-utils.eclass without any python-r1 suite eclass is not supported."
 		eerror "Please make sure to configure and inherit appropriate -r1 eclass."
 		eerror "For more information and examples, please see:"
-- 
2.39.0

[gentoo-dev] [PATCH 26/41] python-single-r1.eclass: drop EAPI 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/docs.eclass             |  6 +++---
 eclass/python-any-r1.eclass    |  2 +-
 eclass/python-r1.eclass        |  2 +-
 eclass/python-single-r1.eclass | 26 ++++++++------------------
 eclass/scons-utils.eclass      |  4 ++--
 eclass/waf-utils.eclass        |  4 ++--
 6 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/eclass/docs.eclass b/eclass/docs.eclass
index f4663c3575f..cbf35068de3 100644
--- a/eclass/docs.eclass
+++ b/eclass/docs.eclass
@@ -153,7 +153,7 @@ _DOCS_ECLASS=1
 case ${DOCS_BUILDER} in
 	"sphinx"|"mkdocs")
 		# We need the python_gen_any_dep function
-		if [[ ! ${_PYTHON_R1_ECLASS} && ! ${_PYTHON_ANY_R1_ECLASS} && ! ${_PYTHON_SINGLE_R1} ]]; then
+		if [[ ! ${_PYTHON_R1_ECLASS} && ! ${_PYTHON_ANY_R1_ECLASS} && ! ${_PYTHON_SINGLE_R1_ECLASS} ]]; then
 			die "distutils-r1, python-r1, python-single-r1 or python-any-r1 needs to be inherited to use python based documentation builders"
 		fi
 		;;
@@ -221,7 +221,7 @@ sphinx_deps() {
 	elif [[ ${DOCS_AUTODOC} != 0 && ${DOCS_AUTODOC} != 1 ]]; then
 		die "${FUNCNAME}: DOCS_AUTODOC should be set to 0 or 1"
 	fi
-	if [[ ${_PYTHON_SINGLE_R1} ]]; then
+	if [[ ${_PYTHON_SINGLE_R1_ECLASS} ]]; then
 		DOCS_DEPEND="$(python_gen_cond_dep "${deps}")"
 	else
 		DOCS_DEPEND="$(python_gen_any_dep "${deps}")"
@@ -284,7 +284,7 @@ mkdocs_deps() {
 	elif [[ ${DOCS_AUTODOC} != 0 && ${DOCS_AUTODOC} != 1 ]]; then
 		die "${FUNCNAME}: DOCS_AUTODOC should be set to 0 or 1"
 	fi
-	if [[ ${_PYTHON_SINGLE_R1} ]]; then
+	if [[ ${_PYTHON_SINGLE_R1_ECLASS} ]]; then
 		DOCS_DEPEND="$(python_gen_cond_dep "${deps}")"
 	else
 		DOCS_DEPEND="$(python_gen_any_dep "${deps}")"
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index 7474ef0474b..d7d44a87f51 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -48,7 +48,7 @@ _PYTHON_ANY_R1_ECLASS=1
 
 if [[ ${_PYTHON_R1_ECLASS} ]]; then
 	die 'python-any-r1.eclass can not be used with python-r1.eclass.'
-elif [[ ${_PYTHON_SINGLE_R1} ]]; then
+elif [[ ${_PYTHON_SINGLE_R1_ECLASS} ]]; then
 	die 'python-any-r1.eclass can not be used with python-single-r1.eclass.'
 fi
 
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 52822c5f47b..622a479dcfa 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -38,7 +38,7 @@ esac
 if [[ ! ${_PYTHON_R1_ECLASS} ]]; then
 _PYTHON_R1_ECLASS=1
 
-if [[ ${_PYTHON_SINGLE_R1} ]]; then
+if [[ ${_PYTHON_SINGLE_R1_ECLASS} ]]; then
 	die 'python-r1.eclass can not be used with python-single-r1.eclass.'
 elif [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then
 	die 'python-r1.eclass can not be used with python-any-r1.eclass.'
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 790477c1472..4d61f08c06f 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Author: Michał Górny <mgorny@gentoo.org>
 # Based on work of: Krzysztof Pawlik <nelchael@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @PROVIDES: python-utils-r1
 # @BLURB: An eclass for Python packages not installed for multiple implementations.
 # @DESCRIPTION:
@@ -37,18 +37,13 @@
 # For more information, please see the Python Guide:
 # https://projects.gentoo.org/python/guide/
 
-case "${EAPI:-0}" in
-	[0-5])
-		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
-		;;
-	[6-8])
-		;;
-	*)
-		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
-		;;
+case ${EAPI} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ ! ${_PYTHON_SINGLE_R1} ]]; then
+if [[ ! ${_PYTHON_SINGLE_R1_ECLASS} ]]; then
+_PYTHON_SINGLE_R1_ECLASS=1
 
 if [[ ${_PYTHON_R1_ECLASS} ]]; then
 	die 'python-single-r1.eclass can not be used with python-r1.eclass.'
@@ -58,10 +53,6 @@ fi
 
 inherit python-utils-r1
 
-fi
-
-EXPORT_FUNCTIONS pkg_setup
-
 # @ECLASS_VARIABLE: PYTHON_COMPAT
 # @REQUIRED
 # @DESCRIPTION:
@@ -257,8 +248,6 @@ _python_single_set_globals() {
 _python_single_set_globals
 unset -f _python_single_set_globals
 
-if [[ ! ${_PYTHON_SINGLE_R1} ]]; then
-
 # @FUNCTION: python_gen_useflags
 # @USAGE: [<pattern>...]
 # @DESCRIPTION:
@@ -463,5 +452,6 @@ python-single-r1_pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && python_setup
 }
 
-_PYTHON_SINGLE_R1=1
 fi
+
+EXPORT_FUNCTIONS pkg_setup
diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass
index 619230ecca6..8d0076de97e 100644
--- a/eclass/scons-utils.eclass
+++ b/eclass/scons-utils.eclass
@@ -103,7 +103,7 @@ if [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then
 		python_has_version "${SCONS_DEPEND}[${PYTHON_USEDEP}]"
 	}
 	python_check_deps() { scons-utils_python_check_deps; }
-elif [[ ${_PYTHON_SINGLE_R1} ]]; then
+elif [[ ${_PYTHON_SINGLE_R1_ECLASS} ]]; then
 	# when using python-single-r1, use PYTHON_USEDEP API
 	BDEPEND="
 		$(python_gen_cond_dep "${SCONS_DEPEND}[\${PYTHON_USEDEP}]")
@@ -139,7 +139,7 @@ escons() {
 		eerror "the ebuild did not call the appropriate eclass function before calling scons."
 		if [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then
 			eerror "Please ensure that python-any-r1_pkg_setup is called in pkg_setup()."
-		elif [[ ${_PYTHON_SINGLE_R1} ]]; then
+		elif [[ ${_PYTHON_SINGLE_R1_ECLASS} ]]; then
 			eerror "Please ensure that python-single-r1_pkg_setup is called in pkg_setup()."
 		else # python-r1
 			eerror "Please ensure that python_setup is called before escons, or that escons"
diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
index 61994e73bed..2f4a20cd457 100644
--- a/eclass/waf-utils.eclass
+++ b/eclass/waf-utils.eclass
@@ -41,7 +41,7 @@ waf-utils_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	local fail
-	if [[ ! ${_PYTHON_ANY_R1_ECLASS} && ! ${_PYTHON_SINGLE_R1} && ! ${_PYTHON_R1_ECLASS} ]]; then
+	if [[ ! ${_PYTHON_ANY_R1_ECLASS} && ! ${_PYTHON_SINGLE_R1_ECLASS} && ! ${_PYTHON_R1_ECLASS} ]]; then
 		eerror "Using waf-utils.eclass without any python-r1 suite eclass is not supported."
 		eerror "Please make sure to configure and inherit appropriate -r1 eclass."
 		eerror "For more information and examples, please see:"
@@ -53,7 +53,7 @@ waf-utils_src_configure() {
 			eerror "the ebuild did not call the appropriate eclass function before calling waf."
 			if [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then
 				eerror "Please ensure that python-any-r1_pkg_setup is called in pkg_setup()."
-			elif [[ ${_PYTHON_SINGLE_R1} ]]; then
+			elif [[ ${_PYTHON_SINGLE_R1_ECLASS} ]]; then
 				eerror "Please ensure that python-single-r1_pkg_setup is called in pkg_setup()."
 			else # python-r1
 				eerror "Please ensure that python_setup is called before waf-utils_src_configure(),"
-- 
2.39.0

[gentoo-dev] [PATCH 27/41] python-utils-r1.eclass: drop EAPI 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/python-utils-r1.eclass | 45 +++++++++++------------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index d7b3df6105a..568b2dbdfa4 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Author: Michał Górny <mgorny@gentoo.org>
 # Based on work of: Krzysztof Pawlik <nelchael@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Utility functions for packages with Python parts.
 # @DESCRIPTION:
 # A utility eclass providing functions to query Python implementations,
@@ -22,20 +22,16 @@
 # NOTE: When dropping support for EAPIs here, we need to update
 # metadata/install-qa-check.d/60python-pyc
 # See bug #704286, bug #781878
-case "${EAPI:-0}" in
-	[0-5]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
-	[6-8]) ;;
-	*)     die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
-esac
 
-if [[ ${_PYTHON_ECLASS_INHERITED} ]]; then
-	die 'python-r1 suite eclasses can not be used with python.eclass.'
-fi
+case ${EAPI} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
 
-if [[ ! ${_PYTHON_UTILS_R1} ]]; then
+if [[ ! ${_PYTHON_UTILS_R1_ECLASS} ]]; then
+_PYTHON_UTILS_R1_ECLASS=1
 
-[[ ${EAPI} == [67] ]] && inherit eapi8-dosym
-[[ ${EAPI} == 6 ]] && inherit eqawarn
+[[ ${EAPI} == 7 ]] && inherit eapi8-dosym
 inherit multiprocessing toolchain-funcs
 
 # @ECLASS_VARIABLE: _PYTHON_ALL_IMPLS
@@ -218,7 +214,7 @@ _python_impl_matches() {
 	for pattern; do
 		case ${pattern} in
 			-2|python2*|pypy)
-				if [[ ${EAPI} != [67] ]]; then
+				if [[ ${EAPI} != 7 ]]; then
 					eerror
 					eerror "Python 2 is no longer supported in Gentoo, please remove Python 2"
 					eerror "${FUNCNAME[1]} calls."
@@ -227,7 +223,7 @@ _python_impl_matches() {
 				;;
 			-3)
 				# NB: "python3*" is fine, as "not pypy3"
-				if [[ ${EAPI} != [67] ]]; then
+				if [[ ${EAPI} != 7 ]]; then
 					eerror
 					eerror "Python 2 is no longer supported in Gentoo, please remove Python 2"
 					eerror "${FUNCNAME[1]} calls."
@@ -724,7 +720,7 @@ python_newexe() {
 
 	# install the wrapper
 	local dosym=dosym
-	[[ ${EAPI} == [67] ]] && dosym=dosym8
+	[[ ${EAPI} == 7 ]] && dosym=dosym8
 	"${dosym}" -r /usr/lib/python-exec/python-exec2 "${wrapd}/${newfn}"
 
 	# don't use this at home, just call python_doscript() instead
@@ -1368,15 +1364,13 @@ _python_run_check_deps() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	local impl=${1}
-	local hasv_args=( -b )
-	[[ ${EAPI} == 6 ]] && hasv_args=( --host-root )
 
 	einfo "Checking whether ${impl} is suitable ..."
 
 	local PYTHON_PKG_DEP
 	_python_export "${impl}" PYTHON_PKG_DEP
 	ebegin "  ${PYTHON_PKG_DEP}"
-	has_version "${hasv_args[@]}" "${PYTHON_PKG_DEP}"
+	has_version -b "${PYTHON_PKG_DEP}"
 	eend ${?} || return 1
 	declare -f python_check_deps >/dev/null || return 0
 
@@ -1393,10 +1387,8 @@ _python_run_check_deps() {
 # A convenience wrapper for has_version() with verbose output and better
 # defaults for use in python_check_deps().
 #
-# The wrapper accepts EAPI 7+-style -b/-d/-r options to indicate
-# the root to perform the lookup on.  Unlike has_version, the default
-# is -b.  In EAPI 6, -b and -d are translated to --host-root
-# for compatibility.
+# The wrapper accepts -b/-d/-r options to indicate the root to perform
+# the lookup on.  Unlike has_version, the default is -b.
 #
 # The wrapper accepts multiple package specifications.  For the check
 # to succeed, *all* specified atoms must match.
@@ -1411,14 +1403,6 @@ python_has_version() {
 			;;
 	esac
 
-	if [[ ${EAPI} == 6 ]]; then
-		if [[ ${root_arg} == -r ]]; then
-			root_arg=()
-		else
-			root_arg=( --host-root )
-		fi
-	fi
-
 	local pkg
 	for pkg; do
 		ebegin "    ${pkg}"
@@ -1429,5 +1413,4 @@ python_has_version() {
 	return 0
 }
 
-_PYTHON_UTILS_R1=1
 fi
-- 
2.39.0

[gentoo-dev] [PATCH 28/41] rocm.eclass: drop EAPI 7 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/rocm.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/rocm.eclass b/eclass/rocm.eclass
index 4c8fd39f249..dcddd262e59 100644
--- a/eclass/rocm.eclass
+++ b/eclass/rocm.eclass
@@ -6,7 +6,7 @@
 # Gentoo Science Project <sci@gentoo.org>
 # @AUTHOR:
 # Yiyang Wu <xgreenlandforwyy@gmail.com>
-# @SUPPORTED_EAPIS: 7 8
+# @SUPPORTED_EAPIS: 8
 # @BLURB: Common functions and variables for ROCm packages written in HIP
 # @DESCRIPTION:
 # ROCm packages such as sci-libs/<roc|hip>*, and packages built on top of ROCm
@@ -83,9 +83,10 @@
 # @CODE
 
 if [[ ! ${_ROCM_ECLASS} ]]; then
+_ROCM_ECLASS=1
 
 case ${EAPI} in
-	7|8) ;;
+	8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -219,5 +220,4 @@ check_amdgpu() {
 	done
 }
 
-_ROCM_ECLASS=1
 fi
-- 
2.39.0

[gentoo-dev] [PATCH 29/41] ruby-ng-gnome2.eclass: drop EAPI 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/ruby-ng-gnome2.eclass | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/eclass/ruby-ng-gnome2.eclass b/eclass/ruby-ng-gnome2.eclass
index 487e3268e36..4c48e94df70 100644
--- a/eclass/ruby-ng-gnome2.eclass
+++ b/eclass/ruby-ng-gnome2.eclass
@@ -6,21 +6,21 @@
 # Ruby herd <ruby@gentoo.org>
 # @AUTHOR:
 # Author: Hans de Graaff <graaff@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 7
 # @PROVIDES: ruby-ng
 # @BLURB: An eclass to simplify handling of various ruby-gnome2 parts.
 # @DESCRIPTION:
 # This eclass simplifies installation of the various pieces of
 # ruby-gnome2 since they share a very common installation procedure.
 
-case "${EAPI:-0}" in
-	6)	inherit eapi7-ver ;;
-	7)	;;
-	*)
-		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
-		;;
+case ${EAPI} in
+	7) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
+if [[ ! ${_RUBY_NG_GNOME2_ECLASS} ]]; then
+_RUBY_NG_GNOME2_ECLASS=1
+
 RUBY_FAKEGEM_NAME="${RUBY_FAKEGEM_NAME:-${PN#ruby-}}"
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
@@ -40,7 +40,7 @@ fi
 IUSE="test"
 RESTRICT+=" !test? ( test )"
 
-DEPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 ruby_add_bdepend "
 	dev-ruby/pkg-config
 	test? ( >=dev-ruby/test-unit-2 )"
@@ -157,3 +157,5 @@ each_ruby_test() {
 		${RUBY} test/run-test.rb || die
 	fi
 }
+
+fi
-- 
2.39.0

[gentoo-dev] [PATCH 30/41] ruby-single.eclass: drop EAPI 4-6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/ruby-single.eclass | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/eclass/ruby-single.eclass b/eclass/ruby-single.eclass
index 476d16b5cae..035675c4810 100644
--- a/eclass/ruby-single.eclass
+++ b/eclass/ruby-single.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Author: Hans de Graaff <graaff@gentoo.org>
 # Based on python-single-r1 by: Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 4 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @PROVIDES: ruby-utils
 # @BLURB: An eclass for Ruby packages not installed for multiple implementations.
 # @DESCRIPTION:
@@ -23,18 +23,13 @@
 # RDEPEND="${RUBY_DEPS}"
 # @CODE
 
-case "${EAPI:-0}" in
-	0|1|2|3)
-		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
-		;;
-	4|5|6|7|8)
-		;;
-	*)
-		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
-		;;
+case ${EAPI} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ ! ${_RUBY_SINGLE} ]]; then
+if [[ ! ${_RUBY_SINGLE_ECLASS} ]]; then
+_RUBY_SINGLE_ECLASS=1
 
 inherit ruby-utils
 
@@ -88,6 +83,4 @@ _ruby_single_set_globals() {
 }
 _ruby_single_set_globals
 
-
-_RUBY_SINGLE=1
 fi
-- 
2.39.0

[gentoo-dev] [PATCH 31/41] rust-toolchain.eclass: drop EAPI 6, 7 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/rust-toolchain.eclass | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass
index 75b15a7088b..0bbdf46df1f 100644
--- a/eclass/rust-toolchain.eclass
+++ b/eclass/rust-toolchain.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: rust-toolchain.eclass
 # @MAINTAINER:
 # Rust Project <rust@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 8
 # @BLURB: helps map gentoo arches to rust ABIs
 # @DESCRIPTION:
 # This eclass contains a src_unpack default phase function, and
@@ -12,10 +12,8 @@
 # gentoo arches.
 
 case ${EAPI} in
-	6) : ;;
-	7) : ;;
-	8) : ;;
-	*) die "EAPI=${EAPI:-0} is not supported" ;;
+	8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 inherit multilib-build
-- 
2.39.0

[gentoo-dev] [PATCH 32/41] selinux-policy-2.eclass: drop EAPI 6 support

[David Seifert]

Closes: https://bugs.gentoo.org/778812
Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/selinux-policy-2.eclass | 49 +++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass
index f00e3555b6b..84e95678a67 100644
--- a/eclass/selinux-policy-2.eclass
+++ b/eclass/selinux-policy-2.eclass
@@ -7,7 +7,7 @@
 # @ECLASS: selinux-policy-2.eclass
 # @MAINTAINER:
 # selinux@gentoo.org
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 7
 # @BLURB: This eclass supports the deployment of the various SELinux modules in sec-policy
 # @DESCRIPTION:
 # The selinux-policy-2.eclass supports deployment of the various SELinux modules
@@ -18,6 +18,14 @@
 # Also, it supports for bundling patches to make the whole thing just a bit more
 # manageable.
 
+case ${EAPI} in
+	7) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
+if [[ ! ${_SELINUX_POLICY_2_ECLASS} ]]; then
+_SELINUX_POLICY_2_ECLASS=1
+
 # @ECLASS_VARIABLE: MODS
 # @DESCRIPTION:
 # This variable contains the (upstream) module name for the SELinux module.
@@ -74,12 +82,6 @@
 # The default value is the 'master' branch.
 : ${SELINUX_GIT_BRANCH:="master"};
 
-case "${EAPI:-0}" in
-	0|1|2|3|4|5) die "EAPI<6 is not supported";;
-	6|7) : ;;
-	*) die "unknown EAPI" ;;
-esac
-
 case ${BASEPOL} in
 	9999)	inherit git-r3
 			EGIT_REPO_URI="${SELINUX_GIT_REPO}";
@@ -113,17 +115,12 @@ else
 	RDEPEND=">=sys-apps/policycoreutils-2.0.82
 		>=sec-policy/selinux-base-policy-${PV}"
 fi
-if [[ ${EAPI} == 6 ]]; then
-	DEPEND="${RDEPEND}
-		sys-devel/m4
-		>=sys-apps/checkpolicy-2.0.21"
-else
-	DEPEND="${RDEPEND}"
-	BDEPEND="sys-devel/m4
-		>=sys-apps/checkpolicy-2.0.21"
-fi
 
-EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/m4
+	>=sys-apps/checkpolicy-2.0.21
+"
 
 # @FUNCTION: selinux-policy-2_src_unpack
 # @DESCRIPTION:
@@ -219,7 +216,7 @@ selinux-policy-2_src_compile() {
 	for i in ${POLICY_TYPES}; do
 		# Support USE flags in builds
 		export M4PARAM="${makeuse}"
-		emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed"
+		emake NAME=$i SHAREDIR="${EPREFIX}"/usr/share/selinux -C "${S}"/${i}
 	done
 }
 
@@ -255,8 +252,8 @@ selinux-policy-2_src_install() {
 selinux-policy-2_pkg_postinst() {
 	# Set root path and don't load policy into the kernel when cross compiling
 	local root_opts=""
-	if [[ "${ROOT%/}" != "" ]]; then
-		root_opts="-p ${ROOT%/} -n"
+	if [[ -n ${ROOT} ]]; then
+		root_opts="-p ${ROOT} -n"
 	fi
 
 	# build up the command in the case of multiple modules
@@ -274,7 +271,7 @@ selinux-policy-2_pkg_postinst() {
 
 		einfo "Inserting the following modules into the $i module store: ${MODS}"
 
-		cd "${ROOT%/}/usr/share/selinux/${i}" || die "Could not enter /usr/share/selinux/${i}"
+		cd "${ROOT}/usr/share/selinux/${i}" || die "Could not enter /usr/share/selinux/${i}"
 		for j in ${MODS} ; do
 			if [[ -f "${j}.pp" ]] ; then
 				COMMAND="${j}.pp ${COMMAND}"
@@ -323,7 +320,7 @@ selinux-policy-2_pkg_postinst() {
 	done
 
 	# Don't relabel when cross compiling
-	if [[ "${ROOT%/}" == "" ]]; then
+	if [[ -z ${ROOT} ]]; then
 		# Relabel depending packages
 		local PKGSET="";
 		if [[ -x /usr/bin/qdepends ]] ; then
@@ -346,8 +343,8 @@ selinux-policy-2_pkg_postrm() {
 	if [[ -z "${REPLACED_BY_VERSION}" ]]; then
 		# Set root path and don't load policy into the kernel when cross compiling
 		local root_opts=""
-		if [[ "${ROOT%/}" != "" ]]; then
-			root_opts="-p ${ROOT%/} -n"
+		if [[ -n ${ROOT} ]]; then
+			root_opts="-p ${ROOT} -n"
 		fi
 
 		# build up the command in the case of multiple modules
@@ -368,3 +365,7 @@ selinux-policy-2_pkg_postrm() {
 		done
 	fi
 }
+
+fi
+
+EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm
-- 
2.39.0

[gentoo-dev] [PATCH 33/41] toolchain-autoconf.eclass: drop EAPI 6, add EAPI 8 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/toolchain-autoconf.eclass | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/eclass/toolchain-autoconf.eclass b/eclass/toolchain-autoconf.eclass
index 2c8184f894c..2ba27638468 100644
--- a/eclass/toolchain-autoconf.eclass
+++ b/eclass/toolchain-autoconf.eclass
@@ -1,29 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: toolchain-autoconf.eclass
 # @MAINTAINER:
 # <base-system@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Common code for sys-devel/autoconf ebuilds
 # @DESCRIPTION:
 # This eclass contains the common phase functions migrated from
 # sys-devel/autoconf eblits.
 
-case ${EAPI:-0} in
-	[0-5])
-		die "${ECLASS} is banned in EAPI ${EAPI:-0}"
-		;;
-	[6-7])
-		;;
-	*)
-		die "Unknown EAPI ${EAPI:-0}"
-		;;
+case ${EAPI} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 if [[ -z ${_TOOLCHAIN_AUTOCONF_ECLASS} ]]; then
-
-EXPORT_FUNCTIONS src_prepare src_configure src_install
+_TOOLCHAIN_AUTOCONF_ECLASS=1
 
 toolchain-autoconf_src_prepare() {
 	find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + || die
@@ -75,5 +68,6 @@ toolchain-autoconf_src_install() {
 	slot_info_pages
 }
 
-_TOOLCHAIN_AUTOCONF_ECLASS=1
 fi
+
+EXPORT_FUNCTIONS src_prepare src_configure src_install
-- 
2.39.0

[gentoo-dev] [PATCH 34/41] user-info.eclass: drop EAPI 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/user-info.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/user-info.eclass b/eclass/user-info.eclass
index 5550e4f08ee..b18f280c102 100644
--- a/eclass/user-info.eclass
+++ b/eclass/user-info.eclass
@@ -5,11 +5,11 @@
 # @MAINTAINER:
 # base-system@gentoo.org (Linux)
 # Michał Górny <mgorny@gentoo.org> (NetBSD)
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Read-only access to user and group information
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.39.0

[gentoo-dev] [PATCH 35/41] usr-ldscript.eclass: drop EAPI 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/usr-ldscript.eclass | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/eclass/usr-ldscript.eclass b/eclass/usr-ldscript.eclass
index c821abd6084..b73d538ae5b 100644
--- a/eclass/usr-ldscript.eclass
+++ b/eclass/usr-ldscript.eclass
@@ -4,11 +4,11 @@
 # @ECLASS: usr-ldscript.eclass
 # @MAINTAINER:
 # Toolchain Ninjas <toolchain@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Defines the gen_usr_ldscript function.
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -84,27 +84,27 @@ gen_usr_ldscript() {
 			# Ensure /lib/${lib} exists to avoid dangling scripts/symlinks.
 			# This especially is for AIX where $(get_libname) can return ".a",
 			# so /lib/${lib} might be moved to /usr/lib/${lib} (by accident).
-			[[ -r ${ED%/}/${libdir}/${lib} ]] || continue
+			[[ -r ${ED}/${libdir}/${lib} ]] || continue
 			#TODO: better die here?
 		fi
 
 		case ${CTARGET:-${CHOST}} in
 		*-darwin*)
 			if ${auto} ; then
-				tlib=$(scanmacho -qF'%S#F' "${ED%/}"/usr/${libdir}/${lib})
+				tlib=$(scanmacho -qF'%S#F' "${ED}"/usr/${libdir}/${lib})
 			else
-				tlib=$(scanmacho -qF'%S#F' "${ED%/}"/${libdir}/${lib})
+				tlib=$(scanmacho -qF'%S#F' "${ED}"/${libdir}/${lib})
 			fi
 			[[ -z ${tlib} ]] && die "unable to read install_name from ${lib}"
 			tlib=${tlib##*/}
 
 			if ${auto} ; then
-				mv "${ED%/}"/usr/${libdir}/${lib%${suffix}}.*${suffix#.} "${ED%/}"/${libdir}/ || die
+				mv "${ED}"/usr/${libdir}/${lib%${suffix}}.*${suffix#.} "${ED}"/${libdir}/ || die
 				# some install_names are funky: they encode a version
 				if [[ ${tlib} != ${lib%${suffix}}.*${suffix#.} ]] ; then
-					mv "${ED%/}"/usr/${libdir}/${tlib%${suffix}}.*${suffix#.} "${ED%/}"/${libdir}/ || die
+					mv "${ED}"/usr/${libdir}/${tlib%${suffix}}.*${suffix#.} "${ED}"/${libdir}/ || die
 				fi
-				rm -f "${ED%/}"/${libdir}/${lib}
+				rm -f "${ED}"/${libdir}/${lib}
 			fi
 
 			# Mach-O files have an id, which is like a soname, it tells how
@@ -114,34 +114,36 @@ gen_usr_ldscript() {
 			# libdir=/lib because that messes up libtool files.
 			# Make sure we don't lose the specific version, so just modify the
 			# existing install_name
-			if [[ ! -w "${ED%/}/${libdir}/${tlib}" ]] ; then
-				chmod u+w "${ED%/}/${libdir}/${tlib}" # needed to write to it
+			if [[ ! -w "${ED}/${libdir}/${tlib}" ]] ; then
+				chmod u+w "${ED}/${libdir}/${tlib}" || die # needed to write to it
 				local nowrite=yes
 			fi
 			install_name_tool \
 				-id "${EPREFIX}"/${libdir}/${tlib} \
-				"${ED%/}"/${libdir}/${tlib} || die "install_name_tool failed"
-			[[ -n ${nowrite} ]] && chmod u-w "${ED%/}/${libdir}/${tlib}"
+				"${ED}"/${libdir}/${tlib} || die "install_name_tool failed"
+			if [[ -n ${nowrite} ]] ; then
+				chmod u-w "${ED}/${libdir}/${tlib}" || die
+			fi
 			# Now as we don't use GNU binutils and our linker doesn't
 			# understand linker scripts, just create a symlink.
-			pushd "${ED%/}/usr/${libdir}" > /dev/null
+			pushd "${ED}/usr/${libdir}" > /dev/null
 			ln -snf "../../${libdir}/${tlib}" "${lib}"
 			popd > /dev/null
 			;;
 		*)
 			if ${auto} ; then
-				tlib=$(scanelf -qF'%S#F' "${ED%/}"/usr/${libdir}/${lib})
+				tlib=$(scanelf -qF'%S#F' "${ED}"/usr/${libdir}/${lib})
 				[[ -z ${tlib} ]] && die "unable to read SONAME from ${lib}"
-				mv "${ED%/}"/usr/${libdir}/${lib}* "${ED%/}"/${libdir}/ || die
+				mv "${ED}"/usr/${libdir}/${lib}* "${ED}"/${libdir}/ || die
 				# some SONAMEs are funky: they encode a version before the .so
 				if [[ ${tlib} != ${lib}* ]] ; then
-					mv "${ED%/}"/usr/${libdir}/${tlib}* "${ED%/}"/${libdir}/ || die
+					mv "${ED}"/usr/${libdir}/${tlib}* "${ED}"/${libdir}/ || die
 				fi
-				rm -f "${ED%/}"/${libdir}/${lib}
+				rm -f "${ED}"/${libdir}/${lib}
 			else
 				tlib=${lib}
 			fi
-			cat > "${ED%/}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
+			cat > "${ED}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
 			/* GNU ld script
 			   Since Gentoo has critical dynamic libraries in /lib, and the static versions
 			   in /usr/lib, we need to have a "fake" dynamic lib in /usr/lib, otherwise we
-- 
2.39.0

[gentoo-dev] [PATCH 36/41] waf-utils.eclass: drop EAPI 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/waf-utils.eclass | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
index 2f4a20cd457..1be02bbea3c 100644
--- a/eclass/waf-utils.eclass
+++ b/eclass/waf-utils.eclass
@@ -8,20 +8,23 @@
 # Original Author: Gilles Dartiguelongue <eva@gentoo.org>
 # Various improvements based on cmake-utils.eclass: Tomáš Chvátal <scarabeus@gentoo.org>
 # Proper prefix support: Jonathan Callen <jcallen@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: common ebuild functions for waf-based packages
 # @DESCRIPTION:
 # The waf-utils eclass contains functions that make creating ebuild for
 # waf-based packages much easier.
 # Its main features are support of common portage default settings.
 
-inherit multilib toolchain-funcs multiprocessing
-
-case ${EAPI:-0} in
-	6|7|8) EXPORT_FUNCTIONS src_configure src_compile src_install ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
+case ${EAPI} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
+if [[ ! ${_WAF_UTILS_ECLASS} ]]; then
+_WAF_UTILS_ECLASS=1
+
+inherit multilib toolchain-funcs multiprocessing
+
 # @ECLASS_VARIABLE: WAF_VERBOSE
 # @USER_VARIABLE
 # @DESCRIPTION:
@@ -141,3 +144,7 @@ waf-utils_src_install() {
 	# Manual document installation
 	einstalldocs
 }
+
+fi
+
+EXPORT_FUNCTIONS src_configure src_compile src_install
-- 
2.39.0

[gentoo-dev] [PATCH 37/41] xemacs-packages.eclass: drop EAPI 6, 7 support

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/xemacs-packages.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/xemacs-packages.eclass b/eclass/xemacs-packages.eclass
index 91621f5f52d..648f5146f47 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 8
+# @SUPPORTED_EAPIS: 8
 # @BLURB: Eclass to support elisp packages distributed by XEmacs.
 # @DESCRIPTION:
 # This eclass supports ebuilds for packages distributed by XEmacs.
@@ -25,12 +25,10 @@
 # they may not be well-tested.
 
 case ${EAPI} in
-	6|7|8) ;;
+	8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-EXPORT_FUNCTIONS src_unpack src_install
-
 if [[ -z ${_XEMACS_PACKAGES_ECLASS} ]] ; then
 _XEMACS_PACKAGES_ECLASS=1
 
@@ -65,3 +63,5 @@ xemacs-packages_src_install() {
 }
 
 fi
+
+EXPORT_FUNCTIONS src_unpack src_install
-- 
2.39.0

[gentoo-dev] [PATCH 38/41] gnome2.eclass: remove useless || die on emake

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/gnome2.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index e80a517ee0d..a701b58fd9e 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.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: gnome2.eclass
@@ -235,7 +235,7 @@ gnome2_src_install() {
 	# create bogus directories in /var/lib/
 	if has ${EAPI} 5; then
 		dodir "${sk_tmp_dir}" || die "dodir failed"
-		emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install failed"
+		emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install
 	else
 		default
 	fi
-- 
2.39.0

[gentoo-dev] [PATCH 39/41] gnustep-base.eclass: remove useless || die on emake

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/gnustep-base.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/gnustep-base.eclass b/eclass/gnustep-base.eclass
index 5e839bd0702..f967a527282 100644
--- a/eclass/gnustep-base.eclass
+++ b/eclass/gnustep-base.eclass
@@ -172,7 +172,7 @@ egnustep_env() {
 # Make utilizing GNUstep Makefiles
 egnustep_make() {
 	if [[ -f ./Makefile || -f ./makefile || -f ./GNUmakefile ]] ; then
-		emake ${*} "${GS_ENV[@]}" all || die "package make failed"
+		emake ${*} "${GS_ENV[@]}" all
 		return 0
 	fi
 	die "no Makefile found"
@@ -185,7 +185,7 @@ egnustep_install() {
 		mkdir -p "${D}"${GNUSTEP_SYSTEM_TOOLS}
 	fi
 	if [[ -f ./[mM]akefile || -f ./GNUmakefile ]] ; then
-		emake ${*} "${GS_ENV[@]}" install || die "package install failed"
+		emake ${*} "${GS_ENV[@]}" install
 		return 0
 	fi
 	die "no Makefile found"
@@ -197,8 +197,8 @@ egnustep_doc() {
 		# Check documentation presence
 		pushd "${S}"/Documentation || die
 		if [[ -f ./[mM]akefile || -f ./GNUmakefile ]] ; then
-			emake "${GS_ENV[@]}" all || die "doc make failed"
-			emake "${GS_ENV[@]}" install || die "doc install failed"
+			emake "${GS_ENV[@]}" all
+			emake "${GS_ENV[@]}" install
 		fi
 		popd || die
 	fi
-- 
2.39.0

[gentoo-dev] [PATCH 40/41] qmail.eclass: remove useless || die on emake

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/qmail.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index ed53bca56fa..67069087376 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.eclass
@@ -121,12 +121,12 @@ qmail_src_postunpack() {
 
 qmail_src_compile() {
 	cd "${S}"
-	emake it man "$@" || die "make failed"
+	emake it man "$@"
 }
 
 qmail_spp_src_compile() {
 	cd "${GENQMAIL_S}"/spp/
-	emake || die "make spp failed"
+	emake
 }
 
 qmail_base_install() {
-- 
2.39.0

[gentoo-dev] [PATCH 41/41] xorg-3.eclass: remove useless || die on emake

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/xorg-3.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
index 0d35c0a8ebf..a63655e10ec 100644
--- a/eclass/xorg-3.eclass
+++ b/eclass/xorg-3.eclass
@@ -415,7 +415,7 @@ xorg-3_src_configure() {
 }
 
 multilib_src_compile() {
-	emake "$@" || die 'emake failed'
+	emake "$@"
 }
 
 # @FUNCTION: xorg-3_src_compile
@@ -427,12 +427,12 @@ xorg-3_src_compile() {
 	if [[ ${XORG_MULTILIB} == yes ]]; then
 		multilib-minimal_src_compile "$@"
 	else
-		emake "$@" || die 'emake failed'
+		emake "$@"
 	fi
 }
 
 multilib_src_install() {
-	emake DESTDIR="${D}" "${install_args[@]}" "$@" install || die "emake install failed"
+	emake DESTDIR="${D}" "${install_args[@]}" "$@" install
 }
 
 # @FUNCTION: xorg-3_src_install
@@ -446,7 +446,7 @@ xorg-3_src_install() {
 	if [[ ${XORG_MULTILIB} == yes ]]; then
 		multilib-minimal_src_install "$@"
 	else
-		emake DESTDIR="${D}" "${install_args[@]}" "$@" install || die "emake install failed"
+		emake DESTDIR="${D}" "${install_args[@]}" "$@" install
 		einstalldocs
 	fi
 
-- 
2.39.0

Re: [gentoo-dev] [PATCH 37/41] xemacs-packages.eclass: drop EAPI 6, 7 support

[Ulrich Mueller]

[-- Attachment #1: Type: text/plain, Size: 77 bytes --]

EAPI 7 should be kept for this one, in order not to break the Emacs
overlay.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]

Re: [gentoo-dev] [PATCH 04/41] apache-2.eclass: drop EAPI 6 support

[Hans de Graaff]

[-- Attachment #1: Type: text/plain, Size: 749 bytes --]

On Sun, 2022-12-25 at 23:15 +0100, David Seifert wrote:
> Signed-off-by: David Seifert <soap@gentoo.org>
> ---
>  eclass/apache-2.eclass | 29 ++++++++++++++---------------
>  1 file changed, 14 insertions(+), 15 deletions(-)
> 
> diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
> index 71fcb542869..5e1f4a0be4a 100644
> --- a/eclass/apache-2.eclass
> +++ b/eclass/apache-2.eclass
> @@ -3,8 +3,8 @@
>  
>  # @ECLASS: apache-2.eclass
>  # @MAINTAINER:
> -# polynomial-c@gentoo.org
> -# @SUPPORTED_EAPIS: 6 7
> +# maintainer-needed@gentoo.org
> +# @SUPPORTED_EAPIS: 7
> 

I have already updated these based on your "up for grabs" mail. The
other changes look good to me, please feel free to commit them.

Hans

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [gentoo-dev] [PATCH 37/41] xemacs-packages.eclass: drop EAPI 6, 7 support

[Ulrich Mueller]

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

>>>>> On Sun, 25 Dec 2022, Ulrich Mueller wrote:

> EAPI 7 should be kept for this one, in order not to break the Emacs
> overlay.

Never mind, overlay has been updated.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]