Major version bump.

Package-Manager: portage-2.1.3_rc8

7 files changed, 123 insertions, 31 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/Manifest b/app-emacs/vm/Manifest
index d8fd8b84345c..faadfee5f7bf 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 50vm-gentoo.el 639 RMD160 42287c573079b1606c43ef9a2acd997313e60957 SHA1 68d295c7b249447a17747e41791ccb57e844b4e5 SHA256 e664b0b59ea791814747a1c7ae240de91fdbdfcdea038e7e03bb8e08fe8d8414
-MD5 a3ccada98fbc3181244e33f7d19c3212 files/50vm-gentoo.el 639
-RMD160 42287c573079b1606c43ef9a2acd997313e60957 files/50vm-gentoo.el 639
-SHA256 e664b0b59ea791814747a1c7ae240de91fdbdfcdea038e7e03bb8e08fe8d8414 files/50vm-gentoo.el 639
+AUX 50vm-gentoo.el 204 RMD160 001be5dd6bc7df28d462c1666cbab2430284e8a3 SHA1 4cc181949327153f59685363cfda444fc1ca7285 SHA256 3607813ee9ddf6d1a1de285cc71f9e0cbceccf6caf67ece1fe205e3180953048
+MD5 4d528a680c1189d7a555765d18fed9dc files/50vm-gentoo.el 204
+RMD160 001be5dd6bc7df28d462c1666cbab2430284e8a3 files/50vm-gentoo.el 204
+SHA256 3607813ee9ddf6d1a1de285cc71f9e0cbceccf6caf67ece1fe205e3180953048 files/50vm-gentoo.el 204
 AUX 51vm-gentoo.el 641 RMD160 764ebe0c61f7f994ab4da92339822f3e87f9146e SHA1 fc89869698a3c307554078717204c003a94d83d0 SHA256 45931fee706237cc59a8b9eb920b73e6a602d018133e23e9eb4a918f49042f7b
 MD5 b4514051a93699e4fcfe28cd5b9b2d85 files/51vm-gentoo.el 641
 RMD160 764ebe0c61f7f994ab4da92339822f3e87f9146e files/51vm-gentoo.el 641
@@ -17,24 +17,33 @@ AUX vm-7.19-gcc4.patch 1194 RMD160 74c8421cfc845fb0ce7807f9ea74b980ae11877b SHA1
 MD5 5c6e37645131820c37ffe826f35609cd files/vm-7.19-gcc4.patch 1194
 RMD160 74c8421cfc845fb0ce7807f9ea74b980ae11877b files/vm-7.19-gcc4.patch 1194
 SHA256 d0b44f6b08b661f14e2e2de17a3054a1fe8c143bfcf149587c380cd096480259 files/vm-7.19-gcc4.patch 1194
+AUX vm-8.0-no-pcrisis.patch 620 RMD160 9615e5574f955718ae8fe375afb6bc91dded4d54 SHA1 ea87f99aec9d6b03318e58b6197412745fafee4f SHA256 2c343d31649a152791f31bf14e8ee3d7a849e5645ba028661ab84309f73a5886
+MD5 ebffd720fb4b7479eb718200ba9c04b3 files/vm-8.0-no-pcrisis.patch 620
+RMD160 9615e5574f955718ae8fe375afb6bc91dded4d54 files/vm-8.0-no-pcrisis.patch 620
+SHA256 2c343d31649a152791f31bf14e8ee3d7a849e5645ba028661ab84309f73a5886 files/vm-8.0-no-pcrisis.patch 620
 AUX vm-info-dir-fix-gentoo.patch 325 RMD160 51f59c36d9c0ae13eca4db61dc76ef1dabdd6d31 SHA1 3a1bce1bd3e91ef3b2403bab54bb47569933e88d SHA256 8320c7ae7c51a5985bb344ec04a153e263af87de3ff2d95a0a55814e2377d276
 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.1-465.tgz 535947 RMD160 4c6f24bc01abff16401e183e6339d4a5bbd15a0d SHA1 b4fa3f2eda5d6a7dcbb95c8343b489172d124939 SHA256 b7b31d61732bb51fe2d6912ea9270c373977b43893961b5bd703f4725355c41b
 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 2014 RMD160 fa67990bd5481b53d8ddac8ea536506f8792b60a SHA1 b1f6f71d51a1786f71370739ea22a738f73b938e SHA256 213590f80d55fcf5f60563249c817b772c0e5fb9caddac94b262272b53a1316b
-MD5 b2d2e4eac8073dcbdb5c562b448e676f vm-7.19.282.ebuild 2014
-RMD160 fa67990bd5481b53d8ddac8ea536506f8792b60a vm-7.19.282.ebuild 2014
-SHA256 213590f80d55fcf5f60563249c817b772c0e5fb9caddac94b262272b53a1316b vm-7.19.282.ebuild 2014
-MISC ChangeLog 4385 RMD160 cba53c128a5e67020f4a6c5d304128a5d0a88ab3 SHA1 95d92a0c2acd49472eee78e9921dc81ace89995a SHA256 3ed04e6dc5d030193faf205fb9a2f73b778293b21c827f2766cd76aad7ed04b4
-MD5 42486968f170eaffd836a55308f3a737 ChangeLog 4385
-RMD160 cba53c128a5e67020f4a6c5d304128a5d0a88ab3 ChangeLog 4385
-SHA256 3ed04e6dc5d030193faf205fb9a2f73b778293b21c827f2766cd76aad7ed04b4 ChangeLog 4385
+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.1.465.ebuild 1405 RMD160 9366f784529a86305d1cf424c2c8180559969408 SHA1 cf8b6428e4f50ee688f082d9c0e5e40d607b08aa SHA256 ad674c8c32e46f7494a2f7afd050b975f84ce9ecce345bb8076c5b790be8a0e9
+MD5 b455625d16e183be26d4dd5e1aa123ea vm-8.0.1.465.ebuild 1405
+RMD160 9366f784529a86305d1cf424c2c8180559969408 vm-8.0.1.465.ebuild 1405
+SHA256 ad674c8c32e46f7494a2f7afd050b975f84ce9ecce345bb8076c5b790be8a0e9 vm-8.0.1.465.ebuild 1405
+MISC ChangeLog 4624 RMD160 c7b27e6c9f30c793f52475187b4df690a88fe664 SHA1 10f3fa08fd23057e1f3babc184f87c0bdea2836f SHA256 85cd35e8c6d7fe36f3cef250e80a7b8e612e21ab1f4cff743cddb3f0a639fca4
+MD5 1ddf4589487a534d7d2427f54508896b ChangeLog 4624
+RMD160 c7b27e6c9f30c793f52475187b4df690a88fe664 ChangeLog 4624
+SHA256 85cd35e8c6d7fe36f3cef250e80a7b8e612e21ab1f4cff743cddb3f0a639fca4 ChangeLog 4624
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -45,10 +54,13 @@ SHA256 a49b0da65f105b0136337217d6ee968d27fdf854618d54445904e0b4c5cbbba3 files/di
 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 a3e8a210152d9558aec4c89971479fb6 files/digest-vm-8.0.1.465 229
+RMD160 67294a033ed3c6d76f7052d4a702ad5ff671aa4a files/digest-vm-8.0.1.465 229
+SHA256 7e2badaa69aac01734fe329032eec5164462638298f1ee82faedd4ca7bacea01 files/digest-vm-8.0.1.465 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGl6KIAiZjviIA2XgRAlKkAJ9yyChVSvOuMutawWV+CZU7Px8LMgCgmfmR
-yXm32tm2Su9YUecSxcQ4TpA=
-=sZMn
+iD8DBQFGl9aGOeoy/oIi7uwRAtk3AKCdoBHDGlPgUp4RilU/rit/fizauwCcDVTi
+UaLf0gLEVG6zvG10gYtckoI=
+=D8FE
 -----END PGP SIGNATURE-----
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"
+}