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
commit8bee326a9b3a62918e5bd45158b5e386d1585d21 (patch)
tree15a61b058411e75cb8ff7f5418f6270a99e5c71d /app-emacs/vm
parentamd64 stable, bug #286927 (diff)
downloadhistorical-8bee326a9b3a62918e5bd45158b5e386d1585d21.tar.gz
historical-8bee326a9b3a62918e5bd45158b5e386d1585d21.tar.bz2
historical-8bee326a9b3a62918e5bd45158b5e386d1585d21.zip
Add blocker against app-emacs/u-vm-color.
Package-Manager: portage-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/Manifest10
-rw-r--r--app-emacs/vm/vm-8.1.0_beta.ebuild5
3 files changed, 10 insertions, 9 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/Manifest b/app-emacs/vm/Manifest
index d7e3db76f81b..0b1c88964e77 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -20,13 +20,13 @@ DIST vm-8.1.0-beta.tgz 682201 RMD160 8d4325ddd667f5671938df41e1e58e6c1cb7c927 SH
EBUILD vm-7.19-r4.ebuild 1249 RMD160 cce2daf9056af80464421a39333a165dc5960c91 SHA1 bfcd041bedbf950d2c60d4bd5c0fb97d2852bd33 SHA256 5f95b9365e5081d690ea8f6d9ccd7343405673c0504af55dc856c89339761873
EBUILD vm-8.0.12-r4.ebuild 1389 RMD160 5cd6435f2098b690f127317338589ba5bfb8bf20 SHA1 010bb91aebfb525d5c2faa9dc68b6d4b48b1f4c6 SHA256 9d012c84d8d0584606f7774fa25eca55526399caf2c67262d69dd265629eafb9
EBUILD vm-8.0.12-r6.ebuild 1427 RMD160 d07a08634b2d8115eaae28d1aae9bd0e554c73b0 SHA1 e2e2d0531f27be640a9482805c7b997bf5717c2d SHA256 04399e58e2fb92b4b3c419294c13e3bbc80e4fa9573982d263b7eafa16abd0f1
-EBUILD vm-8.1.0_beta.ebuild 1226 RMD160 abe3dfc93349f9d901106576d346d60ec84dbba2 SHA1 9cb4b7fcd612bfce9d29684ebca5c7f46594289e SHA256 179c969ea2b36f72313afe401ef28e495040cc3412725318c90c8e369e155609
-MISC ChangeLog 11471 RMD160 08ed09ae3049946530d052283de14a4c7be416aa SHA1 75ddcd60ce11015c1500e275d974fc6aaf7a6e52 SHA256 b7764c941eeb39b35355de06adf263f6bcfb5e0e5e109cd74c1faaa3a8afd405
+EBUILD vm-8.1.0_beta.ebuild 1249 RMD160 e9e6f2dc49d5abb031554d4eb70eaadaa22b39b3 SHA1 b7b8690dc4b78ada24c605be9dc6776fbe7ff094 SHA256 b5707031de417c408e51636d49a6aa6ea0c4903bef1925a69f6b2dbe85dc6773
+MISC ChangeLog 11513 RMD160 3d955a17780df9d3c604f881170b5ff548b61a65 SHA1 748037a5723bf801e9f6cab6606f92621bbd425d SHA256 38beab390ffbac126ce39887f413e4651466e2b58f94e3a8445361329b5f259f
MISC metadata.xml 616 RMD160 0671bc015f427662d3614403112ee15d0c457125 SHA1 27754651e0a70d9c85c159cb1e6175bc44c85de6 SHA256 9f491a8f5a4adb6bebc5ce9d5177a87d3daff04c7fa9cb3aad9a6a8e4909dec7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
-iEYEARECAAYFAkswmwEACgkQOeoy/oIi7uxUywCdGb+cxeEuRyqW9cdkgz1xilFy
-Y4AAmgMaxO152rjeyucY3NjDKjZrhDrY
-=KKxE
+iEYEARECAAYFAkswny0ACgkQOeoy/oIi7uzL+wCbBqUMmDfFidlb68f7n6KXPZon
+ClgAnjzpQR3AuCC4PdSf+ACctd/WnKqT
+=Jtw/
-----END PGP SIGNATURE-----
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}"