Fix installation of vm-7.19 with Emacs 23. Install pixmaps under SITEETC.

(Portage version: 2.2_rc40/cvs/Linux i686)

10 files changed, 144 insertions, 13 deletions

diff --git a/app-emacs/vm/ChangeLog b/app-emacs/vm/ChangeLog
index 8c3bd4bac979..6e87cd6914b9 100644
--- a/app-emacs/vm/ChangeLog
+++ b/app-emacs/vm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emacs/vm
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.65 2009/04/03 22:42:48 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.66 2009/09/10 08:32:36 ulm Exp $
+
+*vm-8.0.12-r3 (10 Sep 2009)
+*vm-7.19-r4 (10 Sep 2009)
+
+  10 Sep 2009; Ulrich Mueller <ulm@gentoo.org> +vm-7.19-r4.ebuild,
+  +files/50vm-gentoo-7.19.el, files/50vm-gentoo.el,
+  +files/vm-7.19-install-info.patch, vm-8.0.9.544.ebuild,
+  +files/50vm-gentoo-8.0.9.el, vm-8.0.12-r2.ebuild, +vm-8.0.12-r3.ebuild:
+  Fix installation of vm-7.19 with Emacs 23. Install pixmaps under SITEETC.
 
   03 Apr 2009; Tiago Cunha <tcunha@gentoo.org> vm-8.0.12-r2.ebuild:
   stable amd64, bug 256837
diff --git a/app-emacs/vm/files/50vm-gentoo-7.19.el b/app-emacs/vm/files/50vm-gentoo-7.19.el
new file mode 100644
index 000000000000..2ce5be4d0fbc
--- /dev/null
+++ b/app-emacs/vm/files/50vm-gentoo-7.19.el
@@ -0,0 +1,10 @@
+(add-to-list 'load-path "@SITELISP@")
+(setq vm-toolbar-pixmap-directory "@SITEETC@")
+(setq vm-image-directory "@SITEETC@")
+(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/50vm-gentoo-8.0.9.el b/app-emacs/vm/files/50vm-gentoo-8.0.9.el
new file mode 100644
index 000000000000..a1a5d0ef4c8c
--- /dev/null
+++ b/app-emacs/vm/files/50vm-gentoo-8.0.9.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(setq vm-toolbar-pixmap-directory "/usr/share/pixmaps/vm")
+(setq vm-image-directory "/usr/share/pixmaps/vm")
+(require 'vm-autoloads)
diff --git a/app-emacs/vm/files/50vm-gentoo.el b/app-emacs/vm/files/50vm-gentoo.el
index bf55f888ce79..554b6634a2ee 100644
--- a/app-emacs/vm/files/50vm-gentoo.el
+++ b/app-emacs/vm/files/50vm-gentoo.el
@@ -1,7 +1,4 @@
-
-;;; 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")
+(setq vm-toolbar-pixmap-directory "@SITEETC@")
+(setq vm-image-directory "@SITEETC@")
 (require 'vm-autoloads)
diff --git a/app-emacs/vm/files/vm-7.19-install-info.patch b/app-emacs/vm/files/vm-7.19-install-info.patch
new file mode 100644
index 000000000000..38c5601cb257
--- /dev/null
+++ b/app-emacs/vm/files/vm-7.19-install-info.patch
@@ -0,0 +1,13 @@
+Fixes installation with Emacs 23 where only a single vm.info file is created.
+
+--- vm-7.19-orig/Makefile	2003-03-31 01:51:43.000000000 +0200
++++ vm-7.19/Makefile	2009-09-10 09:46:23.000000000 +0200
+@@ -115,7 +115,7 @@
+ 
+ install-info: vm.info
+ 	test -d $(INFODIR) || mkdir -p $(INFODIR)
+-	cp vm.info vm.info-* $(INFODIR)
++	cp vm.info* $(INFODIR)
+ 
+ install-vm: vm.elc
+ 	test -d $(LISPDIR) || mkdir -p $(LISPDIR)
diff --git a/app-emacs/vm/vm-7.19-r3.ebuild b/app-emacs/vm/vm-7.19-r3.ebuild
index d94e2ef34536..bdb03eb67682 100644
--- a/app-emacs/vm/vm-7.19-r3.ebuild
+++ b/app-emacs/vm/vm-7.19-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-7.19-r3.ebuild,v 1.6 2007/05/20 21:20:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-7.19-r3.ebuild,v 1.7 2009/09/10 08:32:36 ulm Exp $
 
 inherit elisp eutils
 
diff --git a/app-emacs/vm/vm-7.19-r4.ebuild b/app-emacs/vm/vm-7.19-r4.ebuild
new file mode 100644
index 000000000000..23afdd327fb3
--- /dev/null
+++ b/app-emacs/vm/vm-7.19-r4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-7.19-r4.ebuild,v 1.1 2009/09/10 08:32:36 ulm 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="50${PN}-gentoo-${PV}.el"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/vm-info-dir-fix-gentoo.patch"
+	epatch "${FILESDIR}/${P}-burst-digest.patch"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+	epatch "${FILESDIR}/${P}-install-info.patch"
+}
+
+src_compile() {
+	make prefix="${D}/usr" \
+		INFODIR="${D}/usr/share/info" \
+		LISPDIR="${D}${SITELISP}/${PN}" \
+		PIXMAPDIR="${D}${SITEETC}/${PN}" \
+		all || die
+}
+
+src_install() {
+	make prefix="${D}/usr" \
+		INFODIR="${D}/usr/share/info" \
+		LISPDIR="${D}${SITELISP}/${PN}" \
+		PIXMAPDIR="${D}${SITEETC}/${PN}" \
+		install || die
+	elisp-install ${PN} *.el
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc README
+}
diff --git a/app-emacs/vm/vm-8.0.12-r2.ebuild b/app-emacs/vm/vm-8.0.12-r2.ebuild
index 1a3a5ddfbd5a..f517e47ce94e 100644
--- a/app-emacs/vm/vm-8.0.12-r2.ebuild
+++ b/app-emacs/vm/vm-8.0.12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.0.12-r2.ebuild,v 1.5 2009/04/03 22:42:48 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.0.12-r2.ebuild,v 1.6 2009/09/10 08:32:36 ulm Exp $
 
 inherit elisp eutils
 
@@ -17,7 +17,7 @@ DEPEND="bbdb? ( app-emacs/bbdb )"
 RDEPEND="${DEPEND}
 	ssl? ( net-misc/stunnel )"
 
-SITEFILE="50${PN}-gentoo.el"
+SITEFILE="50${PN}-gentoo-8.0.9.el"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-emacs/vm/vm-8.0.12-r3.ebuild b/app-emacs/vm/vm-8.0.12-r3.ebuild
new file mode 100644
index 000000000000..fbfb0de26741
--- /dev/null
+++ b/app-emacs/vm/vm-8.0.12-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.0.12-r3.ebuild,v 1.1 2009/09/10 08:32:36 ulm Exp $
+
+inherit elisp eutils
+
+DESCRIPTION="The VM mail reader for Emacs"
+HOMEPAGE="http://www.nongnu.org/viewmail/"
+SRC_URI="http://download.savannah.nongnu.org/releases/viewmail/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="bbdb ssl"
+
+DEPEND="bbdb? ( app-emacs/bbdb )"
+RDEPEND="${DEPEND}
+	ssl? ( net-misc/stunnel )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-autoload-vm-pine.patch" #246185
+	epatch "${FILESDIR}/${P}-supercite-yank.patch" #256886
+
+	if ! use bbdb; then
+		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
+		epatch "${FILESDIR}/vm-8.0-no-pcrisis.patch"
+	fi
+
+	# fix vm-version, bug 235563
+	#sed -i -e "/^(defvar vm-version /s/nil/\"${PV}\"/" lisp/vm-version.el \
+	#	|| die "sed failed"
+}
+
+src_compile() {
+	econf \
+		--with-emacs="emacs" \
+		--with-pixmapdir="${SITEETC}/${PN}" \
+		$(use bbdb && echo "--with-other-dirs=${SITELISP}/bbdb") \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc NEWS README TODO example.vm || die "dodoc failed"
+}
diff --git a/app-emacs/vm/vm-8.0.9.544.ebuild b/app-emacs/vm/vm-8.0.9.544.ebuild
index 92d4946bf6c8..ee3befb2026b 100644
--- a/app-emacs/vm/vm-8.0.9.544.ebuild
+++ b/app-emacs/vm/vm-8.0.9.544.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.0.9.544.ebuild,v 1.6 2008/09/20 09:01:08 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.0.9.544.ebuild,v 1.7 2009/09/10 08:32:36 ulm Exp $
 
 inherit elisp eutils versionator
 
@@ -20,7 +20,7 @@ DEPEND="bbdb? ( app-emacs/bbdb )"
 RDEPEND="${DEPEND}
 	ssl? ( net-misc/stunnel )"
 
-SITEFILE=50${PN}-gentoo.el
+SITEFILE="50${PN}-gentoo-8.0.9.el"
 S="${WORKDIR}/${VM_P}"
 
 src_unpack() {