[gentoo-dev] [PATCH 01/50] apache-module.eclass: drop support for EAPI 6

[gentoo-dev] [PATCH 01/50] apache-module.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/apache-module.eclass b/eclass/apache-module.eclass
index 5a84ffedf71a..1082726b870e 100644
--- a/eclass/apache-module.eclass
+++ b/eclass/apache-module.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: apache-module.eclass
 # @MAINTAINER:
 # apache-bugs@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Provides a common set of functions for apache modules
 # @DESCRIPTION:
 # This eclass handles apache modules in a sane way.
@@ -45,7 +45,7 @@
 # @CODE
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.46.0

[gentoo-dev] [PATCH 02/50] autotools.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 3c9e89bda90e..74f259276960 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Regenerates auto* build scripts
 # @DESCRIPTION:
 # This eclass is for safely handling autotooled software packages that need to
@@ -14,7 +14,7 @@
 # from the GNU version of m4 without worrying about other variants (i.e. BSD).
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -31,8 +31,6 @@ fi
 if [[ -z ${_AUTOTOOLS_ECLASS} ]] ; then
 _AUTOTOOLS_ECLASS=1
 
-[[ ${EAPI} == 6 ]] && inherit eqawarn
-
 GNUCONFIG_AUTO_DEPEND=no
 inherit gnuconfig libtool
 
@@ -180,12 +178,7 @@ RDEPEND=""
 # ebuilds form conditional depends by using ${AUTOTOOLS_DEPEND} in
 # their own DEPEND string.
 : "${AUTOTOOLS_AUTO_DEPEND:=yes}"
-if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then
-	case ${EAPI} in
-		6) DEPEND=${AUTOTOOLS_DEPEND} ;;
-		*) BDEPEND=${AUTOTOOLS_DEPEND} ;;
-	esac
-fi
+[[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] && BDEPEND=${AUTOTOOLS_DEPEND}
 _AUTOTOOLS_AUTO_DEPEND=${AUTOTOOLS_AUTO_DEPEND} # See top of eclass
 
 unset _automake_atom _autoconf_atom
@@ -388,22 +381,16 @@ eaclocal() {
 	# - ${BROOT}/usr/share/aclocal
 	# - ${ESYSROOT}/usr/share/aclocal
 	# See bug #677002
-	if [[ ${EAPI} != 6 ]] ; then
-		if [[ ! -f "${T}"/aclocal/dirlist ]] ; then
-			mkdir "${T}"/aclocal || die
-			cat <<- EOF > "${T}"/aclocal/dirlist || die
-				${BROOT}/usr/share/aclocal
-				${ESYSROOT}/usr/share/aclocal
-			EOF
-		fi
-
-		local system_acdir=" --system-acdir=${T}/aclocal"
-	else
-		local system_acdir=""
+	if [[ ! -f "${T}"/aclocal/dirlist ]] ; then
+		mkdir "${T}"/aclocal || die
+		cat <<- EOF > "${T}"/aclocal/dirlist || die
+			${BROOT}/usr/share/aclocal
+			${ESYSROOT}/usr/share/aclocal
+		EOF
 	fi
 
 	[[ ! -f aclocal.m4 || -n $(grep -e 'generated.*by aclocal' aclocal.m4) ]] && \
-		autotools_run_tool --at-m4flags aclocal "$@" $(eaclocal_amflags) ${system_acdir}
+		autotools_run_tool --at-m4flags aclocal "$@" $(eaclocal_amflags) --system-acdir="${T}"/aclocal
 }
 
 # @FUNCTION: _elibtoolize
@@ -445,7 +432,7 @@ eautoconf() {
 
 	if [[ ${WANT_AUTOCONF} != "2.1" && -e configure.in ]] ; then
 		case ${EAPI} in
-			6|7)
+			7)
 				eqawarn "This package has a configure.in file which has long been deprecated.  Please"
 				eqawarn "update it to use configure.ac instead as newer versions of autotools will die"
 				eqawarn "when it finds this file.  See https://bugs.gentoo.org/426262 for details."
@@ -533,21 +520,13 @@ eautopoint() {
 # use gettext directly.  So we have to copy it in manually since
 # we can't let `autopoint` do it for us.
 config_rpath_update() {
-	local dst src
-
-	case ${EAPI} in
-		6)
-			src="${EPREFIX}/usr/share/gettext/config.rpath"
-			;;
-		*)
-			src="${BROOT}/usr/share/gettext/config.rpath"
-			;;
-	esac
+	local src="${BROOT}/usr/share/gettext/config.rpath"
 
 	[[ $# -eq 0 ]] && set -- $(find -name config.rpath)
 	[[ $# -eq 0 ]] && return 0
 
 	einfo "Updating all config.rpath files"
+	local dst
 	for dst in "$@" ; do
 		einfo "   ${dst}"
 		cp "${src}" "${dst}" || die
@@ -565,16 +544,7 @@ autotools_env_setup() {
 		local pv
 		for pv in ${_LATEST_AUTOMAKE[@]/#*:} ; do
 			# Break on first hit to respect _LATEST_AUTOMAKE order.
-			local hv_args=""
-			case ${EAPI} in
-				6)
-					hv_args="--host-root"
-					;;
-				*)
-					hv_args="-b"
-					;;
-			esac
-			has_version ${hv_args} "=dev-build/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break
+			has_version -b "=dev-build/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break
 		done
 
 		# During bootstrap in prefix there might be no automake merged yet
@@ -594,16 +564,7 @@ autotools_env_setup() {
 		local pv
 		for pv in ${_LATEST_AUTOCONF[@]/#*:} ; do
 			# Break on first hit to respect _LATEST_AUTOCONF order.
-			local hv_args=""
-			case ${EAPI} in
-				6)
-					hv_args="--host-root"
-					;;
-				*)
-					hv_args="-b"
-					;;
-				esac
-			has_version ${hv_args} "=dev-build/autoconf-${pv}*" && export WANT_AUTOCONF="${pv}" && break
+			has_version -b "=dev-build/autoconf-${pv}*" && export WANT_AUTOCONF="${pv}" && break
 		done
 
 		# During bootstrap in prefix there might be no autoconf merged yet
-- 
2.46.0

[gentoo-dev] [PATCH 03/50] bash-completion-r1.eclass: drop support for EAPI 5 and 6

[David Seifert]

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

diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass
index df1a2a54d39a..fd16fca66538 100644
--- a/eclass/bash-completion-r1.eclass
+++ b/eclass/bash-completion-r1.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: bash-completion-r1.eclass
 # @MAINTAINER:
 # mgorny@gentoo.org
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: A few quick functions to install bash-completion files
 # @EXAMPLE:
 #
@@ -29,7 +29,7 @@ _BASH_COMPLETION_R1_ECLASS=1
 inherit toolchain-funcs
 
 case ${EAPI} in
-	5|6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.46.0

[gentoo-dev] [PATCH 04/50] cdrom.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/cdrom.eclass b/eclass/cdrom.eclass
index 4e56db951196..7e983bab67db 100644
--- a/eclass/cdrom.eclass
+++ b/eclass/cdrom.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: cdrom.eclass
 # @MAINTAINER:
 # games@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Functions for CD-ROM handling
 # @DESCRIPTION:
 # Acquire CD(s) for those lovely CD-based emerges.  Yes, this violates
@@ -15,8 +15,8 @@
 # eclass will require RESTRICT="bindist" but the point still stands.
 # The functions are generally called in src_unpack.
 
-case ${EAPI:-0} in
-	6|7|8) ;;
+case ${EAPI} in
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.46.0

[gentoo-dev] [PATCH 05/50] check-reqs.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass
index fac2f4553d74..441ef4b95993 100644
--- a/eclass/check-reqs.eclass
+++ b/eclass/check-reqs.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2023 Gentoo Authors
+# Copyright 2004-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: check-reqs.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Bo Ørsted Andresen <zlin@gentoo.org>
 # Original Author: Ciaran McCreesh <ciaranm@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Provides a uniform way of handling ebuilds with very high build requirements
 # @DESCRIPTION:
 # This eclass provides a uniform way of handling ebuilds which have very high
@@ -39,7 +39,7 @@
 # probably degrade gracefully if they don't. Probably.
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -107,7 +107,7 @@ check-reqs_pkg_pretend() {
 # @DESCRIPTION:
 # Internal function that checks the variables that should be defined.
 check-reqs_prepare() {
-	[[ ${EAPI} == [67] ]] ||
+	[[ ${EAPI} == 7 ]] ||
 		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
 	_check-reqs_prepare "$@"
 }
@@ -134,7 +134,7 @@ _check-reqs_prepare() {
 # @DESCRIPTION:
 # Internal function that runs the check based on variable settings.
 check-reqs_run() {
-	[[ ${EAPI} == [67] ]] ||
+	[[ ${EAPI} == 7 ]] ||
 		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
 	_check-reqs_run "$@"
 }
@@ -163,12 +163,12 @@ _check-reqs_run() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		[[ -n ${CHECKREQS_DISK_USR} ]] && \
 			_check-reqs_disk \
-				"${EROOT%/}/usr" \
+				"${EROOT}/usr" \
 				"${CHECKREQS_DISK_USR}"
 
 		[[ -n ${CHECKREQS_DISK_VAR} ]] && \
 			_check-reqs_disk \
-				"${EROOT%/}/var" \
+				"${EROOT}/var" \
 				"${CHECKREQS_DISK_VAR}"
 	fi
 }
@@ -179,7 +179,7 @@ _check-reqs_run() {
 # Internal function that returns number in KiB.
 # Returns 1024**2 for 1G or 1024**3 for 1T.
 check-reqs_get_kibibytes() {
-	[[ ${EAPI} == [67] ]] ||
+	[[ ${EAPI} == 7 ]] ||
 		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
 	_check-reqs_get_kibibytes "$@"
 }
@@ -213,7 +213,7 @@ _check-reqs_get_kibibytes() {
 # Internal function that returns the numerical value without the unit.
 # Returns "1" for "1G" or "150" for "150T".
 check-reqs_get_number() {
-	[[ ${EAPI} == [67] ]] ||
+	[[ ${EAPI} == 7 ]] ||
 		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
 	_check-reqs_get_number "$@"
 }
@@ -240,7 +240,7 @@ _check-reqs_get_number() {
 # Internal function that returns the unit without the numerical value.
 # Returns "GiB" for "1G" or "TiB" for "150T".
 check-reqs_get_unit() {
-	[[ ${EAPI} == [67] ]] ||
+	[[ ${EAPI} == 7 ]] ||
 		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
 	_check-reqs_get_unit "$@"
 }
@@ -273,7 +273,7 @@ _check-reqs_get_unit() {
 # Internal function that prints the warning and dies if required based on
 # the test results.
 check-reqs_output() {
-	[[ ${EAPI} == [67] ]] ||
+	[[ ${EAPI} == 7 ]] ||
 		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
 	_check-reqs_get_unit "$@"
 }
@@ -308,7 +308,7 @@ _check-reqs_output() {
 # @DESCRIPTION:
 # Internal function that checks size of RAM.
 check-reqs_memory() {
-	[[ ${EAPI} == [67] ]] ||
+	[[ ${EAPI} == 7 ]] ||
 		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
 	_check-reqs_memory "$@"
 }
@@ -367,7 +367,7 @@ _check-reqs_memory() {
 # @DESCRIPTION:
 # Internal function that checks space on the harddrive.
 check-reqs_disk() {
-	[[ ${EAPI} == [67] ]] ||
+	[[ ${EAPI} == 7 ]] ||
 		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
 	_check-reqs_disk "$@"
 }
@@ -411,7 +411,7 @@ _check-reqs_disk() {
 # @DESCRIPTION:
 # Internal function that inform about started check
 check-reqs_start_phase() {
-	[[ ${EAPI} == [67] ]] ||
+	[[ ${EAPI} == 7 ]] ||
 		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
 	_check-reqs_start_phase "$@"
 }
@@ -439,7 +439,7 @@ _check-reqs_start_phase() {
 # It has different output between pretend and setup phase,
 # where in pretend phase it is fatal.
 check-reqs_unsatisfied() {
-	[[ ${EAPI} == [67] ]] ||
+	[[ ${EAPI} == 7 ]] ||
 		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
 	_check-reqs_unsatisfied "$@"
 }
-- 
2.46.0

[gentoo-dev] [PATCH 06/50] depend.apache.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 8f0469931d2c..cc9fb3ee5a5b 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: depend.apache.eclass
 # @MAINTAINER:
 # apache-bugs@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Functions to allow ebuilds to depend on apache
 # @DESCRIPTION:
 # This eclass handles depending on apache in a sane way and provides information
@@ -40,12 +40,9 @@
 # }
 # @CODE
 
-case ${EAPI:-0} in
-	6|7|8)
-		;;
-	*)
-		die "EAPI=${EAPI} is not supported by depend.apache.eclass"
-		;;
+case ${EAPI} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 # ==============================================================================
@@ -215,8 +212,8 @@ want_apache2() {
 want_apache2_2() {
 	debug-print-function $FUNCNAME $*
 
-	case ${EAPI:-0} in
-		6|7)
+	case ${EAPI} in
+		7)
 			local myiuse=${1:-apache2}
 			IUSE="${IUSE} ${myiuse}"
 			DEPEND="${DEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
@@ -270,8 +267,8 @@ need_apache2() {
 need_apache2_2() {
 	debug-print-function $FUNCNAME $*
 
-	case ${EAPI:-0} in
-		6|7)
+	case ${EAPI} in
+		7)
 			DEPEND="${DEPEND} ${APACHE2_2_DEPEND}"
 			RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}"
 			_init_apache2
-- 
2.46.0

[gentoo-dev] [PATCH 07/50] desktop.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass
index 780971342ba1..433120ffef09 100644
--- a/eclass/desktop.eclass
+++ b/eclass/desktop.eclass
@@ -1,14 +1,14 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: desktop.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: support for desktop files, menus, and icons
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -212,7 +212,7 @@ make_desktop_entry() {
 		insopts -m 0644
 		insinto /usr/share/applications
 		doins "${desktop}"
-	) || die "installing desktop file failed"
+	)
 }
 
 # @FUNCTION: make_session_desktop
@@ -353,7 +353,7 @@ _iconins() {
 	if [[ ${funcname} == newicon ]] ; then
 		newins "$@"
 	fi
-	) || die
+	)
 }
 
 # @FUNCTION: doicon
-- 
2.46.0

[gentoo-dev] [PATCH 08/50] distutils-r1.eclass: drop support for EAPI 6

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/distutils-r1.eclass | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 0f9dc8d14d5e..11ac961f8c9d 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1022,7 +1022,7 @@ _distutils-r1_create_setup_cfg() {
 			[install]
 			compile = True
 			optimize = 2
-			root = ${D%/}
+			root = ${D}
 		_EOF_
 
 		if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
@@ -1520,10 +1520,10 @@ _distutils-r1_wrap_scripts() {
 	local scriptdir=$(python_get_scriptdir)
 	local f python_files=() non_python_files=()
 
-	if [[ -d ${D%/}${scriptdir} ]]; then
-		for f in "${D%/}${scriptdir}"/*; do
+	if [[ -d ${D}${scriptdir} ]]; then
+		for f in "${D}${scriptdir}"/*; do
 			[[ -d ${f} ]] && die "Unexpected directory: ${f}"
-			debug-print "${FUNCNAME}: found executable at ${f#${D%/}/}"
+			debug-print "${FUNCNAME}: found executable at ${f#${D}/}"
 
 			local shebang
 			read -r shebang < "${f}"
@@ -1535,7 +1535,7 @@ _distutils-r1_wrap_scripts() {
 				non_python_files+=( "${f}" )
 			fi
 
-			mkdir -p "${D%/}${bindir}" || die
+			mkdir -p "${D}${bindir}" || die
 		done
 
 		for f in "${python_files[@]}"; do
@@ -1551,8 +1551,8 @@ _distutils-r1_wrap_scripts() {
 		for f in "${non_python_files[@]}"; do
 			local basename=${f##*/}
 
-			debug-print "${FUNCNAME}: moving ${f#${D%/}/} to ${bindir}/${basename}"
-			mv "${f}" "${D%/}${bindir}/${basename}" || die
+			debug-print "${FUNCNAME}: moving ${f#${D}/} to ${bindir}/${basename}"
+			mv "${f}" "${D}${bindir}/${basename}" || die
 		done
 	fi
 }
@@ -1660,8 +1660,8 @@ distutils-r1_python_install() {
 		find "${BUILD_DIR}"/install -type d -empty -delete || die
 		[[ -d ${BUILD_DIR}/install ]] && merge_root=1
 	else
-		local root=${D%/}/_${EPYTHON}
-		[[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D%/}
+		local root=${D}/_${EPYTHON}
+		[[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D}
 
 		# inline DISTUTILS_ARGS logic from esetup.py in order to make
 		# argv overwriting easier
@@ -1715,7 +1715,7 @@ distutils-r1_python_install() {
 	fi
 
 	if [[ ${merge_root} ]]; then
-		multibuild_merge_root "${root}" "${D%/}"
+		multibuild_merge_root "${root}" "${D}"
 	fi
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
 		_distutils-r1_wrap_scripts "${scriptdir}"
@@ -2098,7 +2098,7 @@ _distutils-r1_strip_namespace_packages() {
 _distutils-r1_post_python_install() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	local sitedir=${D%/}$(python_get_sitedir)
+	local sitedir=${D}$(python_get_sitedir)
 	if [[ -d ${sitedir} ]]; then
 		_distutils-r1_strip_namespace_packages "${sitedir}"
 
@@ -2157,13 +2157,13 @@ _distutils-r1_check_namespace_pth() {
 
 	while IFS= read -r -d '' f; do
 		pth+=( "${f}" )
-	done < <(find "${ED%/}" -name '*-nspkg.pth' -print0)
+	done < <(find "${ED}" -name '*-nspkg.pth' -print0)
 
 	if [[ ${pth[@]} ]]; then
 		eerror "The following *-nspkg.pth files were found installed:"
 		eerror
 		for f in "${pth[@]}"; do
-			eerror "  ${f#${ED%/}}"
+			eerror "  ${f#${ED}}"
 		done
 		eerror
 		eerror "The presence of those files may break namespaces in Python 3.5+. Please"
-- 
2.46.0

[gentoo-dev] [PATCH 09/50] flag-o-matic.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index c6b1ad80e12e..040a8529a048 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -4,14 +4,14 @@
 # @ECLASS: flag-o-matic.eclass
 # @MAINTAINER:
 # toolchain@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: common functions to manipulate and query toolchain flags
 # @DESCRIPTION:
 # This eclass contains a suite of functions to help developers sanely
 # and safely manage toolchain flags in their builds.
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -20,8 +20,6 @@ _FLAG_O_MATIC_ECLASS=1
 
 inherit toolchain-funcs
 
-[[ ${EAPI} == 6 ]] && inherit eqawarn
-
 # @FUNCTION: all-flag-vars
 # @DESCRIPTION:
 # Return all the flag variables that our high level functions operate on.
@@ -35,7 +33,7 @@ all-flag-vars() {
 # {C,CPP,CXX,CCAS,F,FC,LD}FLAGS that we allow in strip-flags
 # Note: shell globs and character lists are allowed
 setup-allowed-flags() {
-	[[ ${EAPI} == [67] ]] ||
+	[[ ${EAPI} == 7 ]] ||
 		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
 	_setup-allowed-flags "$@"
 }
@@ -566,7 +564,7 @@ strip-flags() {
 # Returns shell true if <flag> is supported by given <compiler>,
 # else returns shell false.
 test-flag-PROG() {
-	[[ ${EAPI} == [67] ]] ||
+	[[ ${EAPI} == 7 ]] ||
 		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
 	_test-flag-PROG "$@"
 }
@@ -716,7 +714,7 @@ test-flag-CCLD() { _test-flag-PROG CC c+ld "$@"; }
 # Returns shell true if <flags> are supported by given <compiler>,
 # else returns shell false.
 test-flags-PROG() {
-	[[ ${EAPI} == [67] ]] ||
+	[[ ${EAPI} == 7 ]] ||
 		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
 	_test-flags-PROG "$@"
 }
-- 
2.46.0

[gentoo-dev] [PATCH 10/50] fortran-2.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass
index 855dcba59a39..0538bfd49a11 100644
--- a/eclass/fortran-2.eclass
+++ b/eclass/fortran-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: fortran-2.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Author Justin Lecher <jlec@gentoo.org>
 # Test functions provided by Sebastien Fabbro and Kacper Kowalik
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Simplify fortran compiler management
 # @DESCRIPTION:
 # If you need a fortran compiler, then you should be inheriting this eclass.
@@ -27,7 +27,7 @@
 # FORTRAN_NEED_OPENMP=1
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -66,9 +66,7 @@ inherit toolchain-funcs
 for _f_use in ${FORTRAN_NEEDED}; do
 	case ${_f_use} in
 		always)
-			if [[ ${EAPI} != [56] ]]; then
-				BDEPEND+=" virtual/fortran"
-			fi
+			BDEPEND+=" virtual/fortran"
 			DEPEND+=" virtual/fortran"
 			RDEPEND+=" virtual/fortran"
 			break
@@ -77,16 +75,10 @@ for _f_use in ${FORTRAN_NEEDED}; do
 			break
 			;;
 		test)
-			if [[ ${EAPI} != [56] ]]; then
-				BDEPEND+=" ${_f_use}? ( virtual/fortran )"
-			else
-				DEPEND+=" ${_f_use}? ( virtual/fortran )"
-			fi
+			BDEPEND+=" ${_f_use}? ( virtual/fortran )"
 			;;
 		*)
-			if [[ ${EAPI} != [56] ]]; then
-				BDEPEND+=" ${_f_use}? ( virtual/fortran )"
-			fi
+			BDEPEND+=" ${_f_use}? ( virtual/fortran )"
 			DEPEND+=" ${_f_use}? ( virtual/fortran )"
 			RDEPEND+=" ${_f_use}? ( virtual/fortran )"
 			;;
-- 
2.46.0

[gentoo-dev] [PATCH 11/50] gap-pkg.eclass: drop support for EAPI 6

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/gap-pkg.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/gap-pkg.eclass b/eclass/gap-pkg.eclass
index e242cc92e8a3..b5a3bd7ab923 100644
--- a/eclass/gap-pkg.eclass
+++ b/eclass/gap-pkg.eclass
@@ -381,7 +381,7 @@ gap-pkg_src_install() {
 		# usual "find" command doesn't work here because occasionally we
 		# find *.la files in GAP packages that are not libtool archives
 		# and should not be deleted.
-		find "${ED%/}$(gap-pkg_dir)/bin" -type f -name '*.la' -delete || die
+		find "${ED}$(gap-pkg_dir)/bin" -type f -name '*.la' -delete || die
 	fi
 }
 
-- 
2.46.0

[gentoo-dev] [PATCH 12/50] gnuconfig.eclass: drop support for EAPI 6

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/gnuconfig.eclass | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/eclass/gnuconfig.eclass b/eclass/gnuconfig.eclass
index fb73087aeacf..c0747d55d1e6 100644
--- a/eclass/gnuconfig.eclass
+++ b/eclass/gnuconfig.eclass
@@ -6,7 +6,7 @@
 # Sam James <sam@gentoo.org>
 # @AUTHOR:
 # Will Woods <wwoods@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Refresh bundled gnuconfig files (config.guess, config.sub)
 # @DESCRIPTION:
 # This eclass is used to automatically update files that typically come with
@@ -16,8 +16,8 @@
 # other files that come with automake, e.g. depcomp, mkinstalldirs, etc.
 #
 
-case ${EAPI:-0} in
-	6|7|8) ;;
+case ${EAPI} in
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -37,12 +37,7 @@ GNUCONFIG_DEPEND="sys-devel/gnuconfig"
 # ebuilds form conditional depends by using ${GNUCONFIG_DEPEND} in
 # their own DEPEND string.
 : "${GNUCONFIG_AUTO_DEPEND:=yes}"
-if [[ ${GNUCONFIG_AUTO_DEPEND} != "no" ]] ; then
-	case ${EAPI} in
-		6) DEPEND=${GNUCONFIG_DEPEND} ;;
-		*) BDEPEND=${GNUCONFIG_DEPEND} ;;
-	esac
-fi
+[[ ${GNUCONFIG_AUTO_DEPEND} != "no" ]] && BDEPEND=${GNUCONFIG_DEPEND}
 
 # @FUNCTION: gnuconfig_update
 # @USAGE: [file1 file2 ...]
@@ -118,23 +113,11 @@ gnuconfig_do_update() {
 # This searches the standard locations for the newest config.{sub|guess}, and
 # returns the directory where they can be found.
 gnuconfig_findnewest() {
-	local locations=()
-	local prefix
-
-	case ${EAPI} in
-		6)
-			prefix="${EPREFIX}"
-			;;
-		*)
-			prefix="${BROOT}"
-			;;
-	esac
-
-	locations+=(
-		"${prefix}"/usr/share/misc/config.sub
-		"${prefix}"/usr/share/gnuconfig/config.sub
-		"${prefix}"/usr/share/automake*/config.sub
-		"${prefix}"/usr/share/libtool/config.sub
+	local locations=(
+		"${BROOT}"/usr/share/misc/config.sub
+		"${BROOT}"/usr/share/gnuconfig/config.sub
+		"${BROOT}"/usr/share/automake*/config.sub
+		"${BROOT}"/usr/share/libtool/config.sub
 	)
 
 	grep -s '^timestamp' "${locations[@]}" | \
-- 
2.46.0

[gentoo-dev] [PATCH 13/50] java-pkg-2.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index c17a9db26b3b..6acf93f654d9 100644
--- a/eclass/java-pkg-2.eclass
+++ b/eclass/java-pkg-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2023 Gentoo Authors
+# Copyright 2004-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: java-pkg-2.eclass
@@ -6,7 +6,7 @@
 # java@gentoo.org
 # @AUTHOR:
 # Thomas Matthijs <axxo@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @PROVIDES: java-utils-2
 # @BLURB: Eclass for Java Packages
 # @DESCRIPTION:
@@ -14,7 +14,7 @@
 # need to use Java.
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.46.0

[gentoo-dev] [PATCH 14/50] java-utils-2.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 9c657cc4c1f9..1b4f4f138706 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -6,7 +6,7 @@
 # java@gentoo.org
 # @AUTHOR:
 # Thomas Matthijs <axxo@gentoo.org>, Karl Trygve Kalleberg <karltk@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Base eclass for Java packages
 # @DESCRIPTION:
 # This eclass provides functionality which is used by java-pkg-2.eclass,
@@ -18,17 +18,13 @@
 # Ant-based packages.
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 if [[ -z ${_JAVA_UTILS_2_ECLASS} ]] ; then
 _JAVA_UTILS_2_ECLASS=1
 
-# EAPI 7 has version functions built-in. Use eapi7-ver for all earlier EAPIs.
-# Keep versionator inheritance in case consumers are using it implicitly.
-[[ ${EAPI} == 6 ]] && inherit eapi7-ver eqawarn multilib versionator
-
 # Make sure we use java-config-2
 export WANT_JAVA_CONFIG="2"
 
@@ -296,12 +292,12 @@ java-pkg_doexamples() {
 		( # dont want to pollute calling env
 			insinto "${dest}"
 			doins -r ${1}/*
-		) || die "Installing examples failed"
+		)
 	else
 		( # dont want to pollute calling env
 			insinto "${dest}"
 			doins -r "$@"
-		) || die "Installing examples failed"
+		)
 	fi
 
 	# Let's make a symlink to the directory we have everything else under
@@ -426,7 +422,7 @@ java-pkg_dojar() {
 				(
 					insinto "${JAVA_PKG_JARDEST}"
 					doins "${jar}"
-				) || die "failed to install ${jar}"
+				)
 				java-pkg_append_ JAVA_PKG_CLASSPATH "${EPREFIX}${JAVA_PKG_JARDEST}/${jar_basename}"
 				debug-print "installed ${jar} to ${ED}${JAVA_PKG_JARDEST}"
 			# make a symlink to the original jar if it's symlink
@@ -574,7 +570,7 @@ java-pkg_doso() {
 					insinto "${JAVA_PKG_LIBDEST}"
 					insopts -m0755
 					doins "${lib}"
-				) || die "failed to install ${lib}"
+				)
 				java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
 				debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
 			# otherwise make a symlink to the symlink's origin
@@ -806,7 +802,7 @@ java-pkg_dosrc() {
 	(
 		insinto "${JAVA_PKG_SOURCESPATH}"
 		doins ${zip_path}
-	) || die "Failed to install source"
+	)
 
 	JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}"
 
@@ -1975,8 +1971,9 @@ etestng() {
 # src_prepare Searches for bundled jars
 # Don't call directly, but via java-pkg-2_src_prepare!
 java-utils-2_src_prepare() {
+	# have default_src_prepare starting from EAPI 9, see https://bugs.gentoo.org/780585
 	case ${EAPI} in
-		[678]) eapply_user ;;
+		[78]) eapply_user ;;
 		*) default_src_prepare ;;
 	esac
 
-- 
2.46.0

[gentoo-dev] [PATCH 15/50] libtool.eclass: drop support for EAPI 5 and 6

[David Seifert]

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

diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass
index bd6141e1ede9..95019359da7d 100644
--- a/eclass/libtool.eclass
+++ b/eclass/libtool.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: libtool.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: quickly update bundled libtool code
 # @DESCRIPTION:
 # This eclass patches ltmain.sh distributed with libtoolized packages with the
@@ -14,15 +14,16 @@
 # generated libtool files.  We do not run the libtoolize program because that
 # requires a regeneration of the main autotool files in order to work properly.
 
-if [[ -z ${_LIBTOOL_ECLASS} ]]; then
-_LIBTOOL_ECLASS=1
-
 case ${EAPI} in
-	6) DEPEND=">=app-portage/elt-patches-20240116" ;;
-	7|8) BDEPEND=">=app-portage/elt-patches-20240116" ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
+if [[ -z ${_LIBTOOL_ECLASS} ]]; then
+_LIBTOOL_ECLASS=1
+
+BDEPEND=">=app-portage/elt-patches-20240116"
+
 inherit toolchain-funcs
 
 # @FUNCTION: elibtoolize
-- 
2.46.0

[gentoo-dev] [PATCH 16/50] mono-env.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/mono-env.eclass b/eclass/mono-env.eclass
index 48712587ff3e..263bc9b7ad29 100644
--- a/eclass/mono-env.eclass
+++ b/eclass/mono-env.eclass
@@ -1,16 +1,16 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: mono-env.eclass
 # @MAINTAINER:
 # maintainer-needed@gentoo.org
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Set environment variables commonly used by dotnet packages.
 # @DESCRIPTION:
 # Set environment variables commonly used by dotnet packages.
 
 case ${EAPI} in
-	6|7) ;;
+	7) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.46.0

[gentoo-dev] [PATCH 17/50] multibuild.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index f15d3327c7dd..98d2c6c3923b 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: multibuild.eclass
@@ -6,7 +6,7 @@
 # Michał Górny <mgorny@gentoo.org>
 # @AUTHOR:
 # Author: Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: A generic eclass for building multiple variants of packages.
 # @DESCRIPTION:
 # The multibuild eclass aims to provide a generic framework for building
@@ -14,7 +14,7 @@
 # implementations).
 
 case ${EAPI} in
-	6|7|8)
+	7|8)
 		# backwards compatibility for run_in_build_dir
 		inherit out-of-source-utils
 		;;
-- 
2.46.0

[gentoo-dev] [PATCH 18/50] multilib-build.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index 1774ad057430..62f8a4703796 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 2013-2023 Gentoo Authors
+# Copyright 2013-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: multilib-build.eclass
@@ -6,7 +6,7 @@
 # Michał Górny <mgorny@gentoo.org>
 # @AUTHOR:
 # Author: Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: flags and utility functions for building multilib packages
 # @DESCRIPTION:
 # The multilib-build.eclass exports USE flags and utility functions
@@ -18,7 +18,7 @@
 # to properly request multilib enabled.
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -253,8 +253,8 @@ multilib_check_headers() {
 	_multilib_header_cksum() {
 		set -o pipefail
 
-		if [[ -d ${ED%/}/usr/include ]]; then
-			find "${ED%/}"/usr/include -type f \
+		if [[ -d ${ED}/usr/include ]]; then
+			find "${ED}"/usr/include -type f \
 				-exec cksum {} + | sort -k2
 		fi
 	}
@@ -376,7 +376,7 @@ multilib_prepare_wrappers() {
 
 	[[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments"
 
-	local root=${1:-${ED%/}}
+	local root=${1:-${ED}}
 	local f
 
 	if [[ ${COMPLETE_MULTILIB} == yes ]]; then
@@ -444,9 +444,9 @@ multilib_prepare_wrappers() {
 
 				# Some ABIs may have install less files than others.
 				if [[ -f ${root}/usr/include${f} ]]; then
-					local wrapper=${ED%/}/tmp/multilib-include${f}
+					local wrapper=${ED}/tmp/multilib-include${f}
 
-					if [[ ! -f ${ED%/}/tmp/multilib-include${f} ]]; then
+					if [[ ! -f ${ED}/tmp/multilib-include${f} ]]; then
 						dodir "/tmp/multilib-include${dir}"
 						# a generic template
 						cat > "${wrapper}" <<_EOF_ || die
@@ -504,7 +504,7 @@ _EOF_
 
 					# $CHOST shall be set by multilib_toolchain_setup
 					dodir "/tmp/multilib-include/${CHOST}${dir}"
-					mv "${root}/usr/include${f}" "${ED%/}/tmp/multilib-include/${CHOST}${dir}/" || die
+					mv "${root}/usr/include${f}" "${ED}/tmp/multilib-include/${CHOST}${dir}/" || die
 
 					# Note: match a space afterwards to avoid collision potential.
 					sed -e "/${MULTILIB_ABI_FLAG} /s&error.*&include <${CHOST}${f}>&" \
@@ -544,11 +544,11 @@ multilib_install_wrappers() {
 
 	local root=${1:-${ED}}
 
-	if [[ -d ${ED%/}/tmp/multilib-include ]]; then
+	if [[ -d ${ED}/tmp/multilib-include ]]; then
 		multibuild_merge_root \
-			"${ED%/}"/tmp/multilib-include "${root}"/usr/include
+			"${ED}"/tmp/multilib-include "${root}"/usr/include
 		# it can fail if something else uses /tmp
-		rmdir "${ED%/}"/tmp &>/dev/null
+		rmdir "${ED}"/tmp &>/dev/null
 	fi
 }
 
-- 
2.46.0

[gentoo-dev] [PATCH 19/50] multilib-minimal.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass
index 92968b6cf213..ae4c26273b82 100644
--- a/eclass/multilib-minimal.eclass
+++ b/eclass/multilib-minimal.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: multilib-minimal.eclass
 # @MAINTAINER:
 # Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @PROVIDES: multilib-build
 # @BLURB: wrapper for multilib builds providing convenient multilib_src_* functions
 # @DESCRIPTION:
@@ -24,7 +24,7 @@
 # If you need generic install rules, use multilib_src_install_all function.
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.46.0

[gentoo-dev] [PATCH 20/50] multilib.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index bf9c88f7e6a4..33c329c00a59 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -1,16 +1,16 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
 # toolchain@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: This eclass is for all functions pertaining to handling multilib configurations.
 # @DESCRIPTION:
 # This eclass is for all functions pertaining to handling multilib configurations.
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.46.0

[gentoo-dev] [PATCH 21/50] multiprocessing.eclass: drop support for EAPI 5 and 6

[David Seifert]

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

diff --git a/eclass/multiprocessing.eclass b/eclass/multiprocessing.eclass
index 13d6a92f2f2e..8857ce22104a 100644
--- a/eclass/multiprocessing.eclass
+++ b/eclass/multiprocessing.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: multiprocessing.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Brian Harring <ferringb@gentoo.org>
 # Mike Frysinger <vapier@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: multiprocessing helper functions
 # @DESCRIPTION:
 # The multiprocessing eclass contains a suite of utility functions
@@ -24,8 +24,8 @@
 # }
 # @CODE
 
-case ${EAPI:-0} in
-	[5678]) ;;
+case ${EAPI} in
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.46.0

[gentoo-dev] [PATCH 22/50] out-of-source-utils.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/out-of-source-utils.eclass b/eclass/out-of-source-utils.eclass
index d68b21088995..ea4f2df56e33 100644
--- a/eclass/out-of-source-utils.eclass
+++ b/eclass/out-of-source-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: out-of-source-utils.eclass
@@ -6,14 +6,14 @@
 # Michał Górny <mgorny@gentoo.org>
 # @AUTHOR:
 # Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Utility functions for building packages out-of-source
 # @DESCRIPTION:
 # This eclass provides a run_in_build_dir() helper that can be used
 # to execute specified command inside BUILD_DIR.
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.46.0

[gentoo-dev] [PATCH 23/50] pax-utils.eclass: drop support for EAPI 5 and 6

[David Seifert]

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

diff --git a/eclass/pax-utils.eclass b/eclass/pax-utils.eclass
index 3830f03df341..de7f0193ae35 100644
--- a/eclass/pax-utils.eclass
+++ b/eclass/pax-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: pax-utils.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Author: Kevin F. Quinn <kevquinn@gentoo.org>
 # Author: Anthony G. Basile <blueness@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: functions to provide PaX markings for hardened kernels
 # @DESCRIPTION:
 #
@@ -21,8 +21,8 @@
 # To control what markings are made, set PAX_MARKINGS in /etc/portage/make.conf
 # to contain either "PT", "XT" or "none".  The default is none
 
-case ${EAPI:-0} in
-	5|6|7|8) ;;
+case ${EAPI} in
+	7|8);;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.46.0

[gentoo-dev] [PATCH 24/50] perl-functions.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/perl-functions.eclass b/eclass/perl-functions.eclass
index 142fdeb8cfbd..ce511cbefa0a 100644
--- a/eclass/perl-functions.eclass
+++ b/eclass/perl-functions.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: perl-functions.eclass
@@ -157,18 +157,18 @@ perl_fix_packlist() {
                         einfo "Fixing packlist file /${f#${D}}"
 
 			# remove the temporary build dir path
-			sed -i -e "s:${D%/}/:/:g" "${f}"
+			sed -i -e "s:${D}/:/:g" "${f}" || die
 
 			# remove duplicate entries
-			sort -u "${f}" > "${packlist_temp}"
-			mv "${packlist_temp}" "${f}"
+			sort -u "${f}" > "${packlist_temp}" || die
+			mv "${packlist_temp}" "${f}" || die
 
 			# remove files that dont exist
 			cat "${f}" | while read -r entry; do
 				if [[ ! -e ${D}/${entry} ]]; then
 					einfo "Pruning surplus packlist entry ${entry}"
 					grep -v -x -F "${entry}" "${f}" > "${packlist_temp}"
-					mv "${packlist_temp}" "${f}"
+					mv "${packlist_temp}" "${f}" || die
 				fi
 			done
 		fi
@@ -185,7 +185,7 @@ perl_remove_temppath() {
 	find "${D}" -type f -not -name '*.so' -print0 | while read -rd '' f ; do
 		if file "${f}" | grep -q -i " text" ; then
 			grep -q "${D}" "${f}" && ewarn "QA: File contains a temporary path ${f}"
-			sed -i -e "s:${D%/}/:/:g" "${f}"
+			sed -i -e "s:${D}/:/:g" "${f}" || die
 		fi
 	done
 }
-- 
2.46.0

[gentoo-dev] [PATCH 25/50] php-pear-r2.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/php-pear-r2.eclass b/eclass/php-pear-r2.eclass
index 9882c7dcc700..263db8d19f92 100644
--- a/eclass/php-pear-r2.eclass
+++ b/eclass/php-pear-r2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: php-pear-r2.eclass
@@ -6,7 +6,7 @@
 # Gentoo PHP Team <php-bugs@gentoo.org>
 # @AUTHOR:
 # Author: Brian Evans <grknight@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Provides means for an easy installation of PEAR packages.
 # @DESCRIPTION:
 # This eclass provides means for an easy installation of PEAR packages.
@@ -15,7 +15,7 @@
 # on purpose; please use (R)DEPEND to define them correctly!
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -23,7 +23,7 @@ if [[ -z ${_PHP_PEAR_R2_ECLASS} ]]; then
 _PHP_PEAR_R2_ECLASS=1
 
 RDEPEND=">=dev-php/pear-1.8.1"
-[[ ${EAPI} != [67] ]] && IDEPEND=">=dev-php/pear-1.8.1"
+[[ ${EAPI} != 7 ]] && IDEPEND=">=dev-php/pear-1.8.1"
 
 # @ECLASS_VARIABLE: PHP_PEAR_PKG_NAME
 # @DESCRIPTION:
@@ -100,20 +100,20 @@ php-pear-r2_src_install() {
 # Register package with the local PEAR database.
 php-pear-r2_pkg_postinst() {
 	# Add unknown channels
-	if [[ -f "${EROOT%/}/usr/share/php/.packagexml/${PEAR_P}-channel.xml" ]] ; then
-		"${EROOT%/}/usr/bin/peardev" channel-info "${PHP_PEAR_DOMAIN}" &> /dev/null
+	if [[ -f "${EROOT}/usr/share/php/.packagexml/${PEAR_P}-channel.xml" ]] ; then
+		"${EROOT}/usr/bin/peardev" channel-info "${PHP_PEAR_DOMAIN}" &> /dev/null
 		if [[ $? -ne 0 ]]; then
-			"${EROOT%/}/usr/bin/peardev" channel-add \
-				"${EROOT%/}/usr/share/php/.packagexml/${PEAR_P}-channel.xml" \
+			"${EROOT}/usr/bin/peardev" channel-add \
+				"${EROOT}/usr/share/php/.packagexml/${PEAR_P}-channel.xml" \
 				|| einfo "Ignore any errors about existing channels"
 		fi
 	fi
 
 	# Register the package from the package{,2}.xml file
 	# It is not critical to complete so only warn on failure
-	if [[ -f "${EROOT%/}/usr/share/php/.packagexml/${PEAR_P}.xml" ]] ; then
-		"${EROOT%/}/usr/bin/peardev" install -nrO --force \
-			"${EROOT%/}/usr/share/php/.packagexml/${PEAR_P}.xml" 2> /dev/null \
+	if [[ -f "${EROOT}/usr/share/php/.packagexml/${PEAR_P}.xml" ]] ; then
+		"${EROOT}/usr/bin/peardev" install -nrO --force \
+			"${EROOT}/usr/share/php/.packagexml/${PEAR_P}.xml" 2> /dev/null \
 			|| ewarn "Failed to insert package into local PEAR database"
 	fi
 }
@@ -123,7 +123,7 @@ php-pear-r2_pkg_postinst() {
 # Deregister package from the local PEAR database
 php-pear-r2_pkg_postrm() {
 	# Uninstall known dependency
-	"${EROOT%/}/usr/bin/peardev" uninstall -nrO "${PHP_PEAR_DOMAIN}/${PHP_PEAR_PKG_NAME}"
+	"${EROOT}/usr/bin/peardev" uninstall -nrO "${PHP_PEAR_DOMAIN}/${PHP_PEAR_PKG_NAME}"
 }
 
 fi
-- 
2.46.0

[gentoo-dev] [PATCH 26/50] portability.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/portability.eclass b/eclass/portability.eclass
index 78da440e22dd..afc1a1828348 100644
--- a/eclass/portability.eclass
+++ b/eclass/portability.eclass
@@ -6,11 +6,11 @@
 # base-system@gentoo.org
 # @AUTHOR:
 # Diego Pettenò <flameeyes@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: This eclass is created to avoid using non-portable GNUisms inside ebuilds
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.46.0

[gentoo-dev] [PATCH 27/50] prefix.eclass: drop support for EAPI 5 and 6

[David Seifert]

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

diff --git a/eclass/prefix.eclass b/eclass/prefix.eclass
index 8d50d0ba7b6e..3df2e407bf41 100644
--- a/eclass/prefix.eclass
+++ b/eclass/prefix.eclass
@@ -1,19 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: prefix.eclass
 # @MAINTAINER:
 # Feel free to contact the Prefix team through <prefix@gentoo.org> if
 # you have problems, suggestions or questions.
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Eclass to provide Prefix functionality
 # @DESCRIPTION:
 # Gentoo Prefix allows users to install into a self defined offset
 # located somewhere in the filesystem.  Prefix ebuilds require
 # additional functions and variables which are defined by this eclass.
 
-case ${EAPI:-0} in
-	[5678]) ;;
+case ${EAPI} in
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.46.0

[gentoo-dev] [PATCH 28/50] preserve-libs.eclass: drop support for EAPI 5 and 6

[David Seifert]

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

diff --git a/eclass/preserve-libs.eclass b/eclass/preserve-libs.eclass
index 35c65ef4436f..4e31c0ddae0b 100644
--- a/eclass/preserve-libs.eclass
+++ b/eclass/preserve-libs.eclass
@@ -1,14 +1,14 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: preserve-libs.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: preserve libraries after SONAME changes
 
 case ${EAPI} in
-	5|6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.46.0

[gentoo-dev] [PATCH 29/50] python-r1.eclass: drop support for EAPI 6

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/python-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index adf87c2c52f7..bb7aa6452d8b 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -789,7 +789,7 @@ python_replicate_script() {
 		)
 
 		python_fix_shebang -q \
-			"${files[@]/*\//${D%/}/${PYTHON_SCRIPTDIR}/}"
+			"${files[@]/*\//${D}${PYTHON_SCRIPTDIR}/}"
 	}
 
 	local files=( "${@}" )
-- 
2.46.0

[gentoo-dev] [PATCH 30/50] python-utils-r1.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 45d3da6bb98c..683f9b108aae 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -617,8 +617,8 @@ python_optimize() {
 			# 2) skip paths which do not exist
 			#    (python2.6 complains about them verbosely)
 
-			if [[ ${f} == /* && -d ${D%/}${f} ]]; then
-				set -- "${D%/}${f}" "${@}"
+			if [[ ${f} == /* && -d ${D}${f} ]]; then
+				set -- "${D}${f}" "${@}"
 			fi
 		done < <(
 			"${PYTHON}" - <<-EOF || die
@@ -634,7 +634,7 @@ python_optimize() {
 	local d
 	for d; do
 		# make sure to get a nice path without //
-		local instpath=${d#${D%/}}
+		local instpath=${d#${D}}
 		instpath=/${instpath##/}
 
 		einfo "Optimize Python modules for ${instpath}"
@@ -741,7 +741,7 @@ python_newexe() {
 
 	# don't use this at home, just call python_doscript() instead
 	if [[ ${_PYTHON_REWRITE_SHEBANG} ]]; then
-		python_fix_shebang -q "${ED%/}/${d}/${newfn}"
+		python_fix_shebang -q "${ED}${d}/${newfn}"
 	fi
 }
 
@@ -872,15 +872,15 @@ python_domodule() {
 			insinto "${d}"
 			doins -r "${@}" || return ${?}
 		)
-		python_optimize "${ED%/}/${d}"
+		python_optimize "${ED}${d}"
 	elif [[ -n ${BUILD_DIR} ]]; then
 		local dest=${BUILD_DIR}/install${EPREFIX}/${d}
 		mkdir -p "${dest}" || die
 		cp -pR "${@}" "${dest}/" || die
 		(
-			cd "${dest}" &&
-			chmod -R a+rX "${@##*/}"
-		) || die
+			cd "${dest}" || die
+			chmod -R a+rX "${@##*/}" || die
+		)
 	else
 		die "${FUNCNAME} can only be used in src_install or with BUILD_DIR set"
 	fi
@@ -1103,17 +1103,17 @@ python_fix_shebang() {
 			fi
 
 			if [[ ! ${quiet} ]]; then
-				einfo "Fixing shebang in ${f#${D%/}}."
+				einfo "Fixing shebang in ${f#${D}}."
 			fi
 
 			if [[ ! ${error} ]]; then
-				debug-print "${FUNCNAME}: in file ${f#${D%/}}"
+				debug-print "${FUNCNAME}: in file ${f#${D}}"
 				debug-print "${FUNCNAME}: rewriting shebang: ${shebang}"
 				sed -i -e "1s@${from}@#!${EPREFIX}/usr/bin/${EPYTHON}@" "${f}" || die
 				any_fixed=1
 			else
 				eerror "The file has incompatible shebang:"
-				eerror "  file: ${f#${D%/}}"
+				eerror "  file: ${f#${D}}"
 				eerror "  current shebang: ${shebang}"
 				eerror "  requested impl: ${EPYTHON}"
 				die "${FUNCNAME}: conversion of incompatible shebang requested"
@@ -1121,7 +1121,7 @@ python_fix_shebang() {
 		done < <(find -H "${path}" -type f -print0 || die)
 
 		if [[ ! ${any_fixed} ]]; then
-			eerror "QA error: ${FUNCNAME}, ${path#${D%/}} did not match any fixable files."
+			eerror "QA error: ${FUNCNAME}, ${path#${D}} did not match any fixable files."
 			eerror "There are no Python files in specified directory."
 			die "${FUNCNAME} did not match any fixable files"
 		fi
-- 
2.46.0

[gentoo-dev] [PATCH 31/50] readme.gentoo-r1.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/readme.gentoo-r1.eclass b/eclass/readme.gentoo-r1.eclass
index 48023d9c049f..4f1728da5b6f 100644
--- a/eclass/readme.gentoo-r1.eclass
+++ b/eclass/readme.gentoo-r1.eclass
@@ -6,7 +6,7 @@
 # Pacho Ramos <pacho@gentoo.org>
 # @AUTHOR:
 # Author: Pacho Ramos <pacho@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: install a doc file shown via elog messages
 # @DESCRIPTION:
 # An eclass for installing a README.gentoo doc file recording tips
@@ -21,7 +21,7 @@ if [[ -z ${_README_GENTOO_ECLASS} ]]; then
 _README_GENTOO_ECLASS=1
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -78,7 +78,7 @@ readme.gentoo_create_doc() {
 	( # subshell to avoid pollution of calling environment
 		docinto .
 		dodoc "${T}"/README.gentoo
-	) || die
+	)
 	README_GENTOO_DOC_VALUE=$(< "${T}/README.gentoo")
 }
 
-- 
2.46.0

[gentoo-dev] [PATCH 32/50] ruby-fakegem.eclass: drop support for EAPI 5 and 6

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/ruby-fakegem.eclass | 50 ++++++++++++--------------------------
 1 file changed, 16 insertions(+), 34 deletions(-)

diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 40ff76ce900e..0a99406954b0 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ruby-fakegem.eclass
@@ -8,7 +8,7 @@
 # Author: Diego E. Pettenò <flameeyes@gentoo.org>
 # Author: Alex Legler <a3li@gentoo.org>
 # Author: Hans de Graaff <graaff@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @PROVIDES: ruby-ng
 # @BLURB: An eclass for installing Ruby packages to behave like RubyGems.
 # @DESCRIPTION:
@@ -17,6 +17,11 @@
 
 inherit ruby-ng
 
+case ${EAPI} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
 # @ECLASS_VARIABLE: RUBY_FAKEGEM_NAME
 # @PRE_INHERIT
 # @DESCRIPTION:
@@ -61,14 +66,7 @@ RUBY_FAKEGEM_TASK_TEST="${RUBY_FAKEGEM_TASK_TEST-test}"
 #  - rdoc (calls `rdoc-2`, adds dev-ruby/rdoc to the dependencies);
 #  - yard (calls `yard`, adds dev-ruby/yard to the dependencies);
 #  - none
-case ${EAPI} in
-	5|6)
-		RUBY_FAKEGEM_RECIPE_DOC="${RUBY_FAKEGEM_RECIPE_DOC-rake}"
-		;;
-	*)
-		RUBY_FAKEGEM_RECIPE_DOC="${RUBY_FAKEGEM_RECIPE_DOC-rdoc}"
-		;;
-esac
+: "${RUBY_FAKEGEM_RECIPE_DOC=rdoc}"
 
 # @ECLASS_VARIABLE: RUBY_FAKEGEM_DOCDIR
 # @DEFAULT_UNSET
@@ -138,11 +136,6 @@ RUBY_FAKEGEM_BINDIR="${RUBY_FAKEGEM_BINDIR-bin}"
 # legacy way to install extensions for a long time.
 RUBY_FAKEGEM_EXTENSION_LIBDIR="${RUBY_FAKEGEM_EXTENSION_LIBDIR-lib}"
 
-case ${EAPI} in
-	5|6|7|8) ;;
-	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
-esac
-
 RUBY_FAKEGEM_SUFFIX="${RUBY_FAKEGEM_SUFFIX:-}"
 
 
@@ -211,13 +204,7 @@ SRC_URI="https://rubygems.org/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}$
 
 ruby_add_bdepend "virtual/rubygems"
 ruby_add_rdepend virtual/rubygems
-case ${EAPI} in
-	5|6)
-		;;
-	*)
-		ruby_add_depend virtual/rubygems
-		;;
-esac
+ruby_add_depend virtual/rubygems
 
 # Many (but not all) extensions use pkgconfig in src_configure.
 if [[ ${#RUBY_FAKEGEM_EXTENSIONS[@]} -gt 0 ]]; then
@@ -254,7 +241,7 @@ ruby_fakegem_doins() {
 	(
 		insinto $(ruby_fakegem_gemsdir)/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}
 		doins "$@"
-	) || die "failed $0 $@"
+	)
 }
 
 # @FUNCTION: ruby_fakegem_newins
@@ -274,7 +261,7 @@ ruby_fakegem_newins() {
 
 		insinto $(ruby_fakegem_gemsdir)/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}${newdirname}
 		newins "$1" ${newbasename}
-	) || die "failed $0 $@"
+	)
 }
 
 # @FUNCTION: ruby_fakegem_install_gemspec
@@ -299,7 +286,7 @@ ruby_fakegem_install_gemspec() {
 				ruby_fakegem_genspec ${gemspec}
 			fi
 		fi
-	) || die "Unable to generate gemspec file."
+	)
 
 	insinto $(ruby_fakegem_gemsdir)/specifications
 	newins ${gemspec} ${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}.gemspec || die "Unable to install gemspec file."
@@ -345,14 +332,9 @@ ruby_fakegem_metadata_gemspec() {
 ruby_fakegem_genspec() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	case ${EAPI} in
-		5|6) ;;
-		*)
-			eqawarn "Generating generic fallback gemspec *without* dependencies"
-			eqawarn "This will only work when there are no runtime dependencies"
-			eqawarn "Set RUBY_FAKEGEM_GEMSPEC to generate a proper specifications file"
-			;;
-	esac
+	eqawarn "Generating generic fallback gemspec *without* dependencies"
+	eqawarn "This will only work when there are no runtime dependencies"
+	eqawarn "Set RUBY_FAKEGEM_GEMSPEC to generate a proper specifications file"
 
 	local required_paths="'lib'"
 	for path in ${RUBY_FAKEGEM_REQUIRE_PATHS}; do
@@ -430,7 +412,7 @@ EOF
 
 		exeinto ${binpath:-/usr/bin}
 		newexe "${T}"/gembin-wrapper-${gembinary} $(basename $newbinary)
-	) || die "Unable to create fakegem wrapper"
+	)
 }
 
 # @FUNCTION: each_fakegem_configure
-- 
2.46.0

[gentoo-dev] [PATCH 33/50] ruby-ng.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index d80ae96dd40b..03d3e72769b0 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ruby-ng.eclass
@@ -8,7 +8,7 @@
 # Author: Diego E. Pettenò <flameeyes@gentoo.org>
 # Author: Alex Legler <a3li@gentoo.org>
 # Author: Hans de Graaff <graaff@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: An eclass for installing Ruby packages with proper support for multiple Ruby slots.
 # @DESCRIPTION:
 # The Ruby eclass is designed to allow an easier installation of Ruby packages
@@ -67,14 +67,13 @@
 # passed to "grep -E" to remove reporting of these shared objects.
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 if [[ -z ${_RUBY_NG_ECLASS} ]]; then
 _RUBY_NG_ECLASS=1
 
-[[ ${EAPI} == 6 ]] && inherit eqawarn toolchain-funcs
 inherit multilib ruby-utils
 
 # S is no longer automatically assigned when it doesn't exist.
@@ -218,16 +217,7 @@ ruby_add_rdepend() {
 	case $# in
 		1) ;;
 		2)
-			case ${EAPI} in
-				6)
-					[[ "${GENTOO_DEV}" == "yes" ]] && eqawarn "You can now use the usual syntax in ruby_add_rdepend for $CATEGORY/$PF"
-					ruby_add_rdepend "$(_ruby_wrap_conditions "$1" "$2")"
-					return
-					;;
-				*)
-					die "Use the usual depend syntax with a single argument in ruby_add_rdepend"
-					;;
-			esac
+			die "Use the usual depend syntax with a single argument in ruby_add_rdepend"
 			;;
 		*)
 			die "bad number of arguments to $0"
@@ -241,10 +231,7 @@ ruby_add_rdepend() {
 
 	# Add the dependency as a test-dependency since we're going to
 	# execute the code during test phase.
-	case ${EAPI} in
-		6) DEPEND+=" test? ( ${_RUBY_ATOMS_SAMELIB_RESULT} )" ;;
-		*) BDEPEND+=" test? ( ${_RUBY_ATOMS_SAMELIB_RESULT} )" ;;
-	esac
+	BDEPEND+=" test? ( ${_RUBY_ATOMS_SAMELIB_RESULT} )"
 	if ! has test "$IUSE"; then
 		IUSE+=" test"
 		RESTRICT+=" !test? ( test )"
@@ -254,8 +241,8 @@ ruby_add_rdepend() {
 # @FUNCTION: ruby_add_bdepend
 # @USAGE: dependencies
 # @DESCRIPTION:
-# Adds the specified dependencies, with use condition(s) to DEPEND (or
-# BDEPEND in EAPI7), taking the current set of ruby targets into
+# Adds the specified dependencies, with use condition(s) to BDEPEND,
+# taking the current set of ruby targets into
 # account. This makes sure that all ruby dependencies of the package are
 # installed for the same ruby targets. Use this function for all ruby
 # dependencies instead of setting DEPEND or BDEPEND yourself. The list
@@ -266,16 +253,7 @@ ruby_add_bdepend() {
 	case $# in
 		1) ;;
 		2)
-			case ${EAPI} in
-				6)
-					[[ "${GENTOO_DEV}" == "yes" ]] && eqawarn "You can now use the usual syntax in ruby_add_bdepend for $CATEGORY/$PF"
-					ruby_add_bdepend "$(_ruby_wrap_conditions "$1" "$2")"
-					return
-					;;
-				*)
-					die "Use the usual depend syntax with a single argument in ruby_add_bdepend"
-					;;
-			esac
+			die "Use the usual depend syntax with a single argument in ruby_add_bdepend"
 			;;
 		*)
 			die "bad number of arguments to $0"
@@ -285,25 +263,16 @@ ruby_add_bdepend() {
 	_ruby_set_globals_invalidate_if_stale
 	_ruby_atoms_samelib "$1"
 
-	case ${EAPI} in
-		6) DEPEND+=" ${_RUBY_ATOMS_SAMELIB_RESULT}" ;;
-		*) BDEPEND+=" ${_RUBY_ATOMS_SAMELIB_RESULT}" ;;
-	esac
+	BDEPEND+=" ${_RUBY_ATOMS_SAMELIB_RESULT}"
 }
 
 # @FUNCTION: ruby_add_depend
 # @USAGE: dependencies
 # @DESCRIPTION:
-# Adds the specified dependencies to DEPEND in EAPI7, similar to
-# ruby_add_bdepend.
+# Adds the specified dependencies to DEPEND, similar to ruby_add_bdepend.
 ruby_add_depend() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	case ${EAPI} in
-		6) die "only available in EAPI 7 and newer" ;;
-		*) ;;
-	esac
-
 	case $# in
 		1) ;;
 		*) die "bad number of arguments to $0" ;;
@@ -365,7 +334,7 @@ _ruby_get_use_targets() {
 # confuse this function with ruby_implementation_depend().
 #
 # @EXAMPLE:
-# EAPI=7
+# EAPI=8
 # RUBY_OPTIONAL=yes
 #
 # inherit ruby-ng
@@ -417,10 +386,7 @@ if [[ ${RUBY_OPTIONAL} != yes ]]; then
 	DEPEND+=" ${_RUBY_IMPLEMENTATIONS_DEPEND}"
 	RDEPEND+=" ${_RUBY_IMPLEMENTATIONS_DEPEND}"
 	REQUIRED_USE+=" || ( ${_RUBY_GET_USE_TARGETS} )"
-	case ${EAPI} in
-		6) ;;
-		*) BDEPEND+=" ${_RUBY_IMPLEMENTATIONS_DEPEND}" ;;
-	esac
+	BDEPEND+=" ${_RUBY_IMPLEMENTATIONS_DEPEND}"
 fi
 
 _ruby_invoke_environment() {
@@ -534,18 +500,9 @@ ruby-ng_src_unpack() {
 }
 
 _ruby_apply_patches() {
-	case ${EAPI} in
-		6)
-			if [[ -n ${RUBY_PATCHES[@]} ]]; then
-			   eqawarn "RUBY_PATCHES is no longer supported, use PATCHES instead"
-			fi
-			;;
-		*)
-			if [[ -n ${RUBY_PATCHES[@]} ]]; then
-				die "RUBY_PATCHES is no longer supported, use PATCHES instead"
-			fi
-			;;
-	esac
+	if [[ -n ${RUBY_PATCHES[@]} ]]; then
+		die "RUBY_PATCHES is no longer supported, use PATCHES instead"
+	fi
 
 	# This is a special case: instead of executing just in the special
 	# "all" environment, this will actually copy the effects on _all_
@@ -695,7 +652,7 @@ doruby() {
 		insinto "${sitelibdir#${EPREFIX}}"
 		insopts -m 0644
 		doins "$@"
-	) || die "failed to install $@"
+	)
 }
 
 # @FUNCTION: ruby_get_libruby
-- 
2.46.0

[gentoo-dev] [PATCH 34/50] ruby-utils.eclass: drop support for EAPI 5 and 6

[David Seifert]

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

diff --git a/eclass/ruby-utils.eclass b/eclass/ruby-utils.eclass
index 789f57ce25f6..1fdc51a29839 100644
--- a/eclass/ruby-utils.eclass
+++ b/eclass/ruby-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ruby-utils.eclass
@@ -6,7 +6,7 @@
 # Ruby team <ruby@gentoo.org>
 # @AUTHOR:
 # Author: Hans de Graaff <graaff@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: An eclass for supporting ruby scripts and bindings in non-ruby packages
 # @DESCRIPTION:
 # The ruby-utils eclass is designed to allow an easier installation of
@@ -15,12 +15,13 @@
 # This eclass does not set any metadata variables nor export any phase
 # functions. It can be inherited safely.
 
-case ${EAPI:-0} in
-	[5678]) ;;
+case ${EAPI} in
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ ! ${_RUBY_UTILS} ]]; then
+if [[ -z ${_RUBY_UTILS_ECLASS} ]] ; then
+_RUBY_UTILS_ECLASS=1
 
 # @ECLASS_VARIABLE: RUBY_TARGETS_PREFERENCE
 # @INTERNAL
@@ -64,5 +65,4 @@ _ruby_implementation_depend() {
 	echo "$2${rubypn}$3${rubyslot}"
 }
 
-_RUBY_UTILS=1
 fi
-- 
2.46.0

[gentoo-dev] [PATCH 35/50] strip-linguas.eclass: drop support for EAPI 5 and 6

[David Seifert]

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

diff --git a/eclass/strip-linguas.eclass b/eclass/strip-linguas.eclass
index 718341b4a626..782659f02860 100644
--- a/eclass/strip-linguas.eclass
+++ b/eclass/strip-linguas.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2021 Gentoo Authors
+# Copyright 2004-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: strip-linguas.eclass
@@ -6,11 +6,11 @@
 # Ulrich Müller <ulm@gentoo.org>
 # @AUTHOR:
 # Mike Frysinger <vapier@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: convenience function for LINGUAS support
 
 case ${EAPI} in
-	5|6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.46.0

[gentoo-dev] [PATCH 36/50] systemd.eclass: drop support for EAPI 5 and 6

[David Seifert]

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

diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass
index 03d6a82fd310..319650db44b5 100644
--- a/eclass/systemd.eclass
+++ b/eclass/systemd.eclass
@@ -1,10 +1,10 @@
-# Copyright 2011-2023 Gentoo Authors
+# Copyright 2011-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: systemd.eclass
 # @MAINTAINER:
 # systemd@gentoo.org
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: helper functions to install systemd units
 # @DESCRIPTION:
 # This eclass provides a set of functions to install unit files for
@@ -25,17 +25,13 @@
 # @CODE
 
 case ${EAPI} in
-	5|6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 inherit toolchain-funcs
 
-if [[ ${EAPI} == [56] ]]; then
-	DEPEND="virtual/pkgconfig"
-else
-	BDEPEND="virtual/pkgconfig"
-fi
+BDEPEND="virtual/pkgconfig"
 
 # @FUNCTION: _systemd_get_dir
 # @USAGE: <variable-name> <fallback-directory>
@@ -81,15 +77,6 @@ systemd_get_systemunitdir() {
 	_systemd_get_dir systemdsystemunitdir /lib/systemd/system
 }
 
-# @FUNCTION: systemd_get_unitdir
-# @DESCRIPTION:
-# Deprecated alias for systemd_get_systemunitdir.
-systemd_get_unitdir() {
-	[[ ${EAPI} == 5 ]] || die "${FUNCNAME} is banned in EAPI 6, use systemd_get_systemunitdir instead"
-
-	systemd_get_systemunitdir
-}
-
 # @FUNCTION: systemd_get_userunitdir
 # @DESCRIPTION:
 # Output the path for the systemd user unit directory (not including
@@ -335,46 +322,6 @@ systemd_enable_ntpunit() {
 	return ${ret}
 }
 
-# @FUNCTION: systemd_with_unitdir
-# @USAGE: [<configure-option-name>]
-# @DESCRIPTION:
-# Note: deprecated and banned in EAPI 6. Please use full --with-...=
-# parameter for improved ebuild readability.
-#
-# Output '--with-systemdsystemunitdir' as expected by systemd-aware configure
-# scripts. This function always succeeds. Its output may be quoted in order
-# to preserve whitespace in paths. systemd_to_myeconfargs() is preferred over
-# this function.
-#
-# If upstream does use invalid configure option to handle installing systemd
-# units (e.g. `--with-systemdunitdir'), you can pass the 'suffix' as an optional
-# argument to this function (`$(systemd_with_unitdir systemdunitdir)'). Please
-# remember to report a bug upstream as well.
-systemd_with_unitdir() {
-	[[ ${EAPI} == 5 ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use --with-${1:-systemdsystemunitdir}=\"\$(systemd_get_systemunitdir)\" instead"
-
-	debug-print-function ${FUNCNAME} "${@}"
-	local optname=${1:-systemdsystemunitdir}
-
-	echo --with-${optname}="$(systemd_get_systemunitdir)"
-}
-
-# @FUNCTION: systemd_with_utildir
-# @DESCRIPTION:
-# Note: deprecated and banned in EAPI 6. Please use full --with-...=
-# parameter for improved ebuild readability.
-#
-# Output '--with-systemdsystemutildir' as used by some packages to install
-# systemd helpers. This function always succeeds. Its output may be quoted
-# in order to preserve whitespace in paths.
-systemd_with_utildir() {
-	[[ ${EAPI} == 5 ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use --with-systemdutildir=\"\$(systemd_get_utildir)\" instead"
-
-	debug-print-function ${FUNCNAME} "${@}"
-
-	echo --with-systemdutildir="$(systemd_get_utildir)"
-}
-
 # @FUNCTION: systemd_update_catalog
 # @DESCRIPTION:
 # Update the journald catalog. This needs to be called after installing
-- 
2.46.0

[gentoo-dev] [PATCH 37/50] tmpfiles.eclass: drop support for EAPI 5 and 6

[David Seifert]

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

diff --git a/eclass/tmpfiles.eclass b/eclass/tmpfiles.eclass
index 39650401a6a0..731247bdfc7e 100644
--- a/eclass/tmpfiles.eclass
+++ b/eclass/tmpfiles.eclass
@@ -1,4 +1,4 @@
-# Copyright 2016-2022 Gentoo Authors
+# Copyright 2016-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: tmpfiles.eclass
@@ -8,7 +8,7 @@
 # @AUTHOR:
 # Mike Gilbert <floppym@gentoo.org>
 # William Hubbs <williamh@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Functions related to tmpfiles.d files
 # @DESCRIPTION:
 # This eclass provides functionality related to installing and
@@ -32,7 +32,7 @@
 # Typical usage of this eclass:
 #
 # @CODE
-#	EAPI=6
+#	EAPI=8
 #	inherit tmpfiles
 #
 #	...
@@ -52,14 +52,14 @@
 #
 # @CODE
 
+case ${EAPI} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
 if [[ -z ${_TMPFILES_ECLASS} ]]; then
 _TMPFILES_ECLASS=1
 
-case "${EAPI}" in
-5|6|7|8) ;;
-*) die "API is undefined for EAPI ${EAPI}" ;;
-esac
-
 # @ECLASS_VARIABLE: TMPFILES_OPTIONAL
 # @PRE_INHERIT
 # @DEFAULT_UNSET
-- 
2.46.0

[gentoo-dev] [PATCH 38/50] toolchain-funcs.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index 5e36fa275dcd..b438b3c0ab7b 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: toolchain-funcs.eclass
 # @MAINTAINER:
 # Toolchain Ninjas <toolchain@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: functions to query common info about the toolchain
 # @DESCRIPTION:
 # The toolchain-funcs aims to provide a complete suite of functions
@@ -14,7 +14,7 @@
 # something sane.
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -1113,7 +1113,6 @@ gen_usr_ldscript() {
 	ewarn "${FUNCNAME}: Please migrate to usr-ldscript.eclass"
 
 	local lib libdir=$(get_libdir) output_format="" auto=false suffix=$(get_libname)
-	[[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/
 
 	tc-is-static-only && return
 	use prefix && return
-- 
2.46.0

[gentoo-dev] [PATCH 39/50] toolchain.eclass: drop support for EAPI 6

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/toolchain.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index ac236f3127f9..de6bd6a52214 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -2353,7 +2353,7 @@ fix_libtool_libdir_paths() {
 	pushd "${D}" >/dev/null || die
 
 	pushd "./${libpath}" >/dev/null || die
-	local dir="${PWD#${D%/}}"
+	local dir="${PWD#${D}}"
 	local allarchives=$(echo *.la)
 	allarchives="\(${allarchives// /\\|}\)"
 	popd >/dev/null || die
-- 
2.46.0

[gentoo-dev] [PATCH 40/50] udev.eclass: drop support for EAPI 5 and 6

[David Seifert]

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

diff --git a/eclass/udev.eclass b/eclass/udev.eclass
index ac94f98221aa..ba1ac00e51ed 100644
--- a/eclass/udev.eclass
+++ b/eclass/udev.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: udev.eclass
 # @MAINTAINER:
 # systemd@gentoo.org
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Default eclass for determining udev directories.
 # @DESCRIPTION:
 # Default eclass for determining udev directories.
@@ -37,7 +37,7 @@
 # @CODE
 
 case ${EAPI} in
-	5|6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -46,11 +46,7 @@ _UDEV_ECLASS=1
 
 inherit toolchain-funcs
 
-if [[ ${EAPI} == [56] ]]; then
-	DEPEND="virtual/pkgconfig"
-else
-	BDEPEND="virtual/pkgconfig"
-fi
+BDEPEND="virtual/pkgconfig"
 
 # @FUNCTION: _udev_get_udevdir
 # @INTERNAL
@@ -122,7 +118,7 @@ udev_newrules() {
 # Should be called from pkg_postinst and pkg_postrm in packages which install
 # udev rules or hwdb data.
 udev_reload() {
-	if [[ -n ${ROOT%/} ]]; then
+	if [[ -n ${ROOT} ]]; then
 		return 0
 	fi
 
-- 
2.46.0

[gentoo-dev] [PATCH 41/50] vcs-clean.eclass: drop support for EAPI 5 and 6

[David Seifert]

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

diff --git a/eclass/vcs-clean.eclass b/eclass/vcs-clean.eclass
index e4c61ac7164a..ab607e8f71ae 100644
--- a/eclass/vcs-clean.eclass
+++ b/eclass/vcs-clean.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: vcs-clean.eclass
@@ -6,11 +6,11 @@
 # base-system@gentoo.org
 # @AUTHOR:
 # Benedikt Böhm <hollow@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: helper functions to remove VCS directories
 
 case ${EAPI} in
-	5|6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.46.0

[gentoo-dev] [PATCH 42/50] vdr-plugin-2.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass
index dc70ca7c5761..f0cf66b51b7a 100644
--- a/eclass/vdr-plugin-2.eclass
+++ b/eclass/vdr-plugin-2.eclass
@@ -112,14 +112,14 @@ vdr_create_plugindb_file() {
 #		EBUILD=${CATEGORY}/${PN}
 #		EBUILD_V=${PVR}
 #	EOT
-#	obsolet? fix me later...
+#	obsolete? fix me later...
 	{
 		echo "VDRPLUGIN_DB=1"
 		echo "CREATOR=ECLASS"
 		echo "EBUILD=${CATEGORY}/${PN}"
 		echo "EBUILD_V=${PVR}"
 		echo "PLUGINS=\"$@\""
-	} > "${D%/}/${DB_FILE}"
+	} > "${D}/${DB_FILE}" || die
 }
 
 # @FUNCTION: vdr_create_header_checksum_file
@@ -423,7 +423,7 @@ vdr-plugin-2_pkg_setup() {
 	if [[ -n "${VDR_LOCAL_PATCHES_DIR}" ]]; then
 		eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"
 		eerror "Please move all your patches into"
-		eerror "${EROOT%/}/etc/portage/patches/${CATEGORY}/${P}"
+		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
 		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
 		die
 	fi
@@ -564,7 +564,7 @@ vdr-plugin-2_src_install() {
 		emake install \
 		${BUILD_PARAMS} \
 		TMPDIR="${T}" \
-		DESTDIR="${D%/}" \
+		DESTDIR="${D}" \
 		|| die "emake install (makefile target) failed"
 	else
 		einfo "Notice: Plugin use still the old Makefile handling"
@@ -579,12 +579,12 @@ vdr-plugin-2_src_install() {
 		local linguas
 		for linguas in ${LINGUAS[*]}; do
 		insinto "${LOCDIR}"
-		cp -r --parents ${linguas}* "${D%/}"/${LOCDIR} \
+		cp -r --parents ${linguas}* "${D}"/${LOCDIR} \
 			|| die "could not copy linguas files"
 		done
 	fi
 
-	cd "${D%/}/usr/$(get_libdir)/vdr/plugins" \
+	cd "${D}/usr/$(get_libdir)/vdr/plugins" \
 		|| die "could not change to \$D/usr/libdir/vdr/plugins"
 
 	# create list of all created plugin libs
-- 
2.46.0

[gentoo-dev] [PATCH 43/50] vim-doc.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/vim-doc.eclass b/eclass/vim-doc.eclass
index 119ce793071d..6711dadf7617 100644
--- a/eclass/vim-doc.eclass
+++ b/eclass/vim-doc.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: vim-doc.eclass
 # @MAINTAINER:
 # vim@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Eclass for vim{,-plugin}.eclass to update documentation tags.
 # @DESCRIPTION:
 # This eclass is used by vim.eclass and vim-plugin.eclass to update
@@ -17,11 +17,12 @@
 # installed by the eclass.
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ ! ${_VIM_DOC_ECLASS} ]] ; then
+if [[ -z ${_VIM_DOC_ECLASS} ]]; then
+_VIM_DOC_ECLASS=1
 
 # @FUNCTION: update_vim_helptags
 # @USAGE:
@@ -54,7 +55,7 @@ update_vim_helptags() {
 
 	# Install the documentation symlinks into the versioned vim
 	# directory and run :helptags
-	for d in "${EROOT%/}"/usr/share/vim/vim[0-9]*; do
+	for d in "${EROOT}"/usr/share/vim/vim[0-9]*; do
 		[[ -d "${d}/doc" ]] || continue	# catch a failed glob
 
 		# Remove links
@@ -100,5 +101,4 @@ update_vim_helptags() {
 	fi
 }
 
-_VIM_DOC_ECLASS=1
 fi
-- 
2.46.0

[gentoo-dev] [PATCH 44/50] vim-plugin.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/vim-plugin.eclass b/eclass/vim-plugin.eclass
index ee4f1b6e0f81..ba61bf89616e 100644
--- a/eclass/vim-plugin.eclass
+++ b/eclass/vim-plugin.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: vim-plugin.eclass
 # @MAINTAINER:
 # vim@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: used for installing vim plugins
 # @DESCRIPTION:
 # This eclass simplifies installation of app-vim plugins into
@@ -13,7 +13,7 @@
 # documentation, for which we make a special case via vim-doc.eclass.
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -22,7 +22,7 @@ _VIM_PLUGIN_ECLASS=1
 
 inherit vim-doc
 
-[[ ${EAPI} != [67] ]] && _DEFINE_VIM_PLUGIN_SRC_PREPARE=true
+[[ ${EAPI} != 7 ]] && _DEFINE_VIM_PLUGIN_SRC_PREPARE=true
 
 # @ECLASS_VARIABLE: VIM_PLUGIN_VIM_VERSION
 # @DESCRIPTION:
@@ -98,8 +98,8 @@ vim-plugin_src_install() {
 	# Install remainder of plugin
 	insinto /usr/share/vim/vimfiles/
 	local d
-	case ${EAPI:-0} in
-		6|7)
+	case ${EAPI} in
+		7)
 			for d in *; do
 				[[ -d "${d}" ]] || continue
 				doins -r "${d}"
-- 
2.46.0

[gentoo-dev] [PATCH 45/50] vim-spell.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/vim-spell.eclass b/eclass/vim-spell.eclass
index 607771ae8035..2e2df33e5105 100644
--- a/eclass/vim-spell.eclass
+++ b/eclass/vim-spell.eclass
@@ -6,7 +6,7 @@
 # Vim Maintainers <vim@gentoo.org>
 # @AUTHOR:
 # Ciaran McCreesh <ciaranm@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Eclass for managing Vim spell files.
 # @DESCRIPTION:
 # How to make a vim spell file package using prebuilt spell lists
@@ -63,7 +63,7 @@
 # for another language rather than keeping them Gentoo-specific.
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.46.0

[gentoo-dev] [PATCH 46/50] virtualx.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index f7318eafc59e..88c126802990 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: virtualx.eclass
@@ -6,11 +6,11 @@
 # x11@gentoo.org
 # @AUTHOR:
 # Original author: Martin Schlemmer <azarah@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: This eclass can be used for packages that need a working X environment to build.
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -32,15 +32,15 @@ _VIRTUALX_ECLASS=1
 # @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # Standard dependencies string that is automatically added to BDEPEND
-# (in EAPI-6: DEPEND) unless VIRTUALX_REQUIRED is set to "manual".
+# unless VIRTUALX_REQUIRED is set to "manual".
 # DEPRECATED: Pre-EAPI-8 you can specify the variable BEFORE inherit
 # to add more dependencies.
-[[ ${EAPI} != [67] ]] && VIRTUALX_DEPEND=""
+[[ ${EAPI} != 7 ]] && VIRTUALX_DEPEND=""
 VIRTUALX_DEPEND+="
 	x11-base/xorg-server[xvfb]
 	x11-apps/xhost
 "
-[[ ${EAPI} != [67] ]] && readonly VIRTUALX_DEPEND
+[[ ${EAPI} != 7 ]] && readonly VIRTUALX_DEPEND
 
 [[ ${VIRTUALX_COMMAND} ]] && die "VIRTUALX_COMMAND has been removed and is a no-op"
 
@@ -58,8 +58,6 @@ case ${VIRTUALX_REQUIRED} in
 		;;
 esac
 
-[[ ${EAPI} == 6 ]] && DEPEND="${BDEPEND}"
-
 
 # @FUNCTION: virtx
 # @USAGE: <command> [command arguments]
-- 
2.46.0

[gentoo-dev] [PATCH 47/50] webapp.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass
index 5b091c84851f..ff1b956d5847 100644
--- a/eclass/webapp.eclass
+++ b/eclass/webapp.eclass
@@ -1,17 +1,17 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: webapp.eclass
 # @MAINTAINER:
 # web-apps@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: functions for installing applications to run under a web server
 # @DESCRIPTION:
 # The webapp eclass contains functions to handle web applications with
 # webapp-config. Part of the implementation of GLEP #11
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -51,9 +51,9 @@ IS_REPLACE=0
 INSTALL_CHECK_FILE="installed_by_webapp_eclass"
 SETUP_CHECK_FILE="setup_by_webapp_eclass"
 
-ETC_CONFIG="${ROOT%/}/etc/vhosts/webapp-config"
-WEBAPP_CONFIG="${ROOT%/}/usr/sbin/webapp-config"
-WEBAPP_CLEANER="${ROOT%/}/usr/sbin/webapp-cleaner"
+ETC_CONFIG="${EROOT}/etc/vhosts/webapp-config"
+WEBAPP_CONFIG="${EROOT}/usr/sbin/webapp-config"
+WEBAPP_CLEANER="${EROOT}/usr/sbin/webapp-cleaner"
 
 # ==============================================================================
 # INTERNAL FUNCTIONS
@@ -366,7 +366,7 @@ webapp_src_preinst() {
 # @DESCRIPTION:
 # The default pkg_setup() for this eclass. This will gather required variables
 # from webapp-config and check if there is an application installed to
-# `${ROOT%/}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set.
+# `${ROOT}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set.
 #
 # You need to call this function BEFORE anything else has run in your custom
 # pkg_setup().
@@ -390,7 +390,7 @@ webapp_pkg_setup() {
 	G_HOSTNAME="localhost"
 	webapp_read_config
 
-	local my_dir="${ROOT%/}/${VHOST_ROOT}/${MY_HTDOCSBASE}/${PN}"
+	local my_dir="${ROOT}/${VHOST_ROOT}/${MY_HTDOCSBASE}/${PN}"
 
 	# if USE=vhosts is enabled OR no application is installed we're done here
 	if ! has vhosts ${IUSE} || use vhosts || [[ ! -d "${my_dir}" ]]; then
@@ -454,7 +454,7 @@ webapp_src_install() {
 # @FUNCTION: webapp_pkg_postinst
 # @DESCRIPTION:
 # The default pkg_postinst() for this eclass. This installs the web application to
-# `${ROOT%/}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set. Otherwise
+# `${ROOT}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set. Otherwise
 # display a short notice how to install this application with webapp-config.
 #
 # You need to call this function AFTER everything else has run in your custom
@@ -465,7 +465,7 @@ webapp_pkg_postinst() {
 	webapp_read_config
 
 	# sanity checks, to catch bugs in the ebuild
-	if [[ ! -f "${ROOT%/}/${MY_APPDIR}/${INSTALL_CHECK_FILE}" ]]; then
+	if [[ ! -f "${ROOT}/${MY_APPDIR}/${INSTALL_CHECK_FILE}" ]]; then
 		eerror
 		eerror "This ebuild did not call webapp_src_install() at the end"
 		eerror "of the src_install() function"
-- 
2.46.0

[gentoo-dev] [PATCH 48/50] wrapper.eclass: drop support for EAPI 5 and 6

[David Seifert]

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

diff --git a/eclass/wrapper.eclass b/eclass/wrapper.eclass
index 8d3d273d81c6..b2dfc025085d 100644
--- a/eclass/wrapper.eclass
+++ b/eclass/wrapper.eclass
@@ -1,14 +1,14 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: wrapper.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: create a shell wrapper script
 
 case ${EAPI} in
-	5|6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -55,7 +55,7 @@ make_wrapper() {
 		exeopts -m 0755
 		exeinto "${path}"
 		newexe "${tmpwrapper}" "${wrapper}"
-		) || die
+		)
 	else
 		newbin "${tmpwrapper}" "${wrapper}"
 	fi
-- 
2.46.0

[gentoo-dev] [PATCH 49/50] xdg-utils.eclass: drop support for EAPI 5 and 6

[David Seifert]

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

diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass
index 34535a129e33..de383d88cf95 100644
--- a/eclass/xdg-utils.eclass
+++ b/eclass/xdg-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2023 Gentoo Authors
+# Copyright 2004-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: xdg-utils.eclass
@@ -7,7 +7,7 @@
 # freedesktop-bugs@gentoo.org
 # @AUTHOR:
 # Original author: Gilles Dartiguelongue <eva@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Auxiliary functions commonly used by XDG compliant packages.
 # @DESCRIPTION:
 # This eclass provides a set of auxiliary functions needed by most XDG
@@ -18,7 +18,7 @@
 #  * XDG mime information database management
 
 case ${EAPI} in
-	5|6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -68,7 +68,7 @@ xdg_desktop_database_update() {
 	fi
 
 	ebegin "Updating .desktop files database"
-	update-desktop-database -q "${EROOT%/}${DESKTOP_DATABASE_DIR}"
+	update-desktop-database -q "${EROOT}${DESKTOP_DATABASE_DIR}"
 	eend $?
 }
 
@@ -89,7 +89,7 @@ xdg_icon_cache_update() {
 	ebegin "Updating icons cache"
 	local dir retval=0
 	local fails=()
-	for dir in "${EROOT%/}"/usr/share/icons/*; do
+	for dir in "${EROOT}"/usr/share/icons/*; do
 		if [[ -f ${dir}/index.theme ]]; then
 			if ! gtk-update-icon-cache -qf "${dir}"; then
 				debug-print "Updating cache failed on ${dir}"
@@ -130,6 +130,6 @@ xdg_mimeinfo_database_update() {
 	local -x PKGSYSTEM_ENABLE_FSYNC=0
 
 	ebegin "Updating shared mime info database"
-	update-mime-database "${EROOT%/}${MIMEINFO_DATABASE_DIR}"
+	update-mime-database "${EROOT}${MIMEINFO_DATABASE_DIR}"
 	eend $?
 }
-- 
2.46.0

[gentoo-dev] [PATCH 50/50] xdg.eclass: drop support for EAPI 6

[David Seifert]

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

diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass
index 14c56047af45..7d02a2ac18b8 100644
--- a/eclass/xdg.eclass
+++ b/eclass/xdg.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: xdg.eclass
@@ -6,7 +6,7 @@
 # freedesktop-bugs@gentoo.org
 # @AUTHOR:
 # Original author: Gilles Dartiguelongue <eva@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @PROVIDES: xdg-utils
 # @BLURB: Provides phases for XDG compliant packages.
 # @DESCRIPTION:
@@ -14,7 +14,7 @@
 # out in the freedesktop specs & implementations
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -30,7 +30,7 @@ inherit xdg-utils
 "
 
 case ${EAPI} in
-	6|7)
+	7)
 		# src_prepare is only exported in EAPI < 8.
 		# @FUNCTION: xdg_src_prepare
 		# @DESCRIPTION:
-- 
2.46.0

Re: [gentoo-dev] [PATCH 00/50] XXXXXX.eclass: drop support for EAPI6

[Robin H. Johnson]

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

There wasn't an introduction message to this series, but I wanted to
raise the discussion.

We only JUST got rid of the last EAPI6 ebuilds in the main tree.

There are overlays that still have EAPI6 ebuilds - and depend on these
ebuilds.

When is an expected time for all of those ebuilds to migrate, and how is
that being communicated?

-- 
Robin Hugh Johnson
Gentoo Linux: Dev, Infra Lead, Foundation President & Treasurer
E-Mail   : robbat2@gentoo.org
GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85
GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136

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

Re: [gentoo-dev] [PATCH 00/50] XXXXXX.eclass: drop support for EAPI6

[Eli Schwartz]

[-- Attachment #1.1: Type: text/plain, Size: 883 bytes --]

On 8/27/24 5:03 PM, Robin H. Johnson wrote:
> There wasn't an introduction message to this series, but I wanted to
> raise the discussion.
> 
> We only JUST got rid of the last EAPI6 ebuilds in the main tree.
> 
> There are overlays that still have EAPI6 ebuilds - and depend on these
> ebuilds.
> 
> When is an expected time for all of those ebuilds to migrate, and how is
> that being communicated?


If we were removing an eclass that only supports EAPI 6 and is being
dropped because it's useless, we'd last rite it and give people 30 days
to move.

But because the *file* isn't being removed, there is no rule how to do
it apparently?? :D The obvious answer here is to stick an ewarn in the
"if EAPI 6" branch at global scope.


(It's a bit messy when doing dependency calculation. This too is a
feature, if you think about it.)


-- 
Eli Schwartz


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

Re: [gentoo-dev] [PATCH 00/50] XXXXXX.eclass: drop support for EAPI6

[Sam James]

Eli Schwartz <eschwartz@gentoo.org> writes:

> On 8/27/24 5:03 PM, Robin H. Johnson wrote:
>> There wasn't an introduction message to this series, but I wanted to
>> raise the discussion.
>> 
>> We only JUST got rid of the last EAPI6 ebuilds in the main tree.
>> 
>> There are overlays that still have EAPI6 ebuilds - and depend on these
>> ebuilds.
>> 
>> When is an expected time for all of those ebuilds to migrate, and how is
>> that being communicated?
>
>
> If we were removing an eclass that only supports EAPI 6 and is being
> dropped because it's useless, we'd last rite it and give people 30 days
> to move.
>
> But because the *file* isn't being removed, there is no rule how to do
> it apparently?? :D The obvious answer here is to stick an ewarn in the
> "if EAPI 6" branch at global scope.
>
>
> (It's a bit messy when doing dependency calculation. This too is a
> feature, if you think about it.)

Yes, it's something which has bothered me for a while. When we ratified
GLEP 83 [0], I wanted to come back to it for handling EAPI support
deprecation in "important" eclasses but I couldn't figure out a nice
definition for that and got distracted.

I actually *do* think we should do something here, but I will note
pkgcheck will have been warning about use of DeprecatedEapi at least.

[0] https://www.gentoo.org/glep/glep-0083.html

Re: [gentoo-dev] [PATCH 00/50] XXXXXX.eclass: drop support for EAPI6

[Ulrich Mueller]

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

>>>>> On Tue, 27 Aug 2024, Robin H Johnson wrote:

> We only JUST got rid of the last EAPI6 ebuilds in the main tree.

Note that the council deprecated EAPI 6 on 2021-07-11 and banned it
on 2023-07-11.

> There are overlays that still have EAPI6 ebuilds - and depend on these
> ebuilds.

> When is an expected time for all of those ebuilds to migrate, and how
> is that being communicated?

I'd argue that the migration period started with the deprecation
of EAPI 6, i.e. more than three years ago.

[1] https://wiki.gentoo.org/wiki/Project:Package_Manager_Specification#Council_approval_and_use_in_Gentoo_repository

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