From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-dev+bounces-94632-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id A5FF21382C5
	for <garchives@archives.gentoo.org>; Mon, 21 Jun 2021 17:25:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id F1537E0882;
	Mon, 21 Jun 2021 17:25:35 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 28838E087A
	for <gentoo-dev@lists.gentoo.org>; Mon, 21 Jun 2021 17:25:34 +0000 (UTC)
Message-ID: <404549a1c40e43b08a1c5952e4d372e5ae654716.camel@gentoo.org>
Subject: Re: [gentoo-dev] [PATCH 7/8] git-r3.eclass: Support EAPI 8, drop
 support for EAPI 4
From: =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?= <mgorny@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: Ulrich =?ISO-8859-1?Q?M=FCller?= <ulm@gentoo.org>
Date: Mon, 21 Jun 2021 19:25:27 +0200
In-Reply-To: <20210621164934.18023-7-ulm@gentoo.org>
References: <20210621164934.18023-1-ulm@gentoo.org>
	 <20210621164934.18023-7-ulm@gentoo.org>
Organization: Gentoo
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.40.2 
Precedence: bulk
List-Post: <mailto:gentoo-dev@lists.gentoo.org>
List-Help: <mailto:gentoo-dev+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-dev+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-dev+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-dev.gentoo.org>
X-BeenThere: gentoo-dev@lists.gentoo.org
Reply-to: gentoo-dev@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Archives-Salt: 5322a135-37be-474e-a181-67d320e2484f
X-Archives-Hash: 51fe7f4cc64a8978faccfa654e28dc0e

On Mon, 2021-06-21 at 18:49 +0200, Ulrich Müller wrote:
> Signed-off-by: Ulrich Müller <ulm@gentoo.org>
> ---
>  eclass/git-r3.eclass | 18 ++++++------------
>  1 file changed, 6 insertions(+), 12 deletions(-)
> 
> diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
> index 9c4f2c9d778e..365f21a4ed4c 100644
> --- a/eclass/git-r3.eclass
> +++ b/eclass/git-r3.eclass
> @@ -4,21 +4,15 @@
>  # @ECLASS: git-r3.eclass
>  # @MAINTAINER:
>  # Michał Górny <mgorny@gentoo.org>
> -# @SUPPORTED_EAPIS: 4 5 6 7
> +# @SUPPORTED_EAPIS: 5 6 7 8
>  # @BLURB: Eclass for fetching and unpacking git repositories.
>  # @DESCRIPTION:
>  # Third generation eclass for easing maintenance of live ebuilds using
>  # git as remote repository.
>  
> -case "${EAPI:-0}" in
> -	0|1|2|3)
> -		die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}"
> -		;;
> -	4|5|6|7)
> -		;;
> -	*)
> -		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
> -		;;
> +case ${EAPI:-0} in
> +	5|6|7|8) ;;
> +	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
>  esac
>  
>  EXPORT_FUNCTIONS src_unpack
> @@ -28,7 +22,7 @@ if [[ ! ${_GIT_R3} ]]; then
>  PROPERTIES+=" live"
>  
>  if [[ ! ${_INHERITED_BY_GIT_2} ]]; then
> -	if [[ ${EAPI:-0} != [0123456] ]]; then
> +	if [[ ${EAPI} != [56] ]]; then
>  		BDEPEND=">=dev-vcs/git-1.8.2.1[curl]"
>  	else
>  		DEPEND=">=dev-vcs/git-1.8.2.1[curl]"
> @@ -612,7 +606,7 @@ git-r3_fetch() {
>  	local commit_date=${4:-${EGIT_COMMIT_DATE}}
>  
>  	# support new override API for EAPI 6+
> -	if ! has "${EAPI:-0}" 0 1 2 3 4 5; then
> +	if [[ ${EAPI} != 5 ]]; then
>  		# get the name and do some more processing:
>  		# 1) kill .git suffix,
>  		# 2) underscore (remaining) non-variable characters,

LGTM, for both git-r3 patches.

-- 
Best regards,
Michał Górny