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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6E01A15802F for ; Fri, 31 Mar 2023 00:06:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B758E08C2; Fri, 31 Mar 2023 00:05:47 +0000 (UTC) Received: from mail-yb1-f170.google.com (mail-yb1-f170.google.com [209.85.219.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 058F2E08B1 for ; Fri, 31 Mar 2023 00:05:46 +0000 (UTC) Received: by mail-yb1-f170.google.com with SMTP id m16so5312424ybk.0 for ; Thu, 30 Mar 2023 17:05:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680221146; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FEP3uNbUKYaR5LBVuXJisdvmdFJH6u++YmC9QB825vI=; b=qTd/Csf8ITaG12okckv83gWxBx2VhbunpD8TANtYeDjcn8f1/+ZPSQRZjOdyF2aq/j /Ic8+dgk5Lq7I9nKQvcw6Wnqbp81hkH3GibO7BLwDtJz2eudYJ59vSksUnMVKwvc+jYL W+nPGiW2IhAvbrOOERFMimNzbC4YpTTEyrb6a4w9AlNQb5y0JolEim6Ey+aoLJn/OdH3 u7yjuEDU4q6LkDjJYp4IbPqZrJWWi6k1k1DGS6nOtH4tX5RqRYYGte9OLAJitgW+ja36 lZXaLA/CDHWiDXwaL8zGUCnDeZeSy4hNaBBVe1ZzlMJBEv6y9Pt+BYFUWs4Yhh2ffC3G CarQ== X-Gm-Message-State: AAQBX9dG6gZg2JZms2Zbre0R2x4ZlA4FO71Fuq9DJWj7CDhG2SmRas7V VR0T3+czQTBcfd4LkSgav2mOa27uudM= X-Google-Smtp-Source: AKy350Z0lHwp6Pmlh9x9qRwi8PCP/sO+fGVR9xpnUqrlKQNHzXA2inMKu7sZkDD3tPDJvjbLGSssxQ== X-Received: by 2002:a25:4e84:0:b0:b75:9a44:5342 with SMTP id c126-20020a254e84000000b00b759a445342mr21928140ybb.4.1680221146071; Thu, 30 Mar 2023 17:05:46 -0700 (PDT) Received: from localhost ([162.208.5.36]) by smtp.gmail.com with ESMTPSA id a5-20020a256605000000b00b7e0d092f91sm220109ybc.18.2023.03.30.17.05.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 17:05:45 -0700 (PDT) From: Matt Turner To: gentoo-dev@lists.gentoo.org Cc: ulm@gentoo.org, leio@gentoo.org, Matt Turner Subject: [gentoo-dev] [PATCH 3/3] gnome.org.eclass: Handle GNOME's .alpha/.beta/.rc versioning Date: Thu, 30 Mar 2023 20:02:32 -0400 Message-Id: <20230331000232.3339792-3-mattst88@gentoo.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230331000232.3339792-1-mattst88@gentoo.org> References: <20230331000232.3339792-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail 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: 55e52cf8-07ae-44ad-8a08-2b51a5818c46 X-Archives-Hash: 6d6187153e6eb2ec4b65405ac4603d2d 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). 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 --- 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