commit:     4ea5e00720ab5774e1afb9d0d58e4d362fd50a02
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 11:46:08 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> 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 <ulm <AT> 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}"

Reply via email to