Version bump.

(Portage version: 2.1.4_rc14)

5 files changed, 60 insertions, 79 deletions

diff --git a/app-emacs/vm/ChangeLog b/app-emacs/vm/ChangeLog
index 9b2f22b4c7c2..134623602d4d 100644
--- a/app-emacs/vm/ChangeLog
+++ b/app-emacs/vm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.44 2007/11/14 07:31:53 ulm Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.45 2008/01/03 21:51:28 ulm Exp $
+
+*vm-8.0.6.515 (03 Jan 2008)
+
+  03 Jan 2008; Ulrich Mueller <ulm@gentoo.org> -vm-7.19.282.ebuild,
+  +vm-8.0.6.515.ebuild:
+  Version bump. Remove old.
 
   14 Nov 2007; Ulrich Mueller <ulm@gentoo.org> vm-8.0.2.487-r1.ebuild:
   Stable on amd64, bug #198033.
diff --git a/app-emacs/vm/files/digest-vm-7.19.282 b/app-emacs/vm/files/digest-vm-7.19.282
deleted file mode 100644
index 4529dae603fd..000000000000
--- a/app-emacs/vm/files/digest-vm-7.19.282
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 fadfef52b6b8eded9a84afdcd0282de9 vm-7.19.282.patch.gz 267935
-RMD160 df8428644a99b6fa51a445eba16f80eb6b29dea4 vm-7.19.282.patch.gz 267935
-SHA256 7c87fda4ed37a478de2d03ad6bf1cdf62cedd12d78f226d90197ba8a4a1968b3 vm-7.19.282.patch.gz 267935
-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/digest-vm-8.0.6.515 b/app-emacs/vm/files/digest-vm-8.0.6.515
new file mode 100644
index 000000000000..15e266359b04
--- /dev/null
+++ b/app-emacs/vm/files/digest-vm-8.0.6.515
@@ -0,0 +1,3 @@
+MD5 89893f5b56c2f9f91a63cf3867ffff3f vm-8.0.6-515.tgz 539323
+RMD160 4ef648d29806e1f343bb4daab8454f54d5c58d5f vm-8.0.6-515.tgz 539323
+SHA256 f72f1784395dd2a3eaf383cd553bb13f3dcfd235ce80a3b680901733c9a020a1 vm-8.0.6-515.tgz 539323
diff --git a/app-emacs/vm/vm-7.19.282.ebuild b/app-emacs/vm/vm-7.19.282.ebuild
deleted file mode 100644
index fcfbc6cd7597..000000000000
--- a/app-emacs/vm/vm-7.19.282.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.7 2007/07/13 19:46:13 ulm Exp $
-
-inherit elisp eutils versionator
-
-VM_PV=$(get_version_component_range 1-2 ${PV})
-VM_P=vm-${VM_PV}
-PATCH_PV=$(get_version_component_range 3- ${PV})
-
-DESCRIPTION="The VM mail reader for Emacs"
-HOMEPAGE="http://www.robf.de/Hacking/elisp/"
-SRC_URI="ftp://ftp.uni-mainz.de/pub/software/gnu/vm/${VM_P}.tar.gz
-	mirror://gentoo/${P}.patch.gz"
-# patch taken from http://www.robf.de/Hacking/elisp/${VM_P}.patch.gz
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="bbdb"
-
-DEPEND="bbdb? ( app-emacs/bbdb )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${VM_P}"
-
-SITEFILE=51${PN}-gentoo.el
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${WORKDIR}/${P}.patch"
-	epatch "${FILESDIR}/vm-info-dir-fix-gentoo.patch"
-
-	# extract patchdoc.txt from leading text of patch
-	sed -e '1,/^\*\**$/d;/^diff\|^Bin/,$d' "${WORKDIR}/${P}.patch" \
-		>patchdoc.txt || die "sed failed"
-
-	# fix vm-version
-	sed -i -e '/^  (interactive)/,/^$/c\' \
-		-e "  (concat vm-version \"-devo-${PATCH_PV}\"))\n" vm-version.el \
-		|| die "sed failed"
-
-	if ! use bbdb; then
-		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
-		rm -f vm-pcrisis.*
-		sed -i -e '1,/^vm\.info:/s/ vm-pcrisis.info//' Makefile \
-			|| die "sed failed"
-	fi
-
-	# 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:' Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "compilation failed"
-}
-
-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-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc README ChangeLog oldChangeLog TODO patchdoc.txt
-}
diff --git a/app-emacs/vm/vm-8.0.6.515.ebuild b/app-emacs/vm/vm-8.0.6.515.ebuild
new file mode 100644
index 000000000000..f6873621507c
--- /dev/null
+++ b/app-emacs/vm/vm-8.0.6.515.ebuild
@@ -0,0 +1,49 @@
+# 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.6.515.ebuild,v 1.1 2008/01/03 21:51:28 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 ssl"
+
+DEPEND="bbdb? ( app-emacs/bbdb )"
+RDEPEND="${DEPEND}
+	ssl? ( net-misc/stunnel )"
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${VM_P}"
+
+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" \
+		--with-pixmapdir="/usr/share/pixmaps/vm" \
+		${myconf} || 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"
+}