summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2014-04-04 20:56:17 +0200
committerUlrich Müller <ulm@gentoo.org>2014-04-04 20:56:17 +0200
commitac0178b008b08add3d60a1c700a289b89afb8d54 (patch)
treed7c0fcc636e1edea1156b884b082f8d54354d751
parentapp-editors/emacs ebuilds moved to Portage tree. (diff)
downloademacs-ac0178b008b08add3d60a1c700a289b89afb8d54.tar.gz
emacs-ac0178b008b08add3d60a1c700a289b89afb8d54.tar.bz2
emacs-ac0178b008b08add3d60a1c700a289b89afb8d54.zip
Merge changes from Portage tree.
Package-Manager: portage-2.2.10
-rw-r--r--app-editors/emacs-vcs/ChangeLog3
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild2
2 files changed, 4 insertions, 1 deletions
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 <ulm@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 <ulm@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}"