Version information is now in src/emacs.c.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index e3e2cbfe2ecced3dd8199d5fde5fd4376b4520e2..b262be403c5f2bb364bca1948e3544a614189fd7 100644 (file)
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.19 2010/05/08 08:31:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.20 2010/05/18 08:41:19 ulm Exp $
+
+  18 May 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-24.0.9999.ebuild:
+  Version information is now in src/emacs.c, thanks to Tassilo Horn
+  <tassilo@member.fsf.org> for reporting and providing a fix.
 
 *emacs-vcs-23.2.9999 (08 May 2010)
 

diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index d2f3a4fb4604fddcc979782f823d55db1a007ece..5a9f8f8e8c517b18666a955ed189dc9fbb897dd9 100644 (file)
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 EBUILD emacs-vcs-23.2.9999.ebuild 9792 RMD160 1ef2e096d39226afa76857b7936e8393db9ababb SHA1 78675a1559527d7be2b66444438c1e8cf709b82a SHA256 21d3886712dbb1ada43c0ac8fa58645cd9c5b447b5ee2637675b44e3ac92472e
-EBUILD emacs-vcs-24.0.9999.ebuild 10094 RMD160 e701a17ac250256004d3f54ea3c029704e50b6d3 SHA1 67eac8806ea2234359c13d023dc2343bda748c6c SHA256 940c7da93f482762cd0a67a1b88bb54cf4f027287ef5f487ae51f33acc9bc077
-MISC ChangeLog 52510 RMD160 748bebd0640a28ac99203f353516d35a25e1e5ce SHA1 27803cfa40255eba6e89fc1a99f353d1aa9c9ecf SHA256 895895899ec029869931acb7ff557984ec2baee0420a0b132ff377be99459deb
+EBUILD emacs-vcs-24.0.9999.ebuild 10088 RMD160 a9e025b8df28708726c804db1bf82e89d5460e09 SHA1 b1d8261ad20f30eec4fc1326e425ae9c21d355e6 SHA256 c8bdf9014634b4a39f5c208539b7725d5e725c4e18740a3b69860f68ec1f2ab5
+MISC ChangeLog 52716 RMD160 6948a66113620fc0adb30564a4a43abc5ad421ea SHA1 cd79951d3e96d71dc7b42e3bdf6965aefbb0f289 SHA256 5ed0d818a7e258ac7c38bd443622db13e5bacc4e640b1edb1b947e1ffa124343
 MISC metadata.xml 1622 RMD160 01a46ab0aebc8acab07a5a874736783791b75c4e SHA1 c2869923f6e835df175a9a6f0d803170bf98fd85 SHA256 7875ea72b5aa0e9dd526c88692c08a3e1598e563d8e2d27e336fd1d5d707cb5c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvlIXAACgkQOeoy/oIi7uz7/ACfcbq19SxYE7sgCeYlE93V72XQ
-9gQAn31JozrjBBFSs7PixKTcJCudBmMY
-=2Fac
+iEYEARECAAYFAkvyUsMACgkQOeoy/oIi7uwmKACgkGfRwXW5hPSDAF3CIep4khbC
+2BkAnjyQOOZlKOQrg/9qzKM2+M8DhA0j
+=u9sN
 -----END PGP SIGNATURE-----

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 3c6e92f57b2b83b4c7562718b6f18baee3b0b3a6..5054c5fd0fddfa6396ef38b190b6e62a199b69f8 100644 (file)
--- 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-2010 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.5 2010/05/08 08:31:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.6 2010/05/18 08:41:19 ulm Exp $
 
 EAPI=2
 
@@ -87,7 +87,7 @@ pkg_setup() {
 
 src_prepare() {
        if [ "${PV##*.}" = "9999" ]; then
-               FULL_VERSION=$(grep 'defconst[   ]*emacs-version' lisp/version.el \
+               FULL_VERSION=$(grep 'const char emacs_version' src/emacs.c \
                        | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
                [ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
                echo