| 1 |
ulm 11/01/31 21:19:35 |
| 2 |
|
| 3 |
Modified: ChangeLog emacs-vcs-24.0.9999-r1.ebuild |
| 4 |
emacs-vcs-24.0.9999.ebuild |
| 5 |
Log: |
| 6 |
Fix version detection, bug 353324. |
| 7 |
|
| 8 |
(Portage version: 2.1.9.35/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.44 app-editors/emacs-vcs/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.44&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.44&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.43&r2=1.44 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v |
| 20 |
retrieving revision 1.43 |
| 21 |
retrieving revision 1.44 |
| 22 |
diff -u -r1.43 -r1.44 |
| 23 |
--- ChangeLog 30 Jan 2011 08:54:05 -0000 1.43 |
| 24 |
+++ ChangeLog 31 Jan 2011 21:19:35 -0000 1.44 |
| 25 |
@@ -1,6 +1,10 @@ |
| 26 |
# ChangeLog for app-editors/emacs-vcs |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.43 2011/01/30 08:54:05 ulm Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.44 2011/01/31 21:19:35 ulm Exp $ |
| 30 |
+ |
| 31 |
+ 31 Jan 2011; Ulrich Mueller <ulm@g.o> emacs-vcs-24.0.9999.ebuild, |
| 32 |
+ emacs-vcs-24.0.9999-r1.ebuild: |
| 33 |
+ Fix version detection, bug 353324. |
| 34 |
|
| 35 |
*emacs-vcs-24.0.9999-r1 (30 Jan 2011) |
| 36 |
*emacs-vcs-23.2.9999-r1 (30 Jan 2011) |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.2 app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild?rev=1.2&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild?rev=1.2&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild?r1=1.1&r2=1.2 |
| 45 |
|
| 46 |
Index: emacs-vcs-24.0.9999-r1.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild,v |
| 49 |
retrieving revision 1.1 |
| 50 |
retrieving revision 1.2 |
| 51 |
diff -u -r1.1 -r1.2 |
| 52 |
--- emacs-vcs-24.0.9999-r1.ebuild 30 Jan 2011 08:54:05 -0000 1.1 |
| 53 |
+++ emacs-vcs-24.0.9999-r1.ebuild 31 Jan 2011 21:19:35 -0000 1.2 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2011 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $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 $ |
| 58 |
+# $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 $ |
| 59 |
|
| 60 |
EAPI=4 |
| 61 |
WANT_AUTOMAKE="none" |
| 62 |
@@ -83,8 +83,8 @@ |
| 63 |
|
| 64 |
src_prepare() { |
| 65 |
if [ "${PV##*.}" = "9999" ]; then |
| 66 |
- FULL_VERSION=$(grep 'const char emacs_version' src/emacs.c \ |
| 67 |
- | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/') |
| 68 |
+ FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \ |
| 69 |
+ configure.in) |
| 70 |
[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version" |
| 71 |
echo |
| 72 |
einfo "Emacs branch: ${EMACS_BRANCH}" |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
1.24 app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild |
| 77 |
|
| 78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.24&view=markup |
| 79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.24&content-type=text/plain |
| 80 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?r1=1.23&r2=1.24 |
| 81 |
|
| 82 |
Index: emacs-vcs-24.0.9999.ebuild |
| 83 |
=================================================================== |
| 84 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v |
| 85 |
retrieving revision 1.23 |
| 86 |
retrieving revision 1.24 |
| 87 |
diff -u -r1.23 -r1.24 |
| 88 |
--- emacs-vcs-24.0.9999.ebuild 25 Jan 2011 23:24:53 -0000 1.23 |
| 89 |
+++ emacs-vcs-24.0.9999.ebuild 31 Jan 2011 21:19:35 -0000 1.24 |
| 90 |
@@ -1,6 +1,6 @@ |
| 91 |
# Copyright 1999-2011 Gentoo Foundation |
| 92 |
# Distributed under the terms of the GNU General Public License v2 |
| 93 |
-# $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 $ |
| 94 |
+# $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 $ |
| 95 |
|
| 96 |
EAPI=2 |
| 97 |
|
| 98 |
@@ -91,8 +91,8 @@ |
| 99 |
|
| 100 |
src_prepare() { |
| 101 |
if [ "${PV##*.}" = "9999" ]; then |
| 102 |
- FULL_VERSION=$(grep 'const char emacs_version' src/emacs.c \ |
| 103 |
- | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/') |
| 104 |
+ FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \ |
| 105 |
+ configure.in) |
| 106 |
[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version" |
| 107 |
echo |
| 108 |
einfo "Emacs branch: ${EMACS_BRANCH}" |
Archives