diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2011-01-31 21:19:35 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2011-01-31 21:19:35 +0000 |
| commit | 9dbae4851f304a4e770511b51441126f13505f5a (patch) | |
| tree | b61f0551d38661fb4018c99fce0a14dd691e3abe /app-editors | |
| parent | Fix for ARP/wARP. It looked for Refmac in a location where we didn't have it,... (diff) | |
| download | gentoo-2-9dbae4851f304a4e770511b51441126f13505f5a.tar.gz gentoo-2-9dbae4851f304a4e770511b51441126f13505f5a.tar.bz2 gentoo-2-9dbae4851f304a4e770511b51441126f13505f5a.zip | |
Fix version detection, bug 353324.
(Portage version: 2.1.9.35/cvs/Linux x86_64)
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs-vcs/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild | 6 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index 390a029be218..f296308b76c4 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/emacs-vcs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.43 2011/01/30 08:54:05 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.44 2011/01/31 21:19:35 ulm Exp $ + + 31 Jan 2011; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-24.0.9999.ebuild, + emacs-vcs-24.0.9999-r1.ebuild: + Fix version detection, bug 353324. *emacs-vcs-24.0.9999-r1 (30 Jan 2011) *emacs-vcs-23.2.9999-r1 (30 Jan 2011) diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild index 102f2ebc723e..763631df777c 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild,v 1.1 2011/01/30 08:54:05 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild,v 1.2 2011/01/31 21:19:35 ulm Exp $ EAPI=4 WANT_AUTOMAKE="none" @@ -83,8 +83,8 @@ SITEFILE="20${PN}-${SLOT}-gentoo.el" src_prepare() { if [ "${PV##*.}" = "9999" ]; then - FULL_VERSION=$(grep 'const char emacs_version' src/emacs.c \ - | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/') + FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \ + configure.in) [ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version" echo einfo "Emacs branch: ${EMACS_BRANCH}" diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild index 05acebeccece..cf152dfcb342 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.23 2011/01/25 23:24:53 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.24 2011/01/31 21:19:35 ulm Exp $ EAPI=2 @@ -91,8 +91,8 @@ pkg_setup() { src_prepare() { if [ "${PV##*.}" = "9999" ]; then - FULL_VERSION=$(grep 'const char emacs_version' src/emacs.c \ - | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/') + FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \ + configure.in) [ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version" echo einfo "Emacs branch: ${EMACS_BRANCH}" |