revision bump: fixes some warnings with GCC 4, also change installation directory...

Package-Manager: portage-2.1.2-r9

diff --git a/app-emacs/vm/ChangeLog b/app-emacs/vm/ChangeLog
index 716ea9fdc0a802d6f2a9304a2a76ac1256b8ac26..307f0a8a11b81a7586300ef518424618ffea7075 100644 (file)
--- a/app-emacs/vm/ChangeLog
+++ b/app-emacs/vm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emacs/vm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.17 2007/02/08 23:38:35 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.18 2007/02/26 08:14:37 opfer Exp $
+
+*vm-7.19-r2 (26 Feb 2007)
+
+  26 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
+  +files/vm-7.19-gcc4.patch, +files/51vm-gentoo.el, +vm-7.19-r2.ebuild:
+  revision bump: fixes some warnings with GCC 4, also change installation
+  directory for pixmaps (fix bugs 168210 and 168212, reported by Ulrich
+  Mueller <ulm@kph.uni-mainz.de>); also added some quotes
 
   08 Feb 2007; Christian Faulhammer <opfer@gentoo.org> -vm-7.18.ebuild:
   clean up

diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index 169e9c92dbaba3521606d3b996938f87e1baf359..277671c209f3733d3bc7ad033d1202df74886fa5 100644 (file)
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -5,10 +5,18 @@ AUX 50vm-gentoo.el 639 RMD160 42287c573079b1606c43ef9a2acd997313e60957 SHA1 68d2
 MD5 a3ccada98fbc3181244e33f7d19c3212 files/50vm-gentoo.el 639
 RMD160 42287c573079b1606c43ef9a2acd997313e60957 files/50vm-gentoo.el 639
 SHA256 e664b0b59ea791814747a1c7ae240de91fdbdfcdea038e7e03bb8e08fe8d8414 files/50vm-gentoo.el 639
+AUX 51vm-gentoo.el 641 RMD160 764ebe0c61f7f994ab4da92339822f3e87f9146e SHA1 fc89869698a3c307554078717204c003a94d83d0 SHA256 45931fee706237cc59a8b9eb920b73e6a602d018133e23e9eb4a918f49042f7b
+MD5 b4514051a93699e4fcfe28cd5b9b2d85 files/51vm-gentoo.el 641
+RMD160 764ebe0c61f7f994ab4da92339822f3e87f9146e files/51vm-gentoo.el 641
+SHA256 45931fee706237cc59a8b9eb920b73e6a602d018133e23e9eb4a918f49042f7b files/51vm-gentoo.el 641
 AUX vm-7.19-burst-digest.patch 632 RMD160 c255a41e56921d1c9e7e7448be0b566ba9dccc18 SHA1 776b5f39833fdcc6c316960399f0d0305490e0d9 SHA256 c7105eaf435c09bff03136e29e8636a7c828ceaf2cd75dacbce5b88a70c25cd1
 MD5 a6eef61bac53216606f7ec505a8a4598 files/vm-7.19-burst-digest.patch 632
 RMD160 c255a41e56921d1c9e7e7448be0b566ba9dccc18 files/vm-7.19-burst-digest.patch 632
 SHA256 c7105eaf435c09bff03136e29e8636a7c828ceaf2cd75dacbce5b88a70c25cd1 files/vm-7.19-burst-digest.patch 632
+AUX vm-7.19-gcc4.patch 1194 RMD160 74c8421cfc845fb0ce7807f9ea74b980ae11877b SHA1 02983d3840469c535de1eb596c1979c3b25f7649 SHA256 d0b44f6b08b661f14e2e2de17a3054a1fe8c143bfcf149587c380cd096480259
+MD5 5c6e37645131820c37ffe826f35609cd files/vm-7.19-gcc4.patch 1194
+RMD160 74c8421cfc845fb0ce7807f9ea74b980ae11877b files/vm-7.19-gcc4.patch 1194
+SHA256 d0b44f6b08b661f14e2e2de17a3054a1fe8c143bfcf149587c380cd096480259 files/vm-7.19-gcc4.patch 1194
 AUX vm-direntry-fix-gentoo.patch 271 RMD160 c8bccbc1cb01db9ba9cef20ca080fbd68e22b55e SHA1 971a52d80bf54d77924d0641d1b51a691e12696f SHA256 cecc4e98c1e3e36836ca26e942b42c8746ce2b6cab9d4bd3a603679b3ca2a59a
 MD5 29f46fa938e55c708ae3e691bcaf69b9 files/vm-direntry-fix-gentoo.patch 271
 RMD160 c8bccbc1cb01db9ba9cef20ca080fbd68e22b55e files/vm-direntry-fix-gentoo.patch 271
@@ -18,14 +26,18 @@ EBUILD vm-7.19-r1.ebuild 1150 RMD160 ecf1f60f73b5ecb8c18bd2ab6c5061cb5bfe6a94 SH
 MD5 0c38f40d029011ce85f0d5a261f94608 vm-7.19-r1.ebuild 1150
 RMD160 ecf1f60f73b5ecb8c18bd2ab6c5061cb5bfe6a94 vm-7.19-r1.ebuild 1150
 SHA256 9b91b6016f941525dec10bb31082b0cf86808d6e8dd12c7d14ef72525d2e8880 vm-7.19-r1.ebuild 1150
+EBUILD vm-7.19-r2.ebuild 1205 RMD160 f445a5b26f2069a3f0fea2f37d4b39e9038dea7b SHA1 f3bd9e959aeb7d882d4486e5d5f5b28d102f6887 SHA256 5a22f93f59c328b5b6164d9bd13b4d4389b905ec66fab7cf0767f0e191d81203
+MD5 1116d9e067668fa8bf405a7bb92dfa70 vm-7.19-r2.ebuild 1205
+RMD160 f445a5b26f2069a3f0fea2f37d4b39e9038dea7b vm-7.19-r2.ebuild 1205
+SHA256 5a22f93f59c328b5b6164d9bd13b4d4389b905ec66fab7cf0767f0e191d81203 vm-7.19-r2.ebuild 1205
 EBUILD vm-7.19.ebuild 1096 RMD160 2d2688d888ff734866ca79554b31e4fa558c7512 SHA1 6c6b8860ec71e26fd48d3bf5a663dfbc50685ad8 SHA256 c9f0c626826594e9e5a842489ecb2ff2f5f604d2ed106c51a292b3dd2d78aa9e
 MD5 ab1a4936598de1b81edbd821a1adb67e vm-7.19.ebuild 1096
 RMD160 2d2688d888ff734866ca79554b31e4fa558c7512 vm-7.19.ebuild 1096
 SHA256 c9f0c626826594e9e5a842489ecb2ff2f5f604d2ed106c51a292b3dd2d78aa9e vm-7.19.ebuild 1096
-MISC ChangeLog 2031 RMD160 c5df17333bde4e98307a6ae3780e538cf9b188d8 SHA1 c85bff60a31446455a4daeeffbd1888f0084c0cb SHA256 5b03f3e3901abc803cd96cdea70caf6fc3c6fff46e8bb8f17195d086dd7e1477
-MD5 0e264b8feb407f0b891bedaaeea3c532 ChangeLog 2031
-RMD160 c5df17333bde4e98307a6ae3780e538cf9b188d8 ChangeLog 2031
-SHA256 5b03f3e3901abc803cd96cdea70caf6fc3c6fff46e8bb8f17195d086dd7e1477 ChangeLog 2031
+MISC ChangeLog 2390 RMD160 4b56f64f4df8ee75c8f367f7084d7e8305036fa3 SHA1 8ecaf2df0acd910d54fd4a48148e3fd006e85ce6 SHA256 c6c955b8aa7b10a0c216e947c5cff947e6ddd3900b273a852cdace0f326deb2a
+MD5 78e078954751eafaf13904a8d2d3d738 ChangeLog 2390
+RMD160 4b56f64f4df8ee75c8f367f7084d7e8305036fa3 ChangeLog 2390
+SHA256 c6c955b8aa7b10a0c216e947c5cff947e6ddd3900b273a852cdace0f326deb2a ChangeLog 2390
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -36,10 +48,13 @@ SHA256 a49b0da65f105b0136337217d6ee968d27fdf854618d54445904e0b4c5cbbba3 files/di
 MD5 a7cb3f9b9171e57560688f9a48aa6708 files/digest-vm-7.19-r1 223
 RMD160 295ff3b203cf87e0e7a7ff35cbc652532f76ce96 files/digest-vm-7.19-r1 223
 SHA256 a49b0da65f105b0136337217d6ee968d27fdf854618d54445904e0b4c5cbbba3 files/digest-vm-7.19-r1 223
+MD5 a7cb3f9b9171e57560688f9a48aa6708 files/digest-vm-7.19-r2 223
+RMD160 295ff3b203cf87e0e7a7ff35cbc652532f76ce96 files/digest-vm-7.19-r2 223
+SHA256 a49b0da65f105b0136337217d6ee968d27fdf854618d54445904e0b4c5cbbba3 files/digest-vm-7.19-r2 223
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFy7RPNQqtfCuFneMRAjPPAJ9bjrxAahcHmNMWPEvEI6DSO2zgVQCeN5qX
-JWRfjzrboOcISJt0gV2WVbc=
-=fdry
+iD8DBQFF4pa2NQqtfCuFneMRAjbdAJ989q764WhORFBl++bCIdFtncQ1PgCcD/O6
+KqJfQq9R5Abj7b0sgT+JA/0=
+=gaZo
 -----END PGP SIGNATURE-----

diff --git a/app-emacs/vm/files/51vm-gentoo.el b/app-emacs/vm/files/51vm-gentoo.el
new file mode 100644 (file)
index 0000000..754b946
--- /dev/null
+++ b/app-emacs/vm/files/51vm-gentoo.el
@@ -0,0 +1,13 @@
+
+;;; VM site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(setq vm-toolbar-pixmap-directory "/usr/share/pixmaps/vm")
+(setq vm-image-directory "/usr/share/pixmaps/vm")
+(autoload 'vm "vm" "Start VM on your primary inbox." t)
+(autoload 'vm-other-frame "vm" "Like `vm' but starts in another frame." t)
+(autoload 'vm-visit-folder "vm" "Start VM on an arbitrary folder." t)
+(autoload 'vm-visit-virtual-folder "vm" "Visit a VM virtual folder." t)
+(autoload 'vm-mode "vm" "Run VM major mode on a buffer" t)
+(autoload 'vm-mail "vm" "Send a mail message using VM." t)
+(autoload 'vm-submit-bug-report "vm" "Send a bug report about VM." t)

diff --git a/app-emacs/vm/files/digest-vm-7.19-r2 b/app-emacs/vm/files/digest-vm-7.19-r2
new file mode 100644 (file)
index 0000000..243915d
--- /dev/null
+++ b/app-emacs/vm/files/digest-vm-7.19-r2
@@ -0,0 +1,3 @@
+MD5 7866f6243e398d76ae32356a4af76fa3 vm-7.19.tar.gz 381658
+RMD160 7a28c0a096f1f8093cffb9fc621cd270dd67b432 vm-7.19.tar.gz 381658
+SHA256 54bdd076bb98cad57a71fb986d131963e97a13cc71f15819d32691e3c0c5bdb0 vm-7.19.tar.gz 381658

diff --git a/app-emacs/vm/files/vm-7.19-gcc4.patch b/app-emacs/vm/files/vm-7.19-gcc4.patch
new file mode 100644 (file)
index 0000000..15f49a1
--- /dev/null
+++ b/app-emacs/vm/files/vm-7.19-gcc4.patch
@@ -0,0 +1,44 @@
+diff -ur vm-7.19.orig/base64-decode.c vm-7.19/base64-decode.c
+--- vm-7.19.orig/base64-decode.c       1997-09-18 05:06:05.000000000 +0200
++++ vm-7.19/base64-decode.c    2007-02-24 08:57:57.000000000 +0100
+@@ -3,6 +3,7 @@
+ /* BASE64 on stdin -> converted data on stdout */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #ifdef _WIN32
+ #ifndef WIN32
+diff -ur vm-7.19.orig/base64-encode.c vm-7.19/base64-encode.c
+--- vm-7.19.orig/base64-encode.c       1997-09-18 05:06:05.000000000 +0200
++++ vm-7.19/base64-encode.c    2007-02-24 08:57:54.000000000 +0100
+@@ -7,6 +7,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #ifdef _WIN32
+ #ifndef WIN32
+diff -ur vm-7.19.orig/qp-decode.c vm-7.19/qp-decode.c
+--- vm-7.19.orig/qp-decode.c   2000-03-05 21:59:04.000000000 +0100
++++ vm-7.19/qp-decode.c        2007-02-24 08:57:46.000000000 +0100
+@@ -4,6 +4,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #ifdef _WIN32
+ #ifndef WIN32
+diff -ur vm-7.19.orig/qp-encode.c vm-7.19/qp-encode.c
+--- vm-7.19.orig/qp-encode.c   2000-11-30 22:19:52.000000000 +0100
++++ vm-7.19/qp-encode.c        2007-02-24 08:57:35.000000000 +0100
+@@ -7,6 +7,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #ifdef _WIN32
+ #ifndef WIN32

diff --git a/app-emacs/vm/vm-7.19-r2.ebuild b/app-emacs/vm/vm-7.19-r2.ebuild
new file mode 100644 (file)
index 0000000..f2f2592
--- /dev/null
+++ b/app-emacs/vm/vm-7.19-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-7.19-r2.ebuild,v 1.1 2007/02/26 08:14:37 opfer Exp $
+
+inherit elisp eutils
+
+DESCRIPTION="An emacs major mode for reading and writing e-mail with support for GPG and MIME."
+HOMEPAGE="http://www.wonderworks.com/vm/"
+SRC_URI="ftp://ftp.uni-mainz.de/pub/software/gnu/${PN}/${P}.tar.gz
+       ftp://ftp.uu.net/networking/mail/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+SITEFILE=51vm-gentoo.el
+
+src_unpack() {
+       unpack ${A}
+
+       cd "${S}"
+       epatch "${FILESDIR}/vm-direntry-fix-gentoo.patch"
+       epatch "${FILESDIR}/${P}-burst-digest.patch"
+       epatch "${FILESDIR}/${P}-gcc4.patch"
+}
+
+src_compile() {
+       make prefix="${D}/usr" \
+               INFODIR="${D}/usr/share/info" \
+               LISPDIR="${D}/${SITELISP}/vm" \
+               PIXMAPDIR="${D}/usr/share/pixmaps/vm" \
+               all || die
+}
+
+src_install() {
+       make prefix="${D}/usr" \
+               INFODIR="${D}/usr/share/info" \
+               LISPDIR="${D}/${SITELISP}/vm" \
+               PIXMAPDIR="${D}/usr/share/pixmaps/vm" \
+               install || die
+       elisp-install ${PN} *.el
+       elisp-site-file-install "${FILESDIR}/50vm-gentoo.el"
+       dodoc README
+}