summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2008-09-03 18:35:03 +0000
committerUlrich Müller <ulm@gentoo.org>2008-09-03 18:35:03 +0000
commit5fd88c9be4d4fade1d51abf4de555d79fb46f477 (patch)
tree69af746eb09e6b4ad682ee9c17d8ead970a93054 /app-editors
parentAdd a blocker against emacs-cvs. (diff)
downloadgentoo-2-5fd88c9be4d4fade1d51abf4de555d79fb46f477.tar.gz
gentoo-2-5fd88c9be4d4fade1d51abf4de555d79fb46f477.tar.bz2
gentoo-2-5fd88c9be4d4fade1d51abf4de555d79fb46f477.zip
Add blocker against pretest version in app-editors/emacs.
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686)
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs-cvs/ChangeLog8
-rw-r--r--app-editors/emacs-cvs/emacs-cvs-22.2.92.ebuild5
-rw-r--r--app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild5
3 files changed, 11 insertions, 7 deletions
diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index dad6820563e7..4f8df1474e84 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,11 +1,13 @@
# ChangeLog for app-editors/emacs-cvs
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.214 2008/09/03 06:08:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.215 2008/09/03 18:35:03 ulm Exp $
*emacs-cvs-22.2.92 (03 Sep 2008)
- 03 Sep 2008; Ulrich Mueller <ulm@gentoo.org> +emacs-cvs-22.2.92.ebuild:
- New (presumably final) pretest version.
+ 03 Sep 2008; Ulrich Mueller <ulm@gentoo.org> +emacs-cvs-22.2.92.ebuild,
+ emacs-cvs-22.2.9999.ebuild:
+ New (presumably final) pretest version. Add blocker against pretest version
+ in app-editors/emacs.
*emacs-cvs-22.2.91 (26 Aug 2008)
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.2.92.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.2.92.ebuild
index 409a63e75977..d5400905bb2d 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.2.92.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.2.92.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.2.92.ebuild,v 1.1 2008/09/03 06:08:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.2.92.ebuild,v 1.2 2008/09/03 18:35:03 ulm Exp $
inherit autotools elisp-common eutils flag-o-matic
@@ -14,7 +14,8 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbs
IUSE="alsa gif gtk gzip-el hesiod jpeg kerberos motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
RESTRICT="strip"
-RDEPEND="sys-libs/ncurses
+RDEPEND="!~app-editors/emacs-${PV}
+ sys-libs/ncurses
>=app-admin/eselect-emacs-1.2
net-libs/liblockfile
hesiod? ( net-dns/hesiod )
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild
index fdd5d7d0703e..0d908ce4f6cc 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild,v 1.8 2008/08/15 23:49:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild,v 1.9 2008/09/03 18:35:03 ulm Exp $
ECVS_AUTH="pserver"
ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -23,7 +23,8 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbs
IUSE="alsa gif gtk gzip-el hesiod jpeg kerberos motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
RESTRICT="strip"
-RDEPEND="sys-libs/ncurses
+RDEPEND="!~app-editors/emacs-22.2.92
+ sys-libs/ncurses
>=app-admin/eselect-emacs-1.2
net-libs/liblockfile
hesiod? ( net-dns/hesiod )