Version bump.

Package-Manager: portage-2.1.4_rc14

6 files changed, 75 insertions, 94 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/Manifest b/app-emacs/vm/Manifest
index 3b6451cd50d6..704a04bdebf5 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -29,18 +29,14 @@ AUX vm-info-dir-fix-gentoo.patch 325 RMD160 51f59c36d9c0ae13eca4db61dc76ef1dabdd
 MD5 fbd0ca3e26853a8f8c5f68283f7b3188 files/vm-info-dir-fix-gentoo.patch 325
 RMD160 51f59c36d9c0ae13eca4db61dc76ef1dabdd6d31 files/vm-info-dir-fix-gentoo.patch 325
 SHA256 8320c7ae7c51a5985bb344ec04a153e263af87de3ff2d95a0a55814e2377d276 files/vm-info-dir-fix-gentoo.patch 325
-DIST vm-7.19.282.patch.gz 267935 RMD160 df8428644a99b6fa51a445eba16f80eb6b29dea4 SHA1 974875a8a8a932c885ee236a6427394f360c2a47 SHA256 7c87fda4ed37a478de2d03ad6bf1cdf62cedd12d78f226d90197ba8a4a1968b3
 DIST vm-7.19.tar.gz 381658 RMD160 7a28c0a096f1f8093cffb9fc621cd270dd67b432 SHA1 0fe9012b8988ebdec7641f48aca0ef365549c590 SHA256 54bdd076bb98cad57a71fb986d131963e97a13cc71f15819d32691e3c0c5bdb0
 DIST vm-8.0.2-487.tgz 536869 RMD160 f4c13d135dc79ee5f31d4c1000b88d831928e591 SHA1 70530dd416d7b37b01987a0ca159edc88f615b38 SHA256 5fa6d10596ec28d1a0db035c75ac724e4942744551ed708247983d9c150b24d9
 DIST vm-8.0.5-504.tgz 538218 RMD160 166b64c11f439d8c77c41c1362106d8842878b19 SHA1 50192405939b7452a490fa79d623e65c667e3b33 SHA256 147642977b9df582b501211cb338bd5fb58d02f00a78b1d643615f5d39fea973
+DIST vm-8.0.6-515.tgz 539323 RMD160 4ef648d29806e1f343bb4daab8454f54d5c58d5f SHA1 55e1ea73e16ad9dbe00033754743c2e8666bd146 SHA256 f72f1784395dd2a3eaf383cd553bb13f3dcfd235ce80a3b680901733c9a020a1
 EBUILD vm-7.19-r3.ebuild 1199 RMD160 b392b98d8cf8b7a1da7c895dd2766ff1e532384e SHA1 6704093a70872731b138a1b7371a9ea679af0bea SHA256 7665bd4bf975f893bd5d38e5b48f308b9d5ae859b1b51d6979a84d354230d6f3
 MD5 ebb15569b3c85b4244ce889556d0baf4 vm-7.19-r3.ebuild 1199
 RMD160 b392b98d8cf8b7a1da7c895dd2766ff1e532384e vm-7.19-r3.ebuild 1199
 SHA256 7665bd4bf975f893bd5d38e5b48f308b9d5ae859b1b51d6979a84d354230d6f3 vm-7.19-r3.ebuild 1199
-EBUILD vm-7.19.282.ebuild 2004 RMD160 ebe79edf9738f00e8e6d861283b2f5a404facb3c SHA1 c621a5f92c6c5329323b71c0b1ecf4e60f2151ea SHA256 a8256c354960726aa53295b5ea9bb722a74204ec971b3a7bb3b25c74277b559c
-MD5 451bc09f8efdae05d4bdee5257a4799e vm-7.19.282.ebuild 2004
-RMD160 ebe79edf9738f00e8e6d861283b2f5a404facb3c vm-7.19.282.ebuild 2004
-SHA256 a8256c354960726aa53295b5ea9bb722a74204ec971b3a7bb3b25c74277b559c vm-7.19.282.ebuild 2004
 EBUILD vm-8.0.2.487-r1.ebuild 1341 RMD160 9d69471282b07ee850959e1df9a50eb1bd00b3be SHA1 ba1a2ff0f3eaf6a3ce5a14f17180c6e31dc630aa SHA256 cfa1d54ac14c796487c6b01f2cd2e3d1fbc61c0043da833cde00e4877e3c8b3c
 MD5 9cdf10486e40dd04d984a60f28122bf0 vm-8.0.2.487-r1.ebuild 1341
 RMD160 9d69471282b07ee850959e1df9a50eb1bd00b3be vm-8.0.2.487-r1.ebuild 1341
@@ -49,10 +45,14 @@ EBUILD vm-8.0.5.504.ebuild 1294 RMD160 2447d16f24fa341af62031b29aacd9aad856aa07
 MD5 5219164e010cbcc55a653283b20d9e58 vm-8.0.5.504.ebuild 1294
 RMD160 2447d16f24fa341af62031b29aacd9aad856aa07 vm-8.0.5.504.ebuild 1294
 SHA256 c99a3b66ccd9be0b24b25a3aea56a25aea5b9c7c8a63da292939c110f25c93ab vm-8.0.5.504.ebuild 1294
-MISC ChangeLog 6134 RMD160 d24cfd2a3d8cebff6bd4029dd1b8da8d2ff62bd8 SHA1 6ccab3d1b1bedd7c01c527e7817f723d4279c2d4 SHA256 aa2db66b335b12e852ba1229bc80847d1b2700c8756a87e3ac53d375c5dbd1f1
-MD5 c9709c966396933c637df58467b68f66 ChangeLog 6134
-RMD160 d24cfd2a3d8cebff6bd4029dd1b8da8d2ff62bd8 ChangeLog 6134
-SHA256 aa2db66b335b12e852ba1229bc80847d1b2700c8756a87e3ac53d375c5dbd1f1 ChangeLog 6134
+EBUILD vm-8.0.6.515.ebuild 1294 RMD160 697e04cb015c9a4b51e49bc5fabe9c03365c6b76 SHA1 8e70d7bedec3a4ac6be82851f835deb1a56a0b60 SHA256 467e94342899aa0f6f468622ca24d5e3ce45e1d69c10fb5a7af37f3e2c577bce
+MD5 20e0626a63668dbdc380450058e2cea8 vm-8.0.6.515.ebuild 1294
+RMD160 697e04cb015c9a4b51e49bc5fabe9c03365c6b76 vm-8.0.6.515.ebuild 1294
+SHA256 467e94342899aa0f6f468622ca24d5e3ce45e1d69c10fb5a7af37f3e2c577bce vm-8.0.6.515.ebuild 1294
+MISC ChangeLog 6284 RMD160 150bcf8bef93661387e208a1aee3bc97e977a8ad SHA1 a906dc0573dfb7f79bbf3a9376522ab0433f18fc SHA256 3505abe8758c5334662ddcc8915aa8e6222af0f06249d4fb340bfea6243928d3
+MD5 a7c7a782306364c2d49e58c26f43d054 ChangeLog 6284
+RMD160 150bcf8bef93661387e208a1aee3bc97e977a8ad ChangeLog 6284
+SHA256 3505abe8758c5334662ddcc8915aa8e6222af0f06249d4fb340bfea6243928d3 ChangeLog 6284
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -60,19 +60,19 @@ SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata
 MD5 a7cb3f9b9171e57560688f9a48aa6708 files/digest-vm-7.19-r3 223
 RMD160 295ff3b203cf87e0e7a7ff35cbc652532f76ce96 files/digest-vm-7.19-r3 223
 SHA256 a49b0da65f105b0136337217d6ee968d27fdf854618d54445904e0b4c5cbbba3 files/digest-vm-7.19-r3 223
-MD5 7b0d25f65dc6fc1ef71c22789ca5ece9 files/digest-vm-7.19.282 464
-RMD160 45208fca19fd3acb62b13d1ff2171227a5c6eb74 files/digest-vm-7.19.282 464
-SHA256 6ef96c2d3bf3a36c835c9acffba748b2b14c6ebb90098be938597be4c6f82a68 files/digest-vm-7.19.282 464
 MD5 44481340a74d2e8815e430abe2903f49 files/digest-vm-8.0.2.487-r1 229
 RMD160 ac693b8dbc8cd17a512b9754523c47354e94ee3b files/digest-vm-8.0.2.487-r1 229
 SHA256 1858b98bcdd1986eedded644b38913fafaa2e03a9281c3d4047dd20072e20b7b files/digest-vm-8.0.2.487-r1 229
 MD5 d1eed90e81e63f4b13b30122962c4ffa files/digest-vm-8.0.5.504 229
 RMD160 e0f24bbc7d95ac002042e4d2ee53e2643491645d files/digest-vm-8.0.5.504 229
 SHA256 d7198449363cba07d8b900862f64792442b9e9095b09ee980c09c5251af039f8 files/digest-vm-8.0.5.504 229
+MD5 f15fd21c90b81943ab9d72f0a1ba168c files/digest-vm-8.0.6.515 229
+RMD160 c5a7d7c2b8d4f4cf292e84a5ff82e72e16723338 files/digest-vm-8.0.6.515 229
+SHA256 17aaab6477ea944c537c71d698c80b5d3442040cdde704528029f3ee1b23e131 files/digest-vm-8.0.6.515 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.8 (GNU/Linux)
 
-iEYEARECAAYFAkd3igUACgkQOeoy/oIi7uzI5ACfZLp0pwhjd10BcXwDfeWwWbeG
-S5kAoJ1dvWKxlvQ2qr/MNJoIKcPwOpM3
-=e5qe
+iEYEARECAAYFAkd9WOwACgkQOeoy/oIi7uxe0wCgrP6WrXwIDlH82+rso/EJvIHt
+o5cAnAiyHGaw6X4VIHdPt9CrRk37sG1J
+=9BHR
 -----END PGP SIGNATURE-----
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"
+}