Version bump.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

9 files changed, 129 insertions, 22 deletions

diff --git a/app-emacs/vm/ChangeLog b/app-emacs/vm/ChangeLog
index bdedaad29f32..27a4a410957b 100644
--- a/app-emacs/vm/ChangeLog
+++ b/app-emacs/vm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emacs/vm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.92 2010/05/23 16:30:03 ulm Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.93 2011/12/29 22:10:34 ulm Exp $
+
+*vm-8.2.0_beta (29 Dec 2011)
+
+  29 Dec 2011; Ulrich Mueller <ulm@gentoo.org> vm-8.0.12-r6.ebuild,
+  +files/50vm-gentoo-8.0.el, vm-8.1.0.ebuild, vm-8.1.1.ebuild,
+  files/50vm-gentoo.el, +vm-8.2.0_beta.ebuild,
+  +files/vm-8.2.0_beta-datadir.patch:
+  Version bump.
 
   23 May 2010; Ulrich Mueller <ulm@gentoo.org> vm-8.1.1.ebuild:
   Workaround for parallel make failure.
diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index dff6e0204f7b..6aca66b4d793 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -2,7 +2,8 @@
 Hash: SHA1
 
 AUX 50vm-gentoo-7.19.el 584 RMD160 761dc3dc41c81ba23cd3bae2a6c874bbcd639593 SHA1 93a0ac84dd4d184bf46c7cc1fc55bd4665631630 SHA256 dc11350f3d9d3e432b906eab4a87234537cbebfdfecbbb295509726047589703
-AUX 50vm-gentoo.el 147 RMD160 6c4de171b7cdd46641ad73e89b4b55acce913024 SHA1 edcad107507f8db94c3e4b5169a3ca01ccdaeb9e SHA256 b79981760d6c58e03cd1b57d8e413f2c1b2ebc2d083da03cbe6eac287e89bcad
+AUX 50vm-gentoo-8.0.el 147 RMD160 6c4de171b7cdd46641ad73e89b4b55acce913024 SHA1 edcad107507f8db94c3e4b5169a3ca01ccdaeb9e SHA256 b79981760d6c58e03cd1b57d8e413f2c1b2ebc2d083da03cbe6eac287e89bcad
+AUX 50vm-gentoo.el 62 RMD160 2ade3448f2821ca732152b8ba2d82eafa061cc85 SHA1 243a52f5726ad198f6a63c92719e5726d1a7ed02 SHA256 ac5d651e855d765a458cbc33a78ca9c86bd3604e0d972a0cfbce1dbcb6dc72b1
 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-7.19-install-info.patch 412 RMD160 1fc5a5c5e20c1bb18acd013904812c5fed1f550f SHA1 299c51bbcd5e3e0ac2ba7a6c0b50a33edb54f2b2 SHA256 c8b998e29bed776fa75405fc432cd493fd8d9e01fb35935ceb5b96a58945730c
@@ -12,21 +13,24 @@ AUX vm-8.0.12-charset-displayable.patch 921 RMD160 784c0beee5917952e9ed542426027
 AUX vm-8.0.12-emacs-23.patch 3704 RMD160 ad0a36c08968566d7abac86801c7ea072e8e122f SHA1 b1037b2364517cde8e10fd8edc10581329da766f SHA256 7ef9861270b019303968f5db993cbfef1ab13c69ec094d117da1ce91d9c93f45
 AUX vm-8.0.12-folder-corruption.patch 635 RMD160 1dc3454b6df2bfd9944c63e0e90b23ea18f45b03 SHA1 b11b9fb8de22f879313c5cd203cbf2cf76bd8f64 SHA256 f78007ef176ea9e8dd98ed01e2edec4055b9ef9356b0d85f8e3ca6341198febc
 AUX vm-8.0.12-supercite-yank-1.patch 733 RMD160 0cb7bae7019165d75b0c691aab37745f956053c0 SHA1 cde1312c400a6013739bd52400debcc0b8cfb8cc SHA256 49b3006d7dacbf17e334f4fae97cb35170e1a0c52ad11888d2dd40e7dfff0ac6
+AUX vm-8.2.0_beta-datadir.patch 1177 RMD160 b258e52d9d9c81e104992a405b0c34554adea7d9 SHA1 e0f791bbb7ca1ee435df2668fe0029c4b79b5cb1 SHA256 49dfe87f98e6e479a1050891494daa9c43a4aeed260a2c8bfa03c5aaa8071165
 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.12.tgz 547048 RMD160 b2e0976d349a182111dc928073dbbb9327087f6e SHA1 f7016a33c9ef8b8c291aa0c16ccc73adeb8e7c43 SHA256 1e7b6e3c7401a825d288420c5a7820a004eff4b0f8838018a5598c95a0d5de57
 DIST vm-8.1.0.tgz 689653 RMD160 da17398849b4d6ac10614d504415dad85fdb6f54 SHA1 8c0367c73f14b2fb85a8ea964d8c78db2d927886 SHA256 c9065188c476367f67a76d4441ea69372ab6e321c4fa673156838eebcbf68664
 DIST vm-8.1.1.tgz 701429 RMD160 a13383dabe0536e0e19de1abd9acc2e702402a8f SHA1 0d551c47a67f4e1e347896ce3bbde19342669dd2 SHA256 1a40c48027e3ca164415b7054d83f9d00a0236d41d82af0c1816e4a911e869f1
+DIST vm-8.2.0b.tgz 839789 RMD160 d94e96c430cfdd615a4e6afe1b70337a1aad8bb5 SHA1 cd7ba5ad202173a7d44d24f873f8e64811f8eea1 SHA256 6945821a521844a429ae3d0e25db69755185fa848343fdc3c754ab16344d2a12
 EBUILD vm-7.19-r4.ebuild 1249 RMD160 cce2daf9056af80464421a39333a165dc5960c91 SHA1 bfcd041bedbf950d2c60d4bd5c0fb97d2852bd33 SHA256 5f95b9365e5081d690ea8f6d9ccd7343405673c0504af55dc856c89339761873
-EBUILD vm-8.0.12-r6.ebuild 1426 RMD160 348ee892d21d7d046feccabea9a27df34bf421f2 SHA1 9dfed43128cd4eb3af18e28a2af573e1124cf453 SHA256 6c9e5d3880cb5aa033c0c9408b26a333687c9a82c53e3c5e3cdeed737176b35b
-EBUILD vm-8.1.0.ebuild 1249 RMD160 75f5488b87fb5c2eedbd6b4c5feba53b9dd362a5 SHA1 7d0a346ad138e4bb331b68e108bb2d5b70dc3751 SHA256 9e31599928c3cd3e70bbdfcbd1936ef3de153b34257b22c7cc41adc1110adad0
-EBUILD vm-8.1.1.ebuild 1253 RMD160 be3cfbc45a0ddde8c9c484d53e6f9323cecf43fe SHA1 7afad258ea856ccb970e49dd67ed2ce655892073 SHA256 5c7b67a24c73b47f8a143c8dc9b43cd1828e00ad70ff61ce28e19d089f263e49
-MISC ChangeLog 12764 RMD160 fc622d6d7648971af83110abfdfcf9f7861eb1e3 SHA1 8dafe9d5c63c9a2bc157817468f78d10cf75edf0 SHA256 590df4221cd2cdd5ee21891348ac796c4fbe0a775b55048b1933b759c2e1bb19
+EBUILD vm-8.0.12-r6.ebuild 1426 RMD160 8dbaa877c280719d22ce9d5e94f0e3a23171ebd1 SHA1 b9219f47f19c6c3b9aac871a0517a10450c91b1e SHA256 06c46dcafc40c6e0e0b095d18e47b5c8cfb6b46d7854696b925f624f5d7f45c1
+EBUILD vm-8.1.0.ebuild 1253 RMD160 ad0fb318ffacf7c60b68a487b0b9567a7a51dc47 SHA1 ba990d6686b6921b020eb87c775364e723914e5a SHA256 4c46bffe647dec91797cc399870ec37b26cb1e2f0d1fefbe070afe0617441f1b
+EBUILD vm-8.1.1.ebuild 1257 RMD160 167b07730ccd96ce2089e1a3db198a1920c2c674 SHA1 2693201841684e80d84d1f1f4a4f24ef813ab91f SHA256 7d3b28f118516fb592160a764d8a3eb3a70b922062da444654fc677b845e06b5
+EBUILD vm-8.2.0_beta.ebuild 1569 RMD160 fea258e96ba90be2e1463fcc200431364c0a6e26 SHA1 8960f9f9df7873d54e339dc1f5a6b42842edc6da SHA256 97cbf2600fc03c6e65a802ae0fc0b8369348c7457aca705e992f7a698d60a314
+MISC ChangeLog 13027 RMD160 b742379d5747c43d1338e9c9c7540a8f71d15f5f SHA1 789b82221a0500fb1fd8b09575b4c8bc48a815a9 SHA256 6ca029e41e8b86d79107eb747ac05ea30b0903e588b0c7f1f66f0b988d626a48
 MISC metadata.xml 616 RMD160 0671bc015f427662d3614403112ee15d0c457125 SHA1 27754651e0a70d9c85c159cb1e6175bc44c85de6 SHA256 9f491a8f5a4adb6bebc5ce9d5177a87d3daff04c7fa9cb3aad9a6a8e4909dec7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkv5WCwACgkQOeoy/oIi7uxM7QCgjcIZD0cSWHRuyyTEyf32JIYp
-qkwAni9oYH2a2hb5QYNqsdt2rqIfSy2l
-=T4FW
+iEYEARECAAYFAk7859YACgkQOeoy/oIi7uyqogCeNU0LP8YCXVvJuWj+nEVnCJlN
+yV4AoN7IHFjesAx8tsbiIiwOwdTFy3RO
+=6h4p
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/vm/files/50vm-gentoo-8.0.el b/app-emacs/vm/files/50vm-gentoo-8.0.el
new file mode 100644
index 000000000000..554b6634a2ee
--- /dev/null
+++ b/app-emacs/vm/files/50vm-gentoo-8.0.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(setq vm-toolbar-pixmap-directory "@SITEETC@")
+(setq vm-image-directory "@SITEETC@")
+(require 'vm-autoloads)
diff --git a/app-emacs/vm/files/50vm-gentoo.el b/app-emacs/vm/files/50vm-gentoo.el
index 554b6634a2ee..d823436d3bd2 100644
--- a/app-emacs/vm/files/50vm-gentoo.el
+++ b/app-emacs/vm/files/50vm-gentoo.el
@@ -1,4 +1,2 @@
 (add-to-list 'load-path "@SITELISP@")
-(setq vm-toolbar-pixmap-directory "@SITEETC@")
-(setq vm-image-directory "@SITEETC@")
 (require 'vm-autoloads)
diff --git a/app-emacs/vm/files/vm-8.2.0_beta-datadir.patch b/app-emacs/vm/files/vm-8.2.0_beta-datadir.patch
new file mode 100644
index 000000000000..86608e77c97a
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.2.0_beta-datadir.patch
@@ -0,0 +1,31 @@
+--- vm-8.2.0b-orig/lisp/Makefile.in
++++ vm-8.2.0b/lisp/Makefile.in
+@@ -96,7 +96,10 @@
+ datadir= @datadir@
+ datarootdir= @datarootdir@
+ lispdir = @lispdir@
++etcdir= @etcdir@
+ pixmapdir= @pixmapdir@
++docdir = @docdir@
++infodir = @infodir@
+ 
+ EMACS_PROG = @EMACS_PROG@
+ EMACS_FLAVOR = @EMACS_FLAVOR@
+@@ -137,7 +140,7 @@
+ 	 "$(EMACS_PROG)" $(FLAGS) -l autoload \
+ 		-f vm-built-autoloads "@abs_builddir@/$@" "`pwd`")
+ 	echo "(custom-add-load 'vm 'vm-cus-load)" | tr -d '\015' >> $@
+-	echo "(setq vm-configure-datadir \"${datadir}/vm\")" | tr -d '\015' >> $@
++	echo "(setq vm-configure-datadir \"${etcdir}\")" | tr -d '\015' >> $@
+ 	echo "(setq vm-configure-pixmapdir \"${pixmapdir}\")" | tr -d '\015' >> $@
+ 	echo "(setq vm-configure-docdir \"${docdir}\")" | tr -d '\015' >> $@
+ 	echo "(setq vm-configure-infodir \"${infodir}\")" | tr -d '\015' >> $@
+@@ -168,7 +171,7 @@
+ 	cat $@.tmp >> $@
+ 	echo "(setq features (delete 'vm-autoloads features))" >> $@
+ 	echo "(require 'vm-vars)" >> $@
+-	echo "(setq vm-configure-datadir \"${datadir}\")" >> $@
++	echo "(setq vm-configure-datadir \"${etcdir}\")" >> $@
+ 	echo "(setq vm-configure-pixmapdir \"${pixmapdir}\")" >> $@
+ 	$(RM) $@.tmp
+ 
diff --git a/app-emacs/vm/vm-8.0.12-r6.ebuild b/app-emacs/vm/vm-8.0.12-r6.ebuild
index f0e4e6b9a217..0a7ac8e211df 100644
--- a/app-emacs/vm/vm-8.0.12-r6.ebuild
+++ b/app-emacs/vm/vm-8.0.12-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.0.12-r6.ebuild,v 1.5 2010/01/11 18:05:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.0.12-r6.ebuild,v 1.6 2011/12/29 22:10:34 ulm Exp $
 
 inherit elisp eutils
 
@@ -17,7 +17,7 @@ DEPEND="bbdb? ( app-emacs/bbdb )"
 RDEPEND="${DEPEND}
 	ssl? ( net-misc/stunnel )"
 
-SITEFILE="50${PN}-gentoo.el"
+SITEFILE="50${PN}-gentoo-8.0.el"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-emacs/vm/vm-8.1.0.ebuild b/app-emacs/vm/vm-8.1.0.ebuild
index 3a867fb0e664..5dc21a52b5b2 100644
--- a/app-emacs/vm/vm-8.1.0.ebuild
+++ b/app-emacs/vm/vm-8.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.1.0.ebuild,v 1.1 2010/03/16 11:59:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.1.0.ebuild,v 1.2 2011/12/29 22:10:34 ulm Exp $
 
 inherit elisp eutils
 
@@ -21,7 +21,7 @@ RDEPEND="!app-emacs/u-vm-color
 	ssl? ( net-misc/stunnel )"
 
 S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo.el"
+SITEFILE="50${PN}-gentoo-8.0.el"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-emacs/vm/vm-8.1.1.ebuild b/app-emacs/vm/vm-8.1.1.ebuild
index 600bef998047..079a1040367b 100644
--- a/app-emacs/vm/vm-8.1.1.ebuild
+++ b/app-emacs/vm/vm-8.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.1.1.ebuild,v 1.2 2010/05/23 16:30:03 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.1.1.ebuild,v 1.3 2011/12/29 22:10:34 ulm Exp $
 
 inherit elisp eutils
 
@@ -21,7 +21,7 @@ RDEPEND="!app-emacs/u-vm-color
 	ssl? ( net-misc/stunnel )"
 
 S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo.el"
+SITEFILE="50${PN}-gentoo-8.0.el"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-emacs/vm/vm-8.2.0_beta.ebuild b/app-emacs/vm/vm-8.2.0_beta.ebuild
new file mode 100644
index 000000000000..a60f285cb999
--- /dev/null
+++ b/app-emacs/vm/vm-8.2.0_beta.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.2.0_beta.ebuild,v 1.1 2011/12/29 22:10:34 ulm Exp $
+
+EAPI=4
+
+inherit elisp eutils
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="The VM mail reader for Emacs"
+HOMEPAGE="http://www.nongnu.org/viewmail/"
+SRC_URI="http://launchpad.net/vm/${PV%.*}.x/${MY_PV}/+download/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="bbdb ssl"
+
+DEPEND="bbdb? ( app-emacs/bbdb )"
+RDEPEND="!app-emacs/u-vm-color
+	${DEPEND}
+	ssl? ( net-misc/stunnel )"
+
+S="${WORKDIR}/${MY_P}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-datadir.patch"
+
+	if ! use bbdb; then
+		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
+		epatch "${FILESDIR}/${PN}-8.0-no-pcrisis.patch"
+	fi
+}
+
+src_configure() {
+	econf \
+		--with-emacs="emacs" \
+		--with-lispdir="${SITELISP}/${PN}" \
+		--with-etcdir="${SITEETC}/${PN}" \
+		--with-docdir="/usr/share/doc/${PF}" \
+		$(use bbdb && echo "--with-other-dirs=${SITELISP}/bbdb")
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+
+	# delete duplicate documentation
+	find "${D}/${SITEETC}/${PN}" -type d -name pixmaps -prune \
+		-o -type f -exec rm '{}' '+' || die
+	rm "${D}/usr/share/doc/${PF}/COPYING" || die
+
+	dodoc example.vm
+	# NEWS is accessed from lisp and must not be compressed
+	docompress -x /usr/share/doc/${PF}/NEWS
+}