| 1 |
commit: 4ea5e00720ab5774e1afb9d0d58e4d362fd50a02 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 5 11:46:08 2022 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 5 12:01:29 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ea5e007 |
| 7 |
|
| 8 |
app-editors/emacs: Fix sed expression for AC_INIT |
| 9 |
|
| 10 |
Upstream added a pair of brackets which made the previous regexp fail. |
| 11 |
|
| 12 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 13 |
|
| 14 |
app-editors/emacs/emacs-28.1.90.ebuild | 2 +- |
| 15 |
app-editors/emacs/emacs-28.1.9999.ebuild | 2 +- |
| 16 |
app-editors/emacs/emacs-29.0.9999.ebuild | 2 +- |
| 17 |
3 files changed, 3 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-editors/emacs/emacs-28.1.90.ebuild b/app-editors/emacs/emacs-28.1.90.ebuild |
| 20 |
index fb9a507f39e2..a3ba699d12bc 100644 |
| 21 |
--- a/app-editors/emacs/emacs-28.1.90.ebuild |
| 22 |
+++ b/app-editors/emacs/emacs-28.1.90.ebuild |
| 23 |
@@ -138,7 +138,7 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el" |
| 24 |
|
| 25 |
src_prepare() { |
| 26 |
if [[ ${PV##*.} = 9999 ]]; then |
| 27 |
- FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \ |
| 28 |
+ FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \ |
| 29 |
configure.ac) |
| 30 |
[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" |
| 31 |
einfo "Emacs branch: ${EGIT_BRANCH}" |
| 32 |
|
| 33 |
diff --git a/app-editors/emacs/emacs-28.1.9999.ebuild b/app-editors/emacs/emacs-28.1.9999.ebuild |
| 34 |
index fb9a507f39e2..a3ba699d12bc 100644 |
| 35 |
--- a/app-editors/emacs/emacs-28.1.9999.ebuild |
| 36 |
+++ b/app-editors/emacs/emacs-28.1.9999.ebuild |
| 37 |
@@ -138,7 +138,7 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el" |
| 38 |
|
| 39 |
src_prepare() { |
| 40 |
if [[ ${PV##*.} = 9999 ]]; then |
| 41 |
- FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \ |
| 42 |
+ FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \ |
| 43 |
configure.ac) |
| 44 |
[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" |
| 45 |
einfo "Emacs branch: ${EGIT_BRANCH}" |
| 46 |
|
| 47 |
diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild b/app-editors/emacs/emacs-29.0.9999.ebuild |
| 48 |
index 18990e39f457..571ff6e3636c 100644 |
| 49 |
--- a/app-editors/emacs/emacs-29.0.9999.ebuild |
| 50 |
+++ b/app-editors/emacs/emacs-29.0.9999.ebuild |
| 51 |
@@ -160,7 +160,7 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el" |
| 52 |
|
| 53 |
src_prepare() { |
| 54 |
if [[ ${PV##*.} = 9999 ]]; then |
| 55 |
- FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \ |
| 56 |
+ FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \ |
| 57 |
configure.ac) |
| 58 |
[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" |
| 59 |
einfo "Emacs branch: ${EGIT_BRANCH}" |
Archives