diff options
author | Mike Frysinger <vapier@gentoo.org> | 2011-08-20 17:49:23 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2011-08-20 17:49:23 +0000 |
commit | 35e01cad527df8b898542f70e237b75d15d0eb43 (patch) | |
tree | 1164581978f525a5db48593d0bec1ad45c15fd4b /sys-apps/man-pages | |
parent | Remove old versions. (diff) | |
download | gentoo-2-35e01cad527df8b898542f70e237b75d15d0eb43.tar.gz gentoo-2-35e01cad527df8b898542f70e237b75d15d0eb43.tar.bz2 gentoo-2-35e01cad527df8b898542f70e237b75d15d0eb43.zip |
Add blocker to autoresolve man page collision #341953.
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/man-pages')
-rw-r--r-- | sys-apps/man-pages/ChangeLog | 7 | ||||
-rw-r--r-- | sys-apps/man-pages/man-pages-3.32.ebuild | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sys-apps/man-pages/ChangeLog b/sys-apps/man-pages/ChangeLog index 2769e7f3999c..5a4756eaa647 100644 --- a/sys-apps/man-pages/ChangeLog +++ b/sys-apps/man-pages/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/man-pages -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/ChangeLog,v 1.153 2010/12/05 18:23:39 robbat2 Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/ChangeLog,v 1.154 2011/08/20 17:49:23 vapier Exp $ + + 20 Aug 2011; Mike Frysinger <vapier@gentoo.org> man-pages-3.32.ebuild: + Add blocker to autoresolve man page collision #341953. *man-pages-3.32 (05 Dec 2010) diff --git a/sys-apps/man-pages/man-pages-3.32.ebuild b/sys-apps/man-pages/man-pages-3.32.ebuild index 6ebfe64bfa70..ca69ddbfcea2 100644 --- a/sys-apps/man-pages/man-pages-3.32.ebuild +++ b/sys-apps/man-pages/man-pages-3.32.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-3.32.ebuild,v 1.1 2010/12/05 18:23:39 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-3.32.ebuild,v 1.2 2011/08/20 17:49:23 vapier Exp $ EAPI=3 @@ -19,7 +19,8 @@ IUSE_LINGUAS=" cs da de fr it ja nl pl ro ru zh_CN" IUSE="nls ${IUSE_LINGUAS// / linguas_}" RESTRICT="binchecks" -RDEPEND="virtual/man" +RDEPEND="virtual/man + !<dev-libs/libaio-0.3.109-r2" #341953 PDEPEND="nls? ( linguas_cs? ( app-i18n/man-pages-cs ) linguas_da? ( app-i18n/man-pages-da ) |