Block libiconv, as this and that both install iconv(3) manpage.

Package-Manager: portage-2.1.2_rc2-r3

diff --git a/sys-apps/man-pages/ChangeLog b/sys-apps/man-pages/ChangeLog
index 1ea7fb02982e797d8d0d4edc7395b492dc6f6646..1e7df691386d893a47117573e87a1eb79acb1f99 100644 (file)
--- a/sys-apps/man-pages/ChangeLog
+++ b/sys-apps/man-pages/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/man-pages
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/ChangeLog,v 1.64 2006/11/26 19:30:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/ChangeLog,v 1.65 2006/12/02 18:57:15 flameeyes Exp $
+
+  02 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> man-pages-2.41.ebuild,
+  man-pages-2.42.ebuild:
+  Block libiconv, as this and that both install iconv(3) manpage.
 
 *man-pages-2.42 (26 Nov 2006)
 

diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index a3634c7dac269b278498268261f87fc91dc21c4d..9580f21f8f4960ff46664dcfcac6a5fe8fca908b 100644 (file)
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -7,18 +7,18 @@ RMD160 090c1d31d4589fa19f8cb7e287a84f4f18e612e1 files/man-pages-2.08-updates.pat
 SHA256 c1302276b420acf3d9447cb3436ee2b70567b92917d7cf912c59f622086d1e37 files/man-pages-2.08-updates.patch 351
 DIST man-pages-2.41.tar.bz2 1817225 RMD160 a76c5b1944368643658b4ab0fd5abf253cad049f SHA1 1bcff3e89e80d8cfdc01d614aa372de378b832a1 SHA256 bc9e3fe06a550d6eb48fd84eaf58415c78fbc29ba042e4a074adb62736f50760
 DIST man-pages-2.42.tar.bz2 1820225 RMD160 b9964259eed064dea25da0c7f3a12543dbcc2ae6 SHA1 a4b1ba53e90ce4771d70b41da6c17a8f0a50a305 SHA256 192f38c3555f78f66a9f3670296df6f70d087b128749f3467a5ec479ad53db0e
-EBUILD man-pages-2.41.ebuild 1424 RMD160 416dba117b27521d32d5bad96d54c51a46fd6461 SHA1 d13a7a7a739a2b858949256df07e709f8de404e9 SHA256 472d5a231869ad0544d0151ac092d07973a6e5d9b7481ec104d8e438fbcfbf80
-MD5 5d6a02334ec3444c68976a57b1c8f644 man-pages-2.41.ebuild 1424
-RMD160 416dba117b27521d32d5bad96d54c51a46fd6461 man-pages-2.41.ebuild 1424
-SHA256 472d5a231869ad0544d0151ac092d07973a6e5d9b7481ec104d8e438fbcfbf80 man-pages-2.41.ebuild 1424
-EBUILD man-pages-2.42.ebuild 1437 RMD160 5d149b3c9e9d8e8798dc057f17968f7874905219 SHA1 1e289a5c122f0436da37b7b51419b23c5398855a SHA256 6abffc339620290a882363d3a0fd9ef44eeb34ea292fba15d8885a8ce2c0c888
-MD5 28737c77aebbf62cc33bcd952433ce69 man-pages-2.42.ebuild 1437
-RMD160 5d149b3c9e9d8e8798dc057f17968f7874905219 man-pages-2.42.ebuild 1437
-SHA256 6abffc339620290a882363d3a0fd9ef44eeb34ea292fba15d8885a8ce2c0c888 man-pages-2.42.ebuild 1437
-MISC ChangeLog 8401 RMD160 7748b87a74aaadc8b8c008eb794aff88d1faaf86 SHA1 c87587a1ffd93a443700efea6896282557b4eb67 SHA256 4218a19bda2827160de9ca4905712b750bc355d0b481bbbe1371514b4bdd9e9f
-MD5 f97bed77f9785074b27b727187b3c03a ChangeLog 8401
-RMD160 7748b87a74aaadc8b8c008eb794aff88d1faaf86 ChangeLog 8401
-SHA256 4218a19bda2827160de9ca4905712b750bc355d0b481bbbe1371514b4bdd9e9f ChangeLog 8401
+EBUILD man-pages-2.41.ebuild 1447 RMD160 0b4b2520eae89875dfc487fee18580048bb4338b SHA1 07a319ded3a2dfb393cbd2881242318c828ecc45 SHA256 d3eb56d07c5ff49207c9787af65b3e1ac84009de40b6b044fccbece5f4a9c141
+MD5 8df5eeff98863bae36dffff699e727cb man-pages-2.41.ebuild 1447
+RMD160 0b4b2520eae89875dfc487fee18580048bb4338b man-pages-2.41.ebuild 1447
+SHA256 d3eb56d07c5ff49207c9787af65b3e1ac84009de40b6b044fccbece5f4a9c141 man-pages-2.41.ebuild 1447
+EBUILD man-pages-2.42.ebuild 1460 RMD160 5b97a7e205f0d9789c7080593b5a2b5666138383 SHA1 f9bfa2cca1151bb7ba13deb40915de48035fc811 SHA256 cea9e1800f331be17724c41a2daf2f12abe7aca643e2f50071a068e3dcd5ebce
+MD5 39130bf72ce8e32cae6a09a92bf6b6bd man-pages-2.42.ebuild 1460
+RMD160 5b97a7e205f0d9789c7080593b5a2b5666138383 man-pages-2.42.ebuild 1460
+SHA256 cea9e1800f331be17724c41a2daf2f12abe7aca643e2f50071a068e3dcd5ebce man-pages-2.42.ebuild 1460
+MISC ChangeLog 8572 RMD160 2770170c26f4c740bdbc07aa4304a768abde512d SHA1 245acf52799b3283aa5cb4c4141d3304c46fdc61 SHA256 188f2871642b75aac6bccefbb298e8e3d8e0e090aa12e501e9d263868da0add7
+MD5 402dfa721eaaaa68247787b912bd8c2b ChangeLog 8572
+RMD160 2770170c26f4c740bdbc07aa4304a768abde512d ChangeLog 8572
+SHA256 188f2871642b75aac6bccefbb298e8e3d8e0e090aa12e501e9d263868da0add7 ChangeLog 8572
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -32,7 +32,7 @@ SHA256 fbcbdf616a6474ef4d6ce1217377df36a877501c0c756abd20df59bc7e3e85f4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFaeulamhnQswr0vIRAsGjAJ9L5d9Bpb+1a8QcTv6JT5p0sxng9wCgh3/n
-1oqUfcD1WeUCXsOvPbqn748=
-=RgR1
+iD8DBQFFccydAiZjviIA2XgRAq6cAJ9M2Q8sjHCMPOXn3GO9/fs0WqeQ7gCffQH7
+49IPCrE5JtfmUd4KT5BgL40=
+=zfMl
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/man-pages/man-pages-2.41.ebuild b/sys-apps/man-pages/man-pages-2.41.ebuild
index 9c25e1fb68c0dd7cd857295320c5eaac9f3b94aa..e540da06203fb89bb3f151f568a0287981bcff4e 100644 (file)
--- a/sys-apps/man-pages/man-pages-2.41.ebuild
+++ b/sys-apps/man-pages/man-pages-2.41.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/sys-apps/man-pages/man-pages-2.41.ebuild,v 1.2 2006/11/26 19:28:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-2.41.ebuild,v 1.3 2006/12/02 18:57:15 flameeyes Exp $
 
 inherit eutils
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls"
 
-RDEPEND="virtual/man"
+RDEPEND="virtual/man
+       !dev-libs/libiconv"
 PDEPEND="nls? (
        linguas_cs? ( app-i18n/man-pages-cs )
        linguas_da? ( app-i18n/man-pages-da )

diff --git a/sys-apps/man-pages/man-pages-2.42.ebuild b/sys-apps/man-pages/man-pages-2.42.ebuild
index eb068a83313a52018eec051664bc9d3af396f2c3..46d539e04df81d5609b02c4c3232b3e883a7aa4a 100644 (file)
--- a/sys-apps/man-pages/man-pages-2.42.ebuild
+++ b/sys-apps/man-pages/man-pages-2.42.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/sys-apps/man-pages/man-pages-2.42.ebuild,v 1.1 2006/11/26 19:30:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-2.42.ebuild,v 1.2 2006/12/02 18:57:15 flameeyes Exp $
 
 inherit eutils
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="nls"
 
-RDEPEND="virtual/man"
+RDEPEND="virtual/man
+       !dev-libs/libiconv"
 PDEPEND="nls? (
        linguas_cs? ( app-i18n/man-pages-cs )
        linguas_da? ( app-i18n/man-pages-da )