From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 488111382C5 for ; Sun, 21 Mar 2021 22:00:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 847A6E0858; Sun, 21 Mar 2021 22:00:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 6D6CFE0863 for ; Sun, 21 Mar 2021 22:00:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 35762335D54 for ; Sun, 21 Mar 2021 22:00:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8198613B for ; Sun, 21 Mar 2021 22:00:23 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1616363981.76ba5705c512949fcc04fd8435489764fb74101f.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/gnome.org.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 76ba5705c512949fcc04fd8435489764fb74101f X-VCS-Branch: master Date: Sun, 21 Mar 2021 22:00:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0dd6272a-1658-4897-bcc2-3c44c51b335b X-Archives-Hash: 7daa63e94b7d36bbbe29da5eb492fa23 commit: 76ba5705c512949fcc04fd8435489764fb74101f Author: Matt Turner gentoo org> AuthorDate: Sun Mar 21 20:50:46 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Mar 21 21:59:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76ba5705 gnome.org.eclass: Update GNOME_ORG_PVP logic for v40 releases Signed-off-by: Matt Turner gentoo.org> eclass/gnome.org.eclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/eclass/gnome.org.eclass b/eclass/gnome.org.eclass index fd6077e4594..281627859e8 100644 --- a/eclass/gnome.org.eclass +++ b/eclass/gnome.org.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: gnome.org.eclass @@ -45,8 +45,12 @@ fi # @ECLASS-VARIABLE: GNOME_ORG_PVP # @INTERNAL # @DESCRIPTION: -# Major and minor numbers of the version number. -: ${GNOME_ORG_PVP:=$(ver_cut 1-2)} +# Components of the version number that correspond to a 6 month release. +if ver_test -ge 40.0; then + : ${GNOME_ORG_PVP:=$(ver_cut 1)} +else + : ${GNOME_ORG_PVP:=$(ver_cut 1-2)} +fi SRC_URI="mirror://gnome/sources/${GNOME_ORG_MODULE}/${GNOME_ORG_PVP}/${GNOME_ORG_MODULE}-${PV}.tar.${GNOME_TARBALL_SUFFIX}"