[gentoo-dev] [PATCH 0/8] Deprecate eutils.eclass

[gentoo-dev] [PATCH 0/8] Deprecate eutils.eclass

[Ulrich Müller]

This series of patches splits off eqawarn in its own eclass, which
will finally allow us to tag eutils.eclass as deprecated.

Also, some eclasses call eqawarn in EAPI 6 without inheriting the
function. Add a proper inherit statement to them, and drop EAPI 5
support while at it.

Ulrich Müller (8):
  eqawarn.eclass: New eclass, split off from eutils
  eutils.eclass: Add @DEPRECATED tag
  python*-r1.eclass: Add missing inherit for eqawarn
  ruby-ng.eclass: Drop support for EAPI 5
  ruby-ng.eclass: Add missing inherit for eqawarn
  vcs-snapshot.eclass: Add missing inherit for eqawarn
  java-pkg-simple.eclass: Drop support for EAPI 5
  java-pkg-simple.eclass: Inherit eqawarn instead of eutils

 eclass/eqawarn.eclass         | 26 +++++++++++++++++++++++
 eclass/eutils.eclass          | 28 ++----------------------
 eclass/java-pkg-simple.eclass | 10 +++------
 eclass/python-r1.eclass       |  1 +
 eclass/python-utils-r1.eclass |  1 +
 eclass/ruby-ng.eclass         | 40 +++++++++--------------------------
 eclass/vcs-snapshot.eclass    |  3 ++-
 7 files changed, 45 insertions(+), 64 deletions(-)
 create mode 100644 eclass/eqawarn.eclass

-- 
2.35.1

[gentoo-dev] [PATCH 1/8] eqawarn.eclass: New eclass, split off from eutils

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/eqawarn.eclass | 26 ++++++++++++++++++++++++++
 eclass/eutils.eclass  | 15 +--------------
 2 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100644 eclass/eqawarn.eclass

diff --git a/eclass/eqawarn.eclass b/eclass/eqawarn.eclass
new file mode 100644
index 000000000000..288976182fb3
--- /dev/null
+++ b/eclass/eqawarn.eclass
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: eqawarn.eclass
+# @MAINTAINER:
+# base-system@gentoo.org
+# @SUPPORTED_EAPIS: 6
+# @BLURB: output a QA warning
+
+case ${EAPI} in
+	6) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
+# @FUNCTION: eqawarn
+# @USAGE: [message]
+# @DESCRIPTION:
+# Proxy to ewarn for package managers that don't provide eqawarn and
+# use the PM implementation if available.  Reuses PORTAGE_ELOG_CLASSES
+# as set by the dev profile.
+if ! declare -F eqawarn >/dev/null ; then
+	eqawarn() {
+		has qa ${PORTAGE_ELOG_CLASSES} && ewarn "$@"
+		:
+	}
+fi
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index e7fae2c656c6..b1479d33049c 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -24,7 +24,7 @@ _EUTILS_ECLASS=1
 
 # implicitly inherited (now split) eclasses
 case ${EAPI} in
-	6) inherit desktop edos2unix epatch estack ltprune multilib \
+	6) inherit desktop edos2unix epatch eqawarn estack ltprune multilib \
 			preserve-libs strip-linguas toolchain-funcs vcs-clean wrapper ;;
 	7) inherit edos2unix strip-linguas wrapper ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
@@ -50,17 +50,4 @@ use_if_iuse() {
 	die "use_if_iuse is banned"
 }
 
-# @FUNCTION: eqawarn
-# @USAGE: [message]
-# @DESCRIPTION:
-# Proxy to ewarn for package managers that don't provide eqawarn and use the PM
-# implementation if available. Reuses PORTAGE_ELOG_CLASSES as set by the dev
-# profile.
-if [[ ${EAPI} == 6 ]] && ! declare -F eqawarn >/dev/null ; then
-	eqawarn() {
-		has qa ${PORTAGE_ELOG_CLASSES} && ewarn "$@"
-		:
-	}
-fi
-
 fi
-- 
2.35.1

[gentoo-dev] [PATCH 2/8] eutils.eclass: Add @DEPRECATED tag

[Ulrich Müller]

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

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index b1479d33049c..dedb5b1696c1 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -6,18 +6,7 @@
 # base-system@gentoo.org
 # @SUPPORTED_EAPIS: 6 7
 # @BLURB: many extra (but common) functions that are used in ebuilds
-# @DESCRIPTION:
-# The eutils eclass contains a suite of functions that complement
-# the ones that ebuild.sh already contain.  The idea is that the functions
-# are not required in all ebuilds but enough utilize them to have a common
-# home rather than having multiple ebuilds implementing the same thing.
-#
-# Due to the nature of this eclass, some functions may have maintainers
-# different from the overall eclass!
-#
-# This eclass is DEPRECATED and must not be inherited by any new ebuilds
-# or eclasses.  Use the more specific split eclasses instead, or native
-# package manager functions when available.
+# @DEPRECATED native package manager functions, more specific eclasses
 
 if [[ -z ${_EUTILS_ECLASS} ]]; then
 _EUTILS_ECLASS=1
-- 
2.35.1

[gentoo-dev] [PATCH 3/8] python*-r1.eclass: Add missing inherit for eqawarn

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/python-r1.eclass       | 1 +
 eclass/python-utils-r1.eclass | 1 +
 2 files changed, 2 insertions(+)

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 3471e17bdde6..2fd5c70120e9 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -49,6 +49,7 @@ elif [[ ${_PYTHON_ANY_R1} ]]; then
 	die 'python-r1.eclass can not be used with python-any-r1.eclass.'
 fi
 
+[[ ${EAPI} == 6 ]] && inherit eqawarn
 inherit multibuild python-utils-r1
 
 fi
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index e54f943f94f6..b793a1f13e0f 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -35,6 +35,7 @@ fi
 if [[ ! ${_PYTHON_UTILS_R1} ]]; then
 
 [[ ${EAPI} == [67] ]] && inherit eapi8-dosym
+[[ ${EAPI} == 6 ]] && inherit eqawarn
 inherit multiprocessing toolchain-funcs
 
 # @ECLASS_VARIABLE: _PYTHON_ALL_IMPLS
-- 
2.35.1

[gentoo-dev] [PATCH 4/8] ruby-ng.eclass: Drop support for EAPI 5

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/ruby-ng.eclass | 38 +++++++++-----------------------------
 1 file changed, 9 insertions(+), 29 deletions(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index c43d5b4d9826..167aab755f3a 100644
--- a/eclass/ruby-ng.eclass
+++ b/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: 5 6 7 8
+# @SUPPORTED_EAPIS: 6 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,9 +67,6 @@
 # passed to "grep -E" to remove reporting of these shared objects.
 
 case ${EAPI} in
-	5)
-		inherit eutils toolchain-funcs
-		;;
 	6)
 		inherit estack toolchain-funcs
 		;;
@@ -86,7 +83,7 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_i
 S="${WORKDIR}"
 
 case ${EAPI} in
-	5|6|7|8) ;;
+	6|7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -214,7 +211,7 @@ ruby_add_rdepend() {
 		1) ;;
 		2)
 			case ${EAPI} in
-				5|6)
+				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
@@ -236,7 +233,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
-		5|6) DEPEND="${DEPEND} test? ( ${dependency} )" ;;
+		6) DEPEND="${DEPEND} test? ( ${dependency} )" ;;
 		*) BDEPEND="${BDEPEND} test? ( ${dependency} )" ;;
 	esac
 	if ! has test "$IUSE"; then
@@ -261,7 +258,7 @@ ruby_add_bdepend() {
 		1) ;;
 		2)
 			case ${EAPI} in
-				5|6)
+				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
@@ -279,7 +276,7 @@ ruby_add_bdepend() {
 	local dependency=$(_ruby_atoms_samelib "$1")
 
 	case ${EAPI} in
-		5|6) DEPEND="${DEPEND} $dependency" ;;
+		6) DEPEND="${DEPEND} $dependency" ;;
 		*) BDEPEND="${BDEPEND} $dependency" ;;
 	esac
 	RDEPEND="${RDEPEND}"
@@ -294,7 +291,7 @@ ruby_add_depend() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	case ${EAPI} in
-		5|6) die "only available in EAPI 7 and newer" ;;
+		6) die "only available in EAPI 7 and newer" ;;
 		*) ;;
 	esac
 
@@ -368,7 +365,7 @@ if [[ ${RUBY_OPTIONAL} != yes ]]; then
 	RDEPEND="${RDEPEND} $(ruby_implementations_depend)"
 	REQUIRED_USE+=" || ( $(ruby_get_use_targets) )"
 	case ${EAPI} in
-		5|6) ;;
+		6) ;;
 		*) BDEPEND="${BDEPEND} $(ruby_implementations_depend)" ;;
 	esac
 fi
@@ -476,17 +473,6 @@ ruby-ng_src_unpack() {
 
 _ruby_apply_patches() {
 	case ${EAPI} in
-		5)
-			for patch in "${RUBY_PATCHES[@]}"; do
-				if [ -f "${patch}" ]; then
-					epatch "${patch}"
-				elif [ -f "${FILESDIR}/${patch}" ]; then
-					epatch "${FILESDIR}/${patch}"
-				else
-					die "Cannot find patch ${patch}"
-				fi
-			done
-			;;
 		6)
 			if [[ -n ${RUBY_PATCHES[@]} ]]; then
 			   eqawarn "RUBY_PATCHES is no longer supported, use PATCHES instead"
@@ -525,13 +511,7 @@ ruby-ng_src_prepare() {
 	find . -name '._*' -delete
 
 	# Handle PATCHES and user supplied patches via the default phase
-	case ${EAPI} in
-		5)
-			;;
-		*)
-			_ruby_invoke_environment all default
-			;;
-	esac
+	_ruby_invoke_environment all default
 
 	_ruby_invoke_environment all _ruby_apply_patches
 
-- 
2.35.1

[gentoo-dev] [PATCH 5/8] ruby-ng.eclass: Add missing inherit for eqawarn

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/ruby-ng.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index 167aab755f3a..06548392a501 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -68,7 +68,7 @@
 
 case ${EAPI} in
 	6)
-		inherit estack toolchain-funcs
+		inherit eqawarn estack toolchain-funcs
 		;;
 	*)
 		inherit estack
-- 
2.35.1

[gentoo-dev] [PATCH 6/8] vcs-snapshot.eclass: Add missing inherit for eqawarn

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/vcs-snapshot.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/vcs-snapshot.eclass b/eclass/vcs-snapshot.eclass
index 64bc1da040f4..1b7299b92a3b 100644
--- a/eclass/vcs-snapshot.eclass
+++ b/eclass/vcs-snapshot.eclass
@@ -43,7 +43,8 @@
 # in ${WORKDIR}/${P} and ${WORKDIR}/${P}-otherstuff respectively.
 
 case ${EAPI} in
-	6|7|8) ;;
+	6) inherit eqawarn ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-- 
2.35.1

[gentoo-dev] [PATCH 7/8] java-pkg-simple.eclass: Drop support for EAPI 5

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/java-pkg-simple.eclass | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index c0a6b4d21df9..34c044e2ba2d 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -6,7 +6,7 @@
 # java@gentoo.org
 # @AUTHOR:
 # Java maintainers <java@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: Eclass for packaging Java software with ease.
 # @DESCRIPTION:
 # This class is intended to build pure Java packages from Java sources
@@ -16,8 +16,8 @@
 # addressed by an ebuild by putting corresponding files into the target
 # directory before calling the src_compile function of this eclass.
 
-case ${EAPI:-0} in
-	5|6) inherit eutils ;; # eutils for eqawarn
+case ${EAPI} in
+	6) inherit eutils ;; # eutils for eqawarn
 	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
@@ -468,10 +468,6 @@ java-pkg-simple_src_install() {
 		java-pkg_dosrc ${srcdirs}
 	fi
 
-	if [[ ${EAPI} == 5 ]]; then
-		# einstalldocs is only available on EAPI >= 6.
-		return
-	fi
 	einstalldocs
 }
 
-- 
2.35.1

[gentoo-dev] [PATCH 8/8] java-pkg-simple.eclass: Inherit eqawarn instead of eutils

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/java-pkg-simple.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index 34c044e2ba2d..09062d9ede68 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -17,7 +17,7 @@
 # directory before calling the src_compile function of this eclass.
 
 case ${EAPI} in
-	6) inherit eutils ;; # eutils for eqawarn
+	6) inherit eqawarn ;;
 	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
-- 
2.35.1

Re: [gentoo-dev] [PATCH 4/8] ruby-ng.eclass: Drop support for EAPI 5

[Hans de Graaff]

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

On Sat, 2022-07-23 at 21:19 +0200, Ulrich Müller wrote:
> Signed-off-by: Ulrich Müller <ulm@gentoo.org>
> ---
>  eclass/ruby-ng.eclass | 38 +++++++++-----------------------------
>  1 file changed, 9 insertions(+), 29 deletions(-)

Looks good to me.

Hans

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