Version bump, fixes bug 237730. Remove old.

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.26-gentoo-r1 i686

5 files changed, 26 insertions, 78 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/Manifest b/app-emacs/vm/Manifest
index 28c3db09ead2..0714a1492f22 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -1,17 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50vm-gentoo.el 204 RMD160 001be5dd6bc7df28d462c1666cbab2430284e8a3 SHA1 4cc181949327153f59685363cfda444fc1ca7285 SHA256 3607813ee9ddf6d1a1de285cc71f9e0cbceccf6caf67ece1fe205e3180953048
 AUX 51vm-gentoo.el 641 RMD160 764ebe0c61f7f994ab4da92339822f3e87f9146e SHA1 fc89869698a3c307554078717204c003a94d83d0 SHA256 45931fee706237cc59a8b9eb920b73e6a602d018133e23e9eb4a918f49042f7b
 AUX vm-7.19-burst-digest.patch 632 RMD160 c255a41e56921d1c9e7e7448be0b566ba9dccc18 SHA1 776b5f39833fdcc6c316960399f0d0305490e0d9 SHA256 c7105eaf435c09bff03136e29e8636a7c828ceaf2cd75dacbce5b88a70c25cd1
 AUX vm-7.19-gcc4.patch 1194 RMD160 74c8421cfc845fb0ce7807f9ea74b980ae11877b SHA1 02983d3840469c535de1eb596c1979c3b25f7649 SHA256 d0b44f6b08b661f14e2e2de17a3054a1fe8c143bfcf149587c380cd096480259
 AUX vm-8.0-no-pcrisis.patch 620 RMD160 9615e5574f955718ae8fe375afb6bc91dded4d54 SHA1 ea87f99aec9d6b03318e58b6197412745fafee4f SHA256 2c343d31649a152791f31bf14e8ee3d7a849e5645ba028661ab84309f73a5886
-AUX vm-8.0.2.487-proper-charset.patch 509 RMD160 97debec2ff65302ed4c50a1420b305d7a3e03a73 SHA1 dd33d9c73bb7db7fe270e680c4275c1f156b3dd1 SHA256 4400fc7a4b3f39092e2161b004cc6c83f109d8cf5e8b9d473d7cffa260c6bfbb
 AUX vm-info-dir-fix-gentoo.patch 325 RMD160 51f59c36d9c0ae13eca4db61dc76ef1dabdd6d31 SHA1 3a1bce1bd3e91ef3b2403bab54bb47569933e88d SHA256 8320c7ae7c51a5985bb344ec04a153e263af87de3ff2d95a0a55814e2377d276
 DIST vm-7.19.tar.gz 381658 RMD160 7a28c0a096f1f8093cffb9fc621cd270dd67b432 SHA1 0fe9012b8988ebdec7641f48aca0ef365549c590 SHA256 54bdd076bb98cad57a71fb986d131963e97a13cc71f15819d32691e3c0c5bdb0
-DIST vm-8.0.11-581.tgz 540437 RMD160 ccfd7d0c512986233f0101e78ed34325e6e90fb8 SHA1 2a314f24089baca9e0faa911eefb35c2b82a6be7 SHA256 23ce2a71d65f77ed91b24fec8f12cb2da64c28fc5ccce8a0950627c629dbbcd2
-DIST vm-8.0.2-487.tgz 536869 RMD160 f4c13d135dc79ee5f31d4c1000b88d831928e591 SHA1 70530dd416d7b37b01987a0ca159edc88f615b38 SHA256 5fa6d10596ec28d1a0db035c75ac724e4942744551ed708247983d9c150b24d9
+DIST vm-8.0.12.tgz 547048 RMD160 b2e0976d349a182111dc928073dbbb9327087f6e SHA1 f7016a33c9ef8b8c291aa0c16ccc73adeb8e7c43 SHA256 1e7b6e3c7401a825d288420c5a7820a004eff4b0f8838018a5598c95a0d5de57
 DIST vm-8.0.9-544.tgz 538966 RMD160 76a1a11efe519d7f044bea2ae7b2e50161e7b566 SHA1 8fed28edc95e5aabdf6abc95fe3d2c8384f78d87 SHA256 ee0b60f3ded66f94fd2f7a45231ff9ffecc5a2a0fb209a31e4de7d9212a2583c
 EBUILD vm-7.19-r3.ebuild 1199 RMD160 b392b98d8cf8b7a1da7c895dd2766ff1e532384e SHA1 6704093a70872731b138a1b7371a9ea679af0bea SHA256 7665bd4bf975f893bd5d38e5b48f308b9d5ae859b1b51d6979a84d354230d6f3
-EBUILD vm-8.0.11.581-r1.ebuild 1427 RMD160 eb5dfdadc26a0b0e32068b54d4e87a2461d0e821 SHA1 df38099ebbff9ea126e4a066888377695947a940 SHA256 3c77679b6f0a0c61958e77e5127c3ad08b478aef8ce7907abda990ecae59cf24
-EBUILD vm-8.0.2.487-r1.ebuild 1341 RMD160 9d69471282b07ee850959e1df9a50eb1bd00b3be SHA1 ba1a2ff0f3eaf6a3ce5a14f17180c6e31dc630aa SHA256 cfa1d54ac14c796487c6b01f2cd2e3d1fbc61c0043da833cde00e4877e3c8b3c
+EBUILD vm-8.0.12.ebuild 1319 RMD160 8c14711d31b6aa4101fa4e9c8a401198bc467a92 SHA1 b9f2e6c9e3c1a32957eeb78d6c0411c466f53410 SHA256 ffd6a65f60eac4f6f2d3452ef0fceb67983e2eb819f691fb60e7a6f4b7f150e1
 EBUILD vm-8.0.9.544.ebuild 1393 RMD160 42f751aabea7e5a21c62d12a968e9174b94a8a0a SHA1 0bfa154a56087b10554e2a7780724e7eb66acf18 SHA256 cfa17f4151139cf9d73228e51e518b9e856e5a08d5f43013f55519ef1e666fa2
-MISC ChangeLog 7980 RMD160 3b97d41e3eb73982e194b151e7bb752051184aff SHA1 fdb09f9e104491bdfa9ea4531c58f894cb87f165 SHA256 79d263dd6b3190c0c77644926fcb005da2866b758b4e25fc13507436fdf3455a
+MISC ChangeLog 8213 RMD160 6e8fc91d2dc738439861ae3af6e0269dbea420cf SHA1 aef7d09dd6841ffc5cfca288245c2aaddeea7f62 SHA256 76d0cdaa899d82fb9e3fc19d77103da842270505250c67e9684fa35a85672d91
 MISC metadata.xml 616 RMD160 0671bc015f427662d3614403112ee15d0c457125 SHA1 27754651e0a70d9c85c159cb1e6175bc44c85de6 SHA256 9f491a8f5a4adb6bebc5ce9d5177a87d3daff04c7fa9cb3aad9a6a8e4909dec7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkkTbm0ACgkQOeoy/oIi7uz/hQCfUU7ApwEVigbwB2aLh06N/UwO
+ORUAoIxjy+FJxN6wHx5qQAJuDOPjKDWR
+=qnF2
+-----END PGP SIGNATURE-----
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"
-}