summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2009-09-29 11:03:45 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2009-09-29 11:03:45 +0000
commit25068638036f0de2de053fcf6fed6e82f5d9b1ef (patch)
tree2cdf4659833a61508c34b73ad8884c577aca69cb /sys-apps/man
parentVersion bump. Remove old. Per bug #286680. (diff)
downloadgentoo-2-25068638036f0de2de053fcf6fed6e82f5d9b1ef.tar.gz
gentoo-2-25068638036f0de2de053fcf6fed6e82f5d9b1ef.tar.bz2
gentoo-2-25068638036f0de2de053fcf6fed6e82f5d9b1ef.zip
Add alternative dependency over heirloom-doctools; add a warning if it's installed because it's not automatically switched for.
(Portage version: 2.2_rc42/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/man')
-rw-r--r--sys-apps/man/ChangeLog6
-rw-r--r--sys-apps/man/man-1.6f-r3.ebuild12
2 files changed, 15 insertions, 3 deletions
diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index 88d1d58f9e46..baa8b1c6fbcd 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/man
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.152 2009/03/17 09:50:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.153 2009/09/29 11:03:45 flameeyes Exp $
+
+ 29 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org> man-1.6f-r3.ebuild:
+ Add alternative dependency over heirloom-doctools; add a warning if it's
+ installed because it's not automatically switched for.
17 Mar 2009; Raúl Porcel <armin76@gentoo.org> man-1.6f-r3.ebuild:
m68k stable wrt #258767, thanks to kolla for testing
diff --git a/sys-apps/man/man-1.6f-r3.ebuild b/sys-apps/man/man-1.6f-r3.ebuild
index ff76a2982173..fa51a248a6ad 100644
--- a/sys-apps/man/man-1.6f-r3.ebuild
+++ b/sys-apps/man/man-1.6f-r3.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/sys-apps/man/man-1.6f-r3.ebuild,v 1.11 2009/09/08 17:49:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6f-r3.ebuild,v 1.12 2009/09/29 11:03:45 flameeyes Exp $
inherit eutils toolchain-funcs
@@ -14,7 +14,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fb
IUSE="lzma nls"
DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND=">=sys-apps/groff-1.19.2-r1
+RDEPEND="|| ( >=sys-apps/groff-1.19.2-r1 app-doc/heirloom-doctools )
!sys-apps/man-db
!app-arch/lzma
lzma? ( || ( app-arch/xz-utils app-arch/lzma-utils ) )"
@@ -116,4 +116,12 @@ pkg_postinst() {
ewarn "You might want to delete all but one of these:"
ewarn ${files}
fi
+
+ if has_version app-doc/heirloom-docutils; then
+ ewarn "Please note that the /etc/man.conf file installed will not"
+ ewarn "work with heirloom's nroff by default (yet)."
+ ewarn ""
+ ewarn "Check app-doc/heirloom-docutils elog messages for the proper"
+ ewarn "configuration."
+ fi
}