From 93d778ea8f0a25229f601a5d0001948dfc11b278 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 20 Aug 2011 17:49:23 +0000 Subject: [PATCH] Add blocker to autoresolve man page collision #341953. Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64 --- sys-apps/man-pages/ChangeLog | 7 +++++-- sys-apps/man-pages/Manifest | 14 ++++++++++++-- sys-apps/man-pages/man-pages-3.32.ebuild | 7 ++++--- 3 files changed, 21 insertions(+), 7 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 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/Manifest b/sys-apps/man-pages/Manifest index ba8aeee0e1c0..45e84e180ba5 100644 --- a/sys-apps/man-pages/Manifest +++ b/sys-apps/man-pages/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + DIST man-pages-3.28.tar.bz2 1127068 RMD160 d86d91e5aa96bb1a37ae13c9b37891f43d0e28a6 SHA1 c7492bfe4adcd2918fb6995c1fcceddd57a39b63 SHA256 fe32eb3846f72915485f6c44e13fcb0e4a699a461419fc56dadb63508e84b753 DIST man-pages-3.29.tar.bz2 1127834 RMD160 bfef7500b09ee769532bcebaac6ad67202261587 SHA1 059958ebe07a7581fff65ac95be39fd050ef0da2 SHA256 671f4875038dc1e596c2457b8d2c043424ce192840078fefe1be299e47490036 DIST man-pages-3.30.tar.bz2 1129068 RMD160 3d268e42af2ceb0572e8fd4ae1f7c81fc9ca08a5 SHA1 1e3d89dd8c1328696fd5d64a2061489694670827 SHA256 51fda4ea9cf54cf6213d6a67a8a8961b39aa65a89bab3ebe046a8a10d3a39ea3 @@ -8,6 +11,13 @@ EBUILD man-pages-3.28.ebuild 1793 RMD160 37be533db5ea87d3f2247b8d7ce6f89e8aa52cd EBUILD man-pages-3.29.ebuild 1805 RMD160 61158c29f92969cc63cdd05c5b1d9d1df82d0734 SHA1 61c04f173dfff49415390067b6523707e4fec90c SHA256 b8900d6f90bd72c1ef693301f7364d8d635f3e70393258c78c4babd13ee831fc EBUILD man-pages-3.30.ebuild 1805 RMD160 53327dadadf74b3de1bc2f05952ad944f2178a5c SHA1 ee3441d01dc557935d27974acdbaaf80292b570a SHA256 c9077e3d46abcc8ac4e3b8950c4b1ce52975bf853d766e22f2ca7858cc858861 EBUILD man-pages-3.31.ebuild 1805 RMD160 8126cd06aed421d88fb028ea9a6737457d29a7e4 SHA1 e2cb16cfb826014c1e1028cc21d6f835a2129112 SHA256 c1fea2e6aa9600fde6b25f6466df8d8be14663166829916fcf100e890733ba2c -EBUILD man-pages-3.32.ebuild 1806 RMD160 9f42438ac28af98d56275916da10633264ff2127 SHA1 20219d45b397d96d146654613b84caee55612b97 SHA256 c196205f1e580159567816dda71f334f88f16b8c86af5303fa99e0bf9701cd22 -MISC ChangeLog 19557 RMD160 4c3d410e2afd7254f1d0511da687c2014980683f SHA1 b3ed32022e9ade09a612d194e41cbf94206aa0dc SHA256 e1d04bd6d91f56015bba03661785b642a3d80eaee2280064b5276aa183d29c6d +EBUILD man-pages-3.32.ebuild 1843 RMD160 6d84788c2a83020b68928466c6699213ec873895 SHA1 c993eed0140bb6751d3373bf3b7228f9b0520c2c SHA256 fbe1740bd6924998f3d7686e9ccb0b9572b80887e01af0df1d9b380030f60db9 +MISC ChangeLog 19687 RMD160 46347386fedb7fbb23b91c6a8716175343069ca2 SHA1 1a427fa194e2fbaeece4851950f3f132b8a0439d SHA256 c437e6515af573fc267ffabbcbedb43d2a19f141c7768b30996b84fd5318f571 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iF4EAREIAAYFAk5P86kACgkQaC/OocHi7JbOxwD7BFsTdh+V/afbxRdHnq5IPi6I +4oRIdcQRQBODFlTWDkEA/i38O7MfhJye9Q6rA9E/R5ZzQyPKoQ7Ta1dtVDGHPJ7/ +=7VeF +-----END PGP SIGNATURE----- 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 + !