[gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/

[Ulrich Müller]

commit:     ac0178b008b08add3d60a1c700a289b89afb8d54
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  4 18:56:17 2014 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Apr  4 18:56:17 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=ac0178b0

Merge changes from Portage tree.

Package-Manager: portage-2.2.10

---
 app-editors/emacs-vcs/ChangeLog                  | 3 +++
 app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 8506cbb..3222012 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Apr 2014; Ulrich Müller <u...@gentoo.org> emacs-vcs-24.4.9999.ebuild:
+  Merge changes from Portage tree.
+
 *emacs-vcs-24.4.9999 (26 Mar 2014)
 
   26 Mar 2014; Ulrich Müller <u...@gentoo.org> -emacs-vcs-24.3.9999.ebuild,

diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
index 5f6b179..0483cef 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild
@@ -104,7 +104,7 @@ SITEFILE="20${PN}-${SLOT}-gentoo.el"
 
 src_prepare() {
        if [[ ${PV##*.} = 9999 ]]; then
-               FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ 
\t,)]*\).*/\1/p' \
+               FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ 
\t,)]*\).*/\1/p' \
                        configure.ac)
                [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs 
version"
                einfo "Emacs branch: ${EBZR_BRANCH}"