summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2009-11-19 19:53:04 +0000
committerUlrich Müller <ulm@gentoo.org>2009-11-19 19:53:04 +0000
commitb6ae3b28d4cdfca77da299e8f981417abe0dbd0b (patch)
tree59f5b766093f7c1e8e77a53338790b3c0334d381 /app-emacs
parentapp-emacs/matlab: Remove intermediate snapshot, has been updated in main tree (diff)
downloademacs-b6ae3b28d4cdfca77da299e8f981417abe0dbd0b.tar.gz
emacs-b6ae3b28d4cdfca77da299e8f981417abe0dbd0b.tar.bz2
emacs-b6ae3b28d4cdfca77da299e8f981417abe0dbd0b.zip
Switch to Uday S. Reddy's 8.1 branch. Sync with changes in Portage tree.
svn path=/emacs-overlay/; revision=1472
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/vm/ChangeLog8
-rw-r--r--app-emacs/vm/Manifest6
-rw-r--r--app-emacs/vm/files/50vm-gentoo.el4
-rw-r--r--app-emacs/vm/vm-8.0.9999.ebuild (renamed from app-emacs/vm/vm-9999.ebuild)17
4 files changed, 20 insertions, 15 deletions
diff --git a/app-emacs/vm/ChangeLog b/app-emacs/vm/ChangeLog
index 9536221..1d45070 100644
--- a/app-emacs/vm/ChangeLog
+++ b/app-emacs/vm/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for app-emacs/vm
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*vm-8.0.9999 (19 Nov 2009)
+
+ 19 Nov 2009; Ulrich Mueller <ulm@gentoo.org> files/50vm-gentoo.el,
+ +vm-8.0.9999.ebuild, -vm-9999.ebuild:
+ Switch to Uday S. Reddy's 8.1 branch. Sync with changes in Portage tree.
+
21 Mar 2008; Ulrich Mueller <ulm@gentoo.org> vm-9999.ebuild:
Update location of BZR repository.
diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index 1340a0f..d70868b 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -1,5 +1,5 @@
-AUX 50vm-gentoo.el 171 RMD160 3a35dc335923e6d74e7ad0dac6025f04de3b0c4a SHA1 c5a241bb1b10554faff2ef428172ba651902c23d SHA256 848d61a3d4e9788d9bd9a33659060369bda937139ba915c52829b21d43a51037
+AUX 50vm-gentoo.el 147 RMD160 6c4de171b7cdd46641ad73e89b4b55acce913024 SHA1 edcad107507f8db94c3e4b5169a3ca01ccdaeb9e SHA256 b79981760d6c58e03cd1b57d8e413f2c1b2ebc2d083da03cbe6eac287e89bcad
AUX vm-no-pcrisis.patch 620 RMD160 9615e5574f955718ae8fe375afb6bc91dded4d54 SHA1 ea87f99aec9d6b03318e58b6197412745fafee4f SHA256 2c343d31649a152791f31bf14e8ee3d7a849e5645ba028661ab84309f73a5886
-EBUILD vm-9999.ebuild 1109 RMD160 2c079519ddea99db4207d547d163122f73826f79 SHA1 c2156e7fcceaf314c0805514a20044093f5b9074 SHA256 5654a4c683d678819ca3fcbfb2c9be685ace2da60e6622e7212efc9ab6201d08
-MISC ChangeLog 439 RMD160 987504db0ccc556dcf0c2d0b7902ba5da0c7ceb6 SHA1 e0f428b03431275174cc2641421df34cfed8a3ab SHA256 d3262bce085174efab76a2518bb2a08d487125ee00d1359c471cd2f1479651ce
+EBUILD vm-8.0.9999.ebuild 1067 RMD160 25b80f90ed3bbb9ee50685e4440670c9c98baa7d SHA1 36f2f06f8ebfdef6c52f9ba59abb5928bdf51c2e SHA256 663ecd614040b75a4509706d8a9747390c3b370f34ce1e42024be17151da957d
+MISC ChangeLog 652 RMD160 f144b6356222e501e3f428e7151a5978bddfc1ff SHA1 33b1c6a1f7cdf88ceae840874826d39df048e33c SHA256 2e8b18b931e389713f3e639f730675a388e4aab401ef32592fd76f6e52311742
MISC metadata.xml 616 RMD160 0671bc015f427662d3614403112ee15d0c457125 SHA1 27754651e0a70d9c85c159cb1e6175bc44c85de6 SHA256 9f491a8f5a4adb6bebc5ce9d5177a87d3daff04c7fa9cb3aad9a6a8e4909dec7
diff --git a/app-emacs/vm/files/50vm-gentoo.el b/app-emacs/vm/files/50vm-gentoo.el
index a1a5d0e..554b663 100644
--- a/app-emacs/vm/files/50vm-gentoo.el
+++ b/app-emacs/vm/files/50vm-gentoo.el
@@ -1,4 +1,4 @@
(add-to-list 'load-path "@SITELISP@")
-(setq vm-toolbar-pixmap-directory "/usr/share/pixmaps/vm")
-(setq vm-image-directory "/usr/share/pixmaps/vm")
+(setq vm-toolbar-pixmap-directory "@SITEETC@")
+(setq vm-image-directory "@SITEETC@")
(require 'vm-autoloads)
diff --git a/app-emacs/vm/vm-9999.ebuild b/app-emacs/vm/vm-8.0.9999.ebuild
index 7c25102..5848484 100644
--- a/app-emacs/vm/vm-9999.ebuild
+++ b/app-emacs/vm/vm-8.0.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EBZR_REPO_URI="http://launchpad.net/viewmail/"
+EBZR_REPO_URI="lp:~reddyuday/viewmail/8.1"
inherit elisp eutils bzr autotools
@@ -19,7 +19,7 @@ DEPEND="bbdb? ( app-emacs/bbdb )"
RDEPEND="${DEPEND}
ssl? ( net-misc/stunnel )"
-SITEFILE=50${PN}-gentoo.el
+SITEFILE="50${PN}-gentoo.el"
src_unpack() {
bzr_src_unpack
@@ -34,16 +34,15 @@ src_unpack() {
}
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"
+ econf \
+ --with-emacs="emacs" \
+ --with-pixmapdir="${SITEETC}/${PN}" \
+ $(use bbdb && echo "--with-other-dirs=${SITELISP}/bbdb")
emake || die "emake failed"
}
src_install() {
emake -j1 DESTDIR="${D}" install || die "emake install failed"
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
dodoc NEWS README TODO example.vm || die "dodoc failed"
}