Fix version detection, bug 353324.

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

4 files changed, 17 insertions, 13 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/Manifest b/app-editors/emacs-vcs/Manifest
index 55e0a8bb251e..eedf9d74c5b0 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -11,14 +11,14 @@ EBUILD emacs-vcs-23.2.92.ebuild 9960 RMD160 8d40053abe474160a6800d822028360ae6a1
 EBUILD emacs-vcs-23.2.9999-r1.ebuild 10171 RMD160 50c6e95aca230ebd9d5ce5ef02d50f26d5059260 SHA1 9da987f0bf4abf4013c900429520115070af64af SHA256 7114ec7e90fa5125edfdfba7b6a197add854304e9c3eaeba706f7e8360eff211
 EBUILD emacs-vcs-23.2.9999.ebuild 9951 RMD160 71b2cda9f85acd8ab4cc66e9098503fe974fc5a7 SHA1 b554fcdbb08b859dc833e4a7cfd53cd9cd0fa103 SHA256 2c7ae627151ef5c797f3af15789d09aa8c903d3f711a9a24e607d43eb1da178f
 EBUILD emacs-vcs-24.0.50_pre20110116.ebuild 10062 RMD160 a6d68742b1fda29253adeb5ca10d24fab5bade5e SHA1 53ec2d9e2aa70478d54af78f4de30ff62306ec43 SHA256 4bc6cb77e32fdc44eb00b186e43622cd737bb98ed8acabdaed5852aafa935cb2
-EBUILD emacs-vcs-24.0.9999-r1.ebuild 10383 RMD160 730d3ce484fa59943aa61af9c5563f5a27312919 SHA1 2f809dac08cb1c1f1a3b9c71ffa64f2ae60e22cd SHA256 22d25c254132b73b1179db80a5a90e8c5c932e0f7f58c519e53f4e352e408431
-EBUILD emacs-vcs-24.0.9999.ebuild 10373 RMD160 bf03c3e625cc8a4ec2ffd8ebac2b900cddaf4f01 SHA1 7503a0253204aaab83075d241c3c4274a88bd041 SHA256 d9f48046513c5d8b3a9ffe203e581b21ab83423601c5867baacbd0a82a23f98c
-MISC ChangeLog 56441 RMD160 63f441bb0162b86d377f8ce8ac9400d404fdd7c4 SHA1 1d4359a7bd78e951b3ea8cd6cebfc58f56854cdb SHA256 217e464317d075ead870087386983bb2abf4d3b453588cee51aeb2821525dcd7
+EBUILD emacs-vcs-24.0.9999-r1.ebuild 10367 RMD160 68202d8b07a0415336242c87aeebb63d0a1ef451 SHA1 96f6b647796db0cd5d8d2174bd3805aa38c4a26f SHA256 be51bf5bca5d07cc1361db9cec33026e117593382b20a517ece8a8771f2db9a4
+EBUILD emacs-vcs-24.0.9999.ebuild 10357 RMD160 b24982c6d0e1540beb4c413c3e6571adfe4e30df SHA1 412ba66a61b11d059197463d67636f9a22a68f97 SHA256 5ed14b2840b5829f1d8dc66cddd84ea4145894bf2f89e23336951eea717356c8
+MISC ChangeLog 56587 RMD160 9b05c1ebdb7bfa4d0792b3577ee0da4ba38c8c81 SHA1 bf89b1d0cd55d54ce5b8f2113f3aee2dfb807827 SHA256 0c3b58e02a7ee1ddeed5ae6d159f5cd09b4fbd56c23aa0f170fa34a65ee033e2
 MISC metadata.xml 1842 RMD160 57ca3c2d25e695ead4faa6cb01b4d7a03939b511 SHA1 1960513308596b38c3ad7cd248924c903611d39b SHA256 9ebd8972aea68e7b3fd62915725ca35d0678b218d922a467a2c978fe44312ddb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1FKHwACgkQOeoy/oIi7uyWYACfbRxK+qQS6tm7qE4TS0g9BJ1X
-6eMAnRYtiKVzdH0a1kkikUWBsbLoGGlo
-=ioua
+iEYEARECAAYFAk1HKLoACgkQOeoy/oIi7uyNbACgulcguFpWaDwrajj6wKqSGECo
+WUIAn3+da5JFaNhfQ4R9KklP5FXlY5yO
+=/H7M
 -----END PGP SIGNATURE-----
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}"