Version bump, fixes bug 237730. Remove old.

(Portage version: 2.2_rc13/cvs/Linux 2.6.26-gentoo-r1 i686)

4 files changed, 13 insertions, 72 deletions

diff --git a/app-emacs/vm/ChangeLog b/app-emacs/vm/ChangeLog
index d661d38f6631..17b31e1e9b96 100644
--- a/app-emacs/vm/ChangeLog
+++ b/app-emacs/vm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/vm
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.57 2008/09/20 09:01:08 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.58 2008/11/06 22:23:11 ulm Exp $
+
+*vm-8.0.12 (06 Nov 2008)
+
+  06 Nov 2008; Ulrich Mueller <ulm@gentoo.org>
+  -files/vm-8.0.2.487-proper-charset.patch, -vm-8.0.2.487-r1.ebuild,
+  -vm-8.0.11.581-r1.ebuild, +vm-8.0.12.ebuild:
+  Version bump, fixes bug 237730. Remove old.
 
   20 Sep 2008; nixnut <nixnut@gentoo.org> vm-8.0.9.544.ebuild:
   Stable on ppc wrt bug 237738
diff --git a/app-emacs/vm/files/vm-8.0.2.487-proper-charset.patch b/app-emacs/vm/files/vm-8.0.2.487-proper-charset.patch
deleted file mode 100644
index eb9fb9ee26f1..000000000000
--- a/app-emacs/vm/files/vm-8.0.2.487-proper-charset.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lisp/vm-mime.el~	2007-07-25 00:21:40.000000000 +0200
-+++ lisp/vm-mime.el	2007-08-26 04:41:18.000000000 +0200
-@@ -1536,7 +1537,7 @@
- 		    (throw 'done nil))))
- 	       ;; Couldn't do any magic with vm-coding-system-priorities. Pass
- 	       ;; back a Japanese iso-2022 MIME character set.
--	       (t "iso-2022-jp")))
-+	       (t (or vm-mime-8bit-composition-charset "iso-2022-jp"))))
- 	  ;; If we're non-MULE and there are eight bit characters, use a
- 	  ;; sensible default.
- 	  (goto-char (point-min))
diff --git a/app-emacs/vm/vm-8.0.11.581-r1.ebuild b/app-emacs/vm/vm-8.0.12.ebuild
index 221298d058b8..9a4d52583c38 100644
--- a/app-emacs/vm/vm-8.0.11.581-r1.ebuild
+++ b/app-emacs/vm/vm-8.0.12.ebuild
@@ -1,15 +1,12 @@
 # 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.11.581-r1.ebuild,v 1.1 2008/08/24 10:15:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.0.12.ebuild,v 1.1 2008/11/06 22:23:11 ulm Exp $
 
-inherit elisp eutils versionator
-
-VM_PV=$(replace_version_separator 3 '-')
-VM_P=${PN}-${VM_PV}
+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/${VM_P}.tgz"
+SRC_URI="http://download.savannah.nongnu.org/releases/viewmail/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,7 +18,6 @@ RDEPEND="${DEPEND}
 	ssl? ( net-misc/stunnel )"
 
 SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${VM_P}"
 
 src_unpack() {
 	unpack ${A}
@@ -33,8 +29,8 @@ src_unpack() {
 	fi
 
 	# fix vm-version, bug 235563
-	sed -i -e "/^(defvar vm-version /s/nil/\"${VM_PV}\"/" lisp/vm-version.el \
-		|| die "sed failed"
+	#sed -i -e "/^(defvar vm-version /s/nil/\"${PV}\"/" lisp/vm-version.el \
+	#	|| die "sed failed"
 }
 
 src_compile() {
diff --git a/app-emacs/vm/vm-8.0.2.487-r1.ebuild b/app-emacs/vm/vm-8.0.2.487-r1.ebuild
deleted file mode 100644
index 0c975c106761..000000000000
--- a/app-emacs/vm/vm-8.0.2.487-r1.ebuild
+++ /dev/null
@@ -1,51 +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-8.0.2.487-r1.ebuild,v 1.7 2007/12/30 12:07:03 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}"
-
-	epatch "${FILESDIR}/${P}-proper-charset.patch"
-
-	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"
-}