summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2008-08-24 10:15:54 +0000
committerUlrich Müller <ulm@gentoo.org>2008-08-24 10:15:54 +0000
commitfb4f90d80cefacae8dd76b069a5fdc39e71b56f7 (patch)
tree60a091d76ac266cf84868c20934d511fa8242060 /app-emacs/vm
parentRemove mail-mta/xmail (diff)
downloadhistorical-fb4f90d80cefacae8dd76b069a5fdc39e71b56f7.tar.gz
historical-fb4f90d80cefacae8dd76b069a5fdc39e71b56f7.tar.bz2
historical-fb4f90d80cefacae8dd76b069a5fdc39e71b56f7.zip
Fix definition of vm-version, upstream regression, bug 235563.
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686
Diffstat (limited to 'app-emacs/vm')
-rw-r--r--app-emacs/vm/ChangeLog8
-rw-r--r--app-emacs/vm/Manifest10
-rw-r--r--app-emacs/vm/vm-8.0.11.581-r1.ebuild (renamed from app-emacs/vm/vm-8.0.11.581.ebuild)7
3 files changed, 16 insertions, 9 deletions
diff --git a/app-emacs/vm/ChangeLog b/app-emacs/vm/ChangeLog
index 65e7f8800aff..56efd7fa4ed0 100644
--- a/app-emacs/vm/ChangeLog
+++ b/app-emacs/vm/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-emacs/vm
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.52 2008/08/11 21:30:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.53 2008/08/24 10:15:54 ulm Exp $
+
+*vm-8.0.11.581-r1 (24 Aug 2008)
+
+ 24 Aug 2008; Ulrich Mueller <ulm@gentoo.org> -vm-8.0.11.581.ebuild,
+ +vm-8.0.11.581-r1.ebuild:
+ Fix definition of vm-version, upstream regression, bug 235563.
*vm-8.0.11.581 (11 Aug 2008)
diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index e35ecfe5fb52..48d9a9675a5d 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -13,15 +13,15 @@ DIST vm-8.0.11-581.tgz 540437 RMD160 ccfd7d0c512986233f0101e78ed34325e6e90fb8 SH
DIST vm-8.0.2-487.tgz 536869 RMD160 f4c13d135dc79ee5f31d4c1000b88d831928e591 SHA1 70530dd416d7b37b01987a0ca159edc88f615b38 SHA256 5fa6d10596ec28d1a0db035c75ac724e4942744551ed708247983d9c150b24d9
DIST vm-8.0.9-544.tgz 538966 RMD160 76a1a11efe519d7f044bea2ae7b2e50161e7b566 SHA1 8fed28edc95e5aabdf6abc95fe3d2c8384f78d87 SHA256 ee0b60f3ded66f94fd2f7a45231ff9ffecc5a2a0fb209a31e4de7d9212a2583c
EBUILD vm-7.19-r3.ebuild 1199 RMD160 b392b98d8cf8b7a1da7c895dd2766ff1e532384e SHA1 6704093a70872731b138a1b7371a9ea679af0bea SHA256 7665bd4bf975f893bd5d38e5b48f308b9d5ae859b1b51d6979a84d354230d6f3
-EBUILD vm-8.0.11.581.ebuild 1396 RMD160 9a12f0f9aeda1d58845293b54faafb69eb5ccb42 SHA1 9bd2996cc1f9ff1d44fb1b839908a594b0d03743 SHA256 8bf588765890613388ad11e3a3c52fd77a7f7d6ee02a75768e2d053335c373e1
+EBUILD vm-8.0.11.581-r1.ebuild 1427 RMD160 eb5dfdadc26a0b0e32068b54d4e87a2461d0e821 SHA1 df38099ebbff9ea126e4a066888377695947a940 SHA256 3c77679b6f0a0c61958e77e5127c3ad08b478aef8ce7907abda990ecae59cf24
EBUILD vm-8.0.2.487-r1.ebuild 1341 RMD160 9d69471282b07ee850959e1df9a50eb1bd00b3be SHA1 ba1a2ff0f3eaf6a3ce5a14f17180c6e31dc630aa SHA256 cfa1d54ac14c796487c6b01f2cd2e3d1fbc61c0043da833cde00e4877e3c8b3c
EBUILD vm-8.0.9.544.ebuild 1395 RMD160 963efd30820a04bb0ab7a4376465017893dbf5b3 SHA1 bbb0833d690d3a4bdbffc848e2fe6f1ad3c772a9 SHA256 732cb861b377ec17ded431c58b14675b05dc589c58051f6b38a27e4e68642ff1
-MISC ChangeLog 7364 RMD160 1e077d06db2f275fecc717fc596b8a097cc5e7b2 SHA1 89618b0d3917070aed09a50dd65130a6dfbc4ab1 SHA256 2a16e62568c51849ae2666540192b3bf1305647e53ad3b14ea7b14e2f44b3ad3
+MISC ChangeLog 7561 RMD160 fc11c3d12450b8174cc3e0c7ec9f797f3d4a7c66 SHA1 7d5e80babb614b7e283158b736f4c92eb93d8424 SHA256 8ec3a8ab685de650dfcaaeeb92d33b092a6b0f7d8b0b5b78e964bf4242634ccf
MISC metadata.xml 616 RMD160 0671bc015f427662d3614403112ee15d0c457125 SHA1 27754651e0a70d9c85c159cb1e6175bc44c85de6 SHA256 9f491a8f5a4adb6bebc5ce9d5177a87d3daff04c7fa9cb3aad9a6a8e4909dec7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
-iEYEARECAAYFAkigr5MACgkQOeoy/oIi7uzpQACg3wxMG+BncXKnZeXqB5Oa0iol
-BnsAn0GfJZD5kNn8Bn8+LFEMsPJz4G8U
-=ymRK
+iEYEARECAAYFAkixNO8ACgkQOeoy/oIi7uz8gwCeMNhJVhwgzSyD8LQGqYSMAlQy
+6w4An0f6Ne772CRU/GBnnI9JryK/2jts
+=Mp0l
-----END PGP SIGNATURE-----
diff --git a/app-emacs/vm/vm-8.0.11.581.ebuild b/app-emacs/vm/vm-8.0.11.581-r1.ebuild
index e40f05ed9025..221298d058b8 100644
--- a/app-emacs/vm/vm-8.0.11.581.ebuild
+++ b/app-emacs/vm/vm-8.0.11.581-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.0.11.581.ebuild,v 1.1 2008/08/11 21:30:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.0.11.581-r1.ebuild,v 1.1 2008/08/24 10:15:54 ulm Exp $
inherit elisp eutils versionator
@@ -32,8 +32,9 @@ src_unpack() {
epatch "${FILESDIR}/vm-8.0-no-pcrisis.patch"
fi
- # disable vm-revno braindamage
- sed -i -e '/^vm-revno.el:/{:x;s/^/#/;n;/^\t/bx;}' lisp/Makefile.in
+ # fix vm-version, bug 235563
+ sed -i -e "/^(defvar vm-version /s/nil/\"${VM_PV}\"/" lisp/vm-version.el \
+ || die "sed failed"
}
src_compile() {