summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/util-linux/ChangeLog5
-rw-r--r--sys-apps/util-linux/util-linux-2.12r-r7.ebuild5
2 files changed, 7 insertions, 3 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 9c93385b7231..276ff1c83675 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/util-linux
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.192 2007/06/13 03:27:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.193 2007/06/15 23:30:31 lavajoe Exp $
+
+ 15 Jun 2007; Joe Peterson <lavajoe@gentoo.org> util-linux-2.12r-r7.ebuild:
+ Add blocker: sys-apps/more (since both provide the "more" pager)
13 Jun 2007; Mike Frysinger <vapier@gentoo.org>
util-linux-2.12r-r7.ebuild, util-linux-9999.ebuild:
diff --git a/sys-apps/util-linux/util-linux-2.12r-r7.ebuild b/sys-apps/util-linux/util-linux-2.12r-r7.ebuild
index a24fc1b02e17..2c5cf48e3bb2 100644
--- a/sys-apps/util-linux/util-linux-2.12r-r7.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12r-r7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12r-r7.ebuild,v 1.7 2007/06/13 03:27:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12r-r7.ebuild,v 1.8 2007/06/15 23:30:31 lavajoe Exp $
inherit eutils flag-o-matic toolchain-funcs
@@ -24,7 +24,8 @@ RDEPEND=">=sys-libs/ncurses-5.2-r2
>=sys-fs/e2fsprogs-1.34
selinux? ( sys-libs/libselinux )
crypt? ( app-crypt/hashalot )
- perl? ( dev-lang/perl )"
+ perl? ( dev-lang/perl )
+ !sys-apps/more"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
virtual/os-headers"