diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-05-10 16:32:21 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-05-10 16:32:21 +0000 |
| commit | 4954945d08508ecb2e2d23a63e501195147be0e8 (patch) | |
| tree | 68e88d61ac58d973a8926ab4b327e64bbc441c51 /sys-apps/man-pages | |
| parent | Stop installing attr(5) as man-pages handles it now #548900 by Albert W. Hopk... (diff) | |
| download | gentoo-2-4954945d08508ecb2e2d23a63e501195147be0e8.tar.gz gentoo-2-4954945d08508ecb2e2d23a63e501195147be0e8.tar.bz2 gentoo-2-4954945d08508ecb2e2d23a63e501195147be0e8.zip | |
Block older attr that installed attr(5) man page #548900 by Albert W. Hopkins.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-apps/man-pages')
| -rw-r--r-- | sys-apps/man-pages/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/man-pages/man-pages-4.00.ebuild | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sys-apps/man-pages/ChangeLog b/sys-apps/man-pages/ChangeLog index e4313fe3a0e9..4847fbdabbf7 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-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/ChangeLog,v 1.246 2015/05/07 14:01:06 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/ChangeLog,v 1.247 2015/05/10 16:32:21 vapier Exp $ + + 10 May 2015; Mike Frysinger <vapier@gentoo.org> man-pages-4.00.ebuild: + Block older attr that installed attr(5) man page #548900 by Albert W. Hopkins. 07 May 2015; Anthony G. Basile <blueness@gentoo.org> man-pages-3.83.ebuild: Stabilize for all. diff --git a/sys-apps/man-pages/man-pages-4.00.ebuild b/sys-apps/man-pages/man-pages-4.00.ebuild index 153551773468..f4c932d8c9e5 100644 --- a/sys-apps/man-pages/man-pages-4.00.ebuild +++ b/sys-apps/man-pages/man-pages-4.00.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-4.00.ebuild,v 1.1 2015/05/07 13:59:23 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-4.00.ebuild,v 1.2 2015/05/10 16:32:21 vapier Exp $ EAPI=4 @@ -21,8 +21,10 @@ IUSE_LINGUAS=" da de fr it ja nl pl ro ru zh_CN" IUSE="nls ${IUSE_LINGUAS// / linguas_}" RESTRICT="binchecks" +# Block packages that used to install colliding man pages #341953 #548900 RDEPEND="virtual/man - !<dev-libs/libaio-0.3.109-r2" #341953 + !<sys-apps/attr-2.4.47-r2 + !<dev-libs/libaio-0.3.109-r2" PDEPEND="nls? ( linguas_da? ( app-i18n/man-pages-da ) linguas_de? ( app-i18n/man-pages-de ) |