Version bump.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

8 files changed, 116 insertions, 13 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/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
+}