[gentoo-dev] [PATCH 1/3] gnome.org.eclass: Rename GNOME_ORG_PVP -> GNOME_ORG_RELEASE

[gentoo-dev] [PATCH 1/3] gnome.org.eclass: Rename GNOME_ORG_PVP -> GNOME_ORG_RELEASE

[Matt Turner]

I don't think PVP stood for anything.

Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
 eclass/gnome.org.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/gnome.org.eclass b/eclass/gnome.org.eclass
index 99b0090fda7c..2add88ef59f7 100644
--- a/eclass/gnome.org.eclass
+++ b/eclass/gnome.org.eclass
@@ -47,17 +47,17 @@ 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}"
+SRC_URI="mirror://gnome/sources/${GNOME_ORG_MODULE}/${GNOME_ORG_RELEASE}/${GNOME_ORG_MODULE}-${PV}.tar.${GNOME_TARBALL_SUFFIX}"
 
 S="${WORKDIR}/${GNOME_ORG_MODULE}-${PV}"
 
-- 
2.39.2

[gentoo-dev] [PATCH 2/3] gnome.org.eclass: Add GNOME_ORG_PV variable

[Matt Turner]

Provides the package version in the format used upstream by GNOME
projects.

Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
 eclass/gnome.org.eclass | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/eclass/gnome.org.eclass b/eclass/gnome.org.eclass
index 2add88ef59f7..d5f9102e5818 100644
--- a/eclass/gnome.org.eclass
+++ b/eclass/gnome.org.eclass
@@ -57,6 +57,13 @@ else
 	: "${GNOME_ORG_RELEASE:=$(ver_cut 1-2)}"
 fi
 
+# @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- .)}"
+
 SRC_URI="mirror://gnome/sources/${GNOME_ORG_MODULE}/${GNOME_ORG_RELEASE}/${GNOME_ORG_MODULE}-${PV}.tar.${GNOME_TARBALL_SUFFIX}"
 
 S="${WORKDIR}/${GNOME_ORG_MODULE}-${PV}"
-- 
2.39.2

[gentoo-dev] [PATCH 3/3] gnome.org.eclass: Handle GNOME's .alpha/.beta/.rc versioning

[Matt Turner]

Tested by removing SRC_URI and S overrides in evince-44_rc.ebuild and
glib-networking-2.76_beta.ebuild and confirming that we fetch the same
distfile and build from the same source directory.

Also confirmed that (alpha|beta|rc).<num> works by making a
glib-networking-2.76_beta1.ebuild and seeing that we attempt to fetch
glib-networking-2.76.beta.1.tar.xz.

Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
 eclass/gnome.org.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/gnome.org.eclass b/eclass/gnome.org.eclass
index d5f9102e5818..760dc2ba0b66 100644
--- a/eclass/gnome.org.eclass
+++ b/eclass/gnome.org.eclass
@@ -64,8 +64,8 @@ fi
 # See https://discourse.gnome.org/t/new-gnome-versioning-scheme/4235
 : "${GNOME_ORG_PV:=$(ver_rs 1- .)}"
 
-SRC_URI="mirror://gnome/sources/${GNOME_ORG_MODULE}/${GNOME_ORG_RELEASE}/${GNOME_ORG_MODULE}-${PV}.tar.${GNOME_TARBALL_SUFFIX}"
+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}-${PV}"
+S="${WORKDIR}/${GNOME_ORG_MODULE}-${GNOME_ORG_PV}"
 
 fi
-- 
2.39.2