From d4e5d1f201b73f8b05bf580ec547a5de30d13ba4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 24 Apr 2023 07:13:49 +0000 Subject: [PATCH] eclass/gnome.org: Sync with Gentoo It's from Gentoo commit 2933a4a80112e0efc31c9fe0b249bf3762974ed5. --- .../portage-stable/eclass/gnome.org.eclass | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/gnome.org.eclass b/sdk_container/src/third_party/portage-stable/eclass/gnome.org.eclass index 99b0090fda..760dc2ba0b 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/gnome.org.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/gnome.org.eclass @@ -47,18 +47,25 @@ fi # Leave unset if package name matches module name. : "${GNOME_ORG_MODULE:=$PN}" -# @ECLASS_VARIABLE: GNOME_ORG_PVP +# @ECLASS_VARIABLE: GNOME_ORG_RELEASE # @INTERNAL # @DESCRIPTION: # 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)}" + : "${GNOME_ORG_RELEASE:=$(ver_cut 1)}" else - : "${GNOME_ORG_PVP:=$(ver_cut 1-2)}" + : "${GNOME_ORG_RELEASE:=$(ver_cut 1-2)}" fi -SRC_URI="mirror://gnome/sources/${GNOME_ORG_MODULE}/${GNOME_ORG_PVP}/${GNOME_ORG_MODULE}-${PV}.tar.${GNOME_TARBALL_SUFFIX}" +# @ECLASS_VARIABLE: GNOME_ORG_PV +# @DESCRIPTION: +# PV in the GNOME version scheme format. +# The package version in the format used upstream by GNOME projects. +# See https://discourse.gnome.org/t/new-gnome-versioning-scheme/4235 +: "${GNOME_ORG_PV:=$(ver_rs 1- .)}" -S="${WORKDIR}/${GNOME_ORG_MODULE}-${PV}" +SRC_URI="mirror://gnome/sources/${GNOME_ORG_MODULE}/${GNOME_ORG_RELEASE}/${GNOME_ORG_MODULE}-${GNOME_ORG_PV}.tar.${GNOME_TARBALL_SUFFIX}" + +S="${WORKDIR}/${GNOME_ORG_MODULE}-${GNOME_ORG_PV}" fi