Archives
Archives
| From: | "Ulrich Mueller (ulm)" <ulm@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in app-emacs/vm/files: 50vm-gentoo-8.0.el vm-8.2.0_beta-datadir.patch 50vm-gentoo.el |
| Date: | Thu, 29 Dec 2011 22:10:45 |
| Message-Id: | 20111229221035.0CEF82004C@flycatcher.gentoo.org |
| 1 | ulm 11/12/29 22:10:35 |
| 2 | |
| 3 | Modified: 50vm-gentoo.el |
| 4 | Added: 50vm-gentoo-8.0.el vm-8.2.0_beta-datadir.patch |
| 5 | Log: |
| 6 | Version bump. |
| 7 | |
| 8 | (Portage version: 2.1.10.44/cvs/Linux x86_64) |
| 9 | |
| 10 | Revision Changes Path |
| 11 | 1.5 app-emacs/vm/files/50vm-gentoo.el |
| 12 | |
| 13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/vm/files/50vm-gentoo.el?rev=1.5&view=markup |
| 14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/vm/files/50vm-gentoo.el?rev=1.5&content-type=text/plain |
| 15 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/vm/files/50vm-gentoo.el?r1=1.4&r2=1.5 |
| 16 | |
| 17 | Index: 50vm-gentoo.el |
| 18 | =================================================================== |
| 19 | RCS file: /var/cvsroot/gentoo-x86/app-emacs/vm/files/50vm-gentoo.el,v |
| 20 | retrieving revision 1.4 |
| 21 | retrieving revision 1.5 |
| 22 | diff -u -r1.4 -r1.5 |
| 23 | --- 50vm-gentoo.el 10 Sep 2009 08:32:37 -0000 1.4 |
| 24 | +++ 50vm-gentoo.el 29 Dec 2011 22:10:34 -0000 1.5 |
| 25 | @@ -1,4 +1,2 @@ |
| 26 | (add-to-list 'load-path "@SITELISP@") |
| 27 | -(setq vm-toolbar-pixmap-directory "@SITEETC@") |
| 28 | -(setq vm-image-directory "@SITEETC@") |
| 29 | (require 'vm-autoloads) |
| 30 | |
| 31 | |
| 32 | |
| 33 | 1.1 app-emacs/vm/files/50vm-gentoo-8.0.el |
| 34 | |
| 35 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/vm/files/50vm-gentoo-8.0.el?rev=1.1&view=markup |
| 36 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/vm/files/50vm-gentoo-8.0.el?rev=1.1&content-type=text/plain |
| 37 | |
| 38 | Index: 50vm-gentoo-8.0.el |
| 39 | =================================================================== |
| 40 | (add-to-list 'load-path "@SITELISP@") |
| 41 | (setq vm-toolbar-pixmap-directory "@SITEETC@") |
| 42 | (setq vm-image-directory "@SITEETC@") |
| 43 | (require 'vm-autoloads) |
| 44 | |
| 45 | |
| 46 | |
| 47 | 1.1 app-emacs/vm/files/vm-8.2.0_beta-datadir.patch |
| 48 | |
| 49 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/vm/files/vm-8.2.0_beta-datadir.patch?rev=1.1&view=markup |
| 50 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/vm/files/vm-8.2.0_beta-datadir.patch?rev=1.1&content-type=text/plain |
| 51 | |
| 52 | Index: vm-8.2.0_beta-datadir.patch |
| 53 | =================================================================== |
| 54 | --- vm-8.2.0b-orig/lisp/Makefile.in |
| 55 | +++ vm-8.2.0b/lisp/Makefile.in |
| 56 | @@ -96,7 +96,10 @@ |
| 57 | datadir= @datadir@ |
| 58 | datarootdir= @datarootdir@ |
| 59 | lispdir = @lispdir@ |
| 60 | +etcdir= @etcdir@ |
| 61 | pixmapdir= @pixmapdir@ |
| 62 | +docdir = @docdir@ |
| 63 | +infodir = @infodir@ |
| 64 | |
| 65 | EMACS_PROG = @EMACS_PROG@ |
| 66 | EMACS_FLAVOR = @EMACS_FLAVOR@ |
| 67 | @@ -137,7 +140,7 @@ |
| 68 | "$(EMACS_PROG)" $(FLAGS) -l autoload \ |
| 69 | -f vm-built-autoloads "@abs_builddir@/$@" "`pwd`") |
| 70 | echo "(custom-add-load 'vm 'vm-cus-load)" | tr -d '\015' >> $@ |
| 71 | - echo "(setq vm-configure-datadir \"${datadir}/vm\")" | tr -d '\015' >> $@ |
| 72 | + echo "(setq vm-configure-datadir \"${etcdir}\")" | tr -d '\015' >> $@ |
| 73 | echo "(setq vm-configure-pixmapdir \"${pixmapdir}\")" | tr -d '\015' >> $@ |
| 74 | echo "(setq vm-configure-docdir \"${docdir}\")" | tr -d '\015' >> $@ |
| 75 | echo "(setq vm-configure-infodir \"${infodir}\")" | tr -d '\015' >> $@ |
| 76 | @@ -168,7 +171,7 @@ |
| 77 | cat $@.tmp >> $@ |
| 78 | echo "(setq features (delete 'vm-autoloads features))" >> $@ |
| 79 | echo "(require 'vm-vars)" >> $@ |
| 80 | - echo "(setq vm-configure-datadir \"${datadir}\")" >> $@ |
| 81 | + echo "(setq vm-configure-datadir \"${etcdir}\")" >> $@ |
| 82 | echo "(setq vm-configure-pixmapdir \"${pixmapdir}\")" >> $@ |
| 83 | $(RM) $@.tmp |