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 8F8D6158094 for ; Tue, 5 Jul 2022 12:02:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A05E4E0B66; Tue, 5 Jul 2022 12:02:30 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 88C69E0B60 for ; Tue, 5 Jul 2022 12:02:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 smtp.gentoo.org (Postfix) with ESMTPS id BABB634180F for ; Tue, 5 Jul 2022 12:02:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D091C326 for ; Tue, 5 Jul 2022 12:02:27 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1657022489.4ea5e00720ab5774e1afb9d0d58e4d362fd50a02.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/emacs/emacs-28.1.90.ebuild app-editors/emacs/emacs-28.1.9999.ebuild app-editors/emacs/emacs-29.0.9999.ebuild X-VCS-Directories: app-editors/emacs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 4ea5e00720ab5774e1afb9d0d58e4d362fd50a02 X-VCS-Branch: master Date: Tue, 5 Jul 2022 12:02:27 +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: 29713093-2abd-4743-90b2-8b62e15a6bc1 X-Archives-Hash: 0ca64112d9dc094d7226f14553655de8 commit: 4ea5e00720ab5774e1afb9d0d58e4d362fd50a02 Author: Ulrich Müller gentoo org> AuthorDate: Tue Jul 5 11:46:08 2022 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Tue Jul 5 12:01:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ea5e007 app-editors/emacs: Fix sed expression for AC_INIT Upstream added a pair of brackets which made the previous regexp fail. Signed-off-by: Ulrich Müller gentoo.org> app-editors/emacs/emacs-28.1.90.ebuild | 2 +- app-editors/emacs/emacs-28.1.9999.ebuild | 2 +- app-editors/emacs/emacs-29.0.9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-editors/emacs/emacs-28.1.90.ebuild b/app-editors/emacs/emacs-28.1.90.ebuild index fb9a507f39e2..a3ba699d12bc 100644 --- a/app-editors/emacs/emacs-28.1.90.ebuild +++ b/app-editors/emacs/emacs-28.1.90.ebuild @@ -138,7 +138,7 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el" src_prepare() { if [[ ${PV##*.} = 9999 ]]; then - FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \ + FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \ configure.ac) [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" einfo "Emacs branch: ${EGIT_BRANCH}" diff --git a/app-editors/emacs/emacs-28.1.9999.ebuild b/app-editors/emacs/emacs-28.1.9999.ebuild index fb9a507f39e2..a3ba699d12bc 100644 --- a/app-editors/emacs/emacs-28.1.9999.ebuild +++ b/app-editors/emacs/emacs-28.1.9999.ebuild @@ -138,7 +138,7 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el" src_prepare() { if [[ ${PV##*.} = 9999 ]]; then - FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \ + FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \ configure.ac) [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" einfo "Emacs branch: ${EGIT_BRANCH}" diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild b/app-editors/emacs/emacs-29.0.9999.ebuild index 18990e39f457..571ff6e3636c 100644 --- a/app-editors/emacs/emacs-29.0.9999.ebuild +++ b/app-editors/emacs/emacs-29.0.9999.ebuild @@ -160,7 +160,7 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el" src_prepare() { if [[ ${PV##*.} = 9999 ]]; then - FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \ + FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \ configure.ac) [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" einfo "Emacs branch: ${EGIT_BRANCH}"