Rename man pages to avoid collisions w/man-pages package with USERLAND=GNU systems #503162 by René Rhéaume.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 33 insertions, 18 deletions

diff --git a/dev-libs/libiconv/ChangeLog b/dev-libs/libiconv/ChangeLog
index 7a469ee055b9..964c6410661b 100644
--- a/dev-libs/libiconv/ChangeLog
+++ b/dev-libs/libiconv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libiconv
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.46 2014/03/27 06:30:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.47 2014/03/27 06:37:41 vapier Exp $
+
+  27 Mar 2014; Mike Frysinger <vapier@gentoo.org> libiconv-1.14-r1.ebuild:
+  Rename man pages to avoid collisions w/man-pages package with USERLAND=GNU
+  systems #503162 by René Rhéaume.
 
   27 Mar 2014; Mike Frysinger <vapier@gentoo.org>
   +files/libiconv-1.14-no-gets.patch, libiconv-1.14-r1.ebuild:
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index 1c1ffcbaecd9..2e2c90b07b97 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -6,24 +6,24 @@ AUX libiconv-1.14-no-gets.patch 836 SHA256 36742e571eaf7ec63856ec5dbcf8780fa724a
 DIST libiconv-1.13.1.tar.gz 4716070 SHA256 55a36168306089009d054ccdd9d013041bfc3ab26be7033d107821f1c4949a49 SHA512 8475b020769e66f56e476143b81da032e10b02b76b8b49468ce0d8c5658dca1a36940da5cde2fc7e82add2679fc9efe5cd2ea10ccd349682ff85a64d10101662 WHIRLPOOL 5f8b8f72176a3e80e416e3d0535e9ec77322f9a268567c7175f521d1cd3b15818779f28a0e50bac29048c26c14bb149450b81cc5af2d824ff4fc3c2559e0a97c
 DIST libiconv-1.14.tar.gz 4984397 SHA256 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613 SHA512 b96774fefc4fa1d07948fcc667027701373c34ebf9c4101000428e048addd85a5bb5e05e59f80eb783a3054a3a8a3c0da909450053275bbbf3ffde511eb3f387 WHIRLPOOL e96337209a4f86eccb112e94c3cd6b668b2a8fc4b05ed7becaa2f6fbc9279f7b32ec1fa4b086e61520bfffea5d4f7a1cad58bdb266b5f0aa7d02b89aeed9759a
 EBUILD libiconv-1.13.1.ebuild 1730 SHA256 2a357bff3994fb82092f18205d7a37fe3a62cb4b465f1cd3a7f319eb7b2708c9 SHA512 2d6404316853c9de31ca6e08bc66478b7cf652426b4e1101aa6fbb350cc1428ca9593c4b711a8bcd5d080bf3d2f64ef011e49a7e2971ae487e313df296993192 WHIRLPOOL dd8b6cea8fb5be547494012c7141571a19da539a81ec93abadfc51e5e07f6581a07ef8bc3d68c986d6c23d8650c956d1274b9b89ad9def1d67e0745034609dc6
-EBUILD libiconv-1.14-r1.ebuild 1140 SHA256 c026646f60793557e7d8c01fe0ebdae07a6f1dbcf7643bc83a237240a209ec6f SHA512 87bd5c89c04f25638b2cc778952489c72d1bd5aa78a1d206b4435f45ecfcfb3f37d7172e5ab69f0306bcf4602b00a64db01b998be7f1d876989082be98d9775e WHIRLPOOL f7e4f11ae125cfc362bb4e6a03e7fe01640f23450b69df608ac064e5541d85e02d492a4d6fa12f7886bcc223d8c678beec255618de901cd3d45e10232e24adac
+EBUILD libiconv-1.14-r1.ebuild 1501 SHA256 1c7bdead067fcf3976730a4d99b9011d4d780e9271be1b885a9516a2ffed5f41 SHA512 d35949467139463fb5b8797e21d6778b26829a3ae9ec8d7c62118327c9cf00de1161b7aebe6382c17a717a098ecce5966342768f7bcf3027af1948521c14a68f WHIRLPOOL ed3d53c4e9bb8aca1b712e071a306291876856b96128d709b5a44d517f10eec28dbba07d6a4ffd8da446b89ee453b8dc86c0808e4558307a621195cee6eaaa63
 EBUILD libiconv-1.14.ebuild 1100 SHA256 f80959cc4f4a3465f3f2cef848620cbc2a9e93326b312609dea6c267291a7356 SHA512 987d0e0305c8318273552a94de3e2f0c2fa24c0f8d23a0afcb9876fd7f232238b43f299371c9296d7ae630b0576232c40269d4e476c2f6484869283b06504d90 WHIRLPOOL fae8568a24ad758189dae579dac457a3d2d97458f62cc6c1d7e78108390def0420b0e7d4449bd1a050ec041c04c7292855993b40fe2d665b6d741037b851fb36
-MISC ChangeLog 6787 SHA256 eb8f555baba915d94d4a876531f1bfb737edaa09783c4fef8b514bb1abc34fff SHA512 383bff46e69a6d847c4a71d3cb5b494f4e424c6bd4c5051bc604ac4d1c850ce447780ea1a8319591d70ae0674e9b9b5e5070b02c32f88c90f2070d65d6166a78 WHIRLPOOL 6f5afdd04bacf7d3188942cd835f33a5c0cdce4810bc1bfcf45cdffe06719e19755b35928716745a63ed9b1317d328c5e8e44340828d115cfb4c3f41be053c70
+MISC ChangeLog 6977 SHA256 f78bce43b39baa43f8c8544d64e29c6c81e82eb2af3706af16f5a44a476175ae SHA512 28f2a7da351e9b3dd86c5cf4ee171395602b059738bef11ae384c538db2e56e4a587a78ecc2c93d60df385c51abdd2d90c5a3926475545e8da0a298a99abaf63 WHIRLPOOL 817d16408cd6badeb7eb19eb96e4bc66416d07fc73d7903859dec1f393cb8ccd6e3a6114b833e0ef27418cc36a6d9fcd2ba8fc2bf6df06de036e399e8c06c07e
 MISC metadata.xml 378 SHA256 fb61ffaf9539c5b433445c9145ce53945ccbbb19b02e97afa513574f88d64b1f SHA512 5d49cdd285a2f90eb2120439569abb8083eedb074e6ff083bd03d200ea77898c2626cb8975f3676dbd3572888c9589589f44746f916180fc97d4029871286ce2 WHIRLPOOL 6fdffa68eb58014c2b531b09656018551e0ee91b14cdd52265519dc8acb13412a07a6c9c1db70609085c71699086c2926881ddae1d792170bfaf201dea2f2bbd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTM8WaAAoJEPGu1DbS6WIArpsP/ibnawcH39tGpA92LASJBByh
-GmetUAAHtnviP4LaF8NZmQAfQBP0UA+vxV1DjAwHyRRePcg6I1fz7HKdeVOJDJOD
-W46qaLmie3zfDCYh8Whb0W7Yl+wBxf/LpXu+BeRCI3NL3OobmtBsLdDhl8P0SJe7
-jOyuRhWQzhCjcz40ReCRyRQmOg+GJ3UkQkRJC+hkjTdGMrN+kgwxFl1r2NEMT8oB
-2ZIM1UJ5cPnHOd1JkUmvMOL028QlTbCyTH/9YzevjadSi3GGpAWxhixA2+950aWT
-IBBXXuLy0cIyDHlC/16OmWusEIu3xhsI84+Q1gRD4ZKfx7ZAFuX2IF1LGAEucGJz
-8Wjoa4PpnJm6OvQ+tbso2AJ/bhdljCgtFFIyXxYaqdhclyDpCzK8nOPx/Otve0Lh
-MG+E6QJOZ7G5Lq+tw52IU/T3XpVt51/Q9Ki9624j4xtxfBYLwL3Vaf/jKfT8HPfQ
-Hzza5wLmEXQx3ONfTNFG4KMEgdJekPod6s2IRF0aAQHZqz6yQGE4HS8szXjR07z0
-lD5sa9E4BTs9JnPqUlyxnrqXeoKNYLfIW/bHFUQrIa2HcdZkl1yUUx7ABNgOZjhL
-yzUrjv8Bv+UZi4UZ2gPU8Q4WqDYr4+pjpKNIZ2RtEDF5NPbXE8L2RXPllJq29Vy0
-4o3aLEtoEk3sof4N5MrC
-=3HU6
+iQIcBAEBCAAGBQJTM8c9AAoJEPGu1DbS6WIA6bIP/3HbTqTcWZgyvrs5EfsKjZlN
+Ciy6fkyMG2iZbtLe6uRJ158ST2rJ2Flar2xaDBBmk5eB6GtS1QsZ8iXJb6Px+D36
+xe1OupA2EiYnbE53d4b+jpRieXqdEmuKhv6z41lPuSRZlkf+Pc0TcfViyqe9voUA
+I0ToC1tcM2dFMNglCzvHiLD38He+B8t4hUzr67Ts0q5zBWtCudqC4RgKwEVHVbod
+8sc7A85KsTliGa14HcQWph2CuWwlaAwC1FVf62GWLb1QftMDM8qOHwuEj/3QZh5E
+xrGtXTZ6kVNh0u94oJEc6rPWumV+85riziV7+CHMIOIjbHDcLx60p/aWpqxIfbtp
+FIzhrX1dR+J8b5w0QX5JLn1q/EQRFredtY5egTxz7d/vSooTn1sHKqTD+WAPHMTj
+GA3wK55ybn/qxJXmFuPnEhx3NiGqyd77Mzmy9p74K0jiSp3Eo/H3bj2RoBuaIRPf
+G1T+QcCADDa1TebOCB4b77knuuoMCZPkbEpr7BMs/XSamUtDMwza4z40Z96Wl2KE
+Gw78kZ0xlviFmVWKiAgX3xKkKsUM+Nq69S6OAtsLpfP6o3R53qrBLrGsEjQ4JTVi
+QOhdTA/7r28UzKKy3G4Xy+2MWCbarQoRaQTHRgRbjewcpCDJ/m5Dn6eH888Qw/AP
+/vxCdhiVL0XIXfEdfdFc
+=mUlJ
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libiconv/libiconv-1.14-r1.ebuild b/dev-libs/libiconv/libiconv-1.14-r1.ebuild
index e807ce5e53e4..a014795b537a 100644
--- a/dev-libs/libiconv/libiconv-1.14-r1.ebuild
+++ b/dev-libs/libiconv/libiconv-1.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.14-r1.ebuild,v 1.5 2014/03/27 06:30:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.14-r1.ebuild,v 1.6 2014/03/27 06:37:41 vapier Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 arm ~mips ppc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="+static-libs"
 
 DEPEND="!sys-libs/glibc
-	!sys-apps/man-pages"
+	!userland_GNU? ( !sys-apps/man-pages )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
@@ -39,4 +39,15 @@ multilib_src_install_all() {
 	# Install in /lib as utils installed in /lib like gnutar
 	# can depend on this
 	gen_usr_ldscript -a iconv charset
+
+	# If we have a GNU userland, we probably have sys-apps/man-pages
+	# installed, which means we want to rename our copies #503162.
+	# The use of USELAND=GNU is kind of a hack though ...
+	if use userland_GNU ; then
+		cd "${ED}"/usr/share/man || die
+		local f
+		for f in man*/*.[0-9] ; do
+			mv "${f}" "${f%/*}/${PN}-${f#*/}" || die
+		done
+	fi
 }