Block man-pages as they both install iconv(3) manpage.

Package-Manager: portage-2.1.2_rc2-r3

diff --git a/dev-libs/libiconv/ChangeLog b/dev-libs/libiconv/ChangeLog
index 5baff3fc786c0bf9b8c8ff2bc8250f9d9df84817..ea99e8e05d5d595d2ada43b94151f24faf78e2f1 100644 (file)
--- a/dev-libs/libiconv/ChangeLog
+++ b/dev-libs/libiconv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/libiconv
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.26 2006/10/17 06:11:23 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.27 2006/12/02 18:57:25 flameeyes Exp $
+
+  02 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> libiconv-1.11.ebuild:
+  Block man-pages as they both install iconv(3) manpage.
 
   17 Oct 2006; Roy Marples <uberlord@gentoo.org> libiconv-1.11.ebuild:
   Added ~sparc-fbsd keyword.

diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index 1903a33ee13e7438e48b22bbc8e343b8a63daf81..3fdc125c373f38dc5f47df0859661fefd08a800a 100644 (file)
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libiconv-1.10-link.patch 910 RMD160 9ffdad30a03ec8013c4e7eb257de01b096026853 SHA1 e5f2687b3ac28b17f5d5e79c7b1df45a31916a6c SHA256 99618454073097c4946acd4df69f2af961f7bfd3b52d0e385722a6cc4b81d8d8
 MD5 c48abf520f6345ca1cb28be835796db8 files/libiconv-1.10-link.patch 910
 RMD160 9ffdad30a03ec8013c4e7eb257de01b096026853 files/libiconv-1.10-link.patch 910
 SHA256 99618454073097c4946acd4df69f2af961f7bfd3b52d0e385722a6cc4b81d8d8 files/libiconv-1.10-link.patch 910
 DIST libiconv-1.11.tar.gz 4430930 RMD160 9adbcd61598bee2fbe4eb94ac3f35f83f568d9d0 SHA1 df09c3ef43443ac15c0c2d49fd791aa73a64bf30 SHA256 fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b
-EBUILD libiconv-1.11.ebuild 1861 RMD160 510b21c55f8f39e830cb6a95eb2ad6f66123b0aa SHA1 72409604980990bee8507e35cb4d01e44ed0d094 SHA256 ba362d16d22d49f89d1e5acceb94c05ab61a988b379e8d3305cae9de4b67caa4
-MD5 deaa3f0c296650025f542461f1dcb196 libiconv-1.11.ebuild 1861
-RMD160 510b21c55f8f39e830cb6a95eb2ad6f66123b0aa libiconv-1.11.ebuild 1861
-SHA256 ba362d16d22d49f89d1e5acceb94c05ab61a988b379e8d3305cae9de4b67caa4 libiconv-1.11.ebuild 1861
-MISC ChangeLog 4280 RMD160 8824231930ceff190e3130b157a3b5a7a814b2ed SHA1 512fc5ffd33f32b0ce74a203a1b8b2fead63c763 SHA256 2c2a324eff95fe8686329cbd941c86670a761296dcfd978073a501e483fade4e
-MD5 a9457e9bb78769330382ae2ad63fcd00 ChangeLog 4280
-RMD160 8824231930ceff190e3130b157a3b5a7a814b2ed ChangeLog 4280
-SHA256 2c2a324eff95fe8686329cbd941c86670a761296dcfd978073a501e483fade4e ChangeLog 4280
+EBUILD libiconv-1.11.ebuild 1883 RMD160 177b36256ae9735f9a127460560b52190ac16479 SHA1 9d7101ea4099b946aad2f6c590c529acdd9b9665 SHA256 1590a5eda4beaaa5f17b4769eabb95ac2c1b249c30a34b4ddb54ee072d559cf1
+MD5 37438451eeea675ccf37b065a96e1c17 libiconv-1.11.ebuild 1883
+RMD160 177b36256ae9735f9a127460560b52190ac16479 libiconv-1.11.ebuild 1883
+SHA256 1590a5eda4beaaa5f17b4769eabb95ac2c1b249c30a34b4ddb54ee072d559cf1 libiconv-1.11.ebuild 1883
+MISC ChangeLog 4414 RMD160 1e23b043dbb02b936cce509da4e50dfc1cc2948d SHA1 66d50d6d7879e822b682ee40d7f6a6bfb29be797 SHA256 89e3bd69805fe3380e0cb425f836d027257b2d0ef153f2b061407b446f6624cb
+MD5 f9479d6001adf86f914d5e155eecd9c8 ChangeLog 4414
+RMD160 1e23b043dbb02b936cce509da4e50dfc1cc2948d ChangeLog 4414
+SHA256 89e3bd69805fe3380e0cb425f836d027257b2d0ef153f2b061407b446f6624cb ChangeLog 4414
 MISC metadata.xml 378 RMD160 907b05848e357c89928e9e40c8eacfba66a20d04 SHA1 a5566ba3b095b06da0d54f2d79d3f42769a9af26 SHA256 fb61ffaf9539c5b433445c9145ce53945ccbbb19b02e97afa513574f88d64b1f
 MD5 c9d8d5d37487d29e41f03ef9dc5dc198 metadata.xml 378
 RMD160 907b05848e357c89928e9e40c8eacfba66a20d04 metadata.xml 378
@@ -18,3 +21,10 @@ SHA256 fb61ffaf9539c5b433445c9145ce53945ccbbb19b02e97afa513574f88d64b1f metadata
 MD5 b5814d388716bff7df495d4bf1efb9cf files/digest-libiconv-1.11 244
 RMD160 c96e87d30ac33aea1687de3dbb0c5eba6c57b57c files/digest-libiconv-1.11 244
 SHA256 363a12701f3231f372696f460f13b0efc5b8fda01434932e34495b501cf7df38 files/digest-libiconv-1.11 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFccylAiZjviIA2XgRAieXAKDUoVvKUMo5xgsC95sIVl4A0qV+swCgh8/r
+6QXVCGS9Sgbbmy/vw6ii7Ak=
+=kGHd
+-----END PGP SIGNATURE-----

diff --git a/dev-libs/libiconv/libiconv-1.11.ebuild b/dev-libs/libiconv/libiconv-1.11.ebuild
index fa380e77933e0fc3f9859bcede5914b1d4052d78..962aec9c12933e558b46ea1c81af784e12618c08 100644 (file)
--- a/dev-libs/libiconv/libiconv-1.11.ebuild
+++ b/dev-libs/libiconv/libiconv-1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.11.ebuild,v 1.6 2006/10/17 06:11:23 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.11.ebuild,v 1.7 2006/12/02 18:57:25 flameeyes Exp $
 
 inherit eutils multilib flag-o-matic autotools libtool
 
@@ -13,7 +13,8 @@ LICENSE="LGPL-2.1"
 KEYWORDS="~sparc-fbsd ~x86-fbsd"
 IUSE="build"
 
-DEPEND="!sys-libs/glibc"
+DEPEND="!sys-libs/glibc
+       !sys-apps/man-pages"
 
 src_unpack() {
        unpack ${A}