Major version bump.

(Portage version: 2.1.3_rc8)

6 files changed, 95 insertions, 15 deletions

diff --git a/app-emacs/vm/ChangeLog b/app-emacs/vm/ChangeLog
index 10fddaf0e99d..82e5d5ffc5ad 100644
--- a/app-emacs/vm/ChangeLog
+++ b/app-emacs/vm/ChangeLog
@@ -1,6 +1,13 @@
 # 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.32 2007/07/13 16:03:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.33 2007/07/13 19:46:13 ulm Exp $
+
+*vm-8.0.1.465 (13 Jul 2007)
+
+  13 Jul 2007; Ulrich Mueller <ulm@gentoo.org> files/50vm-gentoo.el,
+  +files/vm-8.0-no-pcrisis.patch, +vm-8.0.1.465.ebuild:
+  Major version bump. Updated HOMEPAGE, SRC_URI, and LICENSE; ebuild
+  completely redone.
 
   13 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> vm-7.19.282.ebuild:
   Replace mkdirhier with mkdir -p to avoid depending on x11-misc/imake. Thanks
diff --git a/app-emacs/vm/files/50vm-gentoo.el b/app-emacs/vm/files/50vm-gentoo.el
index ea71120e9889..bf55f888ce79 100644
--- a/app-emacs/vm/files/50vm-gentoo.el
+++ b/app-emacs/vm/files/50vm-gentoo.el
@@ -1,13 +1,7 @@
 
-;;; VM site-lisp configuration
+;;; vm site-lisp configuration
 
 (add-to-list 'load-path "@SITELISP@")
-(setq vm-toolbar-pixmap-directory "@SITELISP@/../etc/vm")
-(setq vm-image-directory "@SITELISP@/../etc/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)
+(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/digest-vm-8.0.1.465 b/app-emacs/vm/files/digest-vm-8.0.1.465
new file mode 100644
index 000000000000..bb61fb0b3faa
--- /dev/null
+++ b/app-emacs/vm/files/digest-vm-8.0.1.465
@@ -0,0 +1,3 @@
+MD5 2b2ad83b45d7f0156f4838f953d30315 vm-8.0.1-465.tgz 535947
+RMD160 4c6f24bc01abff16401e183e6339d4a5bbd15a0d vm-8.0.1-465.tgz 535947
+SHA256 b7b31d61732bb51fe2d6912ea9270c373977b43893961b5bd703f4725355c41b vm-8.0.1-465.tgz 535947
diff --git a/app-emacs/vm/files/vm-8.0-no-pcrisis.patch b/app-emacs/vm/files/vm-8.0-no-pcrisis.patch
new file mode 100644
index 000000000000..33b1a1a9679e
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.0-no-pcrisis.patch
@@ -0,0 +1,21 @@
+--- vm-8.0.1-465-orig/info/Makefile.in	2007-06-29 00:35:41.000000000 +0200
++++ vm-8.0.1-465/info/Makefile.in	2007-07-13 20:07:38.000000000 +0200
+@@ -35,7 +35,7 @@
+ 
+ all: info
+ 
+-info: vm.info vm-pcrisis.info
++info: vm.info
+ 
+ Makefile: @srcdir@/Makefile.in
+ 	cd @srcdir@/..; ./config.status
+--- vm-8.0.1-465-orig/lisp/Makefile.in	2007-06-29 00:35:41.000000000 +0200
++++ vm-8.0.1-465/lisp/Makefile.in	2007-07-13 20:08:00.000000000 +0200
+@@ -30,7 +30,6 @@
+ SOURCES += vm-motion.el
+ SOURCES += vm-mouse.el
+ SOURCES += vm-page.el
+-SOURCES += vm-pcrisis.el
+ SOURCES += vm-pgg.el
+ SOURCES += vm-pine.el
+ SOURCES += vm-pop.el
diff --git a/app-emacs/vm/vm-7.19.282.ebuild b/app-emacs/vm/vm-7.19.282.ebuild
index 319bc52a8409..fcfbc6cd7597 100644
--- a/app-emacs/vm/vm-7.19.282.ebuild
+++ b/app-emacs/vm/vm-7.19.282.ebuild
@@ -1,6 +1,6 @@
 # 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.282.ebuild,v 1.6 2007/07/13 16:03:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-7.19.282.ebuild,v 1.7 2007/07/13 19:46:13 ulm Exp $
 
 inherit elisp eutils versionator
 
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${VM_P}"
 
-SITEFILE=51vm-gentoo.el
+SITEFILE=51${PN}-gentoo.el
 
 src_unpack() {
 	unpack ${A}
@@ -51,7 +51,7 @@ src_unpack() {
 
 	# Avoid using mkdirhier from imake package, it's just a replacement
 	# for mkdir -p, and it would add quite some dependencies
-	sed -i -e 's:mkdirhier:mkdir -p:' "${S}/Makefile"
+	sed -i -e 's:mkdirhier:mkdir -p:' Makefile
 }
 
 src_compile() {
@@ -59,13 +59,13 @@ src_compile() {
 }
 
 src_install() {
+	elisp-install vm *.el
 	emake prefix="${D}/usr" \
 		INFODIR="${D}/usr/share/info" \
 		LISPDIR="${D}${SITELISP}/vm" \
 		PIXMAPDIR="${D}/usr/share/pixmaps/vm" \
 		install || die "installation failed"
 
-	elisp-install vm *.el
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	dodoc README ChangeLog oldChangeLog TODO patchdoc.txt
 }
diff --git a/app-emacs/vm/vm-8.0.1.465.ebuild b/app-emacs/vm/vm-8.0.1.465.ebuild
new file mode 100644
index 000000000000..4f5060b24457
--- /dev/null
+++ b/app-emacs/vm/vm-8.0.1.465.ebuild
@@ -0,0 +1,55 @@
+# 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-8.0.1.465.ebuild,v 1.1 2007/07/13 19:46:13 ulm Exp $
+
+inherit elisp eutils versionator
+
+VM_PV=$(replace_version_separator 3 '-')
+VM_P=${PN}-${VM_PV}
+
+DESCRIPTION="The VM mail reader for Emacs"
+HOMEPAGE="http://www.nongnu.org/viewmail/"
+SRC_URI="http://download.savannah.nongnu.org/releases/viewmail/${VM_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="bbdb"
+
+DEPEND="bbdb? ( app-emacs/bbdb )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${VM_P}"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	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
+}
+
+src_compile() {
+	local myconf
+	use bbdb && myconf="--with-other-dirs=${SITELISP}/bbdb"
+	econf --with-emacs="emacs" ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/bin
+	emake prefix="${D}/usr" \
+		info_dir="${D}/usr/share/info" \
+		install || die "emake install failed"
+
+	# move pixmaps to a more reasonable location
+	dodir /usr/share/pixmaps
+	mv "${D}/${SITELISP}/vm/pixmaps" "${D}/usr/share/pixmaps/vm"
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc NEWS README TODO example.vm || die "dodoc failed"
+}