summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2009-12-22 10:25:15 +0000
committerUlrich Müller <ulm@gentoo.org>2009-12-22 10:25:15 +0000
commitfda01129f86eaba5dcfeb811cfa1f3341e0febaf (patch)
tree9ad86ae453f5a7ffd9179c8d5fe8a5972693b3e0 /app-emacs/vm
parentamd64 stable, bug #286927 (diff)
downloadgentoo-2-fda01129f86eaba5dcfeb811cfa1f3341e0febaf.tar.gz
gentoo-2-fda01129f86eaba5dcfeb811cfa1f3341e0febaf.tar.bz2
gentoo-2-fda01129f86eaba5dcfeb811cfa1f3341e0febaf.zip
Add blocker against app-emacs/u-vm-color.
(Portage version: 2.2_rc60/cvs/Linux i686)
Diffstat (limited to 'app-emacs/vm')
-rw-r--r--app-emacs/vm/ChangeLog4
-rw-r--r--app-emacs/vm/vm-8.1.0_beta.ebuild5
2 files changed, 5 insertions, 4 deletions
diff --git a/app-emacs/vm/ChangeLog b/app-emacs/vm/ChangeLog
index 8cda2a5e14da..0c5ad2b349f2 100644
--- a/app-emacs/vm/ChangeLog
+++ b/app-emacs/vm/ChangeLog
@@ -1,11 +1,11 @@
# ChangeLog for app-emacs/vm
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.81 2009/12/22 10:07:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.82 2009/12/22 10:25:15 ulm Exp $
*vm-8.1.0_beta (22 Dec 2009)
22 Dec 2009; Ulrich Mueller <ulm@gentoo.org> +vm-8.1.0_beta.ebuild:
- Version bump.
+ Version bump. Add blocker against app-emacs/u-vm-color.
09 Nov 2009; Ulrich Mueller <ulm@gentoo.org> -vm-8.0.9.544.ebuild,
-files/50vm-gentoo-8.0.9.el, -vm-8.0.12-r2.ebuild:
diff --git a/app-emacs/vm/vm-8.1.0_beta.ebuild b/app-emacs/vm/vm-8.1.0_beta.ebuild
index 9313193e333b..b1187d6a473d 100644
--- a/app-emacs/vm/vm-8.1.0_beta.ebuild
+++ b/app-emacs/vm/vm-8.1.0_beta.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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_beta.ebuild,v 1.1 2009/12/22 10:07:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.1.0_beta.ebuild,v 1.2 2009/12/22 10:25:15 ulm Exp $
inherit elisp eutils
@@ -16,7 +16,8 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
IUSE="bbdb ssl"
DEPEND="bbdb? ( app-emacs/bbdb )"
-RDEPEND="${DEPEND}
+RDEPEND="!app-emacs/u-vm-color
+ ${DEPEND}
ssl? ( net-misc/stunnel )"
S="${WORKDIR}/${MY_P}"